testing api-unit job

use more inputs as cache key
Merge remote-tracking branch 'origin/develop' into negue/ci-cache
2026-05-14 19:41:26 -05:00 · 2023-07-23 00:40:47 +02:00 · 2023-07-23 00:27:03 +02:00 · 2023-06-25 23:03:09 +02:00 · 2023-06-25 22:39:13 +02:00 · 2023-06-21 13:50:08 -04:00
233 changed files with 6916 additions and 2919 deletions
@@ -0,0 +1,61 @@
+name: job setup
+description: 'Sets the shared steps for each job'
+
+inputs:
+  node-version:
+    description: 'The Node version to be setup'
+    required: true
+  node-env:
+    description: 'Node-Env for CI'
+    required: true
+  package-install-cmd:
+    description: 'CI or install or custom to skip post install and unneeded builds'
+    required: false
+    default: 'ci'
+  install-website-package:
+    description: 'if package-install-cmd skipped post install, you can trigger an installation of website'
+    required: false
+    default: 'false'
+
+  website-package-install-cmd:
+    description: 'CI or install or custom to skip post install and unneeded builds'
+    required: false
+    default: 'ci'
+
+runs:
+  using: composite
+  steps:
+    - name: Use Node.js ${{ inputs.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ inputs.node-version }}
+    - name: Cache multiple paths
+      id: cache-package
+      uses: actions/cache@v2
+      with:
+        path: |
+          **/node_modules
+        key: ${{ runner.os }}-${{ inputs.node-version }}-${{ inputs.node-env }}-${{ inputs.install-website-package }}-${{ hashFiles('**/package.json') }}
+
+    - name: Create dummy config.json
+      shell: bash
+      run: cp config.json.example config.json
+
+    - name: npm install
+      if: steps.cache-package.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        npm ${{ inputs.package-install-cmd }}
+      env:
+        CI: true
+        NODE_ENV: ${{ inputs.node-env }}
+
+    - name: npm install website
+      if: ${{ steps.cache-package.outputs.cache-hit != 'true' && inputs.install-website-package != 'false' }}
+      shell: bash
+      working-directory: ./website/client
+      run: |
+        npm ${{ inputs.website-package-install-cmd }}
+      env:
+        CI: true
+        NODE_ENV: ${{ inputs.node-env }}
@@ -1,6 +1,13 @@
 name: Test

-on: [push, pull_request]
+on:
+  pull_request:
+    branches:
+      - '**'
+  push:
+    branches:
+      - 'develop'
+      - 'release'

 permissions:
  contents: read
@@ -15,17 +22,16 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+        install-website-package: 'true'
+        website-package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run lint-no-fix
  apidoc:
    runs-on: ubuntu-latest
@@ -36,17 +42,14 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run apidoc
  sanity:
    runs-on: ubuntu-latest
@@ -57,19 +60,16 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run test:sanity
-  
+
  common:
    runs-on: ubuntu-latest
    strategy:
@@ -79,17 +79,14 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run test:common
  content:
    runs-on: ubuntu-latest
@@ -100,19 +97,16 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run test:content
-  
+
  api-unit:
    runs-on: ubuntu-latest
    strategy:
@@ -123,22 +117,20 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
+        node-env: 'test'
+        package-install-cmd: 'ci'
+
    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+
    - run: npm run test:api:unit
      env:
        REQUIRES_SERVER=true: true
@@ -152,22 +144,20 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+
    - run: npm run test:api-v3:integration
      env:
        REQUIRES_SERVER=true: true
@@ -181,22 +171,20 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+
    - name: Start MongoDB ${{ matrix.mongodb-version }} Replica Set
      uses: supercharge/mongodb-github-action@1.3.0
      with:
        mongodb-version: ${{ matrix.mongodb-version }}
        mongodb-replica-set: rs
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+
    - run: npm run test:api-v4:integration
      env:
        REQUIRES_SERVER=true: true
@@ -210,17 +198,16 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm ci
-      env:
-        CI: true
-        NODE_ENV: test
+        node-env: 'test'
+        package-install-cmd: 'ci --ignore-scripts'
+        install-website-package: 'true'
+        website-package-install-cmd: 'ci --ignore-scripts'
+
    - run: npm run test:unit
      working-directory: ./website/client

@@ -233,14 +220,9 @@ jobs:
    - uses: actions/checkout@v1
      with:
        fetch-depth: 1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+
+    - name: Setup Shared Job Steps
+      uses: './.github/actions/shared-job-steps'
      with:
        node-version: ${{ matrix.node-version }}
-    - run: cp config.json.example config.json
-    - name: npm install
-      run: |
-        npm install
-      env:
-        CI: true
-        NODE_ENV: production
+        node-env: 'production'
@@ -0,0 +1,158 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20230522_pet_group_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['Parrot-Base']
+      && pets['Parrot-CottonCandyBlue']
+      && pets['Parrot-CottonCandyPink']
+      && pets['Parrot-Desert']
+      && pets['Parrot-Golden']
+      && pets['Parrot-Red']
+      && pets['Parrot-Shade']
+      && pets['Parrot-Skeleton']
+      && pets['Parrot-White']
+      && pets['Parrot-Zombie']
+      && pets['Rooster-Base']
+      && pets['Rooster-CottonCandyBlue']
+      && pets['Rooster-CottonCandyPink']
+      && pets['Rooster-Desert']
+      && pets['Rooster-Golden']
+      && pets['Rooster-Red']
+      && pets['Rooster-Shade']
+      && pets['Rooster-Skeleton']
+      && pets['Rooster-White']
+      && pets['Rooster-Zombie']
+      && pets['Triceratops-Base']
+      && pets['Triceratops-CottonCandyBlue']
+      && pets['Triceratops-CottonCandyPink']
+      && pets['Triceratops-Desert']
+      && pets['Triceratops-Golden']
+      && pets['Triceratops-Red']
+      && pets['Triceratops-Shade']
+      && pets['Triceratops-Skeleton']
+      && pets['Triceratops-White']
+      && pets['Triceratops-Zombie']
+      && pets['TRex-Base']
+      && pets['TRex-CottonCandyBlue']
+      && pets['TRex-CottonCandyPink']
+      && pets['TRex-Desert']
+      && pets['TRex-Golden']
+      && pets['TRex-Red']
+      && pets['TRex-Shade']
+      && pets['TRex-Skeleton']
+      && pets['TRex-White']
+      && pets['TRex-Zombie']
+      && pets['Pterodactyl-Base']
+      && pets['Pterodactyl-CottonCandyBlue']
+      && pets['Pterodactyl-CottonCandyPink']
+      && pets['Pterodactyl-Desert']
+      && pets['Pterodactyl-Golden']
+      && pets['Pterodactyl-Red']
+      && pets['Pterodactyl-Shade']
+      && pets['Pterodactyl-Skeleton']
+      && pets['Pterodactyl-White']
+      && pets['Pterodactyl-Zombie']
+      && pets['Owl-Base']
+      && pets['Owl-CottonCandyBlue']
+      && pets['Owl-CottonCandyPink']
+      && pets['Owl-Desert']
+      && pets['Owl-Golden']
+      && pets['Owl-Red']
+      && pets['Owl-Shade']
+      && pets['Owl-Skeleton']
+      && pets['Owl-White']
+      && pets['Owl-Zombie']
+      && pets['Velociraptor-Base']
+      && pets['Velociraptor-CottonCandyBlue']
+      && pets['Velociraptor-CottonCandyPink']
+      && pets['Velociraptor-Desert']
+      && pets['Velociraptor-Golden']
+      && pets['Velociraptor-Red']
+      && pets['Velociraptor-Shade']
+      && pets['Velociraptor-Skeleton']
+      && pets['Velociraptor-White']
+      && pets['Velociraptor-Zombie']
+      && pets['Penguin-Base']
+      && pets['Penguin-CottonCandyBlue']
+      && pets['Penguin-CottonCandyPink']
+      && pets['Penguin-Desert']
+      && pets['Penguin-Golden']
+      && pets['Penguin-Red']
+      && pets['Penguin-Shade']
+      && pets['Penguin-Skeleton']
+      && pets['Penguin-White']
+      && pets['Penguin-Zombie']
+      && pets['Falcon-Base']
+      && pets['Falcon-CottonCandyBlue']
+      && pets['Falcon-CottonCandyPink']
+      && pets['Falcon-Desert']
+      && pets['Falcon-Golden']
+      && pets['Falcon-Red']
+      && pets['Falcon-Shade']
+      && pets['Falcon-Skeleton']
+      && pets['Falcon-White']
+      && pets['Falcon-Zombie']
+      && pets['Peacock-Base']
+      && pets['Peacock-CottonCandyBlue']
+      && pets['Peacock-CottonCandyPink']
+      && pets['Peacock-Desert']
+      && pets['Peacock-Golden']
+      && pets['Peacock-Red']
+      && pets['Peacock-Shade']
+      && pets['Peacock-Skeleton']
+      && pets['Peacock-White']
+      && pets['Peacock-Zombie']) {
+        set['achievements.dinosaurDynasty'] = 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('2023-04-15') },
+  };
+
+  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,12 +1,12 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.267.3",
+  "version": "4.274.0",
  "main": "./website/server/index.js",
  "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/register": "^7.18.9",
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/register": "^7.22.5",
    "@google-cloud/trace-agent": "^7.1.2",
    "@parse/node-apn": "^5.1.3",
    "@slack/webhook": "^6.1.0",
@@ -14,9 +14,9 @@
    "amazon-payments": "^0.2.9",
    "amplitude": "^6.0.0",
    "apidoc": "^0.54.0",
-    "apple-auth": "^1.0.7",
+    "apple-auth": "^1.0.9",
    "bcrypt": "^5.1.0",
-    "body-parser": "^1.20.1",
+    "body-parser": "^1.20.2",
    "bootstrap": "^4.6.0",
    "compression": "^1.7.4",
    "cookie-session": "^2.0.0",
@@ -42,7 +42,7 @@
    "image-size": "^1.0.2",
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^5.0.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
    "jwks-rsa": "^2.1.5",
    "lodash": "^4.17.21",
    "merge-stream": "^2.0.0",
@@ -67,16 +67,16 @@
    "remove-markdown": "^0.5.0",
    "rimraf": "^3.0.2",
    "short-uuid": "^4.2.2",
-    "stripe": "^11.10.0",
-    "superagent": "^8.0.6",
+    "stripe": "^12.9.0",
+    "superagent": "^8.0.9",
    "universal-analytics": "^0.5.3",
    "useragent": "^2.1.9",
    "uuid": "^9.0.0",
    "validator": "^13.9.0",
    "vinyl-buffer": "^1.0.1",
-    "winston": "^3.8.2",
+    "winston": "^3.9.0",
    "winston-loggly-bulk": "^3.2.1",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.6.0"
  },
  "private": true,
  "engines": {
@@ -110,7 +110,7 @@
    "apidoc": "gulp apidoc"
  },
  "devDependencies": {
-    "axios": "^1.2.2",
+    "axios": "^1.3.6",
    "chai": "^4.3.7",
    "chai-as-promised": "^7.1.1",
    "chai-moment": "^0.1.0",
@@ -122,7 +122,7 @@
    "monk": "^7.3.4",
    "require-again": "^2.0.0",
    "run-rs": "^0.7.7",
-    "sinon": "^15.0.1",
+    "sinon": "^15.1.2",
    "sinon-chai": "^3.7.0",
    "sinon-stub-promise": "^4.0.0"
  },
@@ -748,9 +748,19 @@ describe('payments/index', () => {
      });

      it('does not add to plans.consecutive.offset if 1 month subscription', async () => {
+        data.sub.key = 'basic_earned';
        await api.createSubscription(data);

-        expect(user.purchased.plan.extraMonths).to.eql(0);
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
+      });
+
+      it('resets plans.consecutive.offset if 1 month subscription', async () => {
+        user.purchased.plan.consecutive.offset = 1;
+        await user.save();
+        data.sub.key = 'basic_earned';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
      });

      it('adds 5 to plan.consecutive.gemCapExtra for 3 month block', async () => {
@@ -242,7 +242,7 @@ describe('cron middleware', () => {

    sandbox.spy(cronLib, 'recoverCron');

-    sandbox.stub(User, 'update')
+    sandbox.stub(User, 'updateOne')
      .withArgs({
        _id: user._id,
        $or: [
@@ -1732,7 +1732,7 @@ describe('Group Model', () => {
        });

        it('updates participting members (not including user)', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateMany');

          await party.startQuest(nonParticipatingMember);

@@ -1740,7 +1740,7 @@ describe('Group Model', () => {
            questLeader._id, participatingMember._id, sleepingParticipatingMember._id,
          ];

-          expect(User.update).to.be.calledWith(
+          expect(User.updateMany).to.be.calledWith(
            { _id: { $in: members } },
            {
              $set: {
@@ -1753,11 +1753,11 @@ describe('Group Model', () => {
        });

        it('updates non-user quest leader and decrements quest scroll', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateOne');

          await party.startQuest(participatingMember);

-          expect(User.update).to.be.calledWith(
+          expect(User.updateOne).to.be.calledWith(
            { _id: questLeader._id },
            {
              $inc: {
@@ -1819,29 +1819,29 @@ describe('Group Model', () => {
        };

        it('doesn\'t retry successful operations', async () => {
-          sandbox.stub(User, 'update').returns(successfulMock);
+          sandbox.stub(User, 'updateOne').returns(successfulMock);

          await party.finishQuest(quest);

-          expect(User.update).to.be.calledThrice;
+          expect(User.updateOne).to.be.calledThrice;
        });

        it('stops retrying when a successful update has occurred', async () => {
-          const updateStub = sandbox.stub(User, 'update');
+          const updateStub = sandbox.stub(User, 'updateOne');
          updateStub.onCall(0).returns(failedMock);
          updateStub.returns(successfulMock);

          await party.finishQuest(quest);

-          expect(User.update.callCount).to.equal(4);
+          expect(User.updateOne.callCount).to.equal(4);
        });

        it('retries failed updates at most five times per user', async () => {
-          sandbox.stub(User, 'update').returns(failedMock);
+          sandbox.stub(User, 'updateOne').returns(failedMock);

          await expect(party.finishQuest(quest)).to.eventually.be.rejected;

-          expect(User.update.callCount).to.eql(15); // for 3 users
+          expect(User.updateOne.callCount).to.eql(15); // for 3 users
        });
      });

@@ -2088,17 +2088,17 @@ describe('Group Model', () => {

      context('Party quests', () => {
        it('updates participating members with rewards', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateOne');
          await party.finishQuest(quest);

-          expect(User.update).to.be.calledThrice;
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledThrice;
+          expect(User.updateOne).to.be.calledWithMatch({
            _id: questLeader._id,
          });
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledWithMatch({
            _id: participatingMember._id,
          });
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledWithMatch({
            _id: sleepingParticipatingMember._id,
          });
        });
@@ -2173,11 +2173,11 @@ describe('Group Model', () => {
        });

        it('updates all users with rewards', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateMany');
          await party.finishQuest(tavernQuest);

-          expect(User.update).to.be.calledOnce;
-          expect(User.update).to.be.calledWithMatch({});
+          expect(User.updateMany).to.be.calledOnce;
+          expect(User.updateMany).to.be.calledWithMatch({});
        });

        it('sets quest completed to the world quest key', async () => {
@@ -2,7 +2,6 @@ import { v4 as generateUUID } from 'uuid';
 import {
  generateUser,
  createAndPopulateGroup,
-  checkExistence,
  translate as t,
 } from '../../../../helpers/api-integration/v3';

@@ -258,47 +257,6 @@ describe('POST /group/:groupId/join', () => {
        await expect(user.get('/user')).to.eventually.have.nested.property('items.quests.basilist', 2);
      });

-      it('deletes previous party where the user was the only member', async () => {
-        const userToInvite = await generateUser();
-        const oldParty = await userToInvite.post('/groups', { // add user to a party
-          name: 'Another Test Party',
-          type: 'party',
-        });
-
-        await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(true);
-        await user.post(`/groups/${party._id}/invite`, {
-          uuids: [userToInvite._id],
-        });
-        await userToInvite.post(`/groups/${party._id}/join`);
-
-        await expect(user.get('/user')).to.eventually.have.nested.property('party._id', party._id);
-        await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(false);
-      });
-
-      it('does not allow user to leave a party if a quest was active and they were the only member', async () => {
-        const userToInvite = await generateUser();
-        const oldParty = await userToInvite.post('/groups', { // add user to a party
-          name: 'Another Test Party',
-          type: 'party',
-        });
-
-        await userToInvite.update({
-          [`items.quests.${PET_QUEST}`]: 1,
-        });
-        await userToInvite.post(`/groups/${oldParty._id}/quests/invite/${PET_QUEST}`);
-
-        await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(true);
-        await user.post(`/groups/${party._id}/invite`, {
-          uuids: [userToInvite._id],
-        });
-
-        await expect(userToInvite.post(`/groups/${party._id}/join`)).to.eventually.be.rejected.and.eql({
-          code: 401,
-          error: 'NotAuthorized',
-          message: t('messageCannotLeaveWhileQuesting'),
-        });
-      });
-
      it('invites joining member to active quest', async () => {
        await user.update({
          [`items.quests.${PET_QUEST}`]: 1,
@@ -1,6 +1,7 @@
 import { v4 as generateUUID } from 'uuid';
 import nconf from 'nconf';
 import {
+  createAndPopulateGroup,
  generateUser,
  generateGroup,
  translate as t,
@@ -581,20 +582,7 @@ describe('Post /groups/:groupId/invite', () => {
        });
    });

-    it('allow inviting a user to a party if they are partying solo', async () => {
-      const userToInvite = await generateUser();
-      await userToInvite.post('/groups', { // add user to a party
-        name: 'Another Test Party',
-        type: 'party',
-      });
-
-      await inviter.post(`/groups/${party._id}/invite`, {
-        uuids: [userToInvite._id],
-      });
-      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
-    });
-
-    it('allow inviting a user to 2 different parties', async () => {
+    it('allows inviting a user to 2 different parties', async () => {
      // Create another inviter
      const inviter2 = await generateUser();

@@ -635,29 +623,48 @@ describe('Post /groups/:groupId/invite', () => {
      });
      expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id);
    });
+  });
+
+  describe('party size limits', () => {
+    let party;
+    let partyLeader;
+
+    beforeEach(async () => {
+      group = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'Test Party',
+          type: 'party',
+          privacy: 'private',
+        },
+        // Generate party with 20 members
+        members: PARTY_LIMIT_MEMBERS - 10,
+      });
+      party = group.group;
+      partyLeader = group.groupLeader;
+    });

    it('allows 30 members in a party', async () => {
      const invitesToGenerate = [];
-      // Generate 29 users to invite (29 + leader = 30 members)
-      for (let i = 0; i < PARTY_LIMIT_MEMBERS - 1; i += 1) {
+      // Generate 10 new invites
+      for (let i = 1; i < 10; i += 1) {
        invitesToGenerate.push(generateUser());
      }
      const generatedInvites = await Promise.all(invitesToGenerate);
      // Invite users
-      expect(await inviter.post(`/groups/${party._id}/invite`, {
+      expect(await partyLeader.post(`/groups/${party._id}/invite`, {
        uuids: generatedInvites.map(invite => invite._id),
      })).to.be.an('array');
    }).timeout(10000);

-    it('does not allow 30+ members in a party', async () => {
+    it('does not allow >30 members in a party', async () => {
      const invitesToGenerate = [];
-      // Generate 30 users to invite (30 + leader = 31 members)
-      for (let i = 0; i < PARTY_LIMIT_MEMBERS; i += 1) {
+      // Generate 11 invites
+      for (let i = 1; i < 11; i += 1) {
        invitesToGenerate.push(generateUser());
      }
      const generatedInvites = await Promise.all(invitesToGenerate);
      // Invite users
-      await expect(inviter.post(`/groups/${party._id}/invite`, {
+      await expect(partyLeader.post(`/groups/${party._id}/invite`, {
        uuids: generatedInvites.map(invite => invite._id),
      }))
        .to.eventually.be.rejected.and.eql({
@@ -202,18 +202,86 @@ describe('POST /user/class/cast/:spellId', () => {
    await group.groupLeader.post('/user/class/cast/mpheal');

    promises = [];
+    promises.push(group.groupLeader.sync());
    promises.push(group.members[0].sync());
    promises.push(group.members[1].sync());
    promises.push(group.members[2].sync());
    promises.push(group.members[3].sync());
    await Promise.all(promises);

+    expect(group.groupLeader.stats.mp).to.be.equal(170); // spell caster
    expect(group.members[0].stats.mp).to.be.greaterThan(0); // warrior
    expect(group.members[1].stats.mp).to.equal(0); // wizard
    expect(group.members[2].stats.mp).to.be.greaterThan(0); // rogue
    expect(group.members[3].stats.mp).to.be.greaterThan(0); // healer
  });

+  const spellList = [
+    {
+      className: 'warrior',
+      spells: [['smash', 'task'], ['defensiveStance'], ['valorousPresence'], ['intimidate']],
+    },
+    {
+      className: 'wizard',
+      spells: [['fireball', 'task'], ['mpheal'], ['earth'], ['frost']],
+    },
+    {
+      className: 'healer',
+      spells: [['heal'], ['brightness'], ['protectAura'], ['healAll']],
+    },
+    {
+      className: 'rogue',
+      spells: [['pickPocket', 'task'], ['backStab', 'task'], ['toolsOfTrade'], ['stealth']],
+    },
+  ];
+
+  spellList.forEach(async habitClass => {
+    describe(`For a ${habitClass.className}`, async () => {
+      habitClass.spells.forEach(async spell => {
+        describe(`Using ${spell[0]}`, async () => {
+          it('Deducts MP from spell caster', async () => {
+            const { groupLeader } = await createAndPopulateGroup({
+              groupDetails: { type: 'party', privacy: 'private' },
+              members: 3,
+            });
+            await groupLeader.update({
+              'stats.mp': 200, 'stats.class': habitClass.className, 'stats.lvl': 20, 'stats.hp': 40,
+            });
+            // need this for task spells and for stealth
+            const task = await groupLeader.post('/tasks/user', {
+              text: 'test habit',
+              type: 'daily',
+            });
+            if (spell.length === 2 && spell[1] === 'task') {
+              await groupLeader.post(`/user/class/cast/${spell[0]}?targetId=${task._id}`);
+            } else {
+              await groupLeader.post(`/user/class/cast/${spell[0]}`);
+            }
+            await groupLeader.sync();
+            expect(groupLeader.stats.mp).to.be.lessThan(200);
+          });
+          it('works without a party', async () => {
+            await user.update({
+              'stats.mp': 200, 'stats.class': habitClass.className, 'stats.lvl': 20, 'stats.hp': 40,
+            });
+            // need this for task spells and for stealth
+            const task = await user.post('/tasks/user', {
+              text: 'test habit',
+              type: 'daily',
+            });
+            if (spell.length === 2 && spell[1] === 'task') {
+              await user.post(`/user/class/cast/${spell[0]}?targetId=${task._id}`);
+            } else {
+              await user.post(`/user/class/cast/${spell[0]}`);
+            }
+            await user.sync();
+            expect(user.stats.mp).to.be.lessThan(200);
+          });
+        });
+      });
+    });
+  });
+
  it('cast bulk', async () => {
    let { group, groupLeader } = await createAndPopulateGroup({ // eslint-disable-line prefer-const
      groupDetails: { type: 'party', privacy: 'private' },
@@ -1842,9 +1842,9 @@
      }
    },
    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz",
-      "integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
      "requires": {
        "@babel/helper-plugin-utils": "^7.20.2",
        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
@@ -1870,9 +1870,9 @@
          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
        },
        "@babel/types": {
-          "version": "7.20.7",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-          "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+          "version": "7.21.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+          "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
          "requires": {
            "@babel/helper-string-parser": "^7.19.4",
            "@babel/helper-validator-identifier": "^7.19.1",
@@ -13321,14 +13321,12 @@
        "emojis-list": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "optional": true
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "optional": true
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
@@ -13339,7 +13337,6 @@
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
@@ -13381,7 +13378,6 @@
          "version": "7.2.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
@@ -13390,7 +13386,6 @@
          "version": "npm:vue-loader@16.8.3",
          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "optional": true,
          "requires": {
            "chalk": "^4.1.0",
            "hash-sum": "^2.0.0",
@@ -13401,7 +13396,6 @@
              "version": "4.1.2",
              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "optional": true,
              "requires": {
                "ansi-styles": "^4.1.0",
                "supports-color": "^7.1.0"
@@ -16907,9 +16901,9 @@
      }
    },
    "core-js": {
-      "version": "3.27.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz",
-      "integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="
+      "version": "3.31.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
    },
    "core-js-compat": {
      "version": "3.11.0",
@@ -17958,9 +17952,9 @@
      }
    },
    "dompurify": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz",
-      "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.3.tgz",
+      "integrity": "sha512-axQ9zieHLnAnHh0sfAamKYiqXMJAVwu+LM/alQ7WDagoWessyWvMSFyW65CqF3owufNu8HBcE4cM2Vflu7YWcQ=="
    },
    "domutils": {
      "version": "1.7.0",
@@ -21077,6 +21071,11 @@
      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
    },
+    "immutable": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
+      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="
+    },
    "import-cwd": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -21437,9 +21436,9 @@
      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
    },
    "intro.js": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-6.0.0.tgz",
-      "integrity": "sha512-ZUiR6BoLSvPSlLG0boewnWVgji1fE1gBvP/pyw5pgCKXEDQz1mMeUxarggClPNs71UTq364LwSk9zxz17A9gaQ=="
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-7.0.1.tgz",
+      "integrity": "sha512-1oqz6aOz9cGQ3CrtVYhCSo6AkjnXUn302kcIWLaZ3TI4kKssRXDwDSz4VRoGcfC1jN+WfaSJXRBrITz+QVEBzg=="
    },
    "invariant": {
      "version": "2.2.4",
@@ -22019,9 +22018,9 @@
      }
    },
    "jquery": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
-      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
+      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
    },
    "js-message": {
      "version": "1.0.5",
@@ -27367,17 +27366,19 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "sass": {
-      "version": "1.34.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
-      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
+      "version": "1.63.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.63.4.tgz",
+      "integrity": "sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==",
      "requires": {
-        "chokidar": ">=3.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
      },
      "dependencies": {
        "anymatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+          "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
          "requires": {
            "normalize-path": "^3.0.0",
            "picomatch": "^2.0.4"
@@ -27397,18 +27398,18 @@
          }
        },
        "chokidar": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
          "requires": {
-            "anymatch": "~3.1.1",
+            "anymatch": "~3.1.2",
            "braces": "~3.0.2",
-            "fsevents": "~2.3.1",
-            "glob-parent": "~5.1.0",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
            "is-binary-path": "~2.1.0",
            "is-glob": "~4.0.1",
            "normalize-path": "~3.0.0",
-            "readdirp": "~3.5.0"
+            "readdirp": "~3.6.0"
          }
        },
        "fill-range": {
@@ -27447,9 +27448,9 @@
          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
        },
        "readdirp": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
          "requires": {
            "picomatch": "^2.2.1"
          }
@@ -27801,9 +27802,9 @@
      }
    },
    "smartbanner.js": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.19.1.tgz",
-      "integrity": "sha512-x3alFTlk6pLuqrm9PrYQv1E+86CrEIgPf/KJ+nP5342BmOWstbdR8OwD3TPmM56zHQm4MEr/eoqbEcfTKdvdKw=="
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/smartbanner.js/-/smartbanner.js-1.19.2.tgz",
+      "integrity": "sha512-hwcGNp5Hza5PJHTmqP6H8q0XBYhloIQyJgdzv0ldz3HQSeEuKB2riVraQXdKuquE6ZU/0M0yubno53xJ/ZiQQg=="
    },
    "snapdragon": {
      "version": "0.8.2",
@@ -28175,9 +28176,9 @@
      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
    },
    "stopword": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/stopword/-/stopword-2.0.7.tgz",
-      "integrity": "sha512-s+uLKAxrproCLrq0Wcd3JAIjlJLx6l80b2Rzt0u8+ra5SzGkHnNG8PS3DfGmYk2TrKePDVLL4SdKYwKpgSLc+w=="
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/stopword/-/stopword-2.0.8.tgz",
+      "integrity": "sha512-btlEC2vEuhCuvshz99hSGsY8GzaP5qzDPQm56j6rR/R38p8xdsOXgU5a6tIgvU/4hcCta1Vlo/2FVXA9m0f8XA=="
    },
    "store2": {
      "version": "2.10.0",
@@ -30271,9 +30272,9 @@
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
    },
    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
    },
    "uuid-browser": {
      "version": "3.1.0",
@@ -32,8 +32,8 @@
    "bootstrap": "^4.6.0",
    "bootstrap-vue": "^2.23.1",
    "chai": "^4.3.7",
-    "core-js": "^3.27.2",
-    "dompurify": "^2.4.3",
+    "core-js": "^3.31.0",
+    "dompurify": "^3.0.3",
    "eslint": "^6.8.0",
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
@@ -41,20 +41,20 @@
    "habitica-markdown": "^3.0.0",
    "hellojs": "^1.20.0",
    "inspectpack": "^4.7.1",
-    "intro.js": "^6.0.0",
-    "jquery": "^3.6.3",
+    "intro.js": "^7.0.1",
+    "jquery": "^3.7.0",
    "lodash": "^4.17.21",
    "moment": "^2.29.4",
    "nconf": "^0.12.0",
-    "sass": "^1.34.0",
+    "sass": "^1.63.4",
    "sass-loader": "^8.0.2",
-    "smartbanner.js": "^1.19.1",
-    "stopword": "^2.0.7",
+    "smartbanner.js": "^1.19.2",
+    "stopword": "^2.0.8",
    "svg-inline-loader": "^0.8.2",
    "svg-url-loader": "^7.1.1",
    "svgo": "^1.3.2",
    "svgo-loader": "^2.2.1",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
    "validator": "^13.9.0",
    "vue": "^2.7.10",
    "vue-cli-plugin-storybook": "2.1.0",
@@ -66,6 +66,6 @@
    "webpack": "^4.46.0"
  },
  "devDependencies": {
-    "@babel/plugin-proposal-optional-chaining": "^7.20.7"
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0"
  }
 }
@@ -138,6 +138,11 @@
  width: 48px;
  height: 52px;
 }
+.achievement-dinosaurDynasty2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-dinosaurDynasty2x.png');
+  width: 68px;
+  height: 68px;
+}
 .achievement-domesticated2x {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-domesticated2x.png');
  width: 60px;
@@ -810,6 +815,11 @@
  width: 141px;
  height: 147px;
 }
+.background_crater_lake {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_crater_lake.png');
+  width: 141px;
+  height: 147px;
+}
 .background_creepy_castle {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_creepy_castle.png');
  width: 141px;
@@ -820,6 +830,11 @@
  width: 141px;
  height: 147px;
 }
+.background_cretaceous_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cretaceous_forest.png');
+  width: 141px;
+  height: 147px;
+}
 .background_crosscountry_ski_trail {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_crosscountry_ski_trail.png');
  width: 141px;
@@ -1054,6 +1069,11 @@
  width: 141px;
  height: 147px;
 }
+.background_flying_over_hedge_maze {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_hedge_maze.png');
+  width: 141px;
+  height: 147px;
+}
 .background_flying_over_icy_steppes {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_icy_steppes.png');
  width: 141px;
@@ -1329,11 +1349,21 @@
  width: 141px;
  height: 147px;
 }
+.background_in_a_painting {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_a_painting.png');
+  width: 141px;
+  height: 147px;
+}
 .background_in_an_ancient_tomb {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_an_ancient_tomb.png');
  width: 141px;
  height: 147px;
 }
+.background_in_an_aquarium {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_an_aquarium.png');
+  width: 141px;
+  height: 147px;
+}
 .background_in_front_of_fountain {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_front_of_fountain.png');
  width: 141px;
@@ -1354,6 +1384,11 @@
  width: 141px;
  height: 147px;
 }
+.background_inside_adventurers_hideout {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_inside_adventurers_hideout.png');
+  width: 141px;
+  height: 147px;
+}
 .background_inside_an_ornament {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_inside_an_ornament.png');
  width: 141px;
@@ -2496,6 +2531,11 @@
  width: 68px;
  height: 68px;
 }
+.icon_background_crater_lake {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_crater_lake.png');
+  width: 60px;
+  height: 60px;
+}
 .icon_background_creepy_castle {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_creepy_castle.png');
  width: 60px;
@@ -2506,6 +2546,11 @@
  width: 68px;
  height: 68px;
 }
+.icon_background_cretaceous_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cretaceous_forest.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_crosscountry_ski_trail {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_crosscountry_ski_trail.png');
  width: 68px;
@@ -2740,6 +2785,11 @@
  width: 68px;
  height: 68px;
 }
+.icon_background_flying_over_hedge_maze {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_hedge_maze.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_flying_over_icy_steppes {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_icy_steppes.png');
  width: 68px;
@@ -3015,11 +3065,21 @@
  width: 68px;
  height: 68px;
 }
+.icon_background_in_a_painting {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_a_painting.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_in_an_ancient_tomb {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_an_ancient_tomb.png');
  width: 68px;
  height: 68px;
 }
+.icon_background_in_an_aquarium {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_an_aquarium.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_in_front_of_fountain {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_front_of_fountain.png');
  width: 68px;
@@ -3040,6 +3100,11 @@
  width: 68px;
  height: 68px;
 }
+.icon_background_inside_adventurers_hideout {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_inside_adventurers_hideout.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_inside_an_ornament {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_inside_an_ornament.png');
  width: 68px;
@@ -18345,6 +18410,11 @@
  width: 114px;
  height: 90px;
 }
+.broad_armor_armoireDiagonalRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoireDiagonalRainbowShirt.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_alchemistsRobe {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_alchemistsRobe.png');
  width: 114px;
@@ -18455,6 +18525,11 @@
  width: 90px;
  height: 90px;
 }
+.broad_armor_armoire_diagonalRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_diagonalRainbowShirt.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_doubletOfClubs {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_doubletOfClubs.png');
  width: 114px;
@@ -18640,6 +18715,11 @@
  width: 90px;
  height: 90px;
 }
+.broad_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_paintersApron.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_pirateOutfit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_pirateOutfit.png');
  width: 114px;
@@ -18750,6 +18830,11 @@
  width: 114px;
  height: 90px;
 }
+.broad_armor_armoire_stripedRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_stripedRainbowShirt.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_stripedSwimsuit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_stripedSwimsuit.png');
  width: 90px;
@@ -19130,6 +19215,11 @@
  width: 90px;
  height: 90px;
 }
+.head_armoire_paintersBeret {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paintersBeret.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_paperBag {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paperBag.png');
  width: 90px;
@@ -19470,6 +19560,11 @@
  width: 90px;
  height: 90px;
 }
+.shield_armoire_paintersPalette {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_paintersPalette.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_perchingFalcon {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_perchingFalcon.png');
  width: 90px;
@@ -19725,6 +19820,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_armor_armoire_diagonalRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_diagonalRainbowShirt.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_doubletOfClubs {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_doubletOfClubs.png');
  width: 68px;
@@ -19910,6 +20010,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_paintersApron.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_pirateOutfit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_pirateOutfit.png');
  width: 68px;
@@ -20020,6 +20125,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_armor_armoire_stripedRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_stripedRainbowShirt.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_stripedSwimsuit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_stripedSwimsuit.png');
  width: 68px;
@@ -20415,6 +20525,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_head_armoire_paintersBeret {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paintersBeret.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_armoire_paperBag {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paperBag.png');
  width: 68px;
@@ -20755,6 +20870,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_shield_armoire_paintersPalette {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_paintersPalette.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_armoire_perchingFalcon {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_perchingFalcon.png');
  width: 68px;
@@ -21200,6 +21320,11 @@
  width: 68px;
  height: 68px;
 }
+.shop_weapon_armoire_paintbrush {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paintbrush.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_armoire_paperCutter {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paperCutter.png');
  width: 68px;
@@ -21470,6 +21595,11 @@
  width: 90px;
  height: 90px;
 }
+.slim_armor_armoire_diagonalRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_diagonalRainbowShirt.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_doubletOfClubs {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_doubletOfClubs.png');
  width: 114px;
@@ -21655,6 +21785,11 @@
  width: 90px;
  height: 90px;
 }
+.slim_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_paintersApron.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_pirateOutfit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_pirateOutfit.png');
  width: 114px;
@@ -21765,6 +21900,11 @@
  width: 114px;
  height: 90px;
 }
+.slim_armor_armoire_stripedRainbowShirt {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_stripedRainbowShirt.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_stripedSwimsuit {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_stripedSwimsuit.png');
  width: 90px;
@@ -22110,6 +22250,11 @@
  width: 114px;
  height: 90px;
 }
+.weapon_armoire_paintbrush {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paintbrush.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_paperCutter {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paperCutter.png');
  width: 114px;
@@ -27905,6 +28050,61 @@
  width: 114px;
  height: 90px;
 }
+.back_mystery_202305 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202305.png');
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_mystery_202305 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202305.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_back_mystery_202305 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202305.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_headAccessory_mystery_202305 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202305.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202305 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202305.png');
+  width: 68px;
+  height: 68px;
+}
+.broad_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_301404 {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
  width: 90px;
@@ -30150,6 +30350,26 @@
  width: 117px;
  height: 120px;
 }
+.broad_armor_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2023Healer.png');
+  width: 117px;
+  height: 120px;
+}
+.broad_armor_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2023Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.broad_armor_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2023Rogue.png');
+  width: 117px;
+  height: 120px;
+}
+.broad_armor_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2023Warrior.png');
+  width: 114px;
+  height: 120px;
+}
 .broad_armor_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summerHealer.png');
  width: 90px;
@@ -30340,6 +30560,26 @@
  width: 117px;
  height: 120px;
 }
+.head_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2023Healer.png');
+  width: 117px;
+  height: 120px;
+}
+.head_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2023Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.head_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2023Rogue.png');
+  width: 117px;
+  height: 120px;
+}
+.head_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2023Warrior.png');
+  width: 114px;
+  height: 120px;
+}
 .head_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summerHealer.png');
  width: 90px;
@@ -30485,6 +30725,21 @@
  width: 117px;
  height: 120px;
 }
+.shield_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2023Healer.png');
+  width: 117px;
+  height: 120px;
+}
+.shield_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2023Rogue.png');
+  width: 117px;
+  height: 120px;
+}
+.shield_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2023Warrior.png');
+  width: 114px;
+  height: 120px;
+}
 .shield_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summerHealer.png');
  width: 90px;
@@ -30660,6 +30915,26 @@
  width: 68px;
  height: 68px;
 }
+.shop_armor_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2023Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2023Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2023Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_armor_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2023Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summerHealer.png');
  width: 68px;
@@ -30880,6 +31155,26 @@
  width: 68px;
  height: 68px;
 }
+.shop_head_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2023Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2023Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2023Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2023Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summerHealer.png');
  width: 68px;
@@ -31025,6 +31320,21 @@
  width: 68px;
  height: 68px;
 }
+.shop_shield_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2023Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2023Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_shield_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2023Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summerHealer.png');
  width: 68px;
@@ -31200,6 +31510,26 @@
  width: 68px;
  height: 68px;
 }
+.shop_weapon_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2023Healer.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2023Mage.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2023Rogue.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2023Warrior.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summerHealer.png');
  width: 68px;
@@ -31380,6 +31710,26 @@
  width: 117px;
  height: 120px;
 }
+.slim_armor_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2023Healer.png');
+  width: 117px;
+  height: 120px;
+}
+.slim_armor_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2023Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.slim_armor_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2023Rogue.png');
+  width: 117px;
+  height: 120px;
+}
+.slim_armor_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2023Warrior.png');
+  width: 114px;
+  height: 120px;
+}
 .slim_armor_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summerHealer.png');
  width: 90px;
@@ -31560,6 +31910,26 @@
  width: 117px;
  height: 120px;
 }
+.weapon_special_summer2023Healer {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2023Healer.png');
+  width: 117px;
+  height: 120px;
+}
+.weapon_special_summer2023Mage {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2023Mage.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_special_summer2023Rogue {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2023Rogue.png');
+  width: 117px;
+  height: 120px;
+}
+.weapon_special_summer2023Warrior {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2023Warrior.png');
+  width: 114px;
+  height: 120px;
+}
 .weapon_special_summerHealer {
  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summerHealer.png');
  width: 90px;
@@ -24,9 +24,9 @@
  }
 }

-.icon-16 {
-  width: 16px;
-  height: 16px;
+.icon-10 {
+  width: 10px;
+  height: 10px;
 }

 .icon-12 {
@@ -34,21 +34,26 @@
  height: 12px;
 }

+.icon-16 {
+  width: 16px;
+  height: 16px;
+}
+
 .icon-24 {
  width: 24px;
  height: 24px;
 }

+.icon-32 {
+  width: 32px;
+  height: 32px;
+}
+
 .icon-48 {
  width: 48px;
  height: 48px;
 }

-.icon-10 {
-  width: 10px;
-  height: 10px;
-}
-
 .inline {
  display: inline-block;
 }
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path id="b" d="m10,6h6V0h-2v2.72C12.49.99,10.3,0,8,0,3.59,0,0,3.59,0,8s3.59,8,8,8c2.69,0,5.2-1.35,6.68-3.6l-1.67-1.1c-1.11,1.69-2.99,2.71-5.01,2.7-3.31,0-6-2.69-6-6s2.69-6,6-6c1.72,0,3.33.74,4.46,2h-2.46v2Z" fill-rule="evenodd"/></svg>
@@ -17,10 +17,18 @@
          Payment schedule ("basic-earned" is monthly):
          <strong>{{ hero.purchased.plan.planId }}</strong>
        </div>
+        <div v-if="hero.purchased.plan.planId == 'group_plan_auto'">
+          Group plan ID:
+          <strong>{{ hero.purchased.plan.owner }}</strong>
+        </div>
        <div v-if="hero.purchased.plan.dateCreated">
          Creation date:
          <strong>{{ dateFormat(hero.purchased.plan.dateCreated) }}</strong>
        </div>
+        <div v-if="hero.purchased.plan.dateCurrentTypeCreated">
+          Start date for current subscription type:
+          <strong>{{ dateFormat(hero.purchased.plan.dateCurrentTypeCreated) }}</strong>
+        </div>
        <div>
          Termination date:
          <strong
@@ -46,9 +54,16 @@
          Perk offset months:
          <strong>{{ hero.purchased.plan.consecutive.offset }}</strong>
        </div>
-        <div>
+        <div class="form-inline">
          Perk month count:
-          <strong>{{ hero.purchased.plan.perkMonthCount }}</strong>
+          <input
+              v-model="hero.purchased.plan.perkMonthCount"
+              class="form-control"
+              type="number"
+              min="0"
+              max="2"
+              step="1"
+            >
        </div>
        <div>
          Next Mystic Hourglass:
@@ -183,10 +183,8 @@
          <div
            v-for="bg in backgroundShopSets[0].items"
            :key="bg.key"
+            :id="bg.key"
            class="col-2"
-            :popover-title="bg.text"
-            :popover="bg.notes"
-            popover-trigger="mouseenter"
            @click="unlock('background.' + bg.key)"
          >
            <div
@@ -195,6 +193,13 @@
            >
              <div class="small-rectangle"></div>
            </div>
+            <b-popover
+              :target="bg.key"
+              triggers="hover focus"
+              placement="bottom"
+              :prevent-overflow="false"
+              :content="bg.notes"
+            />
          </div>
        </div>
        <div
@@ -211,16 +216,21 @@
            <div
              v-for="bg in backgroundShopSets[2].items"
              :key="bg.key"
+              :id="bg.key"
              class="col-4 text-center customize-option background-button"
-              :popover-title="bg.text"
-              :popover="bg.notes"
-              popover-trigger="mouseenter"
              @click="unlock('background.' + bg.key)"
            >
              <div
                class="background"
                :class="`background_${bg.key}`"
              ></div>
+              <b-popover
+                :target="bg.key"
+                triggers="hover focus"
+                placement="bottom"
+                :prevent-overflow="false"
+                :content="bg.notes"
+              />
            </div>
          </div>
        </div>
@@ -236,10 +246,8 @@
            <div
              v-for="bg in backgroundShopSets[1].items"
              :key="bg.key"
+              :id="bg.key"
              class="col-4 text-center customize-option background-button"
-              :popover-title="bg.text"
-              :popover="bg.notes"
-              popover-trigger="mouseenter"
              @click="!user.purchased.background[bg.key]
                ? backgroundSelected(bg) : unlock('background.' + bg.key)"
            >
@@ -270,6 +278,13 @@
                  :pinned="isBackgroundPinned(bg)"
                />
              </span>
+              <b-popover
+                :target="bg.key"
+                triggers="hover focus"
+                placement="bottom"
+                :prevent-overflow="false"
+                :content="bg.notes"
+              />
            </div>
          </div>
        </div>
@@ -302,10 +317,8 @@
            <div
              v-for="bg in set.items"
              :key="bg.key"
+              :id="bg.key"
              class="col-4 text-center customize-option background-button"
-              :popover-title="bg.text"
-              :popover="bg.notes"
-              popover-trigger="mouseenter"
              @click="!user.purchased.background[bg.key]
                ? backgroundSelected(bg) : unlock('background.' + bg.key)"
            >
@@ -336,6 +349,13 @@
                  :pinned="isBackgroundPinned(bg)"
                />
              </span>
+              <b-popover
+                :target="bg.key"
+                triggers="hover focus"
+                placement="bottom"
+                :prevent-overflow="false"
+                :content="bg.notes"
+              />
            </div>
            <div
              v-if="!ownsSet('background', set.items) && set.identifier !== 'incentiveBackgrounds'"
@@ -358,16 +378,21 @@
          <div
            v-for="(bg) in ownedBackgrounds"
            :key="bg.key"
+            :id="bg.key"
            class="col-4 text-center customize-option background-button"
-            :popover-title="bg.text"
-            :popover="bg.notes"
-            popover-trigger="mouseenter"
            @click="unlock('background.' + bg.key)"
          >
            <div
              class="background"
              :class="[`background_${bg.key}`, backgroundLockedStatus(bg.key)]"
            ></div>
+            <b-popover
+              :target="bg.key"
+              triggers="hover focus"
+              placement="bottom"
+              :prevent-overflow="false"
+              :content="bg.notes"
+            />
          </div>
        </div>
      </div>
@@ -11,9 +11,12 @@
      <div class="quest_screen"></div>
      <div class="row heading">
        <div class="col-12 text-center pr-5 pl-5">
-          <h2 v-once>
+          <h1
+            v-once
+            class="mb-2"
+          >
            {{ $t('playInPartyTitle') }}
-          </h2>
+          </h1>
          <p
            v-once
            class="mb-4"
@@ -22,67 +25,91 @@
          </p>
          <button
            v-once
-            class="btn btn-primary"
+            class="btn btn-primary px-4 mb-2"
            @click="createParty()"
          >
            {{ $t('createParty') }}
          </button>
        </div>
      </div>
+      <close-x
+        @close="close()"
+      />
    </div>
    <div class="row grey-row">
-      <div class="col-12 text-center">
+      <div class="col-12 text-center px-0">
        <div class="join-party"></div>
-        <h2 v-once>
-          {{ $t('wantToJoinPartyTitle') }}
-        </h2>
-        <p v-html="$t('wantToJoinPartyDescription')"></p>
-        <div
-          class="form-group"
-          @click="copyUsername"
+        <h1
+          v-once
+          class="mb-2"
        >
-          <div class="d-flex align-items-center">
-            <label
-              v-once
-              class="mr-3"
-            >{{ $t('username') }}</label>
-            <div class="flex-grow-1">
-              <div class="input-group-prepend input-group-text">
-                @
-                <div class="text">
-                  {{ user.auth.local.username }}
-                </div>
-                <div
-                  class="svg-icon copy-icon"
-                  v-html="icons.copy"
-                ></div>
-                <div
-                  v-once
-                  class="small"
-                >
-                  {{ $t('copy') }}
-                </div>
-              </div>
+          {{ $t('wantToJoinPartyTitle') }}
+        </h1>
+        <p
+          v-once
+          class="mb-4"
+          v-html="$t('partyFinderDescription')"
+        >
+        </p>
+        <div
+          v-if="seeking"
+        >
+          <div
+            class="green-bar mb-3"
+          >
+            {{ $t('currentlyLookingForParty') }}
+          </div>
+          <div class="d-flex justify-content-center">
+            <div
+              class="red-link"
+              @click="seekParty()"
+            >
+              {{ $t('leave') }}
            </div>
          </div>
        </div>
+        <button
+          v-else
+          class="btn btn-primary px-4 mt-2 mb-1"
+          @click="seekParty()"
+        >
+          {{ $t('lookForParty') }}
+        </button>
      </div>
    </div>
  </b-modal>
 </template>

-<style>
-  #create-party-modal .modal-body {
-    padding: 0rem 0.75rem;
-  }
+<style lang="scss">
+  #create-party-modal {
+    display: flex !important;
+    overflow-y: hidden;

-  #create-party-modal .modal-dialog {
-    width: 35.75rem;
-  }
+    @media (max-height: 770px) {
+      overflow-y: auto;
+    }

-  #create-party-modal .modal-header {
-    padding: 0;
-    border-bottom: 0px;
+    .modal-body {
+      padding: 0rem 0.75rem;
+    }
+
+    .modal-content {
+      border-radius: 8px;
+    }
+
+    .modal-dialog {
+      width: 566px;
+      margin: auto;
+
+      @media (max-height: 826px) {
+        margin-top: 56px;
+      }
+    }
+
+    .modal-header {
+      padding: 0;
+      border-bottom: 0px;
+    }
  }
 </style>

@@ -107,15 +134,27 @@
    cursor: pointer;
  }

+  .green-bar {
+    height: 32px;
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 1.71;
+    text-align: center;
+    color: $green-1;
+    background-color: $green-100;
+    border-radius: 2px;
+    padding: 4px 0px 4px 0px;
+  }
+
  .grey-row {
    background-color: $gray-700;
    color: #4e4a57;
    padding: 2em;
-    border-radius: 0px 0px 2px 2px;
+    border-radius: 0px 0px 8px 8px;
  }

-  h2 {
-    color: $gray-100;
+  h1 {
+    color: $purple-300;
  }

  .header-wrap {
@@ -132,10 +171,6 @@
      border-radius: 2px 2px 0 0;
      image-rendering: optimizequality;
    }
-
-    h2 {
-      color: $purple-200;
-    }
  }

  .heading {
@@ -182,6 +217,21 @@
    margin: 0.75rem auto 0.75rem 0.25rem;
  }

+  p {
+    line-height: 1.71;
+  }
+
+  .red-link {
+    cursor: pointer;
+    font-size: 14px;
+    line-height: 1.71;
+    text-align: center;
+    color: $maroon-50;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
  .small {
    color: $gray-200;
    margin: auto 0.5rem auto 0.25rem;
@@ -192,21 +242,29 @@
 import { mapState } from '@/libs/store';
 import * as Analytics from '@/libs/analytics';
 import notifications from '@/mixins/notifications';
+import closeX from '../ui/closeX';

 import copyIcon from '@/assets/svg/copy.svg';

 export default {
+  components: {
+    closeX,
+  },
  mixins: [notifications],
  data () {
    return {
      icons: Object.freeze({
        copy: copyIcon,
      }),
+      seeking: false,
    };
  },
  computed: {
    ...mapState({ user: 'user.data' }),
  },
+  mounted () {
+    this.seeking = Boolean(this.user.party.seeking);
+  },
  methods: {
    async createParty () {
      const group = {
@@ -223,7 +281,10 @@ export default {
      });

      this.$root.$emit('bv::hide::modal', 'create-party-modal');
-      this.$router.push('/party');
+      await this.$router.push('/party');
+    },
+    close () {
+      this.$root.$emit('bv::hide::modal', 'create-party-modal');
    },
    copyUsername () {
      if (navigator.clipboard) {
@@ -238,6 +299,12 @@ export default {
      }
      this.text(this.$t('usernameCopied'));
    },
+    seekParty () {
+      this.$store.dispatch('user:set', {
+        'party.seeking': !this.user.party.seeking ? new Date() : null,
+      });
+      this.seeking = !this.seeking;
+    },
  },
 };
 </script>
@@ -542,7 +542,8 @@ export default {
      await this.$store.dispatch('guilds:leave', data);

      if (this.isParty) {
-        this.$router.push({ name: 'tasks' });
+        await this.$router.push({ name: 'tasks' });
+        window.location.reload(true);
      }
    },
    upgradeGroup () {
@@ -4,12 +4,12 @@
    <group-plan-creation-modal />
    <div>
      <div class="header">
-        <h1 class="text-center">
-          Need more for your Group?
+        <h1 v-once class="text-center">
+          {{ $t('groupPlanTitle') }}
        </h1>
        <div class="row">
          <div class="col-8 offset-2 text-center">
-            <h2 class="sub-text">
+            <h2 v-once class="sub-text">
              {{ $t('groupBenefitsDescription') }}
            </h2>
          </div>
@@ -24,8 +24,8 @@
                src="~@/assets/images/group-plans/group-14@3x.png"
              >
              <hr>
-              <h2>{{ $t('teamBasedTasks') }}</h2>
-              <p>Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!</p><!-- eslint-disable-line max-len -->
+              <h2 v-once> {{ $t('teamBasedTasks') }} </h2>
+              <p v-once> {{ $t('teamBasedTasksListDesc') }} </p>
            </div>
          </div>
          <div class="col-4">
@@ -35,8 +35,8 @@
                src="~@/assets/images/group-plans/group-12@3x.png"
              >
              <hr>
-              <h2>Group Management Controls</h2>
-              <p>Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.</p><!-- eslint-disable-line max-len -->
+              <h2 v-once> {{ $t('groupManagementControls') }} </h2>
+              <p v-once> {{ $t('groupManagementControlsDesc') }} </p>
            </div>
          </div>
          <div class="col-4">
@@ -46,8 +46,8 @@
                src="~@/assets/images/group-plans/group-13@3x.png"
              >
              <hr>
-              <h2>In-Game Benefits</h2>
-              <p>Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.</p><!-- eslint-disable-line max-len -->
+              <h2 v-once> {{ $t('inGameBenefits') }} </h2>
+              <p v-once> {{ $t('inGameBenefitsDesc') }} </p>
            </div>
          </div>
        </div>
@@ -0,0 +1,343 @@
+<template>
+  <div>
+    <div class="d-flex justify-content-center">
+      <div
+        v-if="seekers.length > 0"
+        class="fit-content mx-auto mt-4"
+      >
+        <div class="d-flex align-items-center">
+          <h1 v-once class="my-auto mr-auto"> {{ $t('findPartyMembers') }}</h1>
+          <div
+            class="btn btn-secondary btn-sync ml-auto my-auto pl-2 pr-3 d-flex"
+            @click="refreshList()"
+          >
+            <div class="svg-icon icon-16 color my-auto mr-2" v-html="icons.sync"></div>
+            <div class="ml-auto"> {{ $t('refreshList') }} </div>
+          </div>
+        </div>
+        <div class="d-flex flex-wrap seeker-list">
+          <div
+            v-for="(seeker, index) in seekers"
+            :key="seeker._id"
+            class="seeker"
+          >
+            <div class="d-flex">
+              <avatar
+                :member="seeker"
+                :hideClassBadge="true"
+                @click.native="showMemberModal(seeker._id)"
+                class="mr-3 mb-2"
+              />
+              <div class="card-data">
+                <user-link
+                  :user-id="seeker._id"
+                  :name="seeker.profile.name"
+                  :backer="seeker.backer"
+                  :contributor="seeker.contributor"
+                />
+                <div class="small-with-border pb-2 mb-2">
+                  @{{ seeker.auth.local.username }} • {{ $t('level') }} {{ seeker.stats.lvl }}
+                </div>
+                <div
+                  class="d-flex"
+                >
+                  <strong v-once> {{ $t('classLabel') }} </strong>
+                  <span
+                    class="svg-icon d-inline-block icon-16 my-auto mx-2"
+                    v-html="icons[seeker.stats.class]"
+                  >
+                  </span>
+                  <strong
+                    :class="`${seeker.stats.class}-color`"
+                  >
+                    {{ $t(seeker.stats.class) }}
+                  </strong>
+                </div>
+                <div>
+                  <strong v-once class="mr-2"> {{ $t('checkinsLabel') }} </strong>
+                  {{ seeker.loginIncentives }}
+                </div>
+                <div>
+                  <strong v-once class="mr-2"> {{ $t('languageLabel') }} </strong>
+                  {{ displayLanguage(seeker.preferences.language) }}
+                </div>
+              </div>
+            </div>
+            <strong
+              v-if="!seeker.invited"
+              @click="inviteUser(seeker._id, index)"
+              class="btn btn-primary w-100"
+            >
+              {{ $t('inviteToParty') }}
+            </strong>
+            <div
+              v-else
+              @click="rescindInvite(seeker._id, index)"
+              class="btn btn-success w-100"
+              v-html="$t('invitedToYourParty')"
+            >
+            </div>
+          </div>
+          <mugen-scroll
+            v-show="loading"
+            :handler="infiniteScrollTrigger"
+            :should-handle="!loading && canLoadMore"
+            :threshold="1"
+          />
+        </div>
+      </div>
+      <div
+        v-if="seekers.length === 0 && !loading"
+        class="d-flex flex-column empty-state text-center my-5"
+      >
+        <div class="gray-circle mb-3 mx-auto d-flex">
+          <div
+            class="svg-icon icon-32 color m-auto"
+            v-html="icons.users"
+          >
+
+          </div>
+        </div>
+        <strong class="mb-1"> {{ $t('findMorePartyMembers') }} </strong>
+        <div v-html="$t('noOneLooking')"></div>
+      </div>
+    </div>
+    <h2
+      v-show="loading"
+      class="loading"
+      :class="seekers.length === 0 ? 'mt-3' : 'mt-0'"
+    >
+      {{ $t('loading') }}
+    </h2>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
+  h1 {
+    color: $purple-300;
+  }
+
+  strong {
+    line-height: 1.71;
+  }
+  .avatar {
+    background-color: $gray-600;
+  }
+
+  .btn-success {
+    box-shadow: none;
+    color: $green-1;
+    font-weight: normal;
+
+    &:not(:disabled):not(.disabled):active {
+      color: $green-1;
+    }
+  }
+
+  .btn-sync {
+    min-width: 128px;
+    max-height: 32px;
+
+    .svg-icon {
+      color: $gray-200;
+    }
+  }
+
+  .card-data {
+    width: 267px;
+  }
+
+  .empty-state {
+    color: $gray-100;
+    line-height: 1.71;
+  }
+
+  .fit-content {
+    width: fit-content;
+  }
+
+  .gray-circle {
+    width: 64px;
+    height: 64px;
+    color: $gray-600;
+    background-color: $gray-200;
+    border-radius: 100px;
+
+    .icon-32 {
+      height: auto;
+    }
+  }
+
+  .loading {
+    text-align: center;
+    color: $purple-300;
+  }
+
+  .seeker-list {
+    max-width: 920px;
+
+    @media (max-width: 962px) {
+      max-width: 464px;
+    };
+
+    .seeker {
+      width: 448px;
+      margin-bottom: 24px;
+      padding: 8px;
+      border-radius: 4px;
+      box-shadow: 0 1px 3px 0 rgba(26, 24, 29, 0.12), 0 1px 2px 0 rgba(26, 24, 29, 0.24);
+
+      &:first-of-type {
+        margin-top: 24px;
+      }
+
+      @media (min-width: 963px) {
+        &:nth-child(2) {
+          margin-top: 24px;
+        }
+        &:nth-child(even) {
+          margin-left: 24px;
+        }
+      }
+    }
+  }
+
+  .small-with-border {
+    border-bottom: 1px solid $gray-500;
+    color: $gray-100;
+    font-size: 12px;
+    font-weight: normal;
+    line-height: 1.33;
+  }
+
+  .healer-color {
+    color: $yellow-10;
+  }
+
+  .rogue-color {
+    color: $purple-200;
+  }
+
+  .warrior-color {
+    color: $red-50;
+  }
+
+  .wizard-color {
+    color: $blue-10;
+  }
+</style>
+
+<script>
+import debounce from 'lodash/debounce';
+import MugenScroll from 'vue-mugen-scroll';
+import Avatar from '../avatar';
+import userLink from '../userLink';
+import { mapState } from '@/libs/store';
+
+import syncIcon from '@/assets/svg/sync-2.svg';
+import usersIcon from '@/assets/svg/users.svg';
+import warriorIcon from '@/assets/svg/warrior.svg';
+import rogueIcon from '@/assets/svg/rogue.svg';
+import healerIcon from '@/assets/svg/healer.svg';
+import wizardIcon from '@/assets/svg/wizard.svg';
+
+export default {
+  components: {
+    Avatar,
+    MugenScroll,
+    userLink,
+  },
+  data () {
+    return {
+      canLoadMore: true,
+      loading: true,
+      page: 0,
+      party: {},
+      seekers: [],
+      icons: Object.freeze({
+        warrior: warriorIcon,
+        rogue: rogueIcon,
+        healer: healerIcon,
+        sync: syncIcon,
+        users: usersIcon,
+        wizard: wizardIcon,
+      }),
+    };
+  },
+  computed: {
+    ...mapState({
+      availableLanguages: 'i18n.availableLanguages',
+      user: 'user.data',
+    }),
+  },
+  async mounted () {
+    try {
+      this.party = await this.$store.dispatch('guilds:getGroup', { groupId: this.user.party._id });
+    } catch {
+      this.$router.push('/');
+    }
+    if (!this.party._id || this.party.leader._id !== this.user._id) {
+      this.$router.push('/');
+    } else {
+      this.$store.dispatch('common:setTitle', {
+        section: this.$t('lookingForPartyTitle'),
+      });
+      this.seekers = await this.$store.dispatch('party:lookingForParty');
+      this.canLoadMore = this.seekers.length === 30;
+      this.loading = false;
+    }
+  },
+  methods: {
+    displayLanguage (languageCode) {
+      const language = this.availableLanguages.find(lang => lang.code === languageCode);
+      if (language) {
+        return language.name;
+      }
+      return languageCode;
+    },
+    infiniteScrollTrigger () {
+      if (this.canLoadMore) {
+        this.loading = true;
+      }
+
+      this.loadMore();
+    },
+    async inviteUser (userId, index) {
+      await this.$store.dispatch('guilds:invite', {
+        invitationDetails: {
+          inviter: this.user.profile.name,
+          uuids: [userId],
+        },
+        groupId: this.party._id,
+      });
+      this.seekers[index].invited = true;
+    },
+    loadMore: debounce(async function loadMoreDebounce () {
+      this.page += 1;
+      const addlSeekers = await this.$store.dispatch('party:lookingForParty', { page: this.page });
+      this.seekers = this.seekers.concat(addlSeekers);
+      this.canLoadMore = this.seekers.length % 30 === 0;
+      this.loading = false;
+    }, 1000),
+    async refreshList () {
+      this.loading = true;
+      this.page = 0;
+      this.seekers = await this.$store.dispatch('party:lookingForParty');
+      this.canLoadMore = this.seekers.length === 30;
+      this.loading = false;
+    },
+    async rescindInvite (userId, index) {
+      await this.$store.dispatch('members:removeMember', {
+        memberId: userId,
+        groupId: this.party._id,
+      });
+      this.seekers[index].invited = false;
+    },
+    showMemberModal (userId) {
+      this.$router.push({ name: 'userProfile', params: { userId } });
+    },
+  },
+};
+</script>
@@ -2,7 +2,7 @@
  <div class="sidebar px-4">
    <div>
      <div class="buttons-wrapper">
-        <div class="button-container button-with-menu-row">
+        <div class="button-container d-flex">
          <button
            v-if="!isMember"
            class="btn btn-success btn-success"
@@ -203,10 +203,6 @@ export default {
    }
  }

-  .button-with-menu-row {
-    display: flex;
-  }
-
  .menuIcon {
    width: 4px;
    height: 1rem;
@@ -258,13 +258,22 @@
                :key="hero._id"
              >
                <td>
-                  <user-link
+                  <div
                    v-if="hasPermission(hero, 'userSupport')"
-                    :user="hero"
-                    :popover="$t('gamemaster')"
-                    popover-trigger="mouseenter"
-                    popover-placement="right"
-                  />
+                    class="width-content"
+                  >
+                    <user-link
+                      :id="hero._id"
+                      :user="hero"
+                    />
+                    <b-popover
+                      :target="hero._id"
+                      triggers="hover focus"
+                      placement="right"
+                      :prevent-overflow="false"
+                      :content="$t('gamemaster')"
+                    />
+                  </div>
                  <user-link
                    v-else
                    :user="hero"
@@ -302,6 +311,10 @@
  h4.expand-toggle::after {
    margin-left: 5px;
  }
+
+  .width-content {
+    width: fit-content;
+  }
 </style>

 <script>
@@ -51,20 +51,20 @@
      </div>
      <div
        v-else
-        class="no-party d-none d-md-flex  justify-content-center text-center mr-4"
+        class="no-party d-none d-md-flex justify-content-center text-center mr-4"
      >
        <div class="align-self-center">
-          <h3>{{ $t('battleWithFriends') }}</h3>
+          <h3>{{ user.party._id ? $t('questWithOthers') : $t('battleWithFriends') }}</h3>
          <span
            class="small-text"
-            v-html="$t('inviteFriendsParty')"
+            v-html="user.party._id ? $t('inviteFriendsParty') : $t('startPartyDetail')"
          ></span>
          <br>
          <button
            class="btn btn-primary"
            @click="createOrInviteParty()"
          >
-            {{ user.party._id ? $t('inviteFriends') : $t('startAParty') }}
+            {{ user.party._id ? $t('findPartyMembers') : $t('getStarted') }}
          </button>
        </div>
      </div>
@@ -122,6 +122,7 @@

 <script>
 import orderBy from 'lodash/orderBy';
+import * as Analytics from '@/libs/analytics';
 import { mapGetters, mapActions } from '@/libs/store';
 import MemberDetails from '../memberDetails';
 import createPartyModal from '../groups/createPartyModal';
@@ -232,10 +233,24 @@ export default {
        this.expandedMember = memberId;
      }
    },
-    createOrInviteParty () {
+    async createOrInviteParty () {
      if (this.user.party._id) {
-        this.$root.$emit('inviteModal::inviteToGroup', this.user.party);
+        await Analytics.track({
+          eventName: 'Header Party CTA',
+          eventAction: 'Header Party CTA',
+          eventCategory: 'behavior',
+          hitType: 'event',
+          state: 'Find Party Members',
+        });
+        this.$router.push('/looking-for-party');
      } else {
+        await Analytics.track({
+          eventName: 'Header Party CTA',
+          eventAction: 'Header Party CTA',
+          eventCategory: 'behavior',
+          hitType: 'event',
+          state: 'Get Started',
+        });
        this.$root.$emit('bv::show::modal', 'create-party-modal');
      }
    },
@@ -148,7 +148,7 @@
            </div>
          </li>
          <b-nav-item
-            v-if="user.party._id"
+            v-if="user.party._id && user._id !== partyLeaderId"
            class="topbar-item"
            :class="{'active': $route.path.startsWith('/party')}"
            tag="li"
@@ -156,6 +156,36 @@
          >
            {{ $t('party') }}
          </b-nav-item>
+          <li
+            v-if="user.party._id && user._id === partyLeaderId"
+            class="topbar-item droppable"
+            :class="{'active': $route.path.startsWith('/party')}"
+          >
+            <div
+              class="chevron rotate"
+              @click="dropdownMobile($event)"
+            >
+              <div
+                v-once
+                class="chevron-icon-down"
+                v-html="icons.chevronDown"
+              ></div>
+            </div>
+            <router-link
+              class="nav-link"
+              :to="{name: 'party'}"
+            >
+              {{ $t('party') }}
+            </router-link>
+            <div class="topbar-dropdown">
+              <router-link
+                class="topbar-dropdown-item dropdown-item"
+                :to="{name: 'lookingForParty'}"
+              >
+                {{ $t('lookingForPartyTitle') }}
+              </router-link>
+            </div>
+          </li>
          <b-nav-item
            v-if="!user.party._id"
            class="topbar-item"
@@ -768,6 +798,7 @@ export default {
    return {
      isUserDropdownOpen: false,
      menuIsOpen: false,
+      partyLeaderId: null,
      icons: Object.freeze({
        gem: gemIcon,
        gold: goldIcon,
@@ -796,8 +827,9 @@ export default {
      };
    },
  },
-  mounted () {
-    this.getUserGroupPlans();
+  async mounted () {
+    await this.getUserGroupPlans();
+    await this.getUserParty();
    Array.from(document.getElementById('menu_collapse').getElementsByTagName('a')).forEach(link => {
      link.addEventListener('click', this.closeMenu);
    });
@@ -805,6 +837,9 @@ export default {
      link.addEventListener('mouseenter', this.dropdownDesktop);
      link.addEventListener('mouseleave', this.dropdownDesktop);
    });
+    this.$root.$on('update-party', () => {
+      this.getUserParty();
+    });
  },
  methods: {
    modForm () {
@@ -816,6 +851,12 @@ export default {
    async getUserGroupPlans () {
      await this.$store.dispatch('guilds:getGroupPlans');
    },
+    async getUserParty () {
+      if (this.user.party._id) {
+        await this.$store.dispatch('party:getParty');
+        this.partyLeaderId = this.$store.state.party.data.leader._id;
+      }
+    },
    openPartyModal () {
      this.$root.$emit('bv::show::modal', 'create-party-modal');
    },
@@ -34,11 +34,13 @@
 <script>
 import BaseNotification from './base';
 import { mapState } from '@/libs/store';
+import sync from '@/mixins/sync';

 export default {
  components: {
    BaseNotification,
  },
+  mixins: [sync],
  props: {
    notification: {
      type: Object,
@@ -73,6 +75,7 @@ export default {
      }

      await this.$store.dispatch('guilds:join', { groupId: group.id, type: 'party' });
+      this.sync();
      this.$router.push('/party');
    },
    reject () {
@@ -126,7 +126,7 @@

          <!-- the word "total" -->
          <div class="buy-gem-total">
-            {{ $t('sendGiftTotal') }}
+            {{ $t('sendTotal') }}
          </div>

          <!-- the actual dollar amount -->
@@ -128,7 +128,10 @@
        <hr>
      </div>
      <div>
-        <div class="checkbox">
+        <div
+          class="checkbox"
+          id="preferenceAdvancedCollapsed"
+        >
          <label>
            <input
              v-model="user.preferences.advancedCollapsed"
@@ -136,33 +139,22 @@
              class="mr-2"
              @change="set('advancedCollapsed')"
            >
-            <span
-              class="hint"
-              popover-trigger="mouseenter"
-              popover-placement="right"
-              :popover="$t('startAdvCollapsedPop')"
-            >{{ $t('startAdvCollapsed') }}</span>
-          </label>
-        </div>
-        <div class="checkbox">
-          <label>
-            <input
-              v-model="user.preferences.dailyDueDefaultView"
-              type="checkbox"
-              class="mr-2"
-              @change="set('dailyDueDefaultView')"
-            >
-            <span
-              class="hint"
-              popover-trigger="mouseenter"
-              popover-placement="right"
-              :popover="$t('dailyDueDefaultViewPop')"
-            >{{ $t('dailyDueDefaultView') }}</span>
+            <span class="hint">
+              {{ $t('startAdvCollapsed') }}
+            </span>
+            <b-popover
+              target="preferenceAdvancedCollapsed"
+              triggers="hover focus"
+              placement="right"
+              :prevent-overflow="false"
+              :content="$t('startAdvCollapsedPop')"
+            />
          </label>
        </div>
        <div
          v-if="party.memberCount === 1"
          class="checkbox"
+          id="preferenceDisplayInviteAtOneMember"
        >
          <label>
            <input
@@ -171,12 +163,9 @@
              class="mr-2"
              @change="set('displayInviteToPartyWhenPartyIs1')"
            >
-            <span
-              class="hint"
-              popover-trigger="mouseenter"
-              popover-placement="right"
-              :popover="$t('displayInviteToPartyWhenPartyIs1')"
-            >{{ $t('displayInviteToPartyWhenPartyIs1') }}</span>
+            <span class="hint">
+              {{ $t('displayInviteToPartyWhenPartyIs1') }}
+            </span>
          </label>
        </div>
        <div class="checkbox">
@@ -217,32 +206,47 @@
        </div>
        <hr>
        <button
+          id="buttonShowBailey"
          class="btn btn-primary mr-2 mb-2"
-          popover-trigger="mouseenter"
-          popover-placement="right"
-          :popover="$t('showBaileyPop')"
          @click="showBailey()"
        >
          {{ $t('showBailey') }}
+          <b-popover
+            target="buttonShowBailey"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t('showBaileyPop')"
+          />
        </button>
        <button
+          id="buttonFCV"
          class="btn btn-primary mr-2 mb-2"
-          popover-trigger="mouseenter"
-          popover-placement="right"
-          :popover="$t('fixValPop')"
          @click="openRestoreModal()"
        >
          {{ $t('fixVal') }}
+          <b-popover
+            target="buttonFCV"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t('fixValPop')"
+          />
        </button>
        <button
          v-if="user.preferences.disableClasses == true"
+          id="buttonEnableClasses"
          class="btn btn-primary mb-2"
-          popover-trigger="mouseenter"
-          popover-placement="right"
-          :popover="$t('enableClassPop')"
          @click="changeClassForUser(false)"
        >
          {{ $t('enableClass') }}
+          <b-popover
+            target="buttonEnableClasses"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t('enableClassPop')"
+          />
        </button>
        <hr>
        <day-start-adjustment />
@@ -532,6 +536,10 @@
  input {
    color: $gray-50;
  }
+
+  .checkbox {
+    width: fit-content;
+  }
  .usersettings h5 {
    margin-top: 1em;
  }
@@ -0,0 +1,93 @@
+<template>
+  <div class="item-cost">
+    <span
+      class="cost"
+      :class="getPriceClass()"
+    >
+      <span
+        class="svg-icon inline icon-24"
+        aria-hidden="true"
+        v-html="icons[getPriceClass()]"
+      >
+      </span>
+      <span
+        :class="getPriceClass()"
+      >{{ item.value }}</span>
+    </span>
+  </div>
+</template>
+
+
+<style lang="scss">
+  @import '~@/assets/scss/colors.scss';
+  @import '~@/assets/scss/mixins.scss';
+
+.item-cost {
+ padding-bottom: 16px;
+}
+
+  .cost {
+    height: 40px;
+    font-size: 1.25rem;
+    font-weight: bold;
+    line-height: 1.4;
+    vertical-align: middle;
+
+    &.gems {
+      color: $gems-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(36, 204, 143, 0.15);
+    }
+
+    &.gold {
+      color: $gold-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(255, 190, 93, 0.15);
+    }
+
+    &.hourglasses {
+      color: $hourglass-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(41, 149, 205, 0.15);
+    }
+  }
+</style>
+
+<script>
+import svgClose from '@/assets/svg/close.svg';
+import svgGold from '@/assets/svg/gold.svg';
+import svgGem from '@/assets/svg/gem.svg';
+
+export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        close: svgClose,
+        gold: svgGold,
+        gems: svgGem,
+      }),
+      selectedAmountToBuy: 1,
+      selectedAmount: 1,
+    };
+  },
+  methods: {
+    getPriceClass () {
+      if (this.priceType && this.icons[this.priceType]) {
+        return this.priceType;
+      } if (this.item.currency && this.icons[this.item.currency]) {
+        return this.item.currency;
+      }
+      return 'gold';
+    },
+  },
+};
+</script>
@@ -0,0 +1,137 @@
+<template>
+  <div class="d-flex flex-row align-items-center justify-content-center number-increment">
+    <!-- buy modal -->
+    <div
+      class="gray-circle"
+      @click="quantity <= 0
+        ? quantity = 0
+        : quantity--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.svgNegative"
+      ></div>
+    </div>
+    <div class="input-group">
+      <div class="align-items-center">
+      </div>
+      <input
+        v-model="quantity"
+        class="form-control alignment"
+        step="1"
+        type="number"
+      >
+    </div>
+    <div
+      class="gray-circle"
+      @click="quantity++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.svgPositive"
+      ></div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+  @import '~@/assets/scss/colors.scss';
+
+  .number-increment {
+    padding-bottom: 0px;
+    }
+
+  .alignment {
+    text-align: center;
+  }
+
+  .input-group {
+    width: 94px;
+    height: 32px;
+    width: 48px;
+    margin: 0px 16px 0px 16px;
+    padding: 0;
+    border-radius: 2px;
+    border: solid 1px $gray-400;
+    background-color: $white;
+  }
+
+  .gray-circle {
+    border-radius: 100%;
+    border: solid 2px $gray-300;
+    width: 32px;
+    height: 32px;
+    cursor: pointer;
+
+    &:hover {
+      border-color: $purple-300;
+    }
+  }
+
+  .gray-circle:hover{
+    .icon-positive, .icon-negative {
+      & ::v-deep svg path {
+        fill: $purple-300;
+      }
+    }
+  }
+
+  .icon-positive, .icon-negative {
+    width: 10px;
+    height: 10px;
+    margin: 4px auto;
+
+    & ::v-deep svg path {
+      fill: $gray-300;
+    }
+  }
+
+/* Chrome, Safari, Edge, Opera */
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+
+/* Firefox */
+  input[type=number] {
+    -moz-appearance: textfield;
+  }
+
+</style>
+
+<script>
+// icons
+import svgGem from '@/assets/svg/gem.svg';
+import svgGold from '@/assets/svg/gold.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';
+
+export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        svgGem,
+        svgGold,
+        svgPositive,
+        svgNegative,
+      }),
+      item: { },
+      quantity: 1,
+    };
+  },
+  computed: {
+  },
+  watch: {
+    quantity () {
+      this.$emit('updateQuantity', this.quantity);
+    },
+  },
+  methods: {
+    setDefaults () {
+      this.input = 1;
+    },
+  },
+};
+
+</script>
@@ -22,10 +22,11 @@
  @import '~@/assets/scss/colors.scss';

 span {
-  font-weight: normal;
-  font-size: 12px;
+  font-size: 0.75rem;
  line-height: 1.33;
-  color: $gray-200;
+  color: $gray-100;
+  margin-bottom: 16px;
+  margin-top: -4px;

  display: inline-block;
 }
@@ -17,7 +17,7 @@
    </span>
    <div>
      <span
-        class="svg-icon icon-12 close-icon"
+        class="svg-icon close-icon icon-16 color"
        aria-hidden="true"
        tabindex="0"
        @click="hideDialog()"
@@ -45,6 +45,13 @@
              :sprites-margin="'0px auto 0px -24px'"
            />
          </div>
+          <item
+            v-else-if="item.key === 'gem'"
+            class="flat bordered-item"
+            :item="item"
+            :item-content-class="item.class"
+            :show-popover="false"
+          />
          <item
            v-else-if="item.key != 'gem'"
            class="flat bordered-item"
@@ -53,10 +60,20 @@
            :show-popover="false"
          />
        </slot>
+        <div
+          v-if="!showAvatar && user.items[item.purchaseType]"
+          class="owned"
+          :class="totalOwned"
+        >
+          <!-- eslint-disable-next-line max-len -->
+          <span class="owned-text">{{ $t('owned') }}: <span class="user-amount">{{ totalOwned }}</span></span>
+        </div>
        <h4 class="title">
          {{ itemText }}
        </h4>
-        <div v-html="itemNotes"></div>
+        <div class="item-notes">
+          {{ itemNotes }}
+        </div>
        <slot
          name="additionalInfo"
          :item="item"
@@ -69,60 +86,61 @@
          />
        </slot>
        <div
-          v-if="item.value > 0"
+          v-if="item.value > 0 && !(item.key === 'gem' && gemsLeft < 1)"
          class="purchase-amount"
        >
-          <div
-            v-if="showAmountToBuy(item)"
-            class="how-many-to-buy"
-          >
-            <strong>{{ $t('howManyToBuy') }}</strong>
-          </div>
-          <div v-if="showAmountToBuy(item)">
-            <div class="box">
-              <input
-                v-model.number="selectedAmountToBuy"
-                class="form-control"
-                type="number"
-                min="0"
-                step="1"
-              >
-            </div>
-            <span :class="{'notEnough': notEnoughCurrency}">
+          <!-- this is where the pretty item cost element lives -->
+          <div class="item-cost">
+            <span
+              class="cost"
+              :class="getPriceClass()"
+            >
              <span
-                class="svg-icon inline icon-32"
+                class="svg-icon inline icon-24"
                aria-hidden="true"
                v-html="icons[getPriceClass()]"
-              ></span>
+              >
+              </span>
              <span
-                class="cost"
                :class="getPriceClass()"
              >{{ item.value }}</span>
            </span>
          </div>
+
          <div
-            v-else
-            class="d-flex align-items-middle"
+            v-if="showAmountToBuy(item)"
+            class="how-many-to-buy"
          >
-            <span
-              class="svg-icon inline icon-32 ml-auto my-auto"
-              aria-hidden="true"
-              v-html="icons[getPriceClass()]"
-            ></span>
-            <span
-              class="cost mr-auto my-auto"
-              :class="getPriceClass()"
-            >{{ item.value }}</span>
+            {{ $t('howManyToBuy') }}
+          </div>
+          <div
+            v-if="showAmountToBuy(item)"
+          >
+            <number-increment
+              class="number-increment"
+              @updateQuantity="selectedAmountToBuy = $event"
+            />
+            <div
+              :class="{'notEnough': notEnoughCurrency}"
+              class="total"
+            >
+              <span class="total-text">{{ $t('sendTotal') }}</span>
+              <span
+                class="svg-icon total icon-24"
+                aria-hidden="true"
+                v-html="icons[getPriceClass()]"
+              ></span>
+              <span
+                class="total-text"
+                :class="getPriceClass()"
+              >{{ item.value * selectedAmountToBuy }}</span>
+            </div>
          </div>
        </div>
        <div
-          v-if="item.key === 'gem'"
-          class="gems-left"
+          v-if="item.key === 'gem' && gemsLeft < 1"
+          class="no-more-gems"
        >
-          <strong v-if="gemsLeft > 0">{{ gemsLeft }} {{ $t('gemsRemaining') }}</strong>
-          <strong v-if="gemsLeft === 0">{{ $t('maxBuyGems') }}</strong>
-        </div>
-        <div v-if="attemptingToPurchaseMoreGemsThanAreLeft">
          {{ $t('notEnoughGemsToBuy') }}
        </div>
        <div
@@ -147,7 +165,7 @@
          {{ $t('viewSubscriptions') }}
        </button>
        <button
-          v-else
+          v-else-if="!(item.key === 'gem' && gemsLeft < 1)"
          class="btn btn-primary"
          :disabled="item.key === 'gem' && gemsLeft === 0 ||
            attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid || item.locked ||
@@ -165,6 +183,7 @@
    <countdown-banner
      v-if="item.event && item.owned == null"
      :end-date="endDate"
+      class="limitedTime available"
    />
    <div
      v-if="item.key === 'rebirth_orb' && item.value > 0 && user.stats.lvl >= 100"
@@ -179,12 +198,31 @@
      </div>
    </div>
    <div
-      slot="modal-footer"
-      class="d-flex"
+      v-if="item.key === 'gem'"
+      class="d-flex justify-content-center align-items-center"
    >
-      <span class="balance mr-auto">{{ $t('yourBalance') }}</span>
+      <div
+        v-if="gemsLeft > 0"
+        class="gems-left d-flex justify-content-center align-items-center"
+      >
+        <strong>{{ $t('monthlyGems') }} &nbsp;</strong>
+        {{ gemsLeft }} / {{ totalGems }} {{ $t('gemsRemaining') }}
+      </div>
+      <div
+        v-if="gemsLeft === 0"
+        class="out-of-gems-banner d-flex justify-content-center align-items-center"
+      >
+        <strong>{{ $t('monthlyGems') }} &nbsp;</strong>
+        {{ gemsLeft }} / {{ totalGems }} {{ $t('gemsRemaining') }}
+      </div>
+    </div>
+    <div
+      slot="modal-footer"
+      class="clearfix"
+    >
+      <span class="user-balance float-left">{{ $t('yourBalance') }}</span>
      <balanceInfo
-        class="ml-auto"
+        class="currency-totals"
        :currency-needed="getPriceClass()"
        :amount-needed="item.value"
      />
@@ -200,11 +238,47 @@
    @include centeredModal();

    .modal-body {
+      padding-left: 0px;
+      padding-right: 0px;
      padding-bottom: 0px;
    }

+    .modal-footer {
+      height: 48px;
+      background-color: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      display: block;
+      margin: 24px 0 0 0;
+      padding: 16px 24px;
+      align-content: center;
+
+      .user-balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
+      }
+    }
+
    .modal-dialog {
-      width: 330px;
+      width: 448px;
+      box-sizing: border-box;
+    }
+
+    .badge-dialog {
+      left: -8px;
+      top: -8px;
    }

    .avatar {
@@ -212,8 +286,71 @@
      margin: 0 auto;
    }

+   .owned {
+      height: 32px;
+      width: 141px;
+      margin-top: -36px;
+      margin-left: 153px;
+      padding-top: 6px;
+      background-color: $gray-600;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
+      display: block;
+      text-align: center;
+      position: relative;
+      z-index: 1;
+
+      .owned-text {
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.71;
+      }
+
+      .user-amount {
+        font-weight: normal !important;
+      }
+    }
+
+    .item {
+      width: 141px;
+      height: 147px;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+      border-bottom-right-radius: 0px;
+      border-bottom-left-radius: 0px;
+      cursor: default;
+    }
+
+    .item-content {
+      transform: scale(1.45, 1.45);
+      top: -25.67px;
+      left: 1px;
+
+      &.shop_gem {
+        transform: scale(1.45, 1.45);
+        top: -2px;
+       left: 0px;
+      }
+    }
+
+    .title {
+      height: 28px;
+      color: $gray-10;
+      font-size: 1.25rem;
+      margin-top: 25px;
+    }
+
+    .item-notes {
+       margin-top: 8px;
+       padding-left: 48.5px;
+       padding-right: 48.5px;
+       line-height: 1.71;
+       font-size: 0.875rem;
+    }
+
    .content {
      text-align: center;
+      width: 448px;
    }

    .item-wrapper {
@@ -221,15 +358,22 @@
    }

    .inner-content {
-      margin: 33px auto auto;
-      width: 282px;
+      margin: 32px auto auto;
+    }
+
+    .btn-primary {
+      margin-top: 16px;
    }

    .purchase-amount {
-      margin-top: 24px;
+      margin-top: 0px;

      .how-many-to-buy {
-        margin-bottom: 16px;
+        font-weight: bold !important;
+      }
+
+      .number-increment {
+        margin-top: 16px;
      }

      .box {
@@ -255,31 +399,105 @@
        }
      }
    }
+    .no-more-gems {
+      color: $yellow-5;
+      font-size: 0.875em;
+      line-height: 1.33;
+      margin: 16px 48px 0 48px;
+    }

-    span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
-
+// for cost icon of a single item
+    span.svg-icon.inline.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-right: 4px;
+      padding-top: 4px;
+    }
+// for the total user cost
+    span.svg-icon.total.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-left: 6px;
      margin-right: 8px;
+      padding-top: 6px;
+    }

-      vertical-align: middle;
+    span.svg-icon.icon-16 {
+      height: 16px;
+      width: 16px;
+    }
+
+    .close-icon {
+      color: $gray-200;
+      stroke-width: 0px;
+
+      &:hover {
+          color: $gray-100;
+      }
+    }
+
+    .attributes-group {
+      margin: 32px;
+      border-radius: 4px;
+      line-height: 1.71;
+      font-size: 0.875;
+    }
+
+    .attributesGrid {
+      margin-top: 28px;
+      border-radius: 2px;
+      background-color: $gray-500;
+    }
+
+    .item-cost {
+      display: inline-flex;
+      margin: 16px 0;
+      align-items: center;
+      height: 40px;
    }

    .cost {
-      width: 28px;
-      height: 32px;
-      font-size: 24px;
+      display: inline-block;
+      font-family: sans-serif;
+      font-size: 1.25rem;
      font-weight: bold;
-      line-height: 1.33;
-
-      vertical-align: middle;
+      padding: 6px 20px;
+      line-height: 1.4;
+      border-radius: 20px;

      &.gems {
-        color: $gems-color;
+        color: $green-10;
+        background-color: rgba(36, 204, 143, 0.15);
+        align-items: center;
      }

      &.gold {
-        color: $gold-color;
+        color: $yellow-5;
+        background-color: rgba(255, 190, 93, 0.15);
+        align-items: center;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+        background-color: rgba(41, 149, 205, 0.15);
+        align-items: center;
+      }
+    }
+
+    .total {
+      font-weight: bold;
+      font-size: 0.875rem;
+      padding-top: 2px;
+      margin-top: 4px;
+
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
      }

      &.hourglasses {
@@ -287,62 +505,84 @@
      }
    }

+  .total-text {
+      color: $gray-50;
+      font-weight: bold;
+      font-size: 0.875rem;
+      line-height: 1.71;
+
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+      }
+  }
+
    button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
-      min-width: 6rem;
+      margin-top: 16px;
+      padding: 4px 16px;
+      height: 32px;

      &:focus {
        border: 2px solid black;
      }
    }

-    .balance {
-      width: 74px;
-      height: 16px;
-      font-size: 12px;
-      font-weight: bold;
-      line-height: 1.33;
-      color: $gray-200;
-    }
+      .notEnough {
+        pointer-events: none;
+        opacity: 0.55;
+      }

-    .modal-footer {
-      height: 48px;
-      background-color: $gray-700;
-      border-bottom-right-radius: 8px;
-      border-bottom-left-radius: 8px;
-      display: block;
-    }
+      .free-rebirth {
+        background-color: $yellow-5;
+        color: $white;
+        height: 2rem;
+        line-height: 16px;
+        margin: auto -1rem -1rem;
+      }

-    .notEnough {
-      pointer-events: none;
-      opacity: 0.55;
-    }
+      // .pt-015 {
+      //   padding-top: 0.15rem;
+      // }

-    .attributesGrid {
-      margin-top: 8px;
-      border-radius: 2px;
-      background-color: $gray-500;
-
-      margin: 10px 0 24px;
-    }

    .gems-left {
-      margin-top: .5em;
+      height: 32px;
+      background-color: $green-100;
+      font-size: 0.75rem;
+      margin-top: 24px;
+      color: $green-1;
+      width: 100%;
+      margin-bottom: -24px;
    }

-    .free-rebirth {
-      background-color: $yellow-5;
+    .out-of-gems-banner {
+      height: 32px;
+      font-size: 0.75rem;
+      margin-top: 24px;
+      background-color: $yellow-100;
+      color: $yellow-1;
+      width: 100%;
+      margin-bottom: -24px;
+    }
+
+    .limitedTime {
+      height: 32px;
+      width: 446px;
+      font-size: 0.75rem;
+      margin: 24px 0 0 0;
+      background-color: $purple-300;
      color: $white;
-      height: 2rem;
-      line-height: 16px;
-      margin: auto -1rem -1rem;
-    }
-
-    .pt-015 {
-      padding-top: 0.15rem;
+      margin-bottom: -24px;
    }
  }
+
 </style>

 <style lang="scss" scoped>
@@ -370,6 +610,8 @@ import svgGem from '@/assets/svg/gem.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
 import svgClock from '@/assets/svg/clock.svg';
 import svgWhiteClock from '@/assets/svg/clock-white.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';

 import BalanceInfo from './balanceInfo.vue';
 import PinBadge from '@/components/ui/pinBadge';
@@ -377,6 +619,7 @@ import CountdownBanner from './countdownBanner';
 import currencyMixin from './_currencyMixin';
 import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
+import numberIncrement from '@/components/shared/numberIncrement';

 import { mapState } from '@/libs/store';

@@ -407,14 +650,17 @@ export default {
    Avatar,
    PinBadge,
    CountdownBanner,
+    numberIncrement,
  },
  mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
  props: {
+    // eslint-disable-next-line vue/require-default-prop
    item: {
      type: Object,
    },
    priceType: {
      type: String,
+      default: '',
    },
    withPin: {
      type: Boolean,
@@ -433,10 +679,14 @@ export default {
        hourglasses: svgHourglasses,
        clock: svgClock,
        whiteClock: svgWhiteClock,
+        positive: svgPositive,
+        negative: svgNegative,
      }),

      selectedAmountToBuy: 1,
+      selectedAmount: 1,
      isPinned: false,
+      quantity: 1,
    };
  },
  computed: {
@@ -474,6 +724,11 @@ export default {
      return planGemLimits.convCap
        + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
    },
+    totalGems () {
+      if (!this.user.purchased.plan) return 0;
+      return planGemLimits.convCap
+        + this.user.purchased.plan.consecutive.gemCapExtra;
+    },
    attemptingToPurchaseMoreGemsThanAreLeft () {
      if (this.item && this.item.key && this.item.key === 'gem' && this.selectedAmountToBuy > this.gemsLeft) return true;
      return false;
@@ -490,6 +745,9 @@ export default {
    endDate () {
      return moment(this.item.event.end);
    },
+    totalOwned () {
+      return this.user.items[this.item.purchaseType][this.item.key] || 0;
+    },
  },
  watch: {
    item: function itemChanged () {
@@ -500,7 +758,9 @@ export default {
  methods: {
    onChange ($event) {
      this.$emit('change', $event);
+      this.selectedAmountToBuy = 1;
    },
+
    buyItem () {
      // @TODO: I  think we should buying to the items.
      // Turn the items into classes, and use polymorphism
@@ -597,6 +857,7 @@ export default {
      }
    },
    hideDialog () {
+      this.selectedAmountToBuy = 1;
      this.$root.$emit('bv::hide::modal', 'buy-modal');
    },
    getPriceClass () {
@@ -16,9 +16,6 @@

  .limitedTime {
    height: 32px;
-    width: calc(100% + 30px);
-    margin: 0 -15px; // the modal content has its own padding
-
    font-size: 12px;
    line-height: 1.33;
    text-align: center;
@@ -4,9 +4,9 @@
    :hide-header="true"
    @change="onChange($event)"
  >
-    <div class="close">
+    <div>
      <span
-        class="svg-icon inline icon-10"
+        class="svg-icon close-icon icon-16 color"
        aria-hidden="true"
        @click="hideDialog()"
        v-html="icons.close"
@@ -14,60 +14,73 @@
    </div>
    <div
      v-if="item"
-      class="content"
+      class="content bordered-item"
    >
      <div class="inner-content">
        <item
-          class="flat"
+          class="flat bordered-item"
          :item="item"
          :item-content-class="itemContextToSell.itemClass"
          :show-popover="false"
-        >
-          <countBadge
-            slot="itemBadge"
-            :show="true"
-            :count="itemContextToSell.itemCount"
-          />
-        </item>
+        />
+        <span class="owned">
+          {{ $t('owned') }}: <span class="user-amount">{{ itemContextToSell.itemCount }}</span>
+        </span>
        <h4 class="title">
          {{ itemContextToSell.itemName }}
        </h4>
        <div v-if="item.key === 'Saddle'">
-          <div class="text">
+          <div class="item-notes">
            {{ item.sellWarningNote() }}
          </div>
          <br>
        </div>
        <div v-else>
          <div>
-            <div class="text">
+            <div class="item-notes">
              {{ item.notes() }}
            </div>
-            <div>
-              <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
+            <div class="item-cost">
+              <span class="cost gold">
+                <span
+                  class="svg-icon inline icon-24"
+                  aria-hidden="true"
+                  v-html="icons.gold"
+                ></span>
+                <span>{{ item.value }}</span>
+              </span>
            </div>
            <div>
-              <b-input
-                v-model="selectedAmountToSell"
-                class="itemsToSell"
-                type="number"
-                :max="itemContextToSell.itemCount"
-                min="1"
-                step="1"
-                @keyup.native="preventNegative($event)"
-              />
              <span
-                class="svg-icon inline icon-32"
+                class="how-many-to-sell"
+              >
+                {{ $t('howManyToSell') }}
+              </span>
+            </div>
+            <div>
+              <number-increment
+                @updateQuantity="selectedAmountToSell = $event"
+              />
+            </div>
+            <div class="total-row">
+              <span class="total-text">
+                {{ $t('sendTotal') }}
+              </span>
+              <span
+                class="svg-icon total icon-24"
                aria-hidden="true"
                v-html="icons.gold"
              ></span>
-              <span class="value">{{ item.value }}</span>
+              <span class="total-text gold">
+                {{ item.value * selectedAmountToSell }}
+              </span>
            </div>
            <button
              class="btn btn-primary"
+              :disabled="selectedAmountToSell > itemContextToSell.itemCount"
              @click="sellItems()"
            >
-              {{ $t('sell') }}
+              {{ $t('sellItems') }}
            </button>
          </div>
        </div>
@@ -77,8 +90,10 @@
      slot="modal-footer"
      class="clearfix"
    >
-      <span class="balance float-left">{{ $t('yourBalance') }}</span>
-      <balanceInfo class="float-right" />
+      <span class="user-balance float-left">{{ $t('yourBalance') }}</span>
+      <balanceInfo
+        class="float-right currency-totals"
+      />
    </div>
  </b-modal>
 </template>
@@ -95,51 +110,13 @@
    }

    .modal-dialog {
-      width: 330px;
+      width: 448px;
    }

-    .content {
-      text-align: center;
-
-    }
-    .inner-content {
-      margin: 33px auto auto;
-      width: 282px;
-    }
-
-    span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
-
-      margin-left: 24px;
-      margin-right: 8px;
-
-      vertical-align: middle;
-    }
-
-    .value {
-      width: 28px;
-      height: 32px;
-      font-size: 24px;
-      font-weight: bold;
-      line-height: 1.33;
-      color: #df911e;
-
-      vertical-align: middle;
-    }
-
-    button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
-    }
-
-    .balance {
-      width: 74px;
-      height: 16px;
-      font-size: 12px;
-      font-weight: bold;
-      line-height: 1.33;
-      color: $gray-200;
+    .modal-body {
+      padding-left: 0px;
+      padding-right: 0px;
+      padding-bottom: 0px;
    }

    .modal-footer {
@@ -148,29 +125,215 @@
      border-bottom-right-radius: 8px;
      border-bottom-left-radius: 8px;
      display: block;
+      margin: 24px 0 0;
+      padding: 16px 24px;
+      align-content: center;
+
+      .user-balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
+      }
    }

-    .how-many-to-sell {
-      margin-bottom: 16px;
+    .content {
+      text-align: center;
+    }
+
+    .inner-content {
+      margin: 33px auto auto;
+      width: 282px;
+    }
+
+    .owned {
+      font-size: 0.75rem;
+      font-weight: bold;
+      line-height: 1.33;
+      background-color: $gray-600;
+      padding: 8px 8px;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
      display: block;
+      width: 141px;
+      margin-left: 71px;
+      margin-top: -48px;
+      position: relative;
+      z-index: 1;
+
+      .user-amount {
+        font-weight: normal !important;
+      }
+    }
+
+    .item-wrapper {
+      margin-top: -10px;
+    }
+
+    .item {
+      width: 141px;
+      height: 147px;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+      border-bottom-right-radius: 0px;
+      border-bottom-left-radius: 0px;
+      cursor: default;
+      margin-top: 8px;
+    }
+
+    .item-content {
+      transform: scale(1.45, 1.45);
+      top: -25px;
+      left: 1px;
+    }
+
+    .title {
+      color: $gray-10;
+      font-size: 1.25rem;
+      margin-top: 26px;
+      margin-bottom: 0px;
+    }
+
+    .item-notes {
+       margin-top: 12px;
+       line-height: 1.71;
+       font-size: 0.875rem;
+    }
+
+// for cost icon of a single item
+    span.svg-icon.inline.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-right: 4px;
+      padding-top: 4px;
+    }
+// for the total user cost
+    span.svg-icon.total.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-left: 6px;
+      margin-right: 8px;
+      padding-top: 6px;
+    }
+
+    span.svg-icon.icon-16 {
+      height: 16px;
+      width: 16px;
+    }
+
+    .close-icon {
+      color: $gray-200;
+      stroke-width: 0px;
+      cursor: pointer;
+
+      &:hover {
+        color: $gray-100;
+      }
+    }
+
+  .item-cost {
+      display: inline-flex;
+      margin: 16px 0;
+      align-items: center;
+      height: 40px;
+    }
+
+    .cost {
+      display: inline-block;
+      font-family: sans-serif;
+      font-size: 1.25rem;
+      font-weight: bold;
+      padding: 6px 20px;
+      line-height: 1.4;
+      border-radius: 20px;
+
+      &.gold {
+        color: $yellow-5;
+        background-color: rgba(255, 190, 93, 0.15);
+        align-items: center;
+      }
    }
  }
+
+  .how-many-to-sell {
+    font-weight: bold !important;
+  }
+
+  .number-increment {
+     margin-top: 16px;
+  }
+
+  .total-row {
+    font-weight: bold;
+    font-size: 0.875rem;
+    margin-top: 16px;
+
+    &.gold {
+      color: $yellow-5;
+    }
+  }
+
+    .total-text {
+      color: $gray-50;
+      font-weight: bold;
+      font-size: 0.875rem;
+      line-height: 1.71;
+
+    &.gold {
+      color: $yellow-5;
+    }
+  }
+
+  button.btn.btn-primary {
+    margin-top: 16px;
+    padding: 4px 16px;
+    height: 32px;
+
+    &:focus {
+      border: 2px solid black;
+    }
+
+  .balance {
+    width: 74px;
+    height: 16px;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 1.33;
+    color: $gray-200;
+  }
+
+
+}
 </style>

 <script>
 import svgClose from '@/assets/svg/close.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgGem from '@/assets/svg/gem.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';

 import BalanceInfo from '../balanceInfo.vue';
 import Item from '@/components/inventory/item';
-import CountBadge from '@/components/ui/countBadge';
+import numberIncrement from '@/components/shared/numberIncrement';

 export default {
  components: {
    BalanceInfo,
    Item,
-    CountBadge,
+    numberIncrement,
  },
  data () {
    return {
@@ -181,6 +344,8 @@ export default {
        close: svgClose,
        gold: svgGold,
        gem: svgGem,
+        svgPositive,
+        svgNegative,
      }),
    };
  },
@@ -211,6 +376,10 @@ export default {
        this.selectedAmountToSell = 0;
      }
    },
+    maxOwned () {
+      const maxOwned = this.itemContextToSell.itemCount;
+      return maxOwned;
+    },
    sellItems () {
      if (!Number.isInteger(Number(this.selectedAmountToSell))) {
        this.selectedAmountToSell = 0;
@@ -33,6 +33,22 @@
          v-if="!item.locked"
          class="purchase-amount"
        >
+          <div class="item-cost">
+            <span
+              class="cost"
+              :class="priceType"
+            >
+              <span
+                class="svg-icon inline icon-24"
+                aria-hidden="true"
+                v-html="icons[priceType]"
+              >
+              </span>
+              <span
+                :class="priceType"
+              >{{ item.value }}</span>
+            </span>
+          </div>
          <div class="how-many-to-buy">
            <strong>{{ $t('howManyToBuy') }}</strong>
          </div>
@@ -42,24 +58,25 @@
          >
            {{ item.addlNotes }}
          </div>
-          <div class="box">
-            <input
-              v-model.number="selectedAmountToBuy"
-              class="form-control"
-              type="number"
-              min="0"
-              step="1"
-            >
+          <div>
+            <number-increment
+              @updateQuantity="selectedAmountToBuy = $event"
+            />
+          </div>
+          <div class="total-row">
+            <span class="total-text">
+              {{ $t('sendTotal') }}
+            </span>
+            <span
+              class="svg-icon inline icon-20"
+              aria-hidden="true"
+              v-html="currencyIcon"
+            ></span>
+            <span
+              class="total"
+              :class="priceType"
+            >{{ item.value * selectedAmountToBuy }}</span>
          </div>
-          <span
-            class="svg-icon inline icon-32"
-            aria-hidden="true"
-            v-html="currencyIcon"
-          ></span>
-          <span
-            class="value"
-            :class="priceType"
-          >{{ item.value }}</span>
        </div>
        <button
          v-if="priceType === 'gems'
@@ -72,7 +89,7 @@
        </button>
        <button
          v-else
-          class="btn btn-primary"
+          class="btn btn-primary mb-4"
          :class="{'notEnough': !enoughCurrency(priceType, item.value * selectedAmountToBuy)}"
          :disabled="numberInvalid"
          @click="buyItem()"
@@ -112,6 +129,39 @@
      margin-top: 1rem;
    }

+    .modal-body {
+      padding-left: 0px;
+      padding-right: 0px;
+      padding-bottom: 0px;
+    }
+
+    .modal-footer {
+      height: 48px;
+      background-color: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      display: block;
+      padding: 16px 24px;
+      align-content: center;
+
+      .user-balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
+      }
+    }
+
    .modal-dialog {
      margin-top: 8%;
      width: 448px !important;
@@ -129,8 +179,13 @@
      margin: 33px auto auto;
    }

-    .modal-body {
-      padding-bottom: 0px;
+    .item-notes {
+      height: 48px;
+      margin-top: 8px;
+      padding-left: 48.5px;
+      padding-right: 48.5px;
+      line-height: 1.71;
+      font-size: 0.875rem;
    }

    .questInfo {
@@ -152,16 +207,14 @@
      height: 100%;
    }

-    span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
-      margin-right: 8px;
-      vertical-align: middle;
-    }
-
    button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
+      margin-top: 14px;
+      padding: 4px 16px;
+      height: 32px;
+
+      &:focus {
+        border: 2px solid black;
+      }
    }

    .balance {
@@ -173,19 +226,6 @@
      color: $gray-200;
    }

-    .modal-footer {
-      height: 48px;
-      background-color: $gray-700;
-      border-bottom-right-radius: 8px;
-      border-bottom-left-radius: 8px;
-      display: block;
-      padding: 1rem 1.5rem;
-
-      &> * {
-        margin: 0;
-      }
-    }
-
    .notEnough {
      pointer-events: none;
      opacity: 0.55;
@@ -198,30 +238,108 @@
        margin-bottom: 16px;
      }

-      .box {
-        display: inline-block;
-        width: 74px;
-        height: 40px;
-        border-radius: 2px;
-        background-color: #ffffff;
-        box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
-        margin-right: 24px;
-
-        input {
-          width: 100%;
-          border: none;
+      .item-cost {
+        padding-bottom: 16px;
        }

-        input::-webkit-contacts-auto-fill-button {
-          visibility: hidden;
-          display: none !important;
-          pointer-events: none;
-          position: absolute;
-          right: 0;
-        }
+        .cost {
+          height: 40px;
+          font-size: 1.25rem;
+          font-weight: bold;
+          vertical-align: middle;
+          padding: 8px 20px 8px 20px;
+
+          &.gems {
+            color: $green-10;
+            background-color: rgba(36, 204, 143, 0.15);
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
+          }
+
+          &.gold {
+            color: $yellow-5;
+            background-color: rgba(255, 190, 93, 0.15);
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
+          }
+
+          &.hourglasses {
+            color: $hourglass-color;
+            background-color: rgba(41, 149, 205, 0.15);
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
+            }
+          }
+
+    .total-row {
+      font-weight: bold;
+      font-size: 0.875rem;
+      margin-top: 16px;
+    }
+
+    .total {
+      font-weight: bold;
+      font-size: 0.875rem;
+      margin-top: 16px;
+
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
      }
    }

+    .total-text {
+      color: $gray-50;
+      font-weight: bold;
+      font-size: 0.875rem;
+      height: 24px;
+      line-height: 1.71;
+      padding-right: 4px;
+
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+      }
+    }
+
+  span.svg-icon.inline.icon-20 {
+      height: 20px;
+      width: 20px;
+      margin-right: 4px;
+      vertical-align: middle;
+    }
+
+  span.svg-icon.inline.icon-24 {
+    height: 24px;
+    width: 24px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+
+  span.svg-icon.inline.icon-32 {
+    height: 32px;
+    width: 32px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+
    @media only screen and (max-width: 1000px) {
      .modal-dialog {
        max-width: 80%;
@@ -234,9 +352,10 @@
      }
    }
  }
+}
 </style>

-<style lang="scss" scoped>
+<!-- <style lang="scss" scoped>
  @import '~@/assets/scss/colors.scss';

  .value {
@@ -260,7 +379,7 @@
      color: $hourglass-color;
    }
  }
-</style>
+</style> -->

 <script>
 import moment from 'moment';
@@ -272,6 +391,8 @@ import svgExperience from '@/assets/svg/experience.svg';
 import svgGem from '@/assets/svg/gem.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';

 import BalanceInfo from '../balanceInfo.vue';
 import currencyMixin from '../_currencyMixin';
@@ -280,6 +401,7 @@ import buyMixin from '@/mixins/buy';
 import numberInvalid from '@/mixins/numberInvalid';
 import PinBadge from '@/components/ui/pinBadge';
 import CountdownBanner from '../countdownBanner';
+import numberIncrement from '@/components/shared/numberIncrement';

 import questDialogContent from './questDialogContent';
 import QuestRewards from './questRewards';
@@ -293,6 +415,7 @@ export default {
    PinBadge,
    questDialogContent,
    CountdownBanner,
+    numberIncrement,
  },
  mixins: [buyMixin, currencyMixin, notifications, numberInvalid],
  props: {
@@ -301,6 +424,7 @@ export default {
    },
    priceType: {
      type: String,
+      default: '',
    },
    withPin: {
      type: Boolean,
@@ -312,9 +436,11 @@ export default {
        clock: svgClock,
        close: svgClose,
        experience: svgExperience,
-        gem: svgGem,
+        gems: svgGem,
        gold: svgGold,
-        hourglass: svgHourglasses,
+        hourglasses: svgHourglasses,
+        positive: svgPositive,
+        negative: svgNegative,
      }),

      isPinned: false,
@@ -339,8 +465,8 @@ export default {
    },
    currencyIcon () {
      if (this.priceType === 'gold') return this.icons.gold;
-      if (this.priceType === 'hourglasses') return this.icons.hourglass;
-      return this.icons.gem;
+      if (this.priceType === 'hourglasses') return this.icons.hourglasses;
+      return this.icons.gems;
    },
    endDate () {
      return moment(this.item.event.end);
@@ -33,17 +33,17 @@

  h3 {
    color: $gray-10;
-    margin-bottom: 0.25rem;
+    margin-bottom: 4pxrem;
  }

  .quest-image {
    margin: 0 auto;
-    margin-bottom: 1em;
-    margin-top: 1.5em;
+    margin-bottom: 16px;
+    margin-top: 24px;
  }

  .text {
-    margin-bottom: 1rem;
+    margin: 16px 16px;
    overflow-y: auto;
    text-overflow: ellipsis;
  }
@@ -54,10 +54,10 @@
    line-height: 1.71;
    color: $gray-50;
    text-align: center;
-    margin-bottom: 0.5rem;
+    margin-bottom: 8px;

    ::v-deep .user-label {
-      font-size: 14px;
+      font-size: 0.875rem;
    }
  }

@@ -177,9 +177,6 @@ export default {
  @import '~@/assets/scss/colors.scss';

  .quest-rewards {
-    margin-left: -1rem;
-    margin-right: -1rem;
-
    background-color: $gray-700;
  }

@@ -7,13 +7,19 @@
        <br>
        <p class="text-center">
          <button
+            id="buttonClearBrowserData"
            class="btn btn-lg btn-danger"
-            popover-trigger="mouseover"
-            :popover="$t('localStorageClearExplanation')"
            @click="clearLocalStorage()"
          >
            {{ $t('localStorageClear') }}
          </button>
+          <b-popover
+            target="buttonClearBrowserData"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t('localStorageClearExplanation')"
+          />
        </p>
        <br>
        <p v-html="$t('localStorageTryNext', localStorageTryNext) "></p>
@@ -17,6 +17,19 @@
          class="faq-question"
        >
          <h2
+            v-once
+            v-if="index === 0"
+          >
+            {{ $t('general') }}
+          </h2>
+          <h2
+            v-once
+            v-if="entry.heading === 'party-with-friends'"
+            id="parties"
+          >
+            {{ $t('parties') }}
+          </h2>
+          <h3
            v-once
            v-b-toggle="entry.heading"
            role="tab"
@@ -24,7 +37,7 @@
            @click="handleClick($event)"
          >
            {{ entry.question }}
-          </h2>
+          </h3>
          <b-collapse
            :id="entry.heading"
            :visible="isVisible(entry.heading)"
@@ -49,25 +62,36 @@
 </template>

 <style lang='scss' scoped>
-  .card-body {
-    margin-bottom: 1em;
+  h2 {
+    color: #34313a;
+    border-bottom: 1px solid #e1e0e3;
+    margin-top: 24px;
+    padding-bottom: 16px;
  }

-  .faq-question h2 {
-    cursor: pointer;
-  }
+  .faq-question {
+    a {
+      text-decoration: none;
+      color: #4F2A93;
+    }

-  .faq-question .card-body {
-    padding: 0;
-  }
+    h3 {
+      font-size: 16px;
+      font-weight: normal;
+      line-height: 1.75;
+      cursor: pointer;

-  .static-wrapper .faq-question h2 {
-    margin: 0 0 16px 0;
-  }
+      &:hover {
+        text-decoration: underline;
+      }
+    }

-  .faq-question a {
-    text-decoration: none;
-    color: #4F2A93;
+    .card-body {
+      padding: 0;
+      font-size: 14px;
+      line-height: 1.71;
+      margin-bottom: 1em;
+    }
  }

  @media only screen and (max-width: 768px) {
@@ -198,10 +198,6 @@
      color: $purple-200;
    }

-    li, p {
-      font-size: 16px;
-    }
-
    .media img {
      margin: 1em;
    }
@@ -521,7 +521,12 @@ export default {
    // Get Category Filter Labels
    this.typeFilters = getFilterLabels(this.type, this.challenge);
    // Set default filter for task column
-    this.activateFilter(this.type);
+
+    if (this.challenge) {
+      this.activateFilter(this.type);
+    } else {
+      this.activateFilter(this.type, this.user.preferences.tasks.activeFilter[this.type], true);
+    }
  },
  mounted () {
    this.setColumnBackgroundVisibility();
@@ -661,7 +666,7 @@ export default {
    taskSummary (task) {
      this.$emit('taskSummary', task);
    },
-    activateFilter (type, filter = '') {
+    activateFilter (type, filter = '', skipSave = false) {
      // Needs a separate API call as this data may not reside in store
      if (type === 'todo' && filter === 'complete2') {
        if (this.group && this.group._id) {
@@ -677,14 +682,16 @@ export default {
      // as default filter for daily
      // and set the filter as 'due' only when the component first
      // loads and not on subsequent reloads.
-      if (
-        type === 'daily' && filter === '' && !this.challenge
-        && this.user.preferences.dailyDueDefaultView
-      ) {
+      if (type === 'daily' && filter === '' && !this.challenge) {
        filter = 'due'; // eslint-disable-line no-param-reassign
      }

      this.activeFilter = getActiveFilter(type, filter, this.challenge);
+
+      if (!skipSave && !this.challenge) {
+        const propertyToUpdate = `preferences.tasks.activeFilter.${type}`;
+        this.$store.dispatch('user:set', { [propertyToUpdate]: filter });
+      }
    },
    setColumnBackgroundVisibility () {
      this.$nextTick(() => {
@@ -6,6 +6,7 @@
        'groupTask': task.group.id,
        'task-not-editable': !teamManagerAccess,
        'task-not-scoreable': showTaskLockIcon,
+        'link-exempt': !isChallengeTask && !isGroupTask,
      }, `type_${task.type}`
      ]"
      @click="castEnd($event, task)"
@@ -31,6 +32,9 @@
              'task-not-scoreable': showTaskLockIcon,
            }, controlClass.up.inner]"
            tabindex="0"
+            role="button"
+            :aria-label="$t('scoreUp')"
+            :aria-disabled="showTaskLockIcon || (!task.up && !showTaskLockIcon)"
            @click="score('up')"
            @keypress.enter="score('up')"
          >
@@ -62,6 +66,7 @@
              controlClass.inner,
            ]"
            tabindex="0"
+            role="checkbox"
            @click="score(showCheckIcon ? 'down' : 'up' )"
            @keypress.enter="score(showCheckIcon ? 'down' : 'up' )"
          >
@@ -240,7 +245,7 @@
            >
              <div
                v-b-tooltip.hover.bottom="$t('dueDate')"
-                class="svg-icon calendar"
+                class="svg-icon calendar my-auto"
                v-html="icons.calendar"
              ></div>
              <span>{{ formatDueDate() }}</span>
@@ -358,6 +363,9 @@
              'task-not-scoreable': showTaskLockIcon,
            }, controlClass.down.inner]"
            tabindex="0"
+            role="button"
+            :aria-label="$t('scoreDown')"
+            :aria-disabled="showTaskLockIcon || (!task.down && !showTaskLockIcon)"
            @click="score('down')"
            @keypress.enter="score('down')"
          >
@@ -700,7 +708,7 @@

  .icons {
    margin-top: 4px;
-    color: $gray-300;
+    color: $gray-100;
    font-style: normal;

    &-right {
@@ -759,7 +767,7 @@
  }

  .due-overdue {
-    color: $red-50;
+    color: $maroon-10;
  }

  .calendar.svg-icon {
@@ -898,7 +906,7 @@
  }
 </style>
 <!-- eslint-enable max-len -->
-
+<!-- eslint-disable-next-line vue/component-tags-order -->
 <script>
 import moment from 'moment';
 import { v4 as uuid } from 'uuid';
@@ -1125,13 +1133,13 @@ export default {
      return moment.duration(endOfDueDate.diff(endOfToday));
    },
    checkIfOverdue () {
-      return this.calculateTimeTillDue().asDays() <= 0;
+      return this.calculateTimeTillDue().asDays() < 0;
    },
    formatDueDate () {
-      const timeTillDue = this.calculateTimeTillDue();
-      const dueIn = timeTillDue.asDays() === 0 ? this.$t('today') : timeTillDue.humanize(true);
-
-      return this.task.date && this.$t('dueIn', { dueIn });
+      if (moment().isSame(this.task.date, 'day')) {
+        return this.$t('today');
+      }
+      return moment(this.task.date).format(this.user.preferences.dateFormat.toUpperCase());
    },
    edit (e, task) {
      if (this.isRunningYesterdailies) return;
@@ -110,7 +110,9 @@ export default {
    };
  },
  updated () {
-    this.handleExternalLinks();
+    window.setTimeout(() => {
+      this.handleExternalLinks();
+    }, 500);
  },
  computed: {
    ...mapState({ user: 'user.data' }),
@@ -0,0 +1,46 @@
+<template>
+  <div
+    class="modal-close"
+    @click="$emit('close')"
+  >
+    <div
+      class="svg-icon svg-close color"
+      v-html="icons.close"
+    >
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .modal-close {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+
+    .svg-close {
+      width: 18px;
+      height: 18px;
+      vertical-align: middle;
+      opacity: 0.75;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+</style>
+
+<script>
+import close from '@/assets/svg/close.svg';
+
+export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        close,
+      }),
+    };
+  },
+};
+</script>
@@ -2,13 +2,13 @@
  <router-link
    v-if="displayName"
    v-b-tooltip.hover.top="tierTitle"
-    class="leader user-link"
+    class="leader user-link d-flex"
    :to="{'name': 'userProfile', 'params': {'userId': id}}"
    :class="levelStyle()"
  >
    {{ displayName }}
    <div
-      class="svg-icon"
+      class="svg-icon icon-12"
      v-html="tierIcon()"
    ></div>
  </router-link>
@@ -37,10 +37,15 @@
      color: $gray-50;
    }

+    &[class*="tier"] .svg-icon {
+      margin-top: 5px;
+    }
+    &.npc .svg-icon {
+      margin-top: 4px;
+    }
+
    .svg-icon {
-      width: 10px;
-      display: inline-block;
-      margin-left: .5em;
+      margin-left: 6px;

      &:empty {
        display: none;
@@ -190,14 +190,10 @@
        class="col-12 col-md-6"
      >
        <div class="row col-12 stats-column">
-          <div class="col-12 col-md-4 attribute-label">
-            <span
-              class="hint"
-              :popover-title="$t(statInfo.title)"
-              popover-placement="right"
-              :popover="$t(statInfo.popover)"
-              popover-trigger="mouseenter"
-            ></span>
+          <div
+            :id="`${stat}-information`"
+            class="col-12 col-md-4 attribute-label"
+          >
            <div
              class="stat-title"
              :class="stat"
@@ -206,6 +202,13 @@
            </div>
            <strong class="number">{{ totalStatPoints(stat) | floorWholeNumber }}</strong>
          </div>
+          <b-popover
+            :target="`${stat}-information`"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t(statInfo.popover)"
+          />
          <div class="col-12 col-md-6">
            <ul class="bonus-stats">
              <li>
@@ -355,7 +358,7 @@ export default {
      },

      allocateStatsList: {
-        str: { title: 'allocateStr', popover: 'strengthText', allocatepop: 'allocateStrPop' },
+        str: { title: 'allocateStr', popover: 'strText', allocatepop: 'allocateStrPop' },
        int: { title: 'allocateInt', popover: 'intText', allocatepop: 'allocateIntPop' },
        con: { title: 'allocateCon', popover: 'conText', allocatepop: 'allocateConPop' },
        per: { title: 'allocatePer', popover: 'perText', allocatepop: 'allocatePerPop' },
@@ -364,7 +367,7 @@ export default {
      stats: {
        str: {
          title: 'strength',
-          popover: 'strengthText',
+          popover: 'strText',
        },
        int: {
          title: 'intelligence',
@@ -146,17 +146,19 @@
          :key="stat"
          class="row"
        >
-          <div class="col-4">
-            <span
-              class="hint"
-              :popover-title="$t(statInfo.title)"
-              popover-placement="right"
-              :popover="$t(statInfo.popover)"
-              popover-trigger="mouseenter"
-            >
-              <strong>{{ $t(statInfo.title) }}</strong>
-            </span>
+          <div
+            class="col-4"
+            :id="statInfo.title"
+          >
+            <strong> {{ $t(statInfo.title)}} </strong>
            <strong>: {{ statsComputed[stat] }}</strong>
+            <b-popover
+              :target="statInfo.title"
+              triggers="hover focus"
+              placement="right"
+              :prevent-overflow="false"
+              :content="$t(statInfo.popover)"
+            />
          </div>
          <div class="col-6">
            <ul class="bonus-stats">
@@ -183,27 +185,38 @@
            </ul>
          </div>
        </div>
-        <div v-if="user.stats.buffs.stealth">
+        <div
+          v-if="user.stats.buffs.stealth"
+          id="stealthBuff"
+        >
          <strong
            v-once
            class="hint"
-            :popover-title="$t('stealth')"
-            popover-trigger="mouseenter"
-            popover-placement="right"
-            :popover="$t('stealthNewDay')"
          >{{ $t('stealth') }}</strong>
          <strong>: {{ user.stats.buffs.stealth }}&nbsp;</strong>
+          <b-popover
+            target="stealthBuff"
+            triggers="hover focus"
+            placement="right"
+            :prevent-overflow="false"
+            :content="$t('stealthNewDay')"
+          />
        </div>
-        <div v-if="user.stats.buffs.streaks">
+        <div
+          v-if="user.stats.buffs.streaks"
+          id="streaksFrozenBuff"
+        >
          <div>
-            <strong
-              class="hint"
-              popover-title="$t('streaksFrozen')"
-              popover-trigger="mouseenter"
-              popover-placement="right"
-              :popover="$t('streaksFrozenText')"
-            ></strong>
-            {{ $t('streaksFrozen') }}
+            <strong>
+              {{ $t('streaksFrozen') }}
+            </strong>
+            <b-popover
+              target="streaksFrozenBuff"
+              triggers="hover focus"
+              placement="right"
+              :prevent-overflow="false"
+              :content="$t('streaksFrozenText')"
+            />
          </div>
        </div>
      </div>
@@ -237,19 +250,27 @@
            >
              {{ $t('noMoreAllocate') }}
            </p>
-            <p v-if="user.stats.points || userLevel100Plus">
+            <p
+              v-if="user.stats.points || userLevel100Plus"
+              id="pointAllocation"
+            >
              <strong class="inline">{{ user.stats.points }}&nbsp;</strong>
-              <strong
-                class="hint"
-                popover-trigger="mouseenter"
-                popover-placement="right"
-                :popover="$t('levelPopover')"
-              >{{ $t('unallocated') }}</strong>
+              <strong> {{ $t('unallocated') }} </strong>
+              <b-popover
+                target="pointAllocation"
+                triggers="hover focus"
+                placement="right"
+                :prevent-overflow="false"
+                :content="$t('levelPopover')"
+              />
            </p>
          </div>
          <div>
            <fieldset class="auto-allocate">
-              <div class="checkbox">
+              <div
+                id="preferenceAutomaticAllocation"
+                class="checkbox"
+              >
                <label>
                  <input
                    v-model="user.preferences.automaticAllocation"
@@ -259,19 +280,24 @@
                      'preferences.allocationMode': 'taskbased'
                    })"
                  >
-                  <span
-                    class="hint"
-                    popover-trigger="mouseenter"
-                    popover-placement="right"
-                    :popover="$t('autoAllocationPop')"
-                  >{{ $t('autoAllocation') }}</span>
+                  <b-popover
+                    target="preferenceAutomaticAllocation"
+                    triggers="hover focus"
+                    placement="right"
+                    :prevent-overflow="false"
+                    :content="$t('autoAllocationPop')"
+                  />
+                  {{ $t('autoAllocation') }}
                </label>
              </div>
              <form
                v-if="user.preferences.automaticAllocation"
                style="margin-left:1em"
              >
-                <div class="radio">
+                <div
+                  id="optionFlatAllocation"
+                  class="radio"
+                >
                  <label>
                    <input
                      v-model="user.preferences.allocationMode"
@@ -280,15 +306,22 @@
                      value="flat"
                      @change="set({'preferences.allocationMode': 'flat'})"
                    >
-                    <span
-                      class="hint"
-                      popover-trigger="mouseenter"
-                      popover-placement="right"
-                      :popover="$t('evenAllocationPop')"
-                    >{{ $t('evenAllocation') }}</span>
+                    <span class="hint">
+                      {{ $t('evenAllocation') }}
+                    </span>
+                    <b-popover
+                      target="optionFlatAllocation"
+                      triggers="hover focus"
+                      placement="right"
+                      :prevent-overflow="false"
+                      :content="$t('evenAllocationPop')"
+                    />
                  </label>
                </div>
-                <div class="radio">
+                <div
+                  id="optionClassAllocation"
+                  class="radio"
+                >
                  <label>
                    <input
                      v-model="user.preferences.allocationMode"
@@ -297,47 +330,63 @@
                      value="classbased"
                      @change="set({'preferences.allocationMode': 'classbased'})"
                    >
-                    <span
-                      class="hint"
-                      popover-trigger="mouseenter"
-                      popover-placement="right"
-                      :popover="$t('classAllocationPop')"
-                    >{{ $t('classAllocation') }}</span>
+                    <span class="hint">
+                      {{ $t('classAllocation') }}
+                    </span>
+                    <b-popover
+                      target="optionClassAllocation"
+                      triggers="hover focus"
+                      placement="right"
+                      :prevent-overflow="false"
+                      :content="$t('classAllocationPop')"
+                    />
                  </label>
                </div>
-                <div class="radio">
+                <div
+                  id="optionTaskAllocation"
+                  class="radio"
+                >
                  <label>
                    <input
                      v-model="user.preferences.allocationMode"
                      type="radio"
                      name="allocationMode"
-                      value="taskbased"
+                      value="classbased"
                      @change="set({'preferences.allocationMode': 'taskbased'})"
                    >
-                    <span
-                      class="hint"
-                      popover-trigger="mouseenter"
-                      popover-placement="right"
-                      :popover="$t('taskAllocationPop')"
-                    >{{ $t('taskAllocation') }}</span>
+                    <span class="hint">
+                      {{ $t('taskAllocation') }}
+                    </span>
+                    <b-popover
+                      target="optionTaskAllocation"
+                      triggers="hover focus"
+                      placement="right"
+                      :prevent-overflow="false"
+                      :content="$t('taskAllocationPop')"
+                    />
                  </label>
                </div>
              </form>
              <div
                v-if="user.preferences.automaticAllocation
                  && !(user.preferences.allocationMode === 'taskbased') && (user.stats.points > 0)"
+                id="buttonDistributePoints"
              >
                <button
                  class="btn btn-primary btn-xs"
-                  popover-trigger="mouseenter"
-                  popover-placement="right"
-                  :popover="$t('distributePointsPop')"
                  @click="allocateNow({})"
                >
                  <span class="glyphicon glyphicon-download"></span>
                  &nbsp;
                  {{ $t('distributePoints') }}
                </button>
+                <b-popover
+                  target="buttonDistributePoints"
+                  triggers="hover focus"
+                  placement="right"
+                  :prevent-overflow="false"
+                  :content="$t('distributePointsPop')"
+                />
              </div>
            </fieldset>
          </div>
@@ -346,28 +395,35 @@
            :key="stat"
            class="row"
          >
-            <div class="col-8">
-              <span
-                class="hint"
-                popover-trigger="mouseenter"
-                popover-placement="right"
-                :popover="$t(statInfo.popover)"
-              ></span>
+            <div
+              :id="`${stat}-info`"
+              class="col-8"
+            >
              {{ $t(statInfo.title) + user.stats[stat] }}
+              <b-popover
+                :target="`${stat}-info`"
+                triggers="hover focus"
+                placement="right"
+                :prevent-overflow="false"
+                :content="$t(statInfo.popover)"
+              />
            </div>
            <div
              v-if="user.stats.points"
+              :id="`${stat}-allocate`"
              class="col-4"
              @click="allocate(stat)"
            >
-              <button
-                class="btn btn-primary"
-                popover-trigger="mouseenter"
-                popover-placement="right"
-                :popover="$t(statInfo.allocatepop)"
-              >
+              <button class="btn btn-primary">
                +
              </button>
+              <b-popover
+                :target="`${stat}-allocate`"
+                triggers="hover focus"
+                placement="right"
+                :prevent-overflow="false"
+                :content="$t(statInfo.allocatePop)"
+              />
            </div>
          </div>
        </div>
@@ -16,6 +16,7 @@ export default {
        }

        if ((link.classList.value.indexOf('external-link') === -1)
+          && (!link.offsetParent || link.offsetParent.classList.value.indexOf('link-exempt') === -1)
          && domainIndex !== 1
          && !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === domainIndex)) {
          link.classList.add('external-link');
@@ -1,7 +1,9 @@
 export default {
  computed: {
    numberInvalid () {
-      return this.selectedAmountToBuy < 1 || !Number.isInteger(this.selectedAmountToBuy);
+      const inputNumber = Number(this.selectedAmountToBuy);
+      return inputNumber < 1
+      || !Number.isInteger(inputNumber);
    },
  },
 };
@@ -114,7 +114,7 @@ export default {
      this.castCancel();

      // the selected member doesn't have the flags property which sets `cardReceived`
-      if (spell.pinType !== 'card') {
+      if (spell.pinType !== 'card' && spell.bulk !== true) {
        try {
          spell.cast(this.user, target, {});
        } catch (e) {
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
+import * as Analytics from '@/libs/analytics';
 import getStore from '@/store';
 import handleRedirect from './handleRedirect';

@@ -72,13 +73,14 @@ const ItemsPage = () => import(/* webpackChunkName: "inventory" */'@/components/
 const EquipmentPage = () => import(/* webpackChunkName: "inventory" */'@/components/inventory/equipment/index');
 const StablePage = () => import(/* webpackChunkName: "inventory" */'@/components/inventory/stable/index');

-// Guilds
+// Guilds & Parties
 const GuildIndex = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/index');
 const TavernPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/tavern');
 const MyGuilds = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/myGuilds');
 const GuildsDiscoveryPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/discovery');
 const GroupPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/group');
 const GroupPlansAppPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/groupPlan');
+const LookingForParty = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/lookingForParty');

 // Group Plans
 const GroupPlanIndex = () => import(/* webpackChunkName: "group-plans" */ '@/components/group-plans/index');
@@ -157,6 +159,7 @@ const router = new VueRouter({
      ],
    },
    { name: 'party', path: '/party', component: GroupPage },
+    { name: 'lookingForParty', path: '/looking-for-party', component: LookingForParty },
    { name: 'groupPlan', path: '/group-plans', component: GroupPlansAppPage },
    {
      name: 'groupPlanDetail',
@@ -433,6 +436,19 @@ router.beforeEach(async (to, from, next) => {
    }
  }

+  if (to.name === 'party') {
+    router.app.$root.$emit('update-party');
+  }
+
+  if (to.name === 'lookingForParty') {
+    Analytics.track({
+      hitType: 'event',
+      eventName: 'View Find Members',
+      eventAction: 'View Find Members',
+      eventCategory: 'behavior',
+    }, { trackOnClient: true });
+  }
+
  // Redirect old guild urls
  if (to.hash.indexOf('#/options/groups/guilds/') !== -1) {
    const splits = to.hash.split('/');
@@ -1,3 +1,4 @@
+import axios from 'axios';
 import { loadAsyncResource } from '@/libs/asyncResource';

 export function getMembers (store, forceLoad = false) {
@@ -23,3 +24,14 @@ export function getParty (store, forceLoad = false) {
    forceLoad,
  });
 }
+
+export async function lookingForParty (store, payload) {
+  let response;
+  if (payload && payload.page) {
+    response = await axios.get(`api/v4/looking-for-party?page=${payload.page}`);
+  } else {
+    response = await axios.get('api/v4/looking-for-party');
+  }
+
+  return response.data.data;
+}
@@ -21,6 +21,18 @@ describe('Task Column', () => {
        getters: {
          'tasks:getFilteredTaskList': () => [],
        },
+
+        state: {
+          user: {
+            data: {
+              preferences: {
+                tasks: {
+                  activeFilter: {},
+                },
+              },
+            },
+          },
+        },
      },
      mocks,
      stubs,
@@ -76,7 +88,20 @@ describe('Task Column', () => {
        'tasks:getFilteredTaskList': () => () => habits,
      };

-      const store = new Store({ getters });
+      const store = new Store({
+        getters,
+        state: {
+          user: {
+            data: {
+              preferences: {
+                tasks: {
+                  activeFilter: {},
+                },
+              },
+            },
+          },
+        },
+      });

      wrapper = makeWrapper({ store });
    });
@@ -1,88 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import moment from 'moment';
-
-import Task from '@/components/tasks/task.vue';
-import Store from '@/libs/store';
-
-const localVue = createLocalVue();
-localVue.use(Store);
-
-describe('Task', () => {
-  let wrapper;
-
-  function makeWrapper (additionalTaskData = {}, additionalUserData = {}) {
-    return shallowMount(Task, {
-      propsData: {
-        task: {
-          group: {},
-          ...additionalTaskData,
-        },
-      },
-      store: {
-        state: {
-          user: {
-            data: {
-              preferences: {},
-              ...additionalUserData,
-            },
-          },
-        },
-        getters: {
-          'tasks:getTaskClasses': () => ({}),
-          'tasks:canEdit': () => ({}),
-          'tasks:canDelete': () => ({}),
-        },
-      },
-      mocks: { $t: (key, params) => key + (params ? JSON.stringify(params) : '') },
-      directives: { 'b-tooltip': {} },
-      localVue,
-    });
-  }
-
-  it('returns a vue instance', () => {
-    wrapper = makeWrapper();
-    expect(wrapper.isVueInstance()).to.be.true;
-  });
-
-  describe('Due date calculation', () => {
-    let clock;
-
-    function setClockTo (time) {
-      const now = moment(time);
-      clock = sinon.useFakeTimers(now.toDate());
-      return now;
-    }
-
-    afterEach(() => {
-      clock.restore();
-    });
-
-    it('formats due date to today if due today', () => {
-      const now = setClockTo('2019-09-17T17:57:00+02:00');
-      wrapper = makeWrapper({ date: now });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"today"}');
-    });
-
-    it('formats due date to tomorrow if due tomorrow', () => {
-      const now = setClockTo('2012-06-12T14:17:28Z');
-      wrapper = makeWrapper({ date: now.add(1, 'day') });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in a day"}');
-    });
-
-    it('formats due date to 5 days if due in 5 days', () => {
-      const now = setClockTo();
-      wrapper = makeWrapper({ date: now.add(5, 'days') });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in 5 days"}');
-    });
-
-    it('formats due date to tomorrow if today but before dayStart', () => {
-      const now = setClockTo('2019-06-12T04:23:37+02:00');
-      wrapper = makeWrapper({ date: now.add(8, 'hours') }, { preferences: { dayStart: 7 } });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in a day"}');
-    });
-  });
-});
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -1,6 +1,6 @@
 {
-    "settings": "Settings",
-    "language": "Language",
+    "settings": "Налады",
+    "language": "Мова",
    "americanEnglishGovern": "In the event of a discrepancy in the translations, the American English version governs.",
    "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">the Aspiring Linguists Guild</a>!",
    "stickyHeader": "Sticky header",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -147,5 +147,8 @@
  "achievementPolarProModalText": "You collected all the Polar Pets!",
  "achievementPlantParent": "Plant Parent",
  "achievementPlantParentText": "Has hatched all standard colors of Plant pets: Cactus and Treeling!",
-  "achievementPlantParentModalText": "You collected all the Plant Pets!"
+  "achievementPlantParentModalText": "You collected all the Plant Pets!",
+  "achievementDinosaurDynasty": "Dinosaur Dynasty",
+  "achievementDinosaurDynastyText": "Has hatched all standard colors of bird and dinosaur pets: Falcon, Owl, Parrot, Peacock, Penguin, Rooster, Pterodactyl, T-Rex, Triceratops, and Velociraptor!",
+  "achievementDinosaurDynastyModalText": "You collected all the bird and dinosaur pets!"
 }
@@ -875,6 +875,22 @@
  "backgroundUnderWisteriaText": "Under Wisteria",
  "backgroundUnderWisteriaNotes": "Relax Under Wisteria.",

+  "backgrounds052023": "SET 108: Released May 2023",
+  "backgroundInAPaintingText": "In A Painting",
+  "backgroundInAPaintingNotes": "Enjoy creative pursuits Inside a Painting.",
+  "backgroundFlyingOverHedgeMazeText": "Flying Over Hedge Maze",
+  "backgroundFlyingOverHedgeMazeNotes": "Marvel while Flying over a Hedge Maze.",
+  "backgroundCretaceousForestText": "Cretaceous Forest",
+  "backgroundCretaceousForestNotes": "Take in the ancient greenery of a Cretaceous Forest.",
+
+  "backgrounds062023": "SET 109: Released June 2023",
+  "backgroundInAnAquariumText": "In an Aquarium",
+  "backgroundInAnAquariumNotes": "Take a peaceful swim with the fish In an Aquarium.",
+  "backgroundInsideAdventurersHideoutText": "Inside an Adventurer's Hideout",
+  "backgroundInsideAdventurersHideoutNotes": "Plan a journey inside an Adventurer's Hideout.",
+  "backgroundCraterLakeText": "Crater Lake",
+  "backgroundCraterLakeNotes": "Admire a lovely Crater Lake.",
+
  "timeTravelBackgrounds": "Steampunk Backgrounds",
  "backgroundAirshipText": "Airship",
  "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
@@ -1,5 +1,6 @@
 {
  "frequentlyAskedQuestions": "Frequently Asked Questions",
+  "general": "General",

  "faqQuestion0": "I'm confused. Where do I get an overview?",
  "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.",
@@ -26,10 +27,10 @@
  "androidFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards tab on the Tasks page. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.",
  "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you. The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. Other Healers can heal you as well if you are in a Party with them. Learn more by clicking \"Party\" in the navigation bar.",

-  "faqQuestion5": "How do I play Habitica with my friends?",
+  "faqQuestion5": "Can I play Habitica with others?",
  "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on Quests, battle monsters, and cast skills to support each other.\n\nIf you want to start your own Party, go to Menu > [Party](https://habitica.com/party) and tap \"Create New Party\". Then scroll down and tap \"Invite a Member\" to invite your friends by entering their @username. If you want to join someone else’s Party, just give them your @username and they can invite you!\n\nYou and your friends can also join Guilds, which are public chat rooms that bring people together based on shared interests! There are a lot of helpful and fun communities, be sure to check them out.\n\nIf you’re feeling more competitive, you and your friends can create or join Challenges to take on a set of tasks. There are all sorts of public Challenges available that span a wide array of interests and goals. Some public Challenges will even award Gem prizes if you’re selected as the winner.",
  "androidFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to the [website](https://habitica.com/) to create one if you don't already have a Party. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n\n For more detailed info, check out the wiki pages on [Parties](https://habitica.fandom.com/wiki/Party) and [Guilds](https://habitica.fandom.com/wiki/Guilds).",
-  "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](https://habitica.fandom.com/wiki/Party) and [Guilds](https://habitica.fandom.com/wiki/Guilds).",
+  "webFaqAnswer5": "Yes, with Parties! You can start your own Party or join an existing one. Partying with other Habitica players is a great way to take on Quests, receive buffs from Party members’ skills, and boost your motivation with additional accountability.",

  "faqQuestion6": "How do I get a Pet or Mount?",
  "iosFaqAnswer6": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. They will be stored in Menu > Items.\n\nTo hatch a Pet, you'll need an Egg and a Hatching Potion. Tap on the Egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a Hatching Potion to determine its color! Go to Menu > Pets and click your new Pet to equip it to your Avatar. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and select \"Feed Pet\"! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](https://habitica.fandom.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your Avatar.\n\nYou can also get Eggs for Quest Pets by completing certain Quests (to learn more about Quests, see [How do I fight monsters and go on Quests](https://habitica.com/static/faq/9)).",
@@ -46,10 +47,10 @@
  "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
  "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",

-  "faqQuestion9": "How do I fight monsters and go on Quests?",
-  "iosFaqAnswer9": "First, you need to join or start a Party (see [How to play Habitica with my friends](https://habitica.com/static/faq/5)). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-  "androidFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
-  "webFaqAnswer9": "First, you need to join or start a Party by clicking \"Party\" in the navigation bar. Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating! Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are four ways to get a scroll:\n * When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Shop (Shops > Quests) for Gold and Gems.\n * When you check in to Habitica a certain number of times, you'll be rewarded with Quest Scrolls. You earn a Scroll during your 1st, 7th, 22nd, and 40th check-ins.\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.",
+  "faqQuestion9": "How do I take on Quests?",
+  "iosFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
+  "androidFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
+  "webFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",

  "faqQuestion10": "What are Gems, and how do I get them?",
  "iosFaqAnswer10": "Gems are purchased with real money from Menu > Purchase Gems. When you buy Gems, you are helping us to keep Habitica running. We’re very grateful for every bit of support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Menu > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
@@ -71,6 +72,63 @@
  "androidFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app by copying the tasks onto your personal task board. You can switch this preference on from Settings in the mobile apps or from the group task board on the browser version. Now open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction.",
  "webFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app by copying the tasks onto your personal task board. You can switch this preference on from Settings in the mobile apps or from the group task board on the browser version. Now open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction.",

+  "parties": "Parties",
+
+  "faqQuestion14": "How do I find a Party when I'm not in one?",
+  "iosFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
+  "androidFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
+  "webFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
+
+  "faqQuestion15": "How does searching for a Party work?",
+  "iosFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+  "androidFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+  "webFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+
+  "faqQuestion16": "How long can I search for a Party after joining the list?",
+  "iosFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
+  "androidFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
+  "webFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
+
+  "faqQuestion17": "Can I stop searching for a Party?",
+  "iosFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
+  "androidFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
+  "webFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
+
+  "faqQuestion18": "I have a Party, how do I find more members?",
+  "iosFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+  "androidFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+  "webFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+
+  "faqQuestion19": "How many members can I invite to my Party?",
+  "iosFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.",
+  "androidFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.",
+  "webFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.",
+
+  "faqQuestion20": "Can I invite someone I already know?",
+  "iosFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+  "androidFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+  "webFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+
+  "faqQuestion21": "How do I cancel a pending invitation to my Party?",
+  "iosFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
+  "androidFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
+  "webFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
+
+  "faqQuestion22": "How do I stop unwanted invitations?",
+  "iosFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+  "androidFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+  "webFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+
+  "faqQuestion23": "How do I filter the list of members searching for a Party?",
+  "iosFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.",
+  "androidFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.",
+  "webFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.",
+
+  "faqQuestion24": "How do I search for a Party on Android or iOS?",
+  "iosFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
+  "androidFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
+  "webFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
+
  "iosFaqStillNeedHelp": "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 Tavern chat under Menu > Tavern! We're happy to help.",
  "androidFaqStillNeedHelp": "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 Tavern chat under Menu > Tavern! 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 [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help."
@@ -177,7 +177,7 @@
  "joinToday": "Join Habitica Today",
  "featuredIn": "Featured in",
  "signup": "Sign Up",
-  "getStarted": "Get Started!",
+  "getStarted": "Get Started",
  "mobileApps": "Mobile Apps",
  "learnMore": "Learn More",
  "translateHabitica": "Translate Habitica"
@@ -477,6 +477,15 @@
  "weaponSpecialSpring2023HealerText": "Lilium Pollen",
  "weaponSpecialSpring2023HealerNotes": "With a puff and a sparkle, you deploy new growth, joy, and color. Increases Intelligence by <%= int %>. Limited Edition 2023 Spring Gear.",

+  "weaponSpecialSummer2023RogueText": "Guppy Fan",
+  "weaponSpecialSummer2023RogueNotes": "No gup, these things are tricky to learn. But impressive when you do! Increases Strength by <%= str %>. Limited Edition 2023 Summer Gear.",
+  "weaponSpecialSummer2023WarriorText": "Water Elemental Sword",
+  "weaponSpecialSummer2023WarriorNotes": "Summon powerful sprays of water to clear your path of obstacles. Increases Strength by <%= str %>. Limited Edition 2023 Summer Gear.",
+  "weaponSpecialSummer2023MageText": "Fish",
+  "weaponSpecialSummer2023MageNotes": "These friendly fish will stay by your side as the best accountability buddies in the ocean. Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+  "weaponSpecialSummer2023HealerText": "Swaying Kelp",
+  "weaponSpecialSummer2023HealerNotes": "They may look frondly, but they get quite grumpy if you call them 'plants'. Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+
  "weaponMystery201411Text": "Pitchfork of Feasting",
  "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
  "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -506,7 +515,9 @@
  "weaponMystery202211Text": "Electromancer Staff",
  "weaponMystery202211Notes": "Harness the awesome power of a lightning storm with this staff. Confers no benefit. November 2022 Subscriber Item.",
  "weaponMystery202212Text": "Glacial Wand",
-  "weaponMystery202212Notes": "The glowing snowflake in this wand holds the power to warm hearts on even the coldest winter night! Confers no benefit. December 2022 Subscriber Item.",  
+  "weaponMystery202212Notes": "The glowing snowflake in this wand holds the power to warm hearts on even the coldest winter night! Confers no benefit. December 2022 Subscriber Item.",
+  "weaponMystery202306Text": "Rainbow Umbrella",
+  "weaponMystery202306Notes": "Shine proud and bring a shimmering prism of color wherever you go! Confers no benefit. June 2023 Subscriber Item.",  
  "weaponMystery301404Text": "Steampunk Cane",
  "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",

@@ -694,6 +705,8 @@
  "weaponArmoireMagicSpatulaNotes": "Watch your food fly and flip in the air. You get good luck for the day if it magically flips over three times and then lands back on your spatula. Increases Perception by <%= per %>. Enchanted Armoire: Cooking Implements Set (Item 1 of 2).",
  "weaponArmoireFinelyCutGemText": "Finely Cut Gem",
  "weaponArmoireFinelyCutGemNotes": "What a find! This stunning, precision-cut gem will be the prize of your collection. And it might contain some special magic, just waiting for you to tap into it. Increases Constitution by <%= con %>. Enchanted Armoire: Jeweler Set (Item 4 of 4).",
+  "weaponArmoirePaintbrushText": "Paintbrush",
+  "weaponArmoirePaintbrushNotes": "A jolt of pure inspiration rushes through you when you pick up this brush, allowing you to paint anything you can imagine. Increases Intelligence by <%= int %>. Enchanted Armoire: Painter Set (Item 3 of 4).",

  "armor": "armor",
  "armorCapitalized": "Armor",
@@ -1149,6 +1162,15 @@
  "armorSpecialSpring2023HealerText": "Lily Leaf Gown",
  "armorSpecialSpring2023HealerNotes": "A sweep of verdant glory to make you the envy of the Party. Increases Constitution by <%= con %>. Limited Edition 2023 Spring Gear.",

+  "armorSpecialSummer2023RogueText": "Guppy Wrap",
+  "armorSpecialSummer2023RogueNotes": "Gup top! Down low! Too slow... Increases Perception by <%= per %>. Limited Edition 2023 Summer Gear.",
+  "armorSpecialSummer2023WarriorText": "Goldfish Armor",
+  "armorSpecialSummer2023WarriorNotes": "Goldfish Warriors actually have excellent memories because they always keep their Dailies and To Do's organized in lists. Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+  "armorSpecialSummer2023MageText": "Coral Robes",
+  "armorSpecialSummer2023MageNotes": "Feel protected and comfortable in these flowing robes, perfectly colored for underwater adventures. Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+  "armorSpecialSummer2023HealerText": "Kelp Kirtle",
+  "armorSpecialSummer2023HealerNotes": "Hold fast to your goals and convictions in this elegant green gown. Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+
  "armorMystery201402Text": "Messenger Robes",
  "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
  "armorMystery201403Text": "Forest Walker Armor",
@@ -1265,6 +1287,8 @@
  "armorMystery202212Notes": "The universe can be cold, but this charming dress will keep you cozy as you fly. Confers no benefit. December 2022 Subscriber Item.",
  "armorMystery202304Text": "Tiptop Teapot Armor",
  "armorMystery202304Notes": "Here is your handle and here is your spout! Confers no benefit. April 2023 Subscriber Item.",
+  "armorMystery202306Text": "Rainbow Parka",
+  "armorMystery202306Notes": "No one’s going to rain on your parade! And if they try, you’ll stay colorful and dry! Confers no benefit. June 2023 Subscriber Item.",

  "armorMystery301404Text": "Steampunk Suit",
  "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
@@ -1453,6 +1477,12 @@
  "armorArmoireTeaGownNotes": "You’re resilient, creative, brilliant, and so fashionable! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Tea Party Set (Item 1 of 3).",  
  "armorArmoireBasketballUniformText": "Basketball Uniform",
  "armorArmoireBasketballUniformNotes": "Wondering what’s printed on the back of this uniform? It’s your lucky number, of course! Increases Perception by <% per %>. Enchanted Armoire: Old Timey Basketball Set (Item 1 of 2).",
+  "armorArmoirePaintersApronText": "Painter's Apron",
+  "armorArmoirePaintersApronNotes": "This apron can protect your clothes from paint and your creative projects from harsh critiques. Increases Constitution by <%= con %>. Enchanted Armoire: Painter Set (Item 1 of 4).",
+  "armorArmoireStripedRainbowShirtText": "Striped Rainbow Shirt",
+  "armorArmoireStripedRainbowShirtNotes": "The colors of the rainbow have never looked so good before. Be bold! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Rainbow Set (Item 1 of 2).",
+  "armorArmoireDiagonalRainbowShirtText": "Diagonal Rainbow Shirt",
+  "armorArmoireDiagonalRainbowShirtNotes": "A splash of color with a dash of style. Be joyful! Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Rainbow Set (Item 2 of 2).",

  "headgear": "helm",
  "headgearCapitalized": "Headgear",
@@ -1903,6 +1933,15 @@
  "headSpecialSpring2023HealerText": "Lily Bloom",
  "headSpecialSpring2023HealerNotes": "This brilliant and colorful display shares a color scheme with the Orb of Rebirth! How symbolic! Increases Intelligence by <%= int %>. Limited Edition 2023 Spring Gear.",

+  "headSpecialSummer2023RogueText": "Guppy Cap",
+  "headSpecialSummer2023RogueNotes": "Gup, two, three, four! Can't get eaten, got tasks to score! Increases Perception by <%= per %>. Limited Edition 2023 Summer Gear.",
+  "headSpecialSummer2023WarriorText": "Goldfish Fin",
+  "headSpecialSummer2023WarriorNotes": "This fabulous fin provides stability as you swim toward troublesome tasks ahead of you. Increases Strength by <%= str %>. Limited Edition 2023 Summer Gear.",
+  "headSpecialSummer2023MageText": "Coral Antlers",
+  "headSpecialSummer2023MageNotes": "The wisdom of an entire ecosystem is with you when you work your marine magic. Increases Perception by <%= per %>. Limited Edition 2023 Summer Gear.",
+  "headSpecialSummer2023HealerText": "Kelp Crown",
+  "headSpecialSummer2023HealerNotes": "They're not snakes! You can open your eyes, it's safe! Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+
  "headSpecialGaymerxText": "Rainbow Warrior Helm",
  "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",

@@ -2232,6 +2271,8 @@
  "headArmoireTeaHatNotes": "This elegant hat is both fancy and functional. Increases Perception by <%= per %>. Enchanted Armoire: Tea Party Set (Item 2 of 3).",
  "headArmoireBeaniePropellerHatText": "Beanie Propeller Hat",
  "headArmoireBeaniePropellerHatNotes": "This isn’t the time to keep your feet on the ground! Spin this little propeller and rise as high as your ambitions will take you. Increases all stats by <%= attrs %>. Enchanted Armoire: Independent Item.",
+  "headArmoirePaintersBeretText": "Painter's Beret",
+  "headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).",  

  "offhand": "off-hand item",
  "offHandCapitalized": "Off-Hand Item",
@@ -2484,6 +2525,11 @@
  "shieldSpecialSpring2023HealerText": "Lily Corsage",
  "shieldSpecialSpring2023HealerNotes": "An accent for a healing visit, or part of a ritual for attending a springtime dance! Increases Constitution by <%= con %>. Limited Edition 2023 Spring Gear.",

+  "shieldSpecialSummer2023WarriorText": "Goldfish Spirit",
+  "shieldSpecialSummer2023WarriorNotes": "Summon this goldfish spirit for an extra burst of reassurance and companionship during a fight. Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+  "shieldSpecialSummer2023HealerText": "Sea Urchin",
+  "shieldSpecialSummer2023HealerNotes": "You conceal and shelter it. It dissuades nosy monsters from coming too close. Perfect symbiosis! Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+
  "shieldMystery201601Text": "Resolution Slayer",
  "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
  "shieldMystery201701Text": "Time-Freezer Shield",
@@ -2646,7 +2692,9 @@
  "shieldArmoireTeaKettleText": "Tea Kettle",
  "shieldArmoireTeaKettleNotes": "All your favorite, flavorful teas can be brewed in this kettle. Are you in the mood for black tea, green tea, oolong, or perhaps an herbal infusion? Increases Constitution by <%= con %>. Enchanted Armoire: Tea Party Set (Item 3 of 3).",
  "shieldArmoireBasketballText": "Basketball",
-  "shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",  
+  "shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",
+  "shieldArmoirePaintersPaletteText": "Painter's Palette",
+  "shieldArmoirePaintersPaletteNotes": "Paints in all colors of the rainbow are at your disposal. Is it magic that makes them so vivid when you use them, or is it your talent? Increases Strength by <%= str %>. Enchanted Armoire: Painter Set (Item 4 of 4).",

  "back": "Back Accessory",
  "backBase0Text": "No Back Accessory",
@@ -2717,6 +2765,8 @@
  "backMystery202301Notes": "These fluffy tails contain ethereal power and also a high level of charm! Confers no benefit. January 2023 Subscriber Item.",
  "backMystery202302Text": "Trickster Tabby Tail",
  "backMystery202302Notes": "Anytime you wear this tail it's sure to be a frabjous day! Callooh! Callay! Confers no benefit. February 2023 Subscriber Item.",
+  "backMystery202305Text": "Eventide Wings",
+  "backMystery202305Notes": "Catch the sparkle of the evening star and soar to strange realms on these wings. Confers no benefit. May 2023 Subscriber Item.",

  "backSpecialWonderconRedText": "Mighty Cape",
  "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -2928,6 +2978,8 @@
  "headAccessoryMystery202212Notes": "Magnify your warmth and friendship to new heights with this ornate golden tiara. Confers no benefit. December 2022 Subscriber Item.",
  "headAccessoryMystery202302Text": "Trickster Tabby Ears",
  "headAccessoryMystery202302Notes": "The purr-fect accessory to set off your enchanting grin. Confers no benefit. February 2023 Subscriber Item.",
+  "headAccessoryMystery202305Text": "Eventide Horns",
+  "headAccessoryMystery202305Notes": "These horns glow with reflected moonlight. Confers no benefit. May 2023 Subscriber Item.",
  "headAccessoryMystery301405Text": "Headwear Goggles",
  "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",

@@ -208,11 +208,12 @@
  "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
  "letsgo": "Let's Go!",
  "selected": "Selected",
-  "howManyToBuy": "How many would you like to buy?",
+  "howManyToBuy": "How many would you like to purchase?",
  "contactForm": "Contact the Moderation Team",
  "loadEarlierMessages": "Load Earlier Messages",
  "askQuestion": "Ask a Question",
  "emptyReportBugMessage": "Report Bug Message missing",
+  "refreshList": "Refresh List",
  "leaveHabitica": "You are about to leave Habitica.com",
  "leaveHabiticaText": "Habitica is not responsible for the content of any linked website that is not owned or operated by HabitRPG.<br>Please note that these websites' practices may differ from Habitica’s community guidelines.",
  "skipExternalLinkModal": "Hold CTRL (Windows) or Command (Mac) when clicking a link to skip this modal."
@@ -130,7 +130,7 @@
  "sendGiftHeading": "Send Gift to <%= name %>",
  "sendGiftGemsBalance": "From <%= number %> Gems",
  "sendGiftCost": "Total: $<%= cost %> USD",
-  "sendGiftTotal": "Total:",
+  "sendTotal": "Total:",
  "sendGiftFromBalance": "From Balance",
  "sendGiftPurchase": "Purchase",
  "sendGiftLabel": "Would you like to send a gift message?",
@@ -138,7 +138,9 @@
  "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
  "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a <strong>violation of the Community Guidelines</strong>, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.",
  "giftMessageTooLong": "The maximum length for gift messages is <%= maxGiftMessageLength %>.",
-  "battleWithFriends": "Battle Monsters With Friends",
+  "battleWithFriends": "Play Habitica with Others",
+  "questWithOthers": "Take on Quests with Others",
+  "startPartyDetail": "Start your own Party or join an existing one <br/>to take on Quests and boost your motivation!",
  "startAParty": "Start a Party",
  "partyUpName": "Party Up",
  "partyOnName": "Party On",
@@ -174,6 +176,7 @@
  "usernamesMustBeAnArray": "Username invites must be an array.",
  "canOnlyInviteMaxInvites": "You can only invite \"<%= maxInvites %>\" at a time",
  "partyExceedsMembersLimit": "Party size is limited to <%= maxMembersParty %> members",
+  "partyExceedsInvitesLimit": "A Party may only have up to <%= maxInvites %> pending invitations.",
  "onlyCreatorOrAdminCanDeleteChat": "Not authorized to delete this message!",
  "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!",
  "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned",
@@ -289,17 +292,20 @@
  "noGuildsParagraph2": "Click the Discover tab to see recommended Guilds based on your interests, browse Habitica's public Guilds, or create your own Guild.",
  "noGuildsMatchFilters": "We couldn't find any matching Guilds.",
  "privateDescription": "A private Guild will not be displayed in Habitica's Guild directory. New members can be added by invitation only.",
-  "removeInvite": "Remove Invitation",
+  "removeInvite": "Cancel Invite",
  "removeMember": "Remove Member",
  "sendMessage": "Send Message",
  "promoteToLeader": "Transfer Ownership",
-  "inviteFriendsParty": "Inviting friends to your Party will grant you an exclusive <br/> Quest Scroll to battle the Basi-List together!",
+  "inviteFriendsParty": "Invite another player to your Party<br/> and receive the exclusive Basi-List Quest Scroll.",
  "createParty": "Create a Party",
  "inviteMembersNow": "Would you like to invite members now?",
  "playInPartyTitle": "Play Habitica in a Party!",
-  "playInPartyDescription": "Take on amazing quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.",
-  "wantToJoinPartyTitle": "Want to join a Party?",
+  "playInPartyDescription": "Take on amazing Quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.",
+  "wantToJoinPartyTitle": "Looking for a Party?",
  "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the <a href='/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>Party Wanted Guild</a> to meet potential comrades!",
+  "lookForParty": "Look for a Party",
+  "currentlyLookingForParty": "You’re looking for a Party!",
+  "partyFinderDescription": "Want to join a Party with others but don’t know any other players? Let Party leaders know you’re looking for an invite!",
  "copy": "Copy",
  "questOwnerRewards": "Quest Owner Rewards",
  "updateParty": "Update Party",
@@ -403,5 +409,13 @@
  "newGroupsBullet10b": "<strong>Assign a task to one member</strong> so only they can complete it",
  "newGroupsBullet10c": "<strong>Assign a task to multiple members</strong> if they all need to complete it",
  "newGroupsVisitFAQ": "Visit the <a href='/static/faq#group-plans' target='_blank'>FAQ</a> from the Help dropdown for more guidance.",
-  "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!"
+  "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!",
+  "checkinsLabel": "Check-ins:",
+  "classLabel": "Class:",
+  "languageLabel": "Language:",
+  "invitedToYourParty": "<strong>Invited to Your Party!</strong>&nbsp;&nbsp;Click to Undo",
+  "lookingForPartyTitle": "Find Members",
+  "findMorePartyMembers": "Find More Members",
+  "findPartyMembers": "Find Party Members",
+  "noOneLooking": "There’s no one looking for a Party right now.<br>You can check back later!"
 }
@@ -199,6 +199,10 @@
  "spring2023HummingbirdWarriorSet": "Hummingbird (Warrior)",
  "spring2023MoonstoneMageSet": "Moonstone (Mage)",
  "spring2023LilyHealerSet": "Lily (Healer)",
+  "summer2023GoldfishWarriorSet": "Goldfish (Warrior)",
+  "summer2023GuppyRogueSet": "Guppy (Rogue)",
+  "summer2023KelpHealerSet": "Kelp (Healer)",
+  "summer2023CoralMageSet": "Coral (Mage)",
  "eventAvailability": "Available for purchase until <%= date(locale) %>.",
  "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
  "dateEndJanuary": "January 31",
@@ -31,6 +31,7 @@
  "howManyToSell": "How many would you like to sell?",
  "yourBalance": "Your balance:",
  "sell": "Sell",
+  "sellItems": "Sell Items",
  "buyNow": "Buy Now",
  "sortByNumber": "Number",
  "featuredItems": "Featured Items!",
@@ -108,7 +109,7 @@
  "toDo": "To Do",
  "tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
  "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Pause Damage\". Come say hi!",
-  "tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
+  "tourPartyPage": "Welcome to your new Party! You can invite other players to your Party by username, email, or from a list of players looking for a Party to earn the exclusive Basi-List Quest Scroll.<br/><br/>Select <a href='/static/faq#parties'>FAQ</a> from the Help dropdown to learn more about how Parties work.",
  "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Habitica Help: Ask a Question guild, where anyone can ask questions about Habitica!",
  "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
  "tourMarketPage": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. You can also buy these items here.",
@@ -586,7 +586,7 @@
  "questNudibranchUnlockText": "Unlocks Nudibranch Eggs for purchase in the Market",

  "splashyPalsText": "Splashy Pals Quest Bundle",
-  "splashyPalsNotes": "Contains 'The Dilatory Derby', 'Guide the Turtle', and 'Wail of the Whale'. Available until July 31.",
+  "splashyPalsNotes": "Contains 'The Dilatory Derby', 'Guide the Turtle', and 'Wail of the Whale'. Available until June 30.",

  "questHippoText": "What a Hippo-Crite",
  "questHippoNotes": "You and @awesomekitty collapse into the shade of a palm tree, exhausted. The sun beats down over the Sloensteadi Savannah, scorching the ground below. It’s been a productive day so far, conquering your Dailies, and this oasis looks like a nice place to take a break and refresh. Stooping near the water to get a drink, you stumble back in shock as a massive hippopotamus rises. “Resting so soon? Don’t be so lazy, get back to work.” You try and protest that you’ve been working hard and need a break, but the hippo isn’t having any of it.<br><br>@khdarkwolf whispers to you, “Notice how it’s lounging around all day but has the nerve to call you lazy? It’s the Hippo-Crite!”<br><br>Your friend @jumorales nods. “Let’s show it what hard work looks like!”",
@@ -5,8 +5,6 @@
    "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">the Aspiring Linguists Guild</a>!",
    "stickyHeader": "Sticky header",
    "newTaskEdit": "Open new tasks in edit mode",
-    "dailyDueDefaultView": "Set Dailies default to 'due' tab",
-    "dailyDueDefaultViewPop": "With this option set, the Dailies tasks will default to 'due' instead of 'all'",
    "reverseChatOrder": "Show chat messages in reverse order",
    "startAdvCollapsed": "Advanced Settings in tasks start collapsed",
    "startAdvCollapsedPop": "With this option set, Advanced Settings will be hidden when you first open a task for editing.",
@@ -149,6 +149,8 @@
    "mysterySet202302": "Trickster Tabby Set",
    "mysterySet202303": "Mane Character Set",
    "mysterySet202304": "Tiptop Teapot Set",
+    "mysterySet202305": "Eventide Dragon Set",
+    "mysterySet202306": "Razzle Dazzle Rainbow Set",
    "mysterySet301404": "Steampunk Standard Set",
    "mysterySet301405": "Steampunk Accessories Set",
    "mysterySet301703": "Peacock Steampunk Set",
@@ -193,8 +195,8 @@
    "subscriptionBenefit5": "Receive the Royal Purple Jackalope pet when you become a new subscriber.",
    "subscriptionBenefit6": "Earn Mystic Hourglasses to purchase items in the Time Traveler’s Shop!",
    "purchaseAll": "Purchase Set",
-    "gemsRemaining": "Gems remaining",
-    "notEnoughGemsToBuy": "You are unable to buy that amount of Gems",
+    "gemsRemaining": "remaining",
+    "notEnoughGemsToBuy": "No more Gems available for purchase this month. More will become available within the first 3 days of each month.",
    "subscribersReceiveBenefits": "Subscribers receive these useful benefits!",
    "monthlyMysteryItems": "Monthly Mystery Items",
    "doubleDropCap": "Double the Drops",
@@ -216,5 +218,6 @@
    "haveNonRecurringSub": "You have a non-recurring gift subscription.",
    "switchToRecurring": "Switch to a recurring subscription?",
    "continueGiftSubBenefits": "Want to continue your benefits? You can start a new subscription before your gifted one runs out to keep your benefits active.",
-    "subscriptionCreditConversion": "Starting a new subscription will convert any remaining months to credit that will be used after the recurring subscription is canceled."
+    "subscriptionCreditConversion": "Starting a new subscription will convert any remaining months to credit that will be used after the recurring subscription is canceled.",
+    "monthlyGems": "Monthly Gems:"
 }
@@ -133,5 +133,7 @@
  "addTags": "Add tags...",
  "enterTag": "Enter a tag",
  "pressEnterToAddTag": "Press Enter to add tag: '<%= tagName %>'",
-  "taskSummary": "<%= type %> Summary"
+  "taskSummary": "<%= type %> Summary",
+  "scoreUp": "Score up",
+  "scoreDown": "Score down"
 }
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -122,5 +122,6 @@
    "achievementZodiacZookeeper": "12 Zodiac Zookeeper",
    "achievementZodiacZookeeperModalText": "You collected all the 12 zodiac pets!",
    "achievementShadyCustomer": "shadow man",
-    "achievementShadeOfItAll": "The Beginning of the Shade"
+    "achievementShadeOfItAll": "The Beginning of the Shade",
+    "achievementDomesticatedModalText": "Ye gathered ev'ry critter matey!"
 }
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Squadron members git an exclusive Jackalope Steed, as well as full subscr'ption benefits, includin' special monthly equipment sets an' th' ability t' buy sapphires wit' gold.",
    "inspireYourParty": "Inspire yer crew, gamify life togeth'r.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -147,5 +147,8 @@
    "achievementPolarProText": "¡Ha eclosionado todos los colores estándar para mascotas Polares: Osos, Zorros, Pinguinos, Ballenas y Lobos!",
    "achievementPlantParent": "Progenitor de las Plantas",
    "achievementPlantParentText": "¡Ha eclosionado todos los colores estándar para las mascotas Planta: Cáctus y Esqueje de árbol!",
-    "achievementPlantParentModalText": "¡Has coleccionado todas las Mascotas Planta!"
+    "achievementPlantParentModalText": "¡Has coleccionado todas las Mascotas Planta!",
+    "achievementDinosaurDynasty": "Dinastía de Dinosaurios",
+    "achievementDinosaurDynastyModalText": "¡Has recogido todas las mascotas de pájaros y dinosaurios!",
+    "achievementDinosaurDynastyText": "Ha incubado todos los colores estándar de mascotas, de aves y dinosaurios: halcón, búho, loro, pavo real, pingüino, gallo, pterodáctilo, tiranosaurio rex, triceratops y velociraptor!"
 }
@@ -1,16 +1,16 @@
 {
-    "languageName": "Español",
+    "languageName": "Inglés",
    "stringNotFound": "No se encontró la cadena '<%= string %>'.",
    "habitica": "Habitica",
    "onward": "¡Adelante!",
-    "done": "Hecho",
+    "done": "Completado",
    "gotIt": "¡Recibido!",
    "titleTimeTravelers": "Viajeros del tiempo",
    "titleSeasonalShop": "Tienda de temporada",
    "saveEdits": "Guardar cambios",
    "showMore": "Mostrar más",
    "showLess": "Mostrar menos",
-    "markdownHelpLink": "Ayuda con el formato Markdown",
+    "markdownHelpLink": "Ayuda con el formato Reducción",
    "bold": "**Negrita**",
    "markdownImageEx": "![texto alt obligatorio](https://habitica.com/cake.png \"título opcional al pasar el ratón\")",
    "code": "`código`",
@@ -41,16 +41,16 @@
    "continue": "Continuar",
    "accept": "Aceptar",
    "reject": "Rechazar",
-    "neverMind": "No importa",
+    "neverMind": "Olvídalo",
    "notEnoughGems": "No tienes suficientes gemas",
-    "alreadyHave": "Vaya, ya tienes este artículo. ¡No necesitas comprarlo otra vez!",
+    "alreadyHave": "Vaya! ya tienes este artículo. ¡No necesitas comprarlo otra vez!",
    "delete": "Eliminar",
    "gemsPopoverTitle": "Gemas",
    "gems": "Gemas",
    "needMoreGems": "¿Necesitas más gemas?",
-    "needMoreGemsInfo": "¡Compra Gemas ahora, o suscríbete para comprar Gemas con Oro, conseguir objetos misteriosos mensuales, disfrutar mayores botines y más!",
+    "needMoreGemsInfo": "¡Compra Gemas ahora, o suscríbete para comprar Gemas con Oro, recibe objetos misteriosos mensualmente, disfruta botines mas fréquentes y más!",
    "veteran": "Veterano",
-    "veteranText": "Ha sobrevivido a Habit The Grey (nuestro sito web pre-Angular) y se ha ganado muchas cicatrices por sus fallos.",
+    "veteranText": "Ha sobrevivido a Habit The Grey (nuestro sito web pre-Angular) y ha recibido muchas cicatrices de sus fallos.",
    "originalUser": "¡Usuario original!",
    "originalUserText": "Uno de los <em>primerísimos</em> usuarios... ¡Este sí que es un alpha tester!",
    "habitBirthday": "Fiesta de cumpleaños de Habitica",
@@ -58,11 +58,11 @@
    "habitBirthdayPluralText": "¡Participó en <%= count %> Fiestas de Cumpleaños de Habitica!",
    "habiticaDay": "Bautizo de Habitica",
    "habiticaDaySingularText": "¡Celebró el bautizo de Habitica! Gracias por ser un usuario magnífico.",
-    "habiticaDayPluralText": "¡Participó en <%= count %> onomásticas de Habitica! Gracias por ser un magnífico usuario.",
+    "habiticaDayPluralText": "¡Participó en <%= count %> bautizos de Habitica! Gracias por ser un magnífico usuario.",
    "achievementDilatory": "Salvador de Dilatoria",
    "achievementDilatoryText": "¡Ayudó a derrotar al Dread Drag'on de Dilatoria durante el evento Summer Splash del 2014!",
    "costumeContest": "Participante disfrazado",
-    "costumeContestText": "Has participado en el Concurso de Disfraces de Habitoween. ¡Mira algunas de las estupendas entradas en blog.habitrpg.com!",
+    "costumeContestText": "Participo en el Concurso de Disfraces de Habitoween. ¡Mira algunas de las estupendas entradas en blog.habitrpg.com!",
    "costumeContestTextPlural": "Has participado en <%= count %> Concursos de Disfraces de Habitoween. ¡Echa un vistazo a las estupendas entradas en blog.habitrpg.com!",
    "newPassSent": "Si tenemos constancia de tu correo electrónico, te hemos enviado un mensaje con las instrucciones a seguir para establecer una nueva contraseña.",
    "error": "Error",
@@ -74,27 +74,27 @@
    "audioTheme": "Tema de audio",
    "audioTheme_off": "Desactivado",
    "audioTheme_danielTheBard": "Daniel el Bardo",
-    "audioTheme_wattsTheme": "Tema Watts",
-    "audioTheme_gokulTheme": "Tema Gokul",
-    "audioTheme_luneFoxTheme": "Tema LuneFox",
-    "audioTheme_rosstavoTheme": "Tema Rosstavo",
-    "audioTheme_dewinTheme": "El tema de Dewin´s",
-    "audioTheme_airuTheme": "Tema Airu",
-    "audioTheme_beatscribeNesTheme": "Tema Beatscribe's NES",
-    "audioTheme_arashiTheme": "Tema Arashi",
-    "audioTheme_triumphTheme": "Tema del Triunfo",
-    "audioTheme_lunasolTheme": "Tema de Lunasol",
-    "audioTheme_spacePenguinTheme": "Tema del Pingüino Espacial",
-    "audioTheme_maflTheme": "Tema MAFL",
-    "audioTheme_pizildenTheme": "Tema de Pizilden",
-    "audioTheme_farvoidTheme": "Tema de Farvoid",
-    "reportBug": "Notificar un error",
+    "audioTheme_wattsTheme": "El tema de Watts",
+    "audioTheme_gokulTheme": "El tema de Gokul",
+    "audioTheme_luneFoxTheme": "El tema de LuneFox",
+    "audioTheme_rosstavoTheme": "El tema de Rosstavo",
+    "audioTheme_dewinTheme": "El tema de Dewin",
+    "audioTheme_airuTheme": "El tema de Airu",
+    "audioTheme_beatscribeNesTheme": "El tema de Beatscribe's NES",
+    "audioTheme_arashiTheme": "El tema de Arashi",
+    "audioTheme_triumphTheme": "El tema del Triunfo",
+    "audioTheme_lunasolTheme": "El tema de Lunasol",
+    "audioTheme_spacePenguinTheme": "El tema del Pingüino Espacial",
+    "audioTheme_maflTheme": "El tema de MAFL",
+    "audioTheme_pizildenTheme": "El tema de Pizilden",
+    "audioTheme_farvoidTheme": "El tema de Farvoid",
+    "reportBug": "Reportar un error",
    "overview": "Introducción para nuevos usuarios",
    "dateFormat": "Formato de fecha",
    "achievementStressbeast": "Salvador de Stoïkalm",
-    "achievementStressbeastText": "¡Ayudó a derrotar a la Abominable Bestia del Estrés durante el evento Winter Wonderland de 2014!",
+    "achievementStressbeastText": "¡Ayudó a derrotar a la Bestia Abominable del Estrés durante el evento Paraíso Invernal de 2014!",
    "achievementBurnout": "Salvador de los Campos Florecientes",
-    "achievementBurnoutText": "¡Ayudó a derrotar al Burnout y restaurar los Espíritus del Cansancio durante el evento Fall Festival de 2015!",
+    "achievementBurnoutText": "¡Ayudó a derrotar al Burnout y restaurar los Espíritus del Cansancio durante el evento Festival de Otoño de 2015!",
    "achievementBewilder": "Salvador de Calavuelos",
    "achievementBewilderText": "¡Ayudó a derrotar al Apa-bullador durante el Evento de Primavera de 2016!",
    "achievementDysheartener": "Salvador de los Destrozados",
@@ -104,19 +104,19 @@
    "cardReceived": "Recibiste una <span class=\"notification-bold-blue\"><%= card %></span>",
    "greetingCard": "Tarjeta de saludo",
    "greetingCardExplanation": "¡Ambos recibís el logro Alegres Amigotes!",
-    "greetingCardNotes": "Enviar una tarjeta para mandar un saludo a un miembro del equipo.",
+    "greetingCardNotes": "Enviar una tarjeta a un miembro del equipo.",
    "greeting0": "¡Hola!",
    "greeting1": "Solo quería saludar :)",
    "greeting2": "(saluda con emoción)",
    "greeting3": "¡Ey!",
    "greetingCardAchievementTitle": "Alegre Amigote",
-    "greetingCardAchievementText": "¡Eh! ¡Hola! ¿Qué tal? <%= count %> tarjetas de saludo enviadas o recibidas.",
+    "greetingCardAchievementText": "¡Eh! ¡Hola! ¿Qué tal? <%= count %> tarjetas enviadas o recibidas.",
    "thankyouCard": "Tarjeta de agradecimiento",
    "thankyouCardExplanation": "¡Ambos recibís el logro Agradablemente Agradecido!",
    "thankyouCardNotes": "Envía una tarjeta de agradecimiento a un miembro de tu equipo.",
    "thankyou0": "¡Muchas gracias!",
    "thankyou1": "¡Gracias, gracias, gracias!",
-    "thankyou2": "Te envío mil gracias.",
+    "thankyou2": "Envíando mil gracias.",
    "thankyou3": "Estoy muy agradecido: ¡gracias!",
    "thankyouCardAchievementTitle": "Agradablemente Agradecido",
    "thankyouCardAchievementText": "¡Gracias por ser agradecido! <%= count %> tarjetas de agradecimiento enviadas o recibidas.",
@@ -126,31 +126,31 @@
    "birthday0": "¡Feliz cumpleaños!",
    "birthdayCardAchievementTitle": "Prosperidad Cumpleañera",
    "birthdayCardAchievementText": "¡Muchas felicidades! <%= count %> tarjetas de cumpleaños enviadas o recibidas.",
-    "congratsCard": "Carta de Enhorabuena",
+    "congratsCard": "Carta de felicitaciónes",
    "congratsCardExplanation": "¡Ambos habéis recibido el logro de Compañero Felicitador!",
-    "congratsCardNotes": "Envía una Carta de Enhorabuena a un miembro del equipo.",
-    "congrats0": "¡Enhorabuena por tu éxito!",
+    "congratsCardNotes": "Envía una Carta de felicitaciónes a un miembro del equipo.",
+    "congrats0": "¡Felicitaciónes por tu éxito!",
    "congrats1": "¡Estoy orgulloso de ti!",
    "congrats2": "¡Bien hecho!",
-    "congrats3": "¡Un aplauso para ti!",
+    "congrats3": "¡Aplauso para ti!",
    "congrats4": "¡Disfruta de tu bien merecido éxito!",
    "congratsCardAchievementTitle": "Compañero Congratulatorio",
-    "congratsCardAchievementText": "¡Es genial celebrar los logros de tus amigos! Enviaste o recibiste <%= count %> cartas de enhorabuena.",
-    "getwellCard": "Carta de Ponte Bueno",
+    "congratsCardAchievementText": "¡Es genial celebrar los logros de tus amigos! Enviaste o recibiste <%= count %> cartas de felicitaciónes.",
+    "getwellCard": "Carta de recupérate pronto",
    "getwellCardExplanation": "¡Ambos habéis recibido el logro de Confidente Solícito!",
-    "getwellCardNotes": "Envía una carta de Ponte Bueno a un miembro del equipo.",
+    "getwellCardNotes": "Envía una carta de recupérate pronto a un miembro del equipo.",
    "getwell0": "¡Espero que te recuperes pronto!",
    "getwell1": "¡Cuídate! <3",
    "getwell2": "¡Te tengo en mis pensamientos!",
    "getwell3": "¡Siento que no te encuentres bien!",
    "getwellCardAchievementTitle": "Confidente Cuidadoso",
-    "getwellCardAchievementText": "Siempre son de agrado los deseos de mejoría. Enviaste o recibiste <%= count %> cartas de Ponte Bueno.",
+    "getwellCardAchievementText": "Siempre son de agradecidos los deseos de salud. Enviaste o recibiste <%= count %> cartas de recupérate pronto.",
    "goodluckCard": "Carta de Buena Suerte",
    "goodluckCardExplanation": "¡Ambos recibís el logro Carta de la Suerte!",
    "goodluckCardNotes": "Envía una carta de Buena Suerte a un miembro del equipo.",
    "goodluck0": "¡Que la suerte te acompañe!",
    "goodluck1": "¡Te deseo un montón de suerte!",
-    "goodluck2": "¡Espero que la suerte esté de lado hoy y siempre!",
+    "goodluck2": "¡Espero que la suerte esté a tu lado hoy y siempre!",
    "goodluckCardAchievementTitle": "Carta de la Suerte",
    "goodluckCardAchievementText": "¡Los deseos de buena suerte son un gran estímulo! Enviaste o recibiste <%= count %> cartas de Buena Suerte.",
    "streakAchievement": "¡Has obtenido un logro de racha!",
@@ -163,8 +163,8 @@
    "orderBy": "Ordenar por <%= item %>",
    "you": "(tú)",
    "loading": "Cargando...",
-    "userIdRequired": "Es necesaria un ID de usuario",
-    "resetFilters": "Limpiar todos los filtros",
+    "userIdRequired": "Es necesario un ID de usuario",
+    "resetFilters": "Borrar todos los filtros",
    "applyFilters": "Aplicar filtros",
    "wantToWorkOn": "Quiero trabajar en:",
    "categories": "Categorías",
@@ -174,11 +174,11 @@
    "health_wellness": "Salud y Bienestar",
    "self_care": "Cuidado de ti mismo",
    "habitica_official": "Oficial de Habitica",
-    "academics": "Académico",
+    "academics": "Académica",
    "advocacy_causes": "Defensa + Causas",
    "entertainment": "Entretenimiento",
    "finance": "Finanzas",
-    "health_fitness": "Salud + Ejercicios",
+    "health_fitness": "Salud + Ejercicio",
    "hobbies_occupations": "Aficiones + Ocupaciones",
    "location_based": "Basado en la localización",
    "mental_health": "Salud Mental + Cuidado de ti mismo",
@@ -186,11 +186,11 @@
    "self_improvement": "Autosuperación",
    "spirituality": "Espiritualidad",
    "time_management": "Manejo del Tiempo + Responsabilidad",
-    "recovery_support_groups": "Recuperación + Grupos de Ayuda",
+    "recovery_support_groups": "Recuperación + Grupos de Apoyo",
    "dismissAll": "Ignorar todas",
    "messages": "Mensajes",
    "emptyMessagesLine1": "No tienes ningún mensaje",
-    "emptyMessagesLine2": "Puedes enviar un nuevo mensaje a un usuario visitando su perfil y haciendo clic en el botón \"Mensaje\".",
+    "emptyMessagesLine2": "Puedes enviar un nuevo mensaje a un usuario visitando su perfil y presionando \"Mensaje\".",
    "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> te ha enviado un mensaje",
    "letsgo": "¡Vamos!",
    "selected": "Seleccionado",
@@ -199,8 +199,8 @@
    "options": "Opciones",
    "demo": "Demo",
    "loadEarlierMessages": "Cargar Mensajes Anteriores",
-    "finish": "Terminar",
-    "congratulations": "¡Enhorabuena!",
+    "finish": "Finalizar",
+    "congratulations": "¡Felicidades!",
    "onboardingAchievs": "Logros de incorporación",
    "reportEmailError": "Por favor, introduzca un correo electrónico válido",
    "reportDescription": "Descripción",
@@ -212,6 +212,10 @@
    "reportEmailText": "Esto solo se utilizará para contactar contigo en relación con el informe de error.",
    "reportEmailPlaceholder": "Tu correo electrónico",
    "reportDescriptionText": "Si lo crees conveniente, incluye capturas de pantalla o errores de la consola de Javascript.",
-    "reportSentDescription": "Nos pondremos en contacto contigo en cuanto nuestro equipo haya podido estudiarlo. Gracias por informarnos del problema.",
-    "askQuestion": "Haz una pregunta"
+    "reportSentDescription": "Nos pondremos en contacto contigo en cuanto nuestro equipo haya podido investigar. Gracias por informarnos del problema.",
+    "askQuestion": "Haz una pregunta",
+    "skipExternalLinkModal": "Mantenga presionada la tecla CTRL (Windows) o Comando (Mac) al hacer clic en un enlace para omitir este modal.",
+    "refreshList": "Actualizar lista",
+    "leaveHabitica": "Estás a punto de salir de Habitica.com",
+    "leaveHabiticaText": "Habitica no es responsable del contenido de ningún sitio web vinculado que no sea propiedad ni esté operado por HabitRPG.<br>Tenga en cuenta que las prácticas de estos sitios web pueden diferir de las pautas de la comunidad de Habitica."
 }
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -147,5 +147,8 @@
    "achievementPolarProModalText": "Vous avez collecté tous les familiers polaires !",
    "achievementPlantParent": "Protecteur des plantes",
    "achievementPlantParentText": "A fait éclore toutes les couleurs standards de familiers plantes : Cactus et arbustes !",
-    "achievementPlantParentModalText": "Vous avec collecté tous les familiers plantes !"
+    "achievementPlantParentModalText": "Vous avec collecté tous les familiers plantes !",
+    "achievementDinosaurDynasty": "Dynastie des dinosaures",
+    "achievementDinosaurDynastyText": "A fait éclore toutes les couleurs standard d'oiseaux et de dinosaures : faucon, hibou, perroquet, paon, pingouin, coq, ptérodactyle, T-Rex, tricératops et vélociraptor !",
+    "achievementDinosaurDynastyModalText": "Vous avez collecté tous les animaux de compagnie d'oiseau et de dinosaure!"
 }
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -109,5 +109,8 @@
    "earnedAchievement": "Ghnóthaigh tú éacht!",
    "viewAchievements": "Féach ar Éachtaí",
    "letsGetStarted": "Ar aghaidh linn!",
-    "achievementMindOverMatter": "Aigne Thar Ábhar"
+    "achievementMindOverMatter": "Aigne Thar Ábhar",
+    "achievementZodiacZookeeperText": "Tagtha amach gach dathanna caighdeánach de na peataí stoidiaca: Francach, Bó, Coinín, Nathair, Capall, Caoirigh, Moncaí, Coileach, Mac tíre, Tíogar, Muc ag Eitilt, agus Dragan!",
+    "achievementBirdsOfAFeather": "Éin Cleite",
+    "achievementBirdsOfAFeatherModalText": "Bhailigh tú na peataí eitilte go léir!"
 }
@@ -312,7 +312,7 @@
    "teamBasedTasksList": "Team-Based Task List",
    "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!",
    "groupManagementControls": "Group Management Controls",
-    "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
+    "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.",
    "inGameBenefits": "In-Game Benefits",
    "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.",
    "inspireYourParty": "Inspire your party, gamify life together.",
@@ -1,7 +1,7 @@
 {
    "achievement": "Logro",
    "onwards": "Adiante!",
-    "levelup": "Ao cumprires as túas metas da vida real subiches de nivel e recuperaches toda a vida!",
+    "levelup": "Ao cumprires as túas metas na realidade subiches de nivel e recuperaches toda a vida!",
    "reachedLevel": "Acadaches o nivel <%= level %>",
    "achievementLostMasterclasser": "Coleccionista de misións: serie de clase mestra",
    "achievementLostMasterclasserText": "Completou as dezaseis misións da serie de misións de clase mestra e resolveu o misterio da clase mestra perdida!",
@@ -38,20 +38,20 @@
    "achievementReptacularRumbleText": "Fixo nacer todas as mascotas réptiles: caimán, pterodáctilo, serpe, triceratops, tartaruga, tiranosauro e velociraptor!",
    "achievementLegendaryBestiary": "Bestiario lendario",
    "achievementBackToBasicsModalText": "Reuniches todas as mascotas básicas!",
-    "achievementVioletsAreBlueText": "Reuniu todas as mascotas azuis algodón de azucre.",
-    "achievementWildBlueYonderModalText": "Domaches todas as monturas azuis algodón de azucre!",
+    "achievementVioletsAreBlueText": "Reuniu todas as mascotas de cor azul algodón de azucre.",
+    "achievementWildBlueYonderModalText": "Domaches todas as monturas de cor azul algodón de azucre!",
    "achievementDustDevilText": "Reuniu todas as mascotas do deserto.",
    "achievementFedPetText": "Deu de comer á súa primeira mascota.",
    "achievementUndeadUndertakerText": "Domou todas as monturas zombi.",
    "achievementTickledPink": "Debilidade polo rosa",
    "foundNewItems": "Atopaches obxectos novos!",
    "achievementBareNecessitiesModalText": "Completaches as misións de mascotas de mono, preguiceiro e arbusto!",
-    "achievementWildBlueYonderText": "Domou todas as monturas azuis algodón de azucre.",
+    "achievementWildBlueYonderText": "Domou todas as monturas de cor azul algodón de azucre.",
    "achievementMindOverMatter": "A mente sobre a materia",
    "achievementGoodAsGold": "A prezo de ouro",
    "achievementAllYourBaseText": "Domou todas as monturas básicas.",
    "achievementFedPet": "Dá de comer a unha mascota",
-    "achievementRosyOutlookText": "Domou todas as monturas rosas algodón de azucre.",
+    "achievementRosyOutlookText": "Domou todas as monturas de cor rosa algodón de azucre.",
    "achievementVioletsAreBlue": "As violetas son azuis",
    "achievementBugBonanza": "Bonanza de bichos",
    "achievementJustAddWater": "Bótalle auga",
@@ -79,7 +79,7 @@
    "achievementKickstarter2019": "Patrocinio en Kickstarter de broche",
    "achievementAllThatGlitters": "Todo o que brilla",
    "achievementBareNecessities": "Necesitades vitais",
-    "achievementRosyOutlookModalText": "Domaches todas as monturas rosas algodón de azucre!",
+    "achievementRosyOutlookModalText": "Domaches todas as monturas de cor rosa algodón de azucre!",
    "achievementAllYourBaseModalText": "Domaches todas as monturas básicas!",
    "achievementDustDevil": "Control das areas",
    "achievementCreatedTaskModalText": "Engade unha tarefa para algo que queiras conseguir esta semana",
@@ -87,7 +87,7 @@
    "achievementCompletedTask": "Completar unha tarefa",
    "achievementBoneCollectorText": "Reuniu todas as mascotas esqueléticas.",
    "achievementPurchasedEquipmentText": "Mercou a súa primeira peza de equipamento.",
-    "achievementFedPetModalText": "Hai moitos tipos distintos de penso, pero as mascotas poden ser esixentes",
+    "achievementFedPetModalText": "Hai moitos tipos de penso, pero as mascotas poden ser esixentes",
    "achievementHatchedPetModalText": "Vai ao teu inventario e proba a xuntar unha poción de eclosión e un ovo",
    "achievementAridAuthority": "Autoridade árida",
    "achievementJustAddWaterText": "Completou as misións de mascotas de polbo, cabalo de mar, lura, balea, tartaruga, lesma, serpe mariña e golfiño.",
@@ -128,8 +128,8 @@
    "achievementPrimedForPaintingModalText": "Reuniches todas as mascotas brancas!",
    "achievementPearlyPro": "Profesional das perlas",
    "achievementPearlyProModalText": "Domaches todas as monturas brancas!",
-    "achievementTickledPinkText": "Reuniu todas as mascotas rosas algodón de azucre.",
-    "achievementTickledPinkModalText": "Reuniches todas as mascotas rosas algodón de azucre!",
+    "achievementTickledPinkText": "Reuniu todas as mascotas de cor rosa algodón de azucre.",
+    "achievementTickledPinkModalText": "Reuniches todas as mascotas de cor rosa algodón de azucre!",
    "achievementBugBonanzaModalText": "Completaches as misións de mascotas de escaravello, bolboreta, caracol e araña!",
    "achievementFreshwaterFriendsText": "Completou as misións de mascotas de axolote, ra e hipopótamo.",
    "achievementBoneCollectorModalText": "Reuniches todas as mascotas esqueléticas!",
@@ -139,7 +139,7 @@
    "achievementLegendaryBestiaryText": "Fixo nacer todas as mascotas místicas estándar: dragón, porco voador, grifón, serpe mariña e unicornio!",
    "achievementLegendaryBestiaryModalText": "Reuniches todas as mascotas míticas!",
    "achievementSeasonalSpecialistModalText": "Completaches todas as misións estacionais!",
-    "achievementVioletsAreBlueModalText": "Reuniches todas as mascotas azuis algodón de azucre!",
+    "achievementVioletsAreBlueModalText": "Reuniches todas as mascotas de cor azul algodón de azucre!",
    "achievementDomesticatedText": "Fixo nacer todas as mascotas domesticadas estándar: tourón, cobaia, galo, porco voador, rata, coello, cabalo e vaca!",
    "achievementShadeOfItAll": "A sombra de todo",
    "achievementZodiacZookeeper": "Zoo do zodíaco",
@@ -147,5 +147,8 @@
    "achievementZodiacZookeeperModalText": "Reuniches todas as mascotas do zodíaco!",
    "achievementGroupsBeta2022ModalText": "Ti e mailo teu grupo axudastes a Habitica probando e informando!",
    "achievementBoneToPickText": "Fixo nacer todas as mascotas esqueléticas clásicas e de misión!",
-    "achievementPolarProText": "Fixo nacer todas as mascotas polares estándar: oso, raposo, pingüín, balea e lobo!"
+    "achievementPolarProText": "Fixo nacer todas as mascotas polares estándar: oso, raposo, pingüín, balea e lobo!",
+    "achievementDinosaurDynasty": "Dinastía de dinosauros",
+    "achievementDinosaurDynastyModalText": "Reuniches todas as mascotas aves e dinosauros!",
+    "achievementDinosaurDynastyText": "Fixo nacer todas as cores estándar de mascotas aves e dinosauros: falcón, curuxa, papagaio, pavón, pingüín, galo, pterodáctilo, tiranosauro, triceratops e velociraptor!"
 }
@@ -65,12 +65,12 @@
    "gearAchievementNotification": "Acabas de gañar o logro «Equipamento definitivo» por adquirires o mellor lote de equipamento da túa clase!",
    "moreGearAchievements": "Para conseguir máis medallas de «Equipamento definitivo», cambia de clase en <a href='/user/settings/site' target='_blank'>Configuración → Sitio</a> e merca o equipamento da túa nova clase!",
    "armoireUnlocked": "Para máis equipamento, proba co <strong>armario encantado</strong>! Preme a recompensa do armario encantado para unha oportunidade aleatoria de conseguir equipamento especial! Tamén pode que consigas experiencia aleatoria ou penso.",
-    "ultimGearName": "Equipamento definitivo - <%= ultClass %>",
+    "ultimGearName": "Equipamento definitivo — <%= ultClass %>",
    "ultimGearText": "Adquiriu o mellor lote de armas e armadura da clase <%= ultClass %>.",
    "level": "Nivel",
    "levelUp": "Subiches de nivel!",
    "gainedLevel": "Gañaches un nivel!",
-    "leveledUp": "Cumprindo os teus obxectivos na vida real, acabas de pasar ao <strong>nivel <%= level %>!</strong>",
+    "leveledUp": "Cumprindo os teus obxectivos na realidade, acabas de pasar ao <strong>nivel <%= level %>!</strong>",
    "huzzah": "Viva!",
    "mana": "Maná",
    "hp": "Vida",
@@ -138,8 +138,8 @@
    "select": "Seleccionar",
    "stealth": "Sixilo",
    "stealthNewDay": "Cando comece un novo día, evitarás o dano inflixido por esta cantidade de tarefas diarias incompletas.",
-    "streaksFrozen": "Conxeláronse as rachas",
-    "streaksFrozenText": "Cando te saltes unha tarefa diaria, as rachas non se reiniciarán ao final do día.",
+    "streaksFrozen": "Conxelouse a serie",
+    "streaksFrozenText": "Cando te saltes unha tarefa diaria, as series non se reiniciarán ao final do día.",
    "purchaseFor": "Mercar por <%= cost %> xemas?",
    "purchaseForHourglasses": "Mercar por <%= cost %> reloxos de area?",
    "notEnoughMana": "Non tes maná dabondo.",
@@ -3,7 +3,7 @@
    "lastUpdated": "Última actualización:",
    "commGuideHeadingWelcome": "Dámoste a benvida a Habitica!",
    "commGuidePara001": "Saúdos! Dámoste a benvida a Habitica, a terra da produtividade, a vida saudábel, e o ataque ocasional de grifón. Temos unha comunidade positiva chea de xente disposta a axudar ao resto no camiño á mellora persoal. Para encaixar, todo o que necesitas é unha actitude positiva, un comportamento respectuoso, e o entendemento de que cada quen ten distintas habilidades e limitacións, incluíndote a ti! A xente de Habitica é paciente co resto e procura axudar cando pode.",
-    "commGuidePara002": "Para axudar a que toda a xente se sinta segura, feliz e produtiva na comunidade, si que temos algunhas directrices. Elaborámolas coidadosamente para que sexan todo o fáciles de ler e comprender posíbel. Por favor, adica un tempo a lelas antes de unirte á conversa.",
+    "commGuidePara002": "Para axudar a que toda a xente se sinta segura, feliz e produtiva na comunidade, si que temos algunhas directrices. Elaborámolas coidadosamente para que sexan todo o fáciles de ler e comprender posíbel. Por favor, dedica un tempo a lelas antes de unirte á conversa.",
    "commGuidePara003": "Estas regras aplícanse a todos os espazos sociais que usamos, incluídos (pero non exclusivamente) Trello, GitHub, Weblate, e o wiki de Habitica en Fandom. A medida que as comunidades medran e cambian, as súas regras poden adaptarse de vez en cando. Cando se producen cambios significativos nas regras da comunidade listadas aquí, anunciarémolo mediante Baia ou nas nosas redes sociais!",
    "commGuideHeadingInteractions": "Interaccións en Habitica",
    "commGuidePara015": "Habitica ten dous tipos de espazos sociais: os públicos e os privados. Entre os espazos públicos están a taberna, os gremios públicos, GitHub, Trello, e o wiki. Os espazos privados son os gremios privados, a conversa de grupo, e as mensaxes privadas. Todos os nomes públicos e os @alcumes deben cumprir as directrices de espazos públicos. Para cambiar o teu nome visual ou o teu alcume, vai a «Menú → Configuración → Perfil» desde unha das aplicacións móbiles ou a «Eu → Configuración» desde a aplicación web.",
@@ -16,7 +16,7 @@
    "commGuideList02F": "Evita as conversas prolongadas sobre temas divisorios na taberna e onde estea fóra de lugar. Se alguén menciona algo que as directrices permiten pero que te senta mal, podes dicirllo de boas maneiras. Se alguén te avisa de que lle provocaches incomodidade, reflexiona en vez de responder desde o enfado. Pero se te dá a sensación de que unha conversa está subindo de ton, é demasiado emocional ou é danosa, <strong>deixa de participar. No seu lugar, denuncia as publicacións para informarnos sobre elas. </strong>O equipo de Habitica responderá tan rápido como sexa posíbel. Tamén podes mandar unha mensaxe de correo electrónico a <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> e incluír capturas de pantalla se poden axudar.",
    "commGuideList02G": "<strong>Cumpre inmediatamente con calquera solicitude do equipo de Habitica.</strong> Estas poderían incluír, entre outras, solicitarche que limites as túas publicacións nun espazo concreto, editar o teu perfil para retirar contido non axeitado, pedirte que movas a túa conversa a un espazo máis axeitado, etc. Non discutas co equipo. Se tes preocupacións ou comentarios sobre as accións do equipo, envía unha mensaxe de correo electrónico a <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> para contactar co equipo de xestión da comunidade.",
    "commGuideList02J": "<strong>Non envíes contido non desexado</strong>. O contido non desexado inclúe, entre outras cousas: publicar o mesmo comentario ou consulta en varios lugares, <strong>publicar ligazóns sen explicalas ou sen contexto</strong>, publicar mensaxes sen sentido, publicar varias mensaxes promocionais sobre un gremio, equipo ou reto, ou publicar moitas mensaxes seguidas. Se que a xente siga unha ligazón te beneficia de algún modo, tes que declaralo previamente no texto da túa mensaxe, ou tamén será considerado contido non desexado. O equipo de Habitica pode decidir á súa discreción o que considera contido non desexado.",
-    "commGuideList02K": "<strong>Evita abusar de maiúsculas iniciais en espazos de conversa públicos, en especial na taberna</strong>. De xeito similar a usar MAIÚSCULAS TODO O TEMPO, percíbese como se estiveses berrando, e fai difícil unha atmosfera cómoda.",
+    "commGuideList02K": "<strong>Evita abusar de maiúsculas iniciais en espazos de conversa públicos, en especial na taberna</strong>. Igual que escribir TODO EN MAIÚSCULAS, percíbese como se estiveses berrando, e fai difícil unha atmosfera cómoda.",
    "commGuideList02L": "<strong>Desaconsellamos encarecidamente o intercambio de información persoal, en especial información que se poida usar para a identificación persoal, nos espazos de conversa públicos</strong>. A información de identificación pode incluír, entre outras cousas: o teu enderezo, o teu enderezo de correo electrónico e o teu contrasinal ou ficha de API. Isto é pola túa seguridade! O equipo de Habitica podería retirar publicacións con tal información se o consideran pertinente. Se te piden información persoal nun gremio privado, equipo ou mensaxe privada, recomendámosche encarecidamente que te negues amabelmente e avises ao equipo de Habitica ou (1) denunciando a mensaxe ou (2) enviando unha mensaxe a <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> e incluíndo capturas de pantalla.",
    "commGuidePara019": "<strong>Nos espazos privados</strong>, as persoas teñen máis liberdade para falar dos temas que queiras, pero poderían aínda así infrinxir as condicións do servizo, incluída a publicación de insultos ou calquera contido discriminatorio, violento ou ameazador. Ten en conta que, dado que os nomes de desafíos aparecen no perfil público de quen os gaña, TODOS os nomes de desafío deben cumprir coas directrices dos espazos públicos, aínda que aparezan nun espazo privado.",
    "commGuidePara020": "<strong>As mensaxes privadas</strong> teñen directrices adicionais. Se alguén te bloqueou, non contactes con esa persoa por outras vías para pedirlle que te desbloquee. Ademais, non deberías enviar mensaxes privadas a xente para pedirlles axuda (dado que responder en público a peticións de asistencia axuda á comunidade). Por último, non envíes a ninguén mensaxes privadas pedindo contido de pago de ningún tipo.",
@@ -58,13 +58,13 @@
    "commGuideList06D": "Infrinxir repetidamente directrices de espazos públicos",
    "commGuideList06E": "Cometer repetidamente infraccións menores",
    "commGuideHeadingMinorInfractions": "Infraccións menores",
-    "commGuidePara056": "As infraccións menores, se ben están desaconselladas, teñen consecuencias pouco importantes. Se seguen ocorrendo, poden levar a consecuencias máis graves co tempo.",
+    "commGuidePara056": "As infraccións menores, malia estar desaconselladas, teñen consecuencias pouco importantes. Se seguen ocorrendo, poden levar a consecuencias máis graves co tempo.",
    "commGuidePara057": "Estes son algúns exemplos de infraccións menores. Esta lista non é exhaustiva.",
    "commGuideList07A": "Infrinxir as directrices de espazos públicos por primeira vez",
    "commGuideList07B": "Calquera declaración ou acción que leve a unha persoa do equipo de Habitica a responder «Por favor, non…». Cando se te solicita publicamente non facer algo, isto mesmo pode ser unha consecuencia. Se o equipo ten que emitir moitas correccións como esta a unha mesma persoa, poderían contar como unha infracción máis grave",
    "commGuidePara057A": "Algunhas publicacións poderían estar agochadas porque conteñen información sensíbel ou poden confundir á xente. Isto non adoita contar como unha infracción, especialmente a primeira vez que ocorre!",
    "commGuideHeadingConsequences": "Consecuencias",
-    "commGuidePara058": "En Habitica, como na vida real, todas as accións teñen consecuencias, sexa mellorar en saúde por correr, sufrir caries por comer demasiado doce, ou aprobar por estudar.",
+    "commGuidePara058": "En Habitica, como na realidade, todas as accións teñen consecuencias, sexa mellorar en saúde por correr, sufrir caries por comer demasiado doce, ou aprobar por estudar.",
    "commGuidePara059": "<strong>De maneira similar, todas as infraccións teñen consecuencias directas.</strong> Algunhas consecuencias descríbense a continuación.",
    "commGuidePara060": "<strong>Se a túa infracción ten unha consecuencia moderada ou severa, haberá unha publicación dunha persoa do equipo de Habitica, no foro no que tivo lugar a infracción, que explicará</strong>:",
    "commGuideList08A": "cal foi a infracción",
@@ -74,12 +74,12 @@
    "commGuidePara060B": "Se se expulsa a túa conta (unha consecuencia severa), non poderás acceder a Habitica e recibirás unha mensaxe de erro ao intentar acceder. <strong>Se queres desculparte ou conseguir a restauración, envía unha mensaxe de correo electrónico ao equipo de Habitica a <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a> co teu identificador de persoa usuaria</strong> (que se indicará na mensaxe de erro) ou o teu @alcume. É responsabilidade <strong>túa</strong> contactar connosco se queres que reconsideremos ou te readmitamos.",
    "commGuideHeadingSevereConsequences": "Exemplos de consecuencias graves",
    "commGuideList09A": "Expulsións de contas (máis información arriba)",
-    "commGuideList09C": "Desactivar permanentemente (“conxelar“) o progreso nos rangos de contribución",
+    "commGuideList09C": "Desactivar permanentemente (“conxelar”) o progreso nos rangos de contribución",
    "commGuideHeadingModerateConsequences": "Exemplos de consecuencias moderadas",
    "commGuideList10A": "Privilexios restrinxidos de conversa pública ou privada",
    "commGuideList10A1": "Se polas túas accións perdes os privilexios de conversa, debes enviar unha mensaxe a <a href='mailto:admin@habitica.com' target='_blank'>admin@habitica.com</a>. Pode que se te readmita se cumpres cordialmente coas accións requiridas e aceptas cumprir coas directrices da comunidade e coas condicións do servizo",
    "commGuideList10C": "Restricted Guild/Challenge creation privileges",
-    "commGuideList10D": "Desactivar temporalmente (“conxelar“) o progreso nos rangos de contribución",
+    "commGuideList10D": "Desactivar temporalmente (“conxelar”) o progreso nos rangos de contribución",
    "commGuideList10E": "Degradación do Nivel dos Contribuidores",
    "commGuideList10F": "Conceder a “condicional”",
    "commGuideHeadingMinorConsequences": "Exemplos de consecuencias menores",
@@ -96,7 +96,7 @@
    "commGuidePara006": "Habitica has some tireless knights-errant who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres.",
    "commGuidePara007": "O equipo de Habitica mantén a aplicación e os sitios en funcionamento e pode moderar conversas. Teñen etiquetas violetas marcadas con coroas. Teñen por título «Heroicidade».",
    "commGuidePara008": "Os moderadores teñen etiquetas azul escuro marcadas con estrelas. O seu título é \"Gardián\". A única excepción é Bailey, quen, como personaxe non xogable, ten unha etiqueta negra e verde marcada cunha estrela.",
-    "commGuidePara009": "O equipo fórmano actualmente as seguintes persoas (de esquerda a dereita):",
+    "commGuidePara009": "O equipo fórmano as seguintes persoas (de esquerda a dereita):",
    "commGuideAKA": "<%= habitName %> ou <%= realName %>",
    "commGuideOnTrello": "<%= trelloName %> on Trello",
    "commGuideOnGitHub": "<%= gitHubName %> en GitHub",
@@ -43,13 +43,13 @@
    "missingUsernameEmail": "Falta o alcume ou o enderezo de correo electrónico.",
    "invalidEmailDomain": "Non pode rexistrarse con correos electrónicos dos seguintes dominios: <%= domains %>",
    "passwordReset": "Se temos constancia do seu correo electrónico ou alcume, enviáronse ao seu correo electrónico instrucións para estabelecer un novo contrasinal.",
-    "unsupportedNetwork": "Actualmente non somos compatíbeis con esta rede.",
+    "unsupportedNetwork": "Non somos compatíbeis con esta rede.",
    "earnRewardsDesc": "Marca as tarefas para subir de nivel o teu avatar e desbloquear funcionalidades do xogo como armaduras de batalla, misteriosas mascotas, habilidades máxicas, e mesmo misións!",
    "schoolAndWorkDesc": "Sen importar se o informe que preparar é para a escola ou para o traballo, resulta doado facer un seguimento do teu progreso a medida que lidias coas tarefas máis complicadas.",
    "pkQuestion1": "Como naceu Habitica?",
    "localStorageClearExplanation": "Este botón borrará o almacenamento local e a maioría das cookies, e pechará a súa sesión.",
    "pkQuestion6": "Quen adoita usar Habitica?",
-    "pkQuestion8": "Que impacto ten Habitica na vida real das persoas?",
+    "pkQuestion8": "Que impacto ten Habitica na vida das persoas?",
    "incorrectDeletePhrase": "Escribe <%= magicWord %> en maiúsculas para eliminar a túa conta.",
    "alreadyHaveAccountLogin": "Xa tes unha conta de Habitica? <strong>Entra.</strong>",
    "joinMany": "Únete a máis de <%= userCountInMillions %> millóns de persoas que o pasan ben conseguindo as súas metas!",
@@ -152,7 +152,7 @@
    "invalidReqParams": "Os parámetros da solicitude son incorrectos.",
    "marketing3Header": "Aplicacións e extensións",
    "marketing1Lead3Title": "Atopa premios aleatorios",
-    "battleMonstersDesc": "Loita contra monstros con máis xente! Usa o ouro que gañes para mercar recompensas do xogo ou da vida real, como ver un episodio da túa serie favorita.",
+    "battleMonstersDesc": "Loita contra monstros con máis xente! Usa o ouro que gañes para mercar recompensas do xogo ou da realidade, como ver un episodio da túa serie favorita.",
    "pkQuestion3": "Por que engadistes funcionalidades sociais?",
    "marketing2Lead2": "Que é un xogo de rol sen batallas? Loita contra monstros co teu equipo. Os monstros son o «modo de máxima responsabilidade»: un día que non vaias ao ximnasio é un día que o mostro fai dano a *toda a xente!*",
    "marketing4Lead3Title": "Converte todo nun xogo",
@@ -161,7 +161,7 @@
    "joinToday": "Únete a Habitica hoxe",
    "emailUsernamePlaceholder": "p. ex. habitiquense ou grifon@example.com",
    "socialAlreadyExists": "Esta conta social xa está asociada a unha conta de Habitica.",
-    "marketing4Lead2": "O custo da sanidade está subindo, e hai que facer algo. Constrúense centos de programas para reducir custos e mellorar o benestar. Nós cremos que Habitica pode construír unha gran parte do camiño cara estilos de vida saudábeis.",
+    "marketing4Lead2": "O custo da sanidade está subindo, e hai que facer algo. Constrúense centos de programas para reducir custos e mellorar o benestar. Nós cremos que Habitica pode construír unha gran parte do camiño cara a estilos de vida saudábeis.",
    "pkAnswer6": "Habitica úsaa moita xente distinta! Máis da metade da xente que nos usa ten entre 18 e 34 anos, pero temos xente maior que usa o sitio coas netas e netos, e todas as idades entre medias. É común que as familias formen un grupo e combatan monstros xuntas. <br /> Moita xente que nos usa ten experiencia con xogos, pero para a nosa sorpresa, cando realizamos unha enquisa hai un tempo, o 40% da xente non se consideraba xogadora! Así que parece que o noso método pode resultar efectivo para calquera que queira que a produtividade e o benestar resulten máis divertidos.",
    "accountSuspended": "Esta conta, o identificador de persoa usuaria «<%= userId %>», bloqueouse por violar as directrices da comunidade (https://habitica.com/static/community-guidelines) ou as condicións do servizo (https://habitica.com/static/terms). Para máis información, ou para solicitar un desbloqueo, envía unha mensaxe á xestoría da comunidade en <%= communityManagerEmail %> ou solicita á túa nai, pai ou garda que o faga. Inclúea o teu @alcume na mensaxe.",
    "muchmuchMoreDesc": "A nosa lista de tarefas completamente personalizábel permíteche darlle a Habitica a forma que queiras para adaptala ás túas metas persoais. Traballa en proxectos creativos, fai fincapé no coidado persoal, ou persegue un soño diferente; ti decides.",
@@ -169,14 +169,14 @@
    "marketing4Lead1": "O ensino é un dos mellores sectores para a ludificación. Xa se sabe que a xente estudante anda pegada aos teléfonos e aos xogos; aprovéitao! Fai que compitan de maneira amigábel. Recompensa os bos comportamentos con premios singulares. Observa como melloran as súas notas e o seu comportamento.",
    "invalidLoginCredentialsLong": "Vaites! O teu enderezo de correo electrónico, alcume ou contrasinal son incorrectos.\n- Asegúrate de que os escribiches ben. O alcume e o contrasinal distinguen maiúsculas.\n- Pode que te rexistrases con Facebook ou Google, non co enderezo de correo electrónico, así que asegúrate probándoos.\n- Se esqueciches o contrasinal, preme «Esquecín o contrasinal».",
    "marketing3Lead2": "Outras **ferramentas de terceiras partes** adaptan Habitica a varios aspectos da túa vida. A nosa API permite integrar facilmente cousas como a [extensión de Chrome](https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=gl-ES), coa que perdes puntos ao visitar sitios web non produtivos, e gañas puntos ao visitar os produtivos. [Aprende máis aquí](https://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations) (en inglés).",
-    "marketing2Lead1": "Se ben podes xogar a Habitica pola túa conta, sácaselle máis partido ao colaborar, competir, e responsabilizarse mutuamente. A parte máis efectiva de calquera programa de mellora persoal é a responsabilidade social, e que mellor ambiente para responsabilidade e competición que un videoxogo?",
+    "marketing2Lead1": "Aínda que podes xogar a Habitica pola túa conta, sácaselle máis partido ao colaborar, competir, e responsabilizarse mutuamente. A parte máis efectiva de calquera programa de mellora persoal é a responsabilidade social, e que mellor ambiente para responsabilidade e competición que un videoxogo?",
    "pkAnswer7": "Habitica usa arte de píxeles por varios motivos. Ademais do factor nostalxia positiva, a arte de píxeles resulta moi accesíbel para o noso voluntariado de artistas que queren colaborar. É moito máis doado manter a consistencia da arte de píxeles cando unha morea de artistas contribúen, e permítenos xerar unha gran cantidade de contido novo!",
-    "aboutHabitica": "Habitica é unha aplicación de balde de construción de hábitos e produtividade que trata a vida real como un xogo. Con recompensas e castigos no xogo para motivarte e unha forte rede social para inspirarte, Habitica pode axudarte a conseguir as túas metas e mellorar a túa saúde, traballar duramente, e ser feliz.",
-    "marketing1Lead1": "Habitica é un videoxogo para axudarte a mellorar os hábitos da vida real. Ludifica a túa vida convertendo as túas tarefas (hábitos, tarefas diarias, e tarefas pendentes) en pequenos monstros que debes conquistar. Canto mellor o fagas, máis progresarás no xogo. Se te descoidas na vida, a túa personaxe empeorará no xogo.",
+    "aboutHabitica": "Habitica é unha aplicación de balde de construción de hábitos e produtividade que trata a vida como un xogo. Con recompensas e castigos no xogo para motivarte e unha forte rede social para inspirarte, Habitica pode axudarte a conseguir as túas metas e mellorar a túa saúde, traballar duramente, e ser feliz.",
+    "marketing1Lead1": "Habitica é un videoxogo para axudarte a mellorar os hábitos da realidade. Ludifica a túa vida convertendo as túas tarefas (hábitos, tarefas diarias, e tarefas pendentes) en pequenos monstros que debes conquistar. Canto mellor o fagas, máis progresarás no xogo. Se te descoidas na vida, a túa personaxe empeorará no xogo.",
    "localStorageTryFirst": "Se experimentas problemas con Habitica, preme o botón de embaixo para borrar o almacenamento local e a maioría das cookies do sitio web (non afectará a outros sitios web). Terás que acceder de novo despois de facelo, así que primeiro asegúrate de que sabes os teus detalles de acceso, que podes atopar en Configuración → <%= linkStart %>Sitio<%= linkEnd %>.",
    "pkAnswer4": "Se saltas unha das túas metas diarias, o teu avatar perderá vida o día seguinte. Isto serve como factor importante de motivación para animar á xente a cumprir as súas metas porque a xente odia facer dano ao seu pequeno avatar! Ademais, a responsabilidade social resulta crítica para moitas persoas: se estás a loitar contra monstros coas túas amizades, saltar as túas tarefas tamén fai dano aos seus avatares.",
-    "pkAnswer5": "Unha das fontes de maior éxito de Habitica no uso de ludificación foi poñer un gran esforzo en pensar nos aspectos de xogo para asegurarnos de que resultan divertidos de verdade. Tamén incluímos moitas compoñentes sociais, porque pensamos que algúns dos xogos máis motivadores permítenche xogar con amizades, e porque as investigacións mostran que resulta máis doado formar hábitos cando tes que responsabilizarte ante outras persoas.",
-    "pkAnswer1": "Se algunha vez investiches tempo en subir de nivel unha personaxe nun xogo, é difícil non preguntarse o ben que iría a túa vida se todo ese esforzo o puxeses en mellorar a túa vida real en vez de o teu avatar. Comezamos a construír Habitica para responder esa pregunta. <br /> Habitica comezou oficialmente cunha campaña de Kickstarter en 2013, e a idea tivo éxito. Desde entón medrou ata se converter nun proxecto enorme, apoiado polo noso alucinante voluntariado do software libre e a xenerosidade da xente que nos usa.",
+    "pkAnswer5": "Unha das fontes de maior éxito de Habitica no uso de ludificación foi poñer un grande esforzo en pensar nos aspectos de xogo para asegurarnos de que resultan divertidos de verdade. Tamén incluímos moitas compoñentes sociais, porque pensamos que algúns dos xogos máis motivadores permítenche xogar con amizades, e porque as investigacións mostran que resulta máis doado formar hábitos cando tes que responsabilizarte ante outras persoas.",
+    "pkAnswer1": "Se algunha vez investiches tempo en subir de nivel unha personaxe nun xogo, é difícil non preguntarse o ben que iría a túa vida se todo ese esforzo o puxeses en mellorar a túa vida en vez de o teu avatar. Comezamos a construír Habitica para responder esa pregunta. <br /> Habitica comezou oficialmente cunha campaña de Kickstarter en 2013, e a idea tivo éxito. Desde entón medrou ata se converter nun proxecto enorme, apoiado polo noso alucinante voluntariado do software libre e a xenerosidade da xente que nos usa.",
    "pkAnswer2": "Formar novos hábitos resulta difícil porque a xente realmente necesita esa recompensa instantánea e obvia. Por exemplo, é difícil empezar a lavar os dentes, porque aínda que na clínica odontolóxica nos digan que é máis saudábel a longo prazo, no momento non fai máis que facer que nos doan as enxivas. <br /> A ludificación de Habitica engade un sentimento de gratificación instantánea aos obxectivos de todos os días recompensando unha tarefa difícil con experiencia, ouro… e quizais mesmo un premio aleatorio, como un ovo de dragón! Isto axuda a manter á xente motivada mesmo cando a tarefa de por si non ten unha recompensa intrínseca, e vimos xente dar a volta á súa vida como resultado.",
    "pkAnswer3": "A presión social é un factor de motivación enorme para unha morea de xente, así que sabíamos que queríamos ter unha comunidade forte que se responsabilizase mutuamente das metas e de animarse para gañar. Por sorte, unha das cousas que fan mellor os videoxogos para varias persoas é alimentar ese sentido de comunidade entre quen os xoga! A estrutura da comunidade de Habitica inspírase nese tipo de xogos; podes formar un pequeno grupo de amizades próximas, pero tamén podes unirte a un grupo máis grande con intereses comúns, un gremio. Aínda que algunhas persoas deciden xogar pola súa conta, a maioría decide formar unha rede de apoio que favorece a responsabilidade social mediante funcionalidades como as misións, onde a xente dos grupos xúntase e pon en común a súa produtividade para loitar contra monstros.",
    "footerProduct": "Produto",
@@ -560,7 +560,7 @@
    "armorSpecialFall2016WarriorNotes": "Mysteriously moist and mossy! Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.",
    "armorSpecialFall2016MageText": "Manto da Crueldade",
    "armorSpecialFall2016MageNotes": "When your cloak flaps, you hear the sound of cackling laughter. Increases Intelligence by <%= int %>. Limited Edition 2016 Autumn Gear.",
-    "armorSpecialFall2016HealerText": "Túnica de gorgona",
+    "armorSpecialFall2016HealerText": "Túnica de górgona",
    "armorSpecialFall2016HealerNotes": "These robes are actually made of stone. How are they so comfortable? Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.",
    "armorSpecialWinter2017RogueText": "Armadura xeada",
    "armorSpecialWinter2017RogueNotes": "This stealthy suit reflects light to dazzle unsuspecting tasks as you take your rewards from them! Increases Perception by <%= per %>. Limited Edition 2016-2017 Winter Gear.",
@@ -1378,7 +1378,7 @@
    "shieldSpecialFall2016RogueNotes": "Feel the sting of the spider's bite! Increases Strength by <%= str %>. Limited Edition 2016 Autumn Gear.",
    "shieldSpecialFall2016WarriorText": "Raíces Defensivas",
    "shieldSpecialFall2016WarriorNotes": "Deféndete das Tarefas Diarias con estas raíces retorcidas! Aumenta a Constitución de <%= con %>. Edición Limitada de Outono de 2016.",
-    "shieldSpecialFall2016HealerText": "Escudo de Gorgona",
+    "shieldSpecialFall2016HealerText": "Escudo de górgona",
    "shieldSpecialFall2016HealerNotes": "Non admires o teu propio reflexo neste escudo. Aumenta a Constitución de <%= con %>. Edición Limitada de Outono de 2016.",
    "shieldSpecialWinter2017RogueText": "Ice Axe",
    "shieldSpecialWinter2017RogueNotes": "This axe is great for attack, defense, and ice-climbing! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.",
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path id="b" d="m10,6h6V0h-2v2.72C12.49.99,10.3,0,8,0,3.59,0,0,3.59,0,8s3.59,8,8,8c2.69,0,5.2-1.35,6.68-3.6l-1.67-1.1c-1.11,1.69-2.99,2.71-5.01,2.7-3.31,0-6-2.69-6-6s2.69-6,6-6c1.72,0,3.33.74,4.46,2h-2.46v2Z" fill-rule="evenodd"/></svg>`