4.146.2

fix(event): missing potions
4.146.1
2026-05-09 11:11:17 -05:00 · 2020-06-19 14:56:52 -05:00 · 2020-06-19 14:55:49 -05:00 · 2020-06-18 19:38:17 -05:00 · 2020-06-18 19:38:08 -05:00 · 2020-06-18 13:29:39 -05:00
321 changed files with 18023 additions and 16565 deletions
@@ -160,7 +160,7 @@ gulp.task('test:content:safe', gulp.series('test:prepare:build', cb => {
  pipe(runner);
 }));

-gulp.task('test:api:unit', done => {
+gulp.task('test:api:unit:run', done => {
  const runner = exec(
    testBin('istanbul cover --dir coverage/api-unit node_modules/mocha/bin/_mocha -- test/api/unit --recursive --require ./test/helpers/start-server'),
    err => {
@@ -174,7 +174,7 @@ gulp.task('test:api:unit', done => {
  pipe(runner);
 });

-gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit', done => done())));
+gulp.task('test:api:unit:watch', () => gulp.watch(['website/server/libs/*', 'test/api/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api:unit:run', done => done())));

 gulp.task('test:api-v3:integration', done => {
  const runner = exec(
@@ -235,14 +235,22 @@ gulp.task('test', gulp.series(
  'test:sanity',
  'test:content',
  'test:common',
-  'test:api:unit',
+  'test:prepare:mongo',
+  'test:api:unit:run',
  'test:api-v3:integration',
  'test:api-v4:integration',
  done => done(),
 ));

 gulp.task('test:api-v3', gulp.series(
-  'test:api:unit',
+  'test:prepare:mongo',
+  'test:api:unit:run',
  'test:api-v3:integration',
  done => done(),
 ));
+
+gulp.task('test:api:unit', gulp.series(
+  'test:prepare:mongo',
+  'test:api:unit:run',
+  done => done(),
+));
@@ -1,6 +1,6 @@
 {
  "name": "habitica",
-  "version": "4.144.1",
+  "version": "4.146.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -7340,9 +7340,9 @@
      }
    },
    "habitica-markdown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-2.0.0.tgz",
-      "integrity": "sha512-70Kl/d7v1d2Rz6TFkQQ9hYcBYGAHnIPbRgS3PrW/dD/GGpN42q6gT3sCLsIpLqEXbN0EWjVscGs2qKWYLc6BMQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-2.0.2.tgz",
+      "integrity": "sha512-GGzWuDKbFBMI+GqmQnSPUD5Zi/WPZDDuC2dC2La6uvu1zVNW7uHyQG0lxwCO43t5EdYXtOoOPin1rhhLdTuZfA==",
      "requires": {
        "habitica-markdown-emoji": "1.2.4",
        "markdown-it": "10.0.0",
@@ -7351,9 +7351,9 @@
      },
      "dependencies": {
        "entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+          "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
        },
        "markdown-it": {
          "version": "10.0.0",
@@ -7533,9 +7533,9 @@
      "dev": true
    },
    "helmet": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.22.0.tgz",
-      "integrity": "sha512-Xrqicn2nm1ZIUxP3YGuTBmbDL04neKsIT583Sjh0FkiwKDXYCMUqGqC88w3NUvVXtA75JyR2Jn6jw6ZEMOD+ZA==",
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.23.0.tgz",
+      "integrity": "sha512-/AKPymGd+mJsFN43IkX+nf8J11V51bxLNYReQZmWrVx7M/FEOs2OEE6U1YIt8Y00rpOupbIeVWv5woEGja1Pug==",
      "requires": {
        "depd": "2.0.0",
        "dns-prefetch-control": "0.2.0",
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.144.1",
+  "version": "4.146.2",
  "main": "./website/server/index.js",
  "dependencies": {
    "@babel/core": "^7.10.2",
@@ -36,8 +36,8 @@
    "gulp-imagemin": "^6.2.0",
    "gulp-nodemon": "^2.5.0",
    "gulp.spritesmith": "^6.9.0",
-    "habitica-markdown": "^2.0.0",
-    "helmet": "^3.22.0",
+    "habitica-markdown": "^2.0.2",
+    "helmet": "^3.23.0",
    "image-size": "^0.8.3",
    "in-app-purchase": "^1.11.3",
    "js2xmlparser": "^4.0.1",
@@ -10,6 +10,8 @@ describe('shared.ops.unlock', () => {
  const unlockGearSetPath = 'items.gear.owned.headAccessory_special_bearEars,items.gear.owned.headAccessory_special_cactusEars,items.gear.owned.headAccessory_special_foxEars,items.gear.owned.headAccessory_special_lionEars,items.gear.owned.headAccessory_special_pandaEars,items.gear.owned.headAccessory_special_pigEars,items.gear.owned.headAccessory_special_tigerEars,items.gear.owned.headAccessory_special_wolfEars';
  const backgroundUnlockPath = 'background.giant_florals';
  const backgroundSetUnlockPath = 'background.archery_range,background.giant_florals,background.rainbows_end';
+  const hairUnlockPath = 'hair.color.rainbow,hair.color.yellow,hair.color.green,hair.color.purple,hair.color.blue,hair.color.TRUred';
+  const facialHairUnlockPath = 'hair.mustache.1,hair.mustache.2,hair.beard.1,hair.beard.2,hair.beard.3';
  const usersStartingGems = 50 / 4;

  beforeEach(() => {
@@ -206,6 +208,40 @@ describe('shared.ops.unlock', () => {
    expect(user.balance).to.equal(usersStartingGems - 1.25);
  });

+  it('unlocks a full set of hair items', () => {
+    user.purchased.hair.color = {};
+
+    const initialHairColors = Object.keys(user.purchased.hair.color).length;
+    const [, message] = unlock(user, { query: { path: hairUnlockPath } });
+
+    expect(message).to.equal(i18n.t('unlocked'));
+    const individualPaths = hairUnlockPath.split(',');
+    individualPaths.forEach(path => {
+      expect(get(user.purchased, path)).to.be.true;
+    });
+    expect(Object.keys(user.purchased.hair.color).length)
+      .to.equal(initialHairColors + individualPaths.length);
+    expect(user.balance).to.equal(usersStartingGems - 1.25);
+  });
+
+  it('unlocks the facial hair set', () => {
+    user.purchased.hair.mustache = {};
+    user.purchased.hair.beard = {};
+
+    const initialMustache = Object.keys(user.purchased.hair.mustache).length;
+    const initialBeard = Object.keys(user.purchased.hair.mustache).length;
+    const [, message] = unlock(user, { query: { path: facialHairUnlockPath } });
+
+    expect(message).to.equal(i18n.t('unlocked'));
+    const individualPaths = facialHairUnlockPath.split(',');
+    individualPaths.forEach(path => {
+      expect(get(user.purchased, path)).to.be.true;
+    });
+    expect(Object.keys(user.purchased.hair.mustache).length + Object.keys(user.purchased.hair.beard).length) // eslint-disable-line max-len
+      .to.equal(initialMustache + initialBeard + individualPaths.length);
+    expect(user.balance).to.equal(usersStartingGems - 1.25);
+  });
+
  it('unlocks a full set of gear', () => {
    const initialGear = Object.keys(user.items.gear.owned).length;
    const [, message] = unlock(user, { query: { path: unlockGearSetPath } });
@@ -246,6 +282,37 @@ describe('shared.ops.unlock', () => {
    expect(user.balance).to.equal(usersStartingGems - 0.5);
  });

+  it('unlocks an item (hair color)', () => {
+    user.purchased.hair.color = {};
+
+    const path = hairUnlockPath.split(',')[0];
+    const initialColorHair = Object.keys(user.purchased.hair.color).length;
+    const [, message] = unlock(user, { query: { path } });
+
+    expect(message).to.equal(i18n.t('unlocked'));
+    expect(Object.keys(user.purchased.hair.color).length).to.equal(initialColorHair + 1);
+    expect(get(user.purchased, path)).to.be.true;
+    expect(user.balance).to.equal(usersStartingGems - 0.5);
+  });
+
+  it('unlocks an item (facial hair)', () => {
+    user.purchased.hair.mustache = {};
+    user.purchased.hair.beard = {};
+
+    const path = facialHairUnlockPath.split(',')[0];
+    const initialMustache = Object.keys(user.purchased.hair.mustache).length;
+    const initialBeard = Object.keys(user.purchased.hair.beard).length;
+    const [, message] = unlock(user, { query: { path } });
+
+    expect(message).to.equal(i18n.t('unlocked'));
+
+    expect(Object.keys(user.purchased.hair.mustache).length).to.equal(initialMustache + 1);
+    expect(Object.keys(user.purchased.hair.beard).length).to.equal(initialBeard);
+
+    expect(get(user.purchased, path)).to.be.true;
+    expect(user.balance).to.equal(usersStartingGems - 0.5);
+  });
+
  it('unlocks an item (gear)', () => {
    const path = unlockGearSetPath.split(',')[0];
    const initialGear = Object.keys(user.items.gear.owned).length;
@@ -39,19 +39,19 @@
          }
        },
        "caniuse-lite": {
-          "version": "1.0.30001066",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
-          "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw=="
+          "version": "1.0.30001083",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001083.tgz",
+          "integrity": "sha512-CnYJ27awX4h7yj5glfK7r1TOI13LBytpLzEgfj0s4mY75/F8pnQcYjL+oVpmS38FB59+vU0gscQ9D8tc+lIXvA=="
        },
        "electron-to-chromium": {
-          "version": "1.3.455",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz",
-          "integrity": "sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA=="
+          "version": "1.3.473",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.473.tgz",
+          "integrity": "sha512-smevlzzMNz3vMz6OLeeCq5HRWEj2AcgccNPYnAx4Usx0IOciq9DU36RJcICcS09hXoY7t7deRfVYKD14IrGb9A=="
        },
        "node-releases": {
-          "version": "1.1.57",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
-          "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw=="
+          "version": "1.1.58",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+          "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
        }
      }
    },
@@ -315,19 +315,19 @@
          }
        },
        "caniuse-lite": {
-          "version": "1.0.30001066",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
-          "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw=="
+          "version": "1.0.30001083",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001083.tgz",
+          "integrity": "sha512-CnYJ27awX4h7yj5glfK7r1TOI13LBytpLzEgfj0s4mY75/F8pnQcYjL+oVpmS38FB59+vU0gscQ9D8tc+lIXvA=="
        },
        "electron-to-chromium": {
-          "version": "1.3.455",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz",
-          "integrity": "sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA=="
+          "version": "1.3.473",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.473.tgz",
+          "integrity": "sha512-smevlzzMNz3vMz6OLeeCq5HRWEj2AcgccNPYnAx4Usx0IOciq9DU36RJcICcS09hXoY7t7deRfVYKD14IrGb9A=="
        },
        "node-releases": {
-          "version": "1.1.57",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
-          "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw=="
+          "version": "1.1.58",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+          "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
        }
      }
    },
@@ -2624,9 +2624,9 @@
      }
    },
    "@soda/get-current-script": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.0.tgz",
-      "integrity": "sha512-9GvTek+7cVw7r+L7TNGOG1astZJWXz2h5q4BqMXl28KN+24iSCm1xo+RhZOZvwdT3bzNe9hD7riJc/lBoO7mgg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz",
+      "integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="
    },
    "@storybook/addon-actions": {
      "version": "5.3.19",
@@ -4727,9 +4727,9 @@
      }
    },
    "@vue/babel-preset-app": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.4.1.tgz",
-      "integrity": "sha512-VHVROEBBiW0dnuNuzlFElkncXo+zxh5Px0MZ51Th5da8UPbQodf43mnpotMnFtmCPTXAFL58tzDttu1FgrgfpQ==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.4.4.tgz",
+      "integrity": "sha512-9b74d/lz4GEc9zkF3C+vjgEXYqu9ITq1DimUT+IVRJDvhgnV+a3C+pQY4Kl4PZSOyqkTHM7jE6eG2K5DUwKpWg==",
      "requires": {
        "@babel/core": "^7.9.6",
        "@babel/helper-compilation-targets": "^7.9.6",
@@ -4791,9 +4791,9 @@
          }
        },
        "caniuse-lite": {
-          "version": "1.0.30001066",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
-          "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw=="
+          "version": "1.0.30001083",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001083.tgz",
+          "integrity": "sha512-CnYJ27awX4h7yj5glfK7r1TOI13LBytpLzEgfj0s4mY75/F8pnQcYjL+oVpmS38FB59+vU0gscQ9D8tc+lIXvA=="
        },
        "core-js-compat": {
          "version": "3.6.5",
@@ -4812,14 +4812,14 @@
          }
        },
        "electron-to-chromium": {
-          "version": "1.3.455",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz",
-          "integrity": "sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA=="
+          "version": "1.3.473",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.473.tgz",
+          "integrity": "sha512-smevlzzMNz3vMz6OLeeCq5HRWEj2AcgccNPYnAx4Usx0IOciq9DU36RJcICcS09hXoY7t7deRfVYKD14IrGb9A=="
        },
        "node-releases": {
-          "version": "1.1.57",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
-          "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw=="
+          "version": "1.1.58",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+          "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
        },
        "regenerator-runtime": {
          "version": "0.13.5",
@@ -4886,18 +4886,18 @@
      }
    },
    "@vue/cli-overlay": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.4.1.tgz",
-      "integrity": "sha512-EQqAVy7O/qqGOfSYIGL073FWlr/s6QFA0wA1wY8pHnTS5WPwAiHT+D+xe+fgXKZ3KeL7v7u/le7YFIEVXFVXOg=="
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.4.4.tgz",
+      "integrity": "sha512-cTvtifIpsSVF2dPF+ibUoAq+hMkEbg4EYTsf6dUuUrBKi1G2tyZ3Pnx54U2NpqXjJMykqMGX+i+BxpIG5tJCGw=="
    },
    "@vue/cli-plugin-babel": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.1.tgz",
-      "integrity": "sha512-dmhymfm2UnZDw13k/zKT6YIj7je53mE37Y+jEJxpRUlCKFmZUDuYkJ8i5HmO0SnaCnEGqNELaBkoIFnY3aE2Gw==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.4.tgz",
+      "integrity": "sha512-VctlKy5oEYhI+AiPpzlorjDmuhbpoRQcKXpBdf2bXvq0+uuTQg7UXmPX0RKJejnFTKSJZvuPTihgfCWiyh9C3Q==",
      "requires": {
        "@babel/core": "^7.9.6",
-        "@vue/babel-preset-app": "^4.4.1",
-        "@vue/cli-shared-utils": "^4.4.1",
+        "@vue/babel-preset-app": "^4.4.4",
+        "@vue/cli-shared-utils": "^4.4.4",
        "babel-loader": "^8.1.0",
        "cache-loader": "^4.1.0",
        "thread-loader": "^2.1.3",
@@ -4905,9 +4905,9 @@
      },
      "dependencies": {
        "@vue/cli-shared-utils": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz",
-          "integrity": "sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==",
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz",
+          "integrity": "sha512-ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA==",
          "requires": {
            "@hapi/joi": "^15.0.1",
            "chalk": "^2.4.2",
@@ -4945,11 +4945,11 @@
      }
    },
    "@vue/cli-plugin-eslint": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.1.tgz",
-      "integrity": "sha512-T+9+q44iajQEbe59z6Io3otFOsWnPOEVU+/hrDyC6aOToJbQo6P4VacByDDcuGYENAjAd8ENLSt18TaPNSIyRw==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.4.tgz",
+      "integrity": "sha512-B+l3smq3Lyob9qiuywC/IymCCyV2Gm/l1ZtxRzQI98RDTKei1PrRriIi3Hrg/AkK59HirwR7P7wiNhF2Pqg3VA==",
      "requires": {
-        "@vue/cli-shared-utils": "^4.4.1",
+        "@vue/cli-shared-utils": "^4.4.4",
        "eslint-loader": "^2.2.1",
        "globby": "^9.2.0",
        "inquirer": "^7.1.0",
@@ -4957,26 +4957,6 @@
        "yorkie": "^2.0.0"
      },
      "dependencies": {
-        "@vue/cli-shared-utils": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz",
-          "integrity": "sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==",
-          "requires": {
-            "@hapi/joi": "^15.0.1",
-            "chalk": "^2.4.2",
-            "execa": "^1.0.0",
-            "launch-editor": "^2.2.1",
-            "lru-cache": "^5.1.1",
-            "node-ipc": "^9.1.1",
-            "open": "^6.3.0",
-            "ora": "^3.4.0",
-            "read-pkg": "^5.1.1",
-            "request": "^2.88.2",
-            "request-promise-native": "^1.0.8",
-            "semver": "^6.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
        "ansi-regex": {
          "version": "5.0.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -4991,6 +4971,15 @@
            "color-convert": "^2.0.1"
          }
        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
        "cli-cursor": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -5023,9 +5012,9 @@
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
        },
        "inquirer": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-          "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz",
+          "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==",
          "requires": {
            "ansi-escapes": "^4.2.1",
            "chalk": "^3.0.0",
@@ -5040,17 +5029,6 @@
            "string-width": "^4.1.0",
            "strip-ansi": "^6.0.0",
            "through": "^2.3.6"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-              "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            }
          }
        },
        "is-fullwidth-code-point": {
@@ -5085,11 +5063,6 @@
          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
          "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
        "string-width": {
          "version": "4.2.0",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -5119,17 +5092,17 @@
      }
    },
    "@vue/cli-plugin-router": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.4.1.tgz",
-      "integrity": "sha512-kCSsJG7pjDvCJDjGtcCI5l0UjmqwNigOR41RkeGSjSUvzV4ArSniXjFqrOmtpMp36S5xCtwtt9MFm/K4fCubkQ==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.4.4.tgz",
+      "integrity": "sha512-jZTupo+zFz1YHH3Q4WC5nJW5wlNEDqX//m+atwUISPahVEG6/EV8HwJnQDT7EQ9re4v78xI27eOtyNw+qSyiSA==",
      "requires": {
-        "@vue/cli-shared-utils": "^4.4.1"
+        "@vue/cli-shared-utils": "^4.4.4"
      },
      "dependencies": {
        "@vue/cli-shared-utils": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz",
-          "integrity": "sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==",
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz",
+          "integrity": "sha512-ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA==",
          "requires": {
            "@hapi/joi": "^15.0.1",
            "chalk": "^2.4.2",
@@ -5167,11 +5140,11 @@
      }
    },
    "@vue/cli-plugin-unit-mocha": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-4.4.1.tgz",
-      "integrity": "sha512-LNX7a6zuFncJvopQFmikkGs5SAmx4iYsfBZNmQUx1iORyAW87IrOf69FJQ+bRTAen7NMi4USNaEwiCxcTha4xg==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-4.4.4.tgz",
+      "integrity": "sha512-U+MZp0XYQUZcrkWE2g+CqPk6vA7qguCfCTr7bxhNMrhJSAdML4D3sTJN6+aoCNYs8+jNfyPfTkrKI4Ad6D/cRg==",
      "requires": {
-        "@vue/cli-shared-utils": "^4.4.1",
+        "@vue/cli-shared-utils": "^4.4.4",
        "jsdom": "^15.2.1",
        "jsdom-global": "^3.0.2",
        "mocha": "^6.2.2",
@@ -5179,9 +5152,9 @@
      },
      "dependencies": {
        "@vue/cli-shared-utils": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz",
-          "integrity": "sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==",
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz",
+          "integrity": "sha512-ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA==",
          "requires": {
            "@hapi/joi": "^15.0.1",
            "chalk": "^2.4.2",
@@ -5219,22 +5192,22 @@
      }
    },
    "@vue/cli-plugin-vuex": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.1.tgz",
-      "integrity": "sha512-FtOFsDP0qznwVaCz0BZmTzUm5vhHSJzX2/XD3L5dLTkrNxyDEbZmbKoX0n1OzBcQwZC7dkJZP2tdoCQx0mX//g=="
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.4.tgz",
+      "integrity": "sha512-A2SZD0B5yPz60W7go2ZYTIHooQse7bhhNUlinGQrdYeQCuURKUqqUbl/zF8u/8Qqo6nZ4F469fHNH6XWRN9Nnw=="
    },
    "@vue/cli-service": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.4.1.tgz",
-      "integrity": "sha512-DVV0zr5Sw7pzdm3z3PRrfqihLgoJP/d9AgNFcSSQF/J9Gtvjf1t0PTJJFeLANHSL3kDWte+3kjc22sXayu0BJQ==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.4.4.tgz",
+      "integrity": "sha512-AKWpBpBAB+LHJ8JpArM2BJ0I2REy9lG7xIkJn9k3Vw9gadejx+y74P0bJh/J8hY65kDTFltO1BW1Kv3URw/ifQ==",
      "requires": {
        "@intervolga/optimize-cssnano-plugin": "^1.0.5",
        "@soda/friendly-errors-webpack-plugin": "^1.7.1",
        "@soda/get-current-script": "^1.0.0",
-        "@vue/cli-overlay": "^4.4.1",
-        "@vue/cli-plugin-router": "^4.4.1",
-        "@vue/cli-plugin-vuex": "^4.4.1",
-        "@vue/cli-shared-utils": "^4.4.1",
+        "@vue/cli-overlay": "^4.4.4",
+        "@vue/cli-plugin-router": "^4.4.4",
+        "@vue/cli-plugin-vuex": "^4.4.4",
+        "@vue/cli-shared-utils": "^4.4.4",
        "@vue/component-compiler-utils": "^3.1.2",
        "@vue/preload-webpack-plugin": "^1.1.0",
        "@vue/web-component-wrapper": "^1.2.0",
@@ -5282,10 +5255,18 @@
        "webpack-merge": "^4.2.2"
      },
      "dependencies": {
+        "@vue/cli-plugin-router": {
+          "version": "4.4.4",
+          "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.4.4.tgz",
+          "integrity": "sha512-jZTupo+zFz1YHH3Q4WC5nJW5wlNEDqX//m+atwUISPahVEG6/EV8HwJnQDT7EQ9re4v78xI27eOtyNw+qSyiSA==",
+          "requires": {
+            "@vue/cli-shared-utils": "^4.4.4"
+          }
+        },
        "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
        },
        "acorn-walk": {
          "version": "7.1.1",
@@ -5329,9 +5310,9 @@
          }
        },
        "caniuse-lite": {
-          "version": "1.0.30001066",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
-          "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw=="
+          "version": "1.0.30001084",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz",
+          "integrity": "sha512-ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w=="
        },
        "cliui": {
          "version": "6.0.0",
@@ -5357,29 +5338,29 @@
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
        },
        "css-loader": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
-          "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
+          "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
          "requires": {
            "camelcase": "^5.3.1",
            "cssesc": "^3.0.0",
            "icss-utils": "^4.1.1",
            "loader-utils": "^1.2.3",
            "normalize-path": "^3.0.0",
-            "postcss": "^7.0.27",
+            "postcss": "^7.0.32",
            "postcss-modules-extract-imports": "^2.0.0",
            "postcss-modules-local-by-default": "^3.0.2",
            "postcss-modules-scope": "^2.2.0",
            "postcss-modules-values": "^3.0.0",
-            "postcss-value-parser": "^4.0.3",
-            "schema-utils": "^2.6.6",
+            "postcss-value-parser": "^4.1.0",
+            "schema-utils": "^2.7.0",
            "semver": "^6.3.0"
          }
        },
        "electron-to-chromium": {
-          "version": "1.3.455",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.455.tgz",
-          "integrity": "sha512-4lwnxp+ArqOX9hiLwLpwhfqvwzUHFuDgLz4NTiU3lhygUzWtocIJ/5Vix+mWVNE2HQ9aI1k2ncGe5H/0OktMvA=="
+          "version": "1.3.474",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.474.tgz",
+          "integrity": "sha512-fPkSgT9IBKmVJz02XioNsIpg0WYmkPrvU1lUJblMMJALxyE7/32NGvbJQKKxpNokozPvqfqkuUqVClYsvetcLw=="
        },
        "emoji-regex": {
          "version": "8.0.0",
@@ -5387,9 +5368,9 @@
          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
        },
        "fast-deep-equal": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
        },
        "is-fullwidth-code-point": {
          "version": "3.0.0",
@@ -5402,9 +5383,9 @@
          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
        },
        "node-releases": {
-          "version": "1.1.57",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
-          "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw=="
+          "version": "1.1.58",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+          "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="
        },
        "pnp-webpack-plugin": {
          "version": "1.6.4",
@@ -5415,9 +5396,9 @@
          }
        },
        "postcss": {
-          "version": "7.0.31",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
-          "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+          "version": "7.0.32",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+          "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
          "requires": {
            "chalk": "^2.4.2",
            "source-map": "^0.6.1",
@@ -5501,9 +5482,9 @@
      }
    },
    "@vue/cli-shared-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz",
-      "integrity": "sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz",
+      "integrity": "sha512-ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA==",
      "requires": {
        "@hapi/joi": "^15.0.1",
        "chalk": "^2.4.2",
@@ -6664,9 +6645,9 @@
          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
        },
        "fast-deep-equal": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
        },
        "json5": {
          "version": "1.0.1",
@@ -9632,9 +9613,9 @@
      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
    },
    "escodegen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
-      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
+      "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
      "requires": {
        "esprima": "^4.0.1",
        "estraverse": "^4.2.0",
@@ -11562,9 +11543,9 @@
      }
    },
    "habitica-markdown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-2.0.0.tgz",
-      "integrity": "sha512-70Kl/d7v1d2Rz6TFkQQ9hYcBYGAHnIPbRgS3PrW/dD/GGpN42q6gT3sCLsIpLqEXbN0EWjVscGs2qKWYLc6BMQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/habitica-markdown/-/habitica-markdown-2.0.2.tgz",
+      "integrity": "sha512-GGzWuDKbFBMI+GqmQnSPUD5Zi/WPZDDuC2dC2La6uvu1zVNW7uHyQG0lxwCO43t5EdYXtOoOPin1rhhLdTuZfA==",
      "requires": {
        "habitica-markdown-emoji": "1.2.4",
        "markdown-it": "10.0.0",
@@ -12994,9 +12975,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
        },
        "tough-cookie": {
          "version": "3.0.1",
@@ -14486,21 +14467,21 @@
      },
      "dependencies": {
        "es-abstract": {
-          "version": "1.17.5",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "version": "1.17.6",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
          "requires": {
            "es-to-primitive": "^1.2.1",
            "function-bind": "^1.1.1",
            "has": "^1.0.3",
            "has-symbols": "^1.0.1",
-            "is-callable": "^1.1.5",
-            "is-regex": "^1.0.5",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
            "object-inspect": "^1.7.0",
            "object-keys": "^1.1.1",
            "object.assign": "^4.1.0",
-            "string.prototype.trimleft": "^2.1.1",
-            "string.prototype.trimright": "^2.1.1"
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
          }
        },
        "es-to-primitive": {
@@ -14519,42 +14500,22 @@
          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
        },
        "is-callable": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
        },
        "is-regex": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
          "requires": {
-            "has": "^1.0.3"
+            "has-symbols": "^1.0.1"
          }
        },
        "object-inspect": {
          "version": "1.7.0",
          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
-        },
-        "string.prototype.trimleft": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-          "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.5",
-            "string.prototype.trimstart": "^1.0.0"
-          }
-        },
-        "string.prototype.trimright": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-          "requires": {
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.17.5",
-            "string.prototype.trimend": "^1.0.0"
-          }
        }
      }
    },
@@ -15233,9 +15194,9 @@
      },
      "dependencies": {
        "postcss": {
-          "version": "7.0.31",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
-          "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+          "version": "7.0.32",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+          "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
          "requires": {
            "chalk": "^2.4.2",
            "source-map": "^0.6.1",
@@ -19754,9 +19715,9 @@
      }
    },
    "vue-router": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.2.tgz",
-      "integrity": "sha512-5sEbcfb7MW8mY8lbUVbF4kgcipGXsagkM/X+pb6n0MhjP+RorWIUTPAPSqgPaiPOxVCXgAItBl8Vwz8vq78faA=="
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
+      "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
    },
    "vue-style-loader": {
      "version": "4.1.2",
@@ -19944,9 +19905,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
        },
        "acorn-walk": {
          "version": "7.1.1",
@@ -18,11 +18,11 @@
    "@storybook/addon-links": "^5.3.19",
    "@storybook/addon-notes": "^5.3.19",
    "@storybook/vue": "^5.3.19",
-    "@vue/cli-plugin-babel": "^4.4.1",
-    "@vue/cli-plugin-eslint": "^4.4.1",
-    "@vue/cli-plugin-router": "^4.4.1",
-    "@vue/cli-plugin-unit-mocha": "^4.4.1",
-    "@vue/cli-service": "^4.4.1",
+    "@vue/cli-plugin-babel": "^4.4.4",
+    "@vue/cli-plugin-eslint": "^4.4.4",
+    "@vue/cli-plugin-router": "^4.4.4",
+    "@vue/cli-plugin-unit-mocha": "^4.4.4",
+    "@vue/cli-service": "^4.4.4",
    "@vue/test-utils": "1.0.0-beta.29",
    "amplitude-js": "^5.11.0",
    "axios": "^0.19.2",
@@ -36,7 +36,7 @@
    "eslint-config-habitrpg": "^6.2.0",
    "eslint-plugin-mocha": "^5.3.0",
    "eslint-plugin-vue": "^6.2.2",
-    "habitica-markdown": "^2.0.0",
+    "habitica-markdown": "^2.0.2",
    "hellojs": "^1.18.4",
    "inspectpack": "^4.5.2",
    "intro.js": "^2.9.3",
@@ -56,7 +56,7 @@
    "vue": "^2.6.11",
    "vue-cli-plugin-storybook": "^0.6.1",
    "vue-mugen-scroll": "^0.2.6",
-    "vue-router": "^3.3.2",
+    "vue-router": "^3.3.4",
    "vue-template-compiler": "^2.6.11",
    "vuedraggable": "^2.23.2",
    "vuejs-datepicker": "git://github.com/habitrpg/vuejs-datepicker.git#5d237615463a84a23dd6f3f77c6ab577d68593ec",
@@ -742,5 +742,6 @@ export default {
 <style src="@/assets/css/sprites/spritesmith-main-25.css"></style>
 <style src="@/assets/css/sprites/spritesmith-main-26.css"></style>
 <style src="@/assets/css/sprites/spritesmith-main-27.css"></style>
+<style src="@/assets/css/sprites/spritesmith-main-28.css"></style>
 <style src="@/assets/css/sprites.css"></style>
 <style src="smartbanner.js/dist/smartbanner.min.css"></style>
@@ -1,24 +1,48 @@
 .promo_armoire_backgrounds_202006 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -259px 0px;
+  background-position: -259px -386px;
  width: 423px;
  height: 147px;
 }
 .promo_mystery_202006 {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -259px;
+  background-position: -785px -148px;
  width: 282px;
  height: 147px;
 }
+.promo_sand_sculpture_potions {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -785px 0px;
+  width: 423px;
+  height: 147px;
+}
+.promo_summer_splash_2019 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -199px;
+  width: 408px;
+  height: 186px;
+}
+.promo_summer_splash_2020 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 444px;
+  height: 198px;
+}
 .promo_take_this {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -259px -148px;
+  background-position: -1068px -148px;
  width: 96px;
  height: 69px;
 }
+.scene_achievement {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -445px 0px;
+  width: 339px;
+  height: 210px;
+}
 .scene_hiking {
  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: 0px -386px;
  width: 258px;
  height: 258px;
 }
@@ -1,120 +1,174 @@
-.quest_bunny {
+.quest_atom1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1546px;
-  width: 210px;
-  height: 186px;
+  background-position: -1082px -1332px;
+  width: 250px;
+  height: 150px;
 }
-.quest_butterfly {
+.quest_atom2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -660px;
-  width: 219px;
-  height: 219px;
+  background-position: -642px -1534px;
+  width: 207px;
+  height: 138px;
 }
-.quest_cheetah {
+.quest_atom3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -211px -1534px;
+  width: 216px;
+  height: 180px;
+}
+.quest_axolotl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
  background-position: -440px 0px;
  width: 219px;
  height: 219px;
 }
-.quest_cow {
+.quest_badger {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px 0px;
-  width: 174px;
-  height: 213px;
-}
-.quest_dilatory {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -232px;
+  background-position: 0px -232px;
  width: 219px;
  height: 219px;
 }
-.quest_dilatoryDistress1 {
+.quest_basilist {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -222px -1332px;
+  background-position: -191px -1721px;
+  width: 189px;
+  height: 141px;
+}
+.quest_beetle {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: 0px -1332px;
+  width: 204px;
+  height: 201px;
+}
+.quest_bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -660px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_bunny {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: 0px -1534px;
  width: 210px;
-  height: 210px;
+  height: 186px;
 }
-.quest_dilatoryDistress2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px -422px;
-  width: 150px;
-  height: 150px;
-}
-.quest_dilatoryDistress3 {
+.quest_butterfly {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
  background-position: 0px -452px;
  width: 219px;
  height: 219px;
 }
-.quest_dilatory_derby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_dolphin {
+.quest_cheetah {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
  background-position: -220px -452px;
  width: 219px;
  height: 219px;
 }
-.quest_dustbunnies {
+.quest_cow {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -452px;
+  background-position: -1762px 0px;
+  width: 174px;
+  height: 213px;
+}
+.quest_dilatory {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -880px 0px;
  width: 219px;
  height: 219px;
 }
-.quest_egg {
+.quest_dilatoryDistress1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px -214px;
-  width: 165px;
-  height: 207px;
+  background-position: -1540px -1082px;
+  width: 210px;
+  height: 210px;
 }
-.quest_evilsanta {
+.quest_dilatoryDistress2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px -875px;
-  width: 118px;
-  height: 131px;
+  background-position: -1762px -422px;
+  width: 150px;
+  height: 150px;
 }
-.quest_evilsanta2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_falcon {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -440px;
-  width: 219px;
-  height: 219px;
-}
-.quest_ferret {
+.quest_dilatoryDistress3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
  background-position: 0px -672px;
  width: 219px;
  height: 219px;
 }
-.quest_frog {
+.quest_dilatory_derby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1332px;
-  width: 221px;
-  height: 213px;
+  background-position: -660px -452px;
+  width: 219px;
+  height: 219px;
 }
-.quest_ghost_stag {
+.quest_dolphin {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -220px -672px;
+  width: 219px;
+  height: 219px;
+}
+.quest_dustbunnies {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
  background-position: -440px -672px;
  width: 219px;
  height: 219px;
 }
+.quest_egg {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1762px -214px;
+  width: 165px;
+  height: 207px;
+}
+.quest_evilsanta {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1762px -724px;
+  width: 118px;
+  height: 131px;
+}
+.quest_evilsanta2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1100px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_falcon {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1100px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_ferret {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1100px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1100px -660px;
+  width: 219px;
+  height: 219px;
+}
+.quest_frog {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1540px 0px;
+  width: 221px;
+  height: 213px;
+}
+.quest_ghost_stag {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -220px -892px;
+  width: 219px;
+  height: 219px;
+}
 .quest_goldenknight1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -672px;
+  background-position: -440px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -462px -1546px;
+  background-position: -1333px -1332px;
  width: 250px;
  height: 150px;
 }
@@ -126,271 +180,217 @@
 }
 .quest_gryphon {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -876px -1332px;
+  background-position: -648px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -440px;
+  background-position: -1320px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -660px;
+  background-position: -1320px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_hedgehog {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -433px -1332px;
+  background-position: -205px -1332px;
  width: 219px;
  height: 186px;
 }
 .quest_hippo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -892px;
+  background-position: -1320px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_horse {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -892px;
+  background-position: -1320px -880px;
  width: 219px;
  height: 219px;
 }
 .quest_kangaroo {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -892px;
+  background-position: 0px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1093px -1332px;
+  background-position: -865px -1332px;
  width: 216px;
  height: 177px;
 }
 .quest_lostMasterclasser1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -892px;
+  background-position: -440px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px 0px;
+  background-position: -660px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_lostMasterclasser3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -220px;
+  background-position: -880px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px -724px;
+  background-position: -1762px -573px;
  width: 150px;
  height: 150px;
 }
 .quest_mayhemMistiflying2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px 0px;
+  background-position: -1320px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_mayhemMistiflying3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -880px;
+  background-position: -220px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_monkey {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1112px;
+  background-position: -1100px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moon1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -437px;
+  background-position: -1540px -648px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -1112px;
+  background-position: -880px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -1112px;
+  background-position: -880px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -1112px;
+  background-position: -440px -232px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -1112px;
+  background-position: -880px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -1112px;
+  background-position: -1100px -1112px;
  width: 219px;
  height: 219px;
 }
 .quest_nudibranch {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -871px;
+  background-position: -1540px -214px;
  width: 216px;
  height: 216px;
 }
 .quest_octopus {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -653px -1332px;
+  background-position: -425px -1332px;
  width: 222px;
  height: 177px;
 }
 .quest_owl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px 0px;
+  background-position: -1320px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -220px;
+  background-position: -1540px -431px;
  width: 216px;
  height: 216px;
 }
 .quest_penguin {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1733px;
+  background-position: 0px -1721px;
  width: 190px;
  height: 183px;
 }
 .quest_pterodactyl {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -1112px;
+  background-position: -660px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_rat {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -440px;
+  background-position: -880px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_robot {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -892px;
+  background-position: -660px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -654px;
+  background-position: -1540px -865px;
  width: 216px;
  height: 216px;
 }
 .quest_rooster {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1527px -1332px;
+  background-position: -428px -1534px;
  width: 213px;
  height: 174px;
 }
 .quest_ruby {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -892px;
+  background-position: -440px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_sabretooth {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -220px;
+  background-position: -660px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_seaserpent {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -672px;
+  background-position: -220px -232px;
  width: 219px;
  height: 219px;
 }
 .quest_sheep {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -672px;
+  background-position: 0px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_silver {
  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_slime {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -452px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sloth {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_snail {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -1088px;
-  width: 219px;
-  height: 213px;
-}
-.quest_snake {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1310px -1332px;
-  width: 216px;
-  height: 177px;
-}
-.quest_spider {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -211px -1546px;
-  width: 250px;
-  height: 150px;
-}
-.quest_squirrel {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity1 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1760px -573px;
-  width: 150px;
-  height: 150px;
-}
-.quest_stoikalmCalamity2 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stoikalmCalamity3 {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px 0px;
+  background-position: -220px 0px;
  width: 219px;
  height: 219px;
 }
@@ -0,0 +1,348 @@
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -300px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -151px -300px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Aurora {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -220px -300px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -289px -300px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_BirchBark {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -69px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -138px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -207px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -414px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -345px -400px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -479px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -69px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -138px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -207px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -276px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -345px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -414px -469px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_SandSculpture {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -548px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -69px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -138px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -207px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -276px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -345px -538px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -276px -400px;
+  width: 68px;
+  height: 68px;
+}
@@ -1,92 +1,193 @@
-@mixin btn-focus-hover-shadow () {
-  box-shadow: 0 4px 4px 0 rgba($black, 0.16), 0 1px 8px 0 rgba($black, 0.12);
-}
-
 .btn {
  cursor: pointer;
-  font-family: 'Roboto Condensed', sans-serif;
-  font-size: 16px;
+  font-family: 'Roboto', sans-serif;
+  font-size: 14px;
  font-weight: bold;
-  line-height: 1.5;
-  border: 1px solid transparent !important;
-  padding: 7.5px 15.5px;
+  line-height: 1.71;
+  border: 1px solid transparent;
+  padding: 0.25rem 1rem;
  border-radius: 2px;
-  box-shadow: 0 2px 2px 0 rgba($black, 0.16), 0 1px 4px 0 rgba($black, 0.12);
+  box-shadow: 0 1px 3px 0 rgba($black, 0.12), 0 1px 2px 0 rgba($black, 0.24);
  color: $white;

-  &:focus:not(.btn-flat) {
-    outline: none;
+  &:hover, &:focus {
+    box-shadow: 0 3px 6px 0 rgba($black, 0.16), 0 3px 6px 0 rgba($black, 0.24);
+
+    &:disabled, &.disabled, &.btn-flat {
+      box-shadow: none;
+    }
+  }
+
+  &:focus {
    border-color: $purple-400;
-    @include btn-focus-hover-shadow();
  }

-  &:hover:not(.btn-flat):not(.disabled):not(:disabled) {
-    @include btn-focus-hover-shadow();
-    border-color: transparent;
+  &:active, &.active:not(.btn-flat), &:disabled, &.disabled {
+    box-shadow: none;
  }

-  &:active:not(.btn-flat), &.active:not(.btn-flat) {
-    box-shadow: none !important;
-    border: 1px solid transparent;
+  &:disabled, &.disabled {
+    cursor: default;
+    opacity: 0.75;
  }
 }

-.btn-warning:hover, .btn-warning:focus, .btn-warning:active {
-  color: $white !important;
-}
-
-.btn:disabled, .btn.disabled {
-  box-shadow: none;
-  cursor: default;
-  opacity: 0.64;
-  border-color: transparent;
+.btn-front {
+  font-size: 16px;
+  line-height: 1.5;
+  padding: 7.5px 15.5px;
 }

 .btn-primary {
  background: $purple-200;
+  border: 1px solid transparent;

-  &:disabled {
+  &:hover:not(:disabled):not(.disabled) {
+    background: #5d3b9c;
+    border: 1px solid transparent;
+  }
+
+  &:focus {
    background: $purple-200;
+    border-color: $purple-400;
  }

-  &:hover:not(:disabled):not(.disabled), &:active:not(:disabled):not(.disabled), &.active:not(:disabled):not(.disabled), &:focus:not(:disabled):not(.disabled) {
-    background: #5d3b9c !important;
-    color: $white;
-  }
-}
-
-.btn-secondary, .dropdown > .btn-secondary {
-  color: $gray-50;
-  background: $white !important;
-
-  &:hover:not(:disabled):not(.disabled), &:active:not(:disabled):not(.disabled), &.active:not(:disabled):not(.disabled), &:focus:not(:disabled):not(.disabled) {
-    color: $purple-200 !important;
+  &:not(:disabled):not(.disabled):active:focus, &:not(:disabled):not(.disabled).active:focus {
+    box-shadow: none;
+    border-color: $purple-400;
  }

-  &:active, &:focus, &.active {
-    border-color: $purple-500 !important;
+  &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active {
+    background: $purple-200;
+    border: 1px solid transparent;
  }

  &:disabled, &.disabled {
-    background: $gray-500 !important;
-    color: $gray-100 !important;
+    background: $purple-200;
+    border: 1px solid transparent;
+    cursor: default;
+    opacity: 0.75;
+  }
+}
+
+.btn-secondary,
+.dropdown > .btn-secondary.dropdown-toggle:not(.btn-success),
+.show > .btn-secondary.dropdown-toggle:not(.btn-success)
+{
+  background: $white;
+  border: 1px solid transparent;
+  color: $gray-50;
+
+  &:focus, &:active {
+    color: $gray-50;
+    background: $white;
+    border-color: $purple-400;
+  }
+
+  &:not(:disabled):not(.disabled) {
+    &:active:focus,
+    &.active:focus {
+      color: $purple-300;
+      box-shadow: none;
+      border-color: $purple-400;
+    }
+
+    &:active,
+    &.active {
+      color: $purple-300;
+
+      &.dropdown-toggle {
+        color: $gray-50;
+      }
+
+
+      background: $white;
+      border: 1px solid transparent;
+    }
+
+    &:hover {
+      color: $purple-300;
+
+      &.dropdown-toggle {
+        color: $gray-50;
+      }
+
+      background: $white !important;
+      border: 1px solid transparent;
+    }
+  }
+
+  &:disabled, &.disabled {
+    color: $gray-50;
+    background: $white;
+    border: 1px solid transparent;
+    cursor: default;
+    opacity: 0.75;
+  }
+}
+
+.btn-danger {
+  background: $maroon-100;
+  border: 1px solid transparent;
+
+  &:hover:not(:disabled):not(.disabled) {
+    background: #e14e4e;
+    border: 1px solid transparent;
+  }
+
+  &:focus {
+    background: $maroon-100;
+    border-color: $purple-400;
+  }
+
+  &:not(:disabled):not(.disabled):active:focus, &:not(:disabled):not(.disabled).active:focus {
+    box-shadow: none;
+    border-color: $purple-400;
+  }
+
+  &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active {
+    background: $maroon-100;
+    border: 1px solid transparent;
+  }
+
+  &:disabled, &.disabled {
+    background: $maroon-100;
+    border: 1px solid transparent;
+    cursor: default;
+    opacity: 0.75;
  }
 }

 .btn-success {
-  background: $green-100;
-
-  &:disabled {
-    background: $green-100;
-  }
-
-  &:hover:not(:disabled):not(.disabled), &:active:not(:disabled):not(.disabled), &.active:not(:disabled):not(.disabled) {
-    background: $green-50;
-  }
-}
-
-.show > .btn-success.dropdown-toggle {
  background: $green-50;
+  border: 1px solid transparent;
+
+  &:hover:not(:disabled):not(.disabled) {
+    background: #32bd8a;
+    border: 1px solid transparent;
+  }
+
+  &:focus {
+    background: $green-50;
+    border-color: $purple-400;
+  }
+
+  &:not(:disabled):not(.disabled):active:focus, &:not(:disabled):not(.disabled).active:focus {
+    box-shadow: none;
+    border-color: $purple-400;
+  }
+
+  &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active {
+    background: $green-50;
+    border: 1px solid transparent;
+  }
+
+  &:disabled, &.disabled {
+    background: $green-50;
+    border: 1px solid transparent;
+    cursor: default;
+    opacity: 0.75;
+  }
 }

 .btn-info {
@@ -105,22 +206,6 @@
  }
 }

-.btn-danger {
-  background: $red-50;
-
-  &:disabled {
-    background: $red-50;
-  }
-
-  &:hover:not(:disabled):not(.disabled) {
-    background: $red-100;
-  }
-
-  &:active:not(:disabled):not(.disabled), &.active:not(:disabled):not(.disabled) {
-    background: $red-100;
-  }
-}
-
 .btn-show-more {
  display: block;
  width: 50%;
@@ -1,34 +1,56 @@
+@mixin habit-controls($disabled-color, $active-color) {
+  &-habit-control-disabled {
+    .habit-option-button {
+      border: 2px solid $disabled-color;
+    }
+    &:hover {
+      .habit-option-button {
+        border: 2px solid $active-color;
+      }
+      .habit-option-icon, .habit-option-label { color: $active-color !important; }
+    }
+  }
+}
+
+@mixin modal-text-input($color) {
+  &-text::placeholder { color: $color !important; }
+  &-input {
+    border: 0 !important;
+
+    &:focus, &:active {
+      box-shadow: 0 0 0 1px $color !important;
+    }
+  }
+}
+
 .task {
  &-worst { // dark red
    &-control {
      &-bg {
        background: $maroon-100 !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $maroon-100 !important;
-      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: $maroon-500 !important; }
-      &-checkbox { color: $maroon-100 !important; }
-      &-icon { color: #6c0406 !important; }
+      &-bg-noninteractive { background: $maroon-100 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($red-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $red-1 !important; }
    }

    &-modal {
      &-bg { background: $maroon-100 !important; }
      &-icon { color: $maroon-100 !important; }
-      &-text { color: $maroon-50 !important; }
+      &-text { color: $red-1 !important; }
+      &-content {
+        --svg-color: #{$maroon-100};
+      }
+      @include modal-text-input($red-1);
      &-option-disabled:hover {
        .svg-icon { color: $maroon-100 !important; }
        .option-item-label { color: $maroon-50 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $maroon-100 !important; }
-        .option-item-label { color: $maroon-50 !important; }
-      }
+      @include habit-controls($gray-300, $maroon-100);
    }
  }

@@ -36,32 +58,30 @@
    &-control {
      &-bg {
        background: $red-100 !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $red-100 !important;
-      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: $red-500 !important; }
-      &-checkbox { color: $red-100 !important; }
-      &-icon { color: #6c0406 !important; }
+      &-bg-noninteractive { background: $red-100 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($red-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $red-1 !important; }
    }

    &-modal {
      &-bg { background: $red-100 !important; }
      &-icon { color: $red-100 !important; }
-      &-text { color: $red-10 !important; }
+      &-text { color: $red-1 !important; }
+      &-content {
+        --svg-color: #{$red-100};
+      }
+      @include modal-text-input($red-1);
      &-option-disabled:hover {
        .svg-icon { color: $red-100 !important; }
        .option-item-label { color: $red-10 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $red-100 !important; }
-        .option-item-label { color: $red-10 !important; }
-      }
+
+      @include habit-controls($gray-300, $red-100);
    }
  }

@@ -69,43 +89,30 @@
    &-control {
      &-bg {
        background: $orange-100 !important;
-
-        &:hover {
-          .habit-control { background: #b75a1c !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($orange-1, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $orange-100 !important;
-      }
-      &-inner-habit { background: rgba(183, 90, 28, 0.4) !important; }
-      &-inner-daily-todo { background: $orange-500 !important; }
-      &-checkbox { color: $orange-100 !important; }
-      &-icon { color: #7f3300 !important; }
+      &-bg-noninteractive { background: $orange-100 !important; }
+      &-inner-habit { background: rgba($orange-1, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($orange-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $orange-1 !important; }
    }

    &-modal {
-      &-bg {
-        background: $orange-100 !important;
-
-        .form-control {
-          background: rgba(183, 90, 28, 0.4) !important;
-
-          &:focus, &:active, &:hover {
-            background-color: #b75a1c !important;
-          }
-        }
-      }
+      &-bg { background: $orange-100 !important; }
      &-icon { color: $orange-100 !important; }
-      &-text { color: #b75a1c !important; }
+      &-text { color: $orange-1 !important; }
+      &-content {
+        --svg-color: #{$orange-100};
+      }
+      @include modal-text-input($orange-1);
      &-option-disabled:hover {
        .svg-icon { color: $orange-100 !important; }
-        .option-item-label { color: #b75a1c !important; }
-      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $orange-100 !important; }
-        .option-item-label { color: #b75a1c !important; }
+        .option-item-label { color: $orange-1 !important; }
      }
+
+      @include habit-controls($gray-300, $orange-100);
    }
  }

@@ -113,42 +120,30 @@
    &-control {
      &-bg {
        background: $yellow-100 !important;
-        &:hover {
-          .habit-control { background: #bf7d1a !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($yellow-1, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $yellow-100 !important;
-      }
-      &-inner-habit { background: rgba(183, 90, 28, 0.32) !important; }
-      &-inner-daily-todo { background: $yellow-500 !important; }
-      &-checkbox { color: $yellow-100 !important; }
-      &-icon { color: #794b00 !important; }
+      &-bg-noninteractive { background: $yellow-100 !important; }
+      &-inner-habit { background: rgba($yellow-1, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($yellow-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $yellow-1 !important; }
    }

    &-modal {
-      &-bg {
-        background: $yellow-100 !important;
-
-        .form-control {
-          background: rgba(183, 90, 28, 0.4) !important;
-
-          &:focus, &:active, &:hover {
-            background-color: #bf7d1a !important;
-          }
-        }
-      }
+      &-bg { background: $yellow-100 !important; }
      &-icon { color: $yellow-100 !important; }
-      &-text { color: #bf7d1a !important; }
+      &-text { color: $yellow-1 !important; }
+      @include modal-text-input($yellow-1);
      &-option-disabled:hover {
        .svg-icon { color: $yellow-100 !important; }
        .option-item-label { color: #bf7d1a !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $yellow-100 !important; }
-        .option-item-label { color: #bf7d1a !important; }
+      &-content {
+        --svg-color: #{$yellow-100};
      }
+
+      @include habit-controls($gray-300, $yellow-100);
    }
  }

@@ -156,32 +151,31 @@
    &-control {
      &-bg {
        background: $green-100 !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $green-100 !important;
-      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: #77f4c7 !important; }
-      &-checkbox { color: $green-10 !important; }
-      &-icon { color: #005737 !important; }
+      &-bg-noninteractive { background: $green-100 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($green-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $green-1 !important; }
    }

    &-modal {
      &-bg { background: $green-100 !important; }
      &-icon { color: $green-10 !important; }
-      &-text { color: #1ca372 !important; }
+      &-text { color: $green-1 !important; }
+      &-content {
+        --svg-color: #{$green-100};
+      }
+
+      @include modal-text-input($green-1);
      &-option-disabled:hover {
        .svg-icon { color: $green-10 !important; }
        .option-item-label { color: #1ca372 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $green-10 !important; }
-        .option-item-label { color: #1ca372 !important; }
-      }
+
+      @include habit-controls($gray-300, $green-100);
    }
  }

@@ -189,32 +183,30 @@
    &-control {
      &-bg {
        background: $teal-100 !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $teal-100 !important;
-      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: #8dedf6 !important; }
-      &-checkbox { color: $teal-100 !important; }
-      &-icon { color: #005158 !important; }
+      &-bg-noninteractive { background: $teal-100 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($teal-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $teal-1 !important; }
    }

    &-modal {
      &-bg { background: $teal-100 !important; }
      &-icon { color: $teal-100 !important; }
-      &-text { color: $teal-10 !important; }
+      &-text { color: $teal-1 !important; }
+      &-content {
+        --svg-color: #{$teal-100};
+      }
+      @include modal-text-input($teal-1);
      &-option-disabled:hover {
        .svg-icon { color: $teal-100 !important; }
        .option-item-label { color: $teal-10 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $teal-100 !important; }
-        .option-item-label { color: $teal-10 !important; }
-      }
+
+      @include habit-controls($gray-300, $teal-100);
    }
  }

@@ -222,32 +214,31 @@
    &-control {
      &-bg {
        background: $blue-100 !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-bg-noninteractive {
-        background: $blue-100 !important;
-      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: $blue-500 !important; }
-      &-checkbox { color: $blue-100 !important; }
-      &-icon { color: #033f5e !important; }
+      &-bg-noninteractive { background: $blue-100 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-habit-noninteractive { border: 1px solid rgba($blue-1, 0.5) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
+      &-checkbox, &-icon { color: $blue-1 !important; }
    }

    &-modal {
      &-bg { background: $blue-100 !important; }
      &-icon { color: $blue-100 !important; }
-      &-text { color: $blue-10 !important; }
+      &-text { color: $blue-1 !important; }
+      &-content {
+        --svg-color: #{$blue-100};
+      }
+
+      @include modal-text-input($blue-1);
      &-option-disabled:hover {
        .svg-icon { color: $blue-50 !important; }
        .option-item-label { color: $blue-10 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $blue-50 !important; }
-        .option-item-label { color: $blue-10 !important; }
-      }
+
+      @include habit-controls($gray-300, $blue-100);
    }
  }

@@ -255,42 +246,43 @@
    &-control {
      &-bg {
        background: $purple-task !important;
-        &:hover {
-          .habit-control { background: rgba(26, 24, 29, 0.48) !important; }
-          .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-        }
+        .habit-control:hover { background: rgba($black, 0.5) !important; }
+        .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
      }
-      &-inner-habit { background: rgba(26, 24, 29, 0.24) !important; }
-      &-inner-daily-todo { background: #ffffff80 !important; }
+      &-inner-habit { background: rgba($black, 0.25) !important; }
+      &-inner-daily-todo { background: rgba($white, 0.5) !important; }
      &-checkbox { color: $purple-task !important; }
    }

    &-modal {
      &-bg { background: $purple-300 !important; }
      &-icon { color: $purple-300 !important; }
-      &-text { color: $purple-200 !important; }
+      &-text { color: $black !important; }
+      &-content {
+        --svg-color: #{$purple-300};
+      }
+
+      @include modal-text-input($black);
      &-option-disabled:hover {
        .svg-icon { color: $purple-300 !important; }
        .option-item-label { color: $purple-200 !important; }
      }
-      &-habit-control-disabled:hover {
-        .habit-control { background: $purple-300 !important; }
-        .option-item-label { color: $purple-200 !important; }
-      }
+
+      @include habit-controls($gray-300, $purple-300);
    }
  }

  &-reward {
    &-control {
      &-bg {
-        background: rgba(255, 217, 160, 0.32) !important;
-        .small-text { color: $orange-10 !important; }
+        background: rgba($yellow-100, 0.15) !important;
+        .small-text { color: $yellow-1 !important; }

-        &:hover { background: rgba(255, 217, 160, 0.48) !important; }
+        &:hover { background: rgba($yellow-100, 0.25) !important; }
      }
      &-bg-noninteractive {
-        background: rgba(255, 217, 160, 0.32) !important;
-        .small-text { color: $orange-10 !important; }
+        background: rgba($yellow-100, 0.15) !important;
+        .small-text { color: $yellow-1 !important; }
      }
    }
  }
@@ -300,8 +292,12 @@
      &-control {
        &-bg { background: $gray-600; }
        &-inner {
-          color: rgba(26, 24, 29, 0.12) !important;
-          border: 1px solid rgba(26, 24, 29, 0.12);
+          border: 1px solid $gray-300;
+          opacity: 0.75;
+
+          .negative, .positive {
+            color: $gray-200;
+          }
        }
      }
    }
@@ -309,13 +305,14 @@
    &-daily-todo {
      &-control {
        &-bg {
-          background: $gray-400 !important;
-          &:hover {
-            .daily-todo-control { background: rgba(255, 255, 255, 0.72) !important; }
-          }
+          background: $gray-200 !important;
+          .daily-todo-control:hover { background: rgba($white, 0.75) !important; }
        }
-        &-inner { background: $gray-500 !important; }
-        &-checkbox { color: $gray-400 !important; }
+        &-bg-noninteractive {
+          background: $gray-200 !important;
+        }
+        &-inner { background: rgba($white, 0.5) !important; }
+        &-checkbox { color: $gray-10 !important; }
        &-content {
          background: $gray-600;

@@ -337,6 +334,24 @@
  border-radius: 100px;
  color: $white;

+  &-negative {
+    &-enabled {
+      padding-top: 13px;
+    }
+    &-disabled {
+      padding-top: 12px;
+    }
+  }
+
+  &-positive {
+    &-enabled {
+      padding-top: 9px;
+    }
+    &-disabled {
+      padding-top: 8px;
+    }
+  }
+
  .svg-icon {
    width: 10px;
    height: 10px;
@@ -347,14 +362,10 @@
    margin-top: 7px;
    height: 12px;
    width: 10px;
-  }

-  .positive {
-    margin-top: 9px;
-  }
-
-  .negative {
-    margin-top: 13px;
+    &.disabled {
+      color: $gray-10;
+    }
  }
 }

@@ -2,11 +2,11 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, normal, summer
 // more to be added on future seasons

-$npc_market_flavor: 'normal';
-$npc_quests_flavor: 'normal';
-$npc_seasonal_flavor: 'normal';
-$npc_timetravelers_flavor: 'normal';
-$npc_tavern_flavor: 'normal';
+$npc_market_flavor: 'summer';
+$npc_quests_flavor: 'summer';
+$npc_seasonal_flavor: 'summer';
+$npc_timetravelers_flavor: 'summer';
+$npc_tavern_flavor: 'summer';

 $restingToolbarHeight: 40px;
 $menuToolbarHeight: 56px;
@@ -225,30 +225,30 @@ export default {
    classGear (heroClass) {
      if (heroClass === 'rogue') {
        return {
-          armor: 'armor_rogue_5',
-          head: 'head_rogue_5',
-          shield: 'shield_rogue_6',
-          weapon: 'weapon_rogue_6',
+          armor: 'armor_special_summer2020Rogue',
+          head: 'head_special_summer2020Rogue',
+          shield: 'shield_special_summer2020Rogue',
+          weapon: 'weapon_special_summer2020Rogue',
        };
      } if (heroClass === 'wizard') {
        return {
-          armor: 'armor_wizard_5',
-          head: 'head_wizard_5',
-          weapon: 'weapon_wizard_6',
+          armor: 'armor_special_summer2020Mage',
+          head: 'head_special_summer2020Mage',
+          weapon: 'weapon_special_summer2020Mage',
        };
      } if (heroClass === 'healer') {
        return {
-          armor: 'armor_healer_5',
-          head: 'head_healer_5',
-          shield: 'shield_healer_5',
-          weapon: 'weapon_healer_6',
+          armor: 'armor_special_summer2020Healer',
+          head: 'head_special_summer2020Healer',
+          shield: 'shield_special_summer2020Healer',
+          weapon: 'weapon_special_summer2020Healer',
        };
      }
      return {
-        armor: 'armor_warrior_5',
-        head: 'head_warrior_5',
-        shield: 'shield_warrior_5',
-        weapon: 'weapon_warrior_6',
+        armor: 'armor_special_summer2020Warrior',
+        head: 'head_special_summer2020Warrior',
+        shield: 'shield_special_summer2020Warrior',
+        weapon: 'weapon_special_summer2020Warrior',
      };
    },
    selectionBox (selectedClass, heroClass) {
@@ -19,10 +19,10 @@
      />
      <div
        v-if="hasParty"
-        class="view-party d-flex align-items-center"
+        class="view-party d-none d-md-flex align-items-center"
      >
        <button
-          class="btn btn-primary view-party-button"
+          class="btn btn-primary"
          @click="showPartyMembers()"
        >
          {{ $t('viewParty') }}
@@ -32,7 +32,7 @@
        v-if="hasParty"
        ref="partyMembersDiv"
        v-resize="1500"
-        class="party-members d-flex"
+        class="party-members d-none d-md-flex "
        @resized="setPartyMembersWidth($event)"
      >
        <!-- eslint-disable vue/no-use-v-if-with-v-for -->
@@ -51,7 +51,7 @@
      </div>
      <div
        v-else
-        class="no-party d-flex justify-content-center text-center"
+        class="no-party d-none d-md-flex  justify-content-center text-center mr-4"
      >
        <div class="align-self-center">
          <h3>{{ $t('battleWithFriends') }}</h3>
@@ -119,12 +119,6 @@
      margin-top: 16px;
    }
  }
-
-  @media only screen and (max-width: 768px) {
-    .view-party-button {
-      display: none;
-    }
-  }
 </style>

 <script>
@@ -25,13 +25,16 @@
        >
          <div
            class="task-control habit-control"
-            :class="controlClass.up.inner"
+            :class="[{
+              'habit-control-positive-enabled': task.up && isUser,
+              'habit-control-positive-disabled': !task.up && isUser,
+            }, controlClass.up.inner]"
            @click="(isUser && task.up) ? score('up') : null"
          >
            <div
-              v-if="task.group.id && !isUser"
+              v-if="!isUser"
              class="svg-icon lock"
-              :class="controlClass.up.icon"
+              :class="task.up ? controlClass.up.icon : 'positive'"
              v-html="icons.lock"
            ></div>
            <div
@@ -55,7 +58,7 @@
            @click="isUser ? score(task.completed ? 'down' : 'up') : null"
          >
            <div
-              v-if="task.group.id && !isUser && !task.completed"
+              v-if="!isUser"
              class="svg-icon lock"
              :class="controlClass.icon"
              v-html="icons.lock"
@@ -186,7 +189,7 @@
              v-if="!task.collapseChecklist"
              :key="item.id"
              class="custom-control custom-checkbox checklist-item"
-              :class="{'checklist-item-done': item.completed}"
+              :class="{'checklist-item-done': item.completed, 'cursor-auto': !isUser}"
            >
              <!-- eslint-enable vue/no-use-v-if-with-v-for -->
              <input
@@ -307,13 +310,16 @@
        >
          <div
            class="task-control habit-control"
-            :class="controlClass.down.inner"
+            :class="[{
+              'habit-control-negative-enabled': task.down && isUser,
+              'habit-control-negative-disabled': !task.down && isUser,
+            }, controlClass.down.inner]"
            @click="(isUser && task.down) ? score('down') : null"
          >
            <div
              v-if="task.group.id && !isUser"
              class="svg-icon lock"
-              :class="controlClass.down.icon"
+              :class="task.down ? controlClass.down.icon : 'negative'"
              v-html="icons.lock"
            ></div>
            <div
@@ -353,15 +359,18 @@
  @import '~@/assets/scss/colors.scss';

  .control-bottom-box {
-    border-bottom-left-radius: 0px !important;
-    border-bottom-right-radius: 0px !important;
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
  }

  .control-top-box {
-    border-top-left-radius: 0px !important;
-    border-top-right-radius: 0px !important;
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
  }

+  .cursor-auto {
+    cursor: auto;
+  }

  .task {
    margin-bottom: 2px;
@@ -11,58 +11,80 @@
    <div
      v-if="task"
      slot="modal-header"
-      class="task-modal-header"
+      class="task-modal-header p-4"
      :class="cssClass('bg')"
      @click="handleClick($event)"
    >
-      <div class="clearfix">
-        <h1 class="float-left">
+      <div class="d-flex align-items-center mb-3">
+        <h2
+          class="my-auto"
+          :class="cssClassHeadings"
+        >
          {{ title }}
-        </h1>
-        <div class="float-right d-flex align-items-center">
+        </h2>
+        <div class="ml-auto d-flex align-items-center">
          <span
-            v-once
-            class="cancel-task-btn mr-2"
+            class="cancel-task-btn mr-3"
+            :class="cssClassHeadings"
            @click="cancel()"
          >{{ $t('cancel') }}</span>
-          <button
-            v-once
-            class="btn btn-secondary"
+          <div
+            class="btn btn-secondary d-flex align-items-center justify-content-center"
+            :class="{disabled: !canSave}"
            @click="submit()"
          >
-            {{ $t('save') }}
-          </button>
+            <div
+              class="m-auto"
+              v-if="purpose === 'edit'"
+            >
+              {{ $t('save') }}
+            </div>
+            <div
+              class="m-auto"
+              v-if="purpose === 'create'"
+            >
+              {{ $t('create') }}
+            </div>
+          </div>
        </div>
      </div>
      <div class="form-group">
-        <label v-once>{{ `${$t('text')}*` }}</label>
+        <label
+          :class="cssClassHeadings"
+          class="mb-1"
+        >{{ `${$t('text')}*` }}</label>
        <input
          ref="inputToFocus"
          v-model="task.text"
-          class="form-control title-input"
+          class="form-control input-title"
+          :class="cssClass('input')"
          type="text"
          required="required"
          spellcheck="true"
          :disabled="groupAccessRequiredAndOnPersonalPage || challengeAccessRequired"
+          :placeholder="$t('addATitle')"
        >
      </div>
-      <div class="form-group">
+      <div class="form-group mb-0">
        <label
-          v-once
-          class="d-flex align-items-center justify-content-between"
+          class="d-flex align-items-center justify-content-between mb-1"
        >
-          <span>{{ $t('notes') }}</span>
-          <small v-once>
+          <span
+            :class="cssClassHeadings"
+          >{{ $t('notes') }}</span>
+          <small>
            <a
              target="_blank"
              href="http://habitica.fandom.com/wiki/Markdown_Cheat_Sheet"
+              :class="cssClassHeadings"
            >{{ $t('markdownHelpLink') }}</a>
          </small>
        </label>
        <textarea
          v-model="task.notes"
-          class="form-control"
-          rows="3"
+          class="form-control input-notes"
+          :class="cssClass('input')"
+          :placeholder="$t('addNotes')"
        ></textarea>
      </div>
    </div>
@@ -147,49 +169,49 @@
          class="d-flex justify-content-center"
        >
          <div
-            class="option-item habit-control"
-            :class="task.up ? 'habit-control-enabled' : cssClass('habit-control-disabled')"
+            class="habit-option-container no-transition
+              d-flex flex-column justify-content-center align-items-center"
            @click="toggleUpDirection()"
+            :class="!task.up ? cssClass('habit-control-disabled') : ''"
          >
            <div
-              class="option-item-box"
+              class="habit-option-button no-transition
+                d-flex justify-content-center align-items-center mb-2"
              :class="task.up ? cssClass('bg') : ''"
            >
-              <div class="task-control habit-control">
-                <div
-                  class="svg-icon positive"
-                  :class="task.up ? cssClass('icon') : ''"
-                  v-html="icons.positive"
-                ></div>
-              </div>
+              <div
+                class="habit-option-icon svg-icon no-transition"
+                :class="task.up ? '' : 'disabled'"
+                v-html="icons.positive"
+              ></div>
            </div>
            <div
-              class="option-item-label"
-              :class="task.up ? cssClass('text') : ''"
+              class="habit-option-label no-transition"
+              :class="task.up ? cssClass('icon') : 'disabled'"
            >
              {{ $t('positive') }}
            </div>
          </div>
          <div
-            class="option-item habit-control"
-            :class="task.down ? 'habit-control-enabled' : cssClass('habit-control-disabled')"
+            class="habit-option-container no-transition
+              d-flex flex-column justify-content-center align-items-center"
            @click="toggleDownDirection()"
+            :class="!task.down ? cssClass('habit-control-disabled') : ''"
          >
            <div
-              class="option-item-box"
+              class="habit-option-button no-transition
+                d-flex justify-content-center align-items-center mb-2"
              :class="task.down ? cssClass('bg') : ''"
            >
-              <div class="task-control habit-control">
-                <div
-                  class="svg-icon negative"
-                  :class="task.down ? cssClass('icon') : ''"
-                  v-html="icons.negative"
-                ></div>
-              </div>
+              <div
+                class="habit-option-icon no-transition svg-icon negative mx-auto"
+                :class="task.down ? '' : 'disabled'"
+                v-html="icons.negative"
+              ></div>
            </div>
            <div
-              class="option-item-label"
-              :class="task.down ? cssClass('text') : ''"
+              class="habit-option-label no-transition"
+              :class="task.down ? cssClass('icon') : 'disabled'"
            >
              {{ $t('negative') }}
            </div>
@@ -600,7 +622,7 @@
          </div>
        </div>
        <div
-          v-if="task.type !== 'reward'"
+          v-if="advancedSettingsAvailable"
          class="advanced-settings"
        >
          <div
@@ -718,10 +740,10 @@
          @click="destroy()"
        >
          <div
-            class="svg-icon d-inline-b"
+            class="svg-icon d-inline-b mt-1 mb-1"
            v-html="icons.destroy"
          ></div>
-          <span>{{ $t('deleteTask') }}</span>
+          <span class="delete-text mt-1 mb-1">{{ $t('deleteTask') }}</span>
        </div>
      </form>
    </div>
@@ -731,19 +753,14 @@
      @click="handleClick($event)"
    >
      <div
-        v-once
-        class="cancel-task-btn"
-        @click="cancel()"
-      >
-        {{ $t('cancel') }}
-      </div>
-      <button
-        v-once
-        class="btn btn-primary"
+        v-if="purpose === 'create'"
+        class="btn btn-primary btn-footer
+          d-flex align-items-center justify-content-center mt-2 mb-2"
+        :class="{disabled: !canSave}"
        @click="submit()"
      >
-        {{ $t('save') }}
-      </button>
+        {{ $t('create') }}
+      </div>
    </div>
  </b-modal>
 </template>
@@ -756,27 +773,29 @@
      max-width: 448px;
    }

-    label {
-      font-weight: bold;
+    .no-transition {
+      transition: none;
    }

-    .input-group > * {
-      height: 40px;
+    .form-control:not(.input-title):not(.input-notes):not(.checklist-item) {
+      height: 40px !important; // until the new changes of teams-2020 are applied
+    }
+
+    // until the new changes of teams-2020 are applied
+    .vdp-datepicker {
+      .input-group-append {
+        height: 40px !important;
+      }
    }

    input, textarea {
-      border: none;
-      background: rgba(0, 0, 0, 0.24);
-      color: rgba($white, 0.64) !important;
-      transition-property: border-color, box-shadow, color, background;
-
-      &:focus, &:active {
-        color: $white !important;
-        box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.32);
+      &:not(:host-context(.tags-popup)) {
+        border: none;
      }
-
+      transition-property: border-color, box-shadow, color, background;
+      background-color: rgba(255, 255, 255, 0.5);
      &:focus, &:active, &:hover {
-        background-color: rgba(0, 0, 0, 0.40);
+        background-color: rgba(255, 255, 255, 0.75);
      }
    }

@@ -785,6 +804,12 @@
      border: none;
    }

+    .modal-body {
+      // the body has a margin/padding that can't be found
+      // if found please remove that padding and this style
+      margin-bottom: -1rem;
+    }
+
    .modal-header, .modal-body, .modal-footer {
      padding: 0px;
      border: none;
@@ -795,6 +820,10 @@
      padding-right: 23px;
    }

+    .cursor-auto {
+      cursor: auto;
+    }
+
    .task-modal-header {
      color: $white;
      width: 100%;
@@ -803,7 +832,7 @@
      padding-top: 16px;
      padding-bottom: 24px;

-      h1 {
+      h2 {
        color: $white;
      }
    }
@@ -894,25 +923,6 @@
      }
    }

-    .habit-control {
-      .option-item-box {
-        background: $white;
-        border: 2px solid $gray-600;
-
-        .habit-control { background: $gray-300; }
-        .svg-icon { color: $white; }
-      }
-
-      &-enabled {
-        .option-item-box {
-          border: 2px solid transparent;
-          transition-property: none;
-
-          .habit-control { background: $white !important; }
-        }
-      }
-    }
-
    .category-wrap {
      cursor: pointer;
      margin-top: 0px;
@@ -1070,27 +1080,44 @@
      }
    }

-    .delete-task-btn, .cancel-task-btn {
+        .delete-task-btn, .cancel-task-btn {
      cursor: pointer;
-
      &:hover, &:focus, &:active {
        text-decoration: underline;
      }
    }
-
    .delete-task-btn {
      margin-top: 32px;
      margin-bottom: 8px;
-      color: $red-50;
-
+      height: 1.5rem;
+      align-items: center;
+      &:hover, &:focus, &:active {
+        text-decoration: underline;
+        text-decoration-color: $maroon-50;
+      }
+      .delete-text {
+        font-size: 14px;
+        font-weight: normal;
+        font-stretch: normal;
+        font-style: normal;
+        line-height: 1.71;
+        letter-spacing: normal;
+        color: $maroon-50;
+        height: 1.5rem;
+      }
      .svg-icon {
-        width: 14px;
-        height: 16px;
-        margin-right: 8.5px;
+        svg {
+          height: 1rem;
+          width: 1rem;
+          object-fit: contain;
+        }
+        margin-right: 0.5rem;
+        color: $maroon-50;
      }
    }

    .task-modal-footer {
+      margin: 0;
      padding: 16px 24px;
      width: 100%;

@@ -1147,10 +1174,69 @@
 </style>

 <style lang="scss" scoped>
+  @import '~@/assets/scss/colors.scss';
+
  .gold {
    width: 24px;
    margin: 0 7px;
  }
+
+  .habit-option {
+    &-container {
+      min-width: 3rem;
+      cursor: pointer;
+      &:first-of-type {
+        margin-right: 2rem;
+      }
+    }
+    &-button {
+      width: 2.5rem;
+      height: 2.5rem;
+      border-radius: 50%;
+    }
+    &-icon {
+      width: 10px;
+      height: 10px;
+      color: $white;
+      &.disabled {
+        color: $gray-200;
+      }
+      &.negative {
+        margin-top: 0.5rem;
+      }
+    }
+    &-label {
+      font-size: 12px;
+      font-weight: bold;
+      text-align: center;
+      &.disabled {
+        color: $gray-100;
+        font-weight: normal;
+      }
+    }
+  }
+
+  input, textarea, input.form-control, textarea.form-control {
+    padding: 0.25rem 0.75rem;
+    line-height: 1.71;
+  }
+  .input-title {
+    height: 2rem;
+  }
+  .input-notes {
+    height: 3.5rem;
+  }
+  label {
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 1.71;
+  }
+  .flex-group {
+    display: flex;
+    .flex {
+      flex: 1;
+    }
+  }
 </style>

 <script>
@@ -1237,6 +1323,15 @@ export default {
      dayMapping: 'constants.DAY_MAPPING',
      ATTRIBUTES: 'constants.ATTRIBUTES',
    }),
+    advancedSettingsAvailable () {
+      if (
+        this.task.type === 'reward'
+        || this.task.type === 'todo'
+        || this.purpose === 'create'
+        || !this.isUserTask
+      ) return false;
+      return true;
+    },
    groupAccessRequiredAndOnPersonalPage () {
      if (!this.groupId && this.task.group && this.task.group.id) return true;
      return false;
@@ -1261,6 +1356,9 @@ export default {
    canDelete () {
      return this.purpose !== 'create' && this.canDeleteTask(this.task);
    },
+    canSave () {
+      return this.task && this.task.text && this.task.text.length > 0;
+    },
    title () {
      const type = this.$t(this.task.type);
      return this.$t(this.purpose === 'edit' ? 'editATask' : 'createTask', { type });
@@ -1305,6 +1403,11 @@ export default {
    remainingSelectedTags () {
      return this.selectedTags.slice(this.maxTags);
    },
+    cssClassHeadings () {
+      const textClass = this.cssClass('text');
+      if (textClass.indexOf('purple') !== -1 || textClass.indexOf('worst') !== -1) return null;
+      return textClass;
+    },
  },
  watch: {
    task () {
@@ -1359,6 +1462,10 @@ export default {
      this.syncTask();
    },
    cssClass (suffix) {
+      if (!this.task) {
+        return '';
+      }
+
      return this.getTaskClasses(this.task, `${this.purpose === 'edit' ? 'edit' : 'create'}-modal-${suffix}`);
    },
    closeTagsPopup () {
@@ -1434,6 +1541,7 @@ export default {
      }
    },
    async submit () {
+      if (!this.canSave) return;
      if (this.newChecklistItem) this.addChecklistItem();

      // TODO Fix up permissions on task.group so we don't have to keep doing these hacks
@@ -60,6 +60,9 @@
    border-radius: 1px;
    height: 12px;
    background-color: $header-dark-background;
+    @media (max-width: 992px) {
+      min-width: 160px;
+    }
  }

  .progress-container > .progress > .progress-bar {
@@ -108,6 +108,11 @@ export function canEdit (store) {
  };
 }

+function _nonInteractive (task) {
+  return (task.group && task.group.id && !task.userId)
+    || (task.challenge && task.challenge.id && !task.userId);
+}
+
 export function getTaskClasses (store) {
  const userPreferences = store.state.user.data.preferences;

@@ -123,10 +128,16 @@ export function getTaskClasses (store) {
    switch (purpose) {
      case 'edit-modal-bg':
        return `task-${color}-modal-bg`;
+      case 'edit-modal-content':
+        return `task-${color}-modal-content`;
+      case 'create-modal-content':
+        return 'task-purple-modal-content';
      case 'edit-modal-text':
        return `task-${color}-modal-text`;
      case 'edit-modal-icon':
        return `task-${color}-modal-icon`;
+      case 'edit-modal-input':
+        return `task-${color}-modal-text task-${color}-modal-input`;
      case 'edit-modal-option-disabled':
        return `task-${color}-modal-option-disabled`;
      case 'edit-modal-habit-control-disabled':
@@ -135,6 +146,8 @@ export function getTaskClasses (store) {
        return 'task-purple-modal-bg';
      case 'create-modal-text':
        return 'task-purple-modal-text';
+      case 'create-modal-input':
+        return 'task-purple-modal-text task-purple-modal-input';
      case 'create-modal-icon':
        return 'task-purple-modal-icon';
      case 'create-modal-option-disabled':
@@ -146,7 +159,7 @@ export function getTaskClasses (store) {
        if (type === 'todo' || type === 'daily') {
          if (task.completed || (!shouldDo(dueDate, task, userPreferences) && type === 'daily')) {
            return {
-              bg: 'task-disabled-daily-todo-control-bg',
+              bg: _nonInteractive(task) ? 'task-disabled-daily-todo-control-bg-noninteractive' : 'task-disabled-daily-todo-control-bg',
              checkbox: 'task-disabled-daily-todo-control-checkbox',
              inner: 'task-disabled-daily-todo-control-inner',
              content: 'task-disabled-daily-todo-control-content',
@@ -154,22 +167,30 @@ export function getTaskClasses (store) {
          }

          return {
-            bg: task.group && task.group.id && !task.userId ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+            bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
            checkbox: `task-${color}-control-checkbox`,
            inner: `task-${color}-control-inner-daily-todo`,
            icon: `task-${color}-control-icon`,
          };
        } if (type === 'reward') {
          return {
-            bg: task.group && task.group.id && !task.userId ? 'task-reward-control-bg-noninteractive' : 'task-reward-control-bg',
+            bg: _nonInteractive(task) ? 'task-reward-control-bg-noninteractive' : 'task-reward-control-bg',
          };
        } if (type === 'habit') {
          return {
            up: task.up
-              ? { bg: task.group && task.group.id && !task.userId ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`, inner: `task-${color}-control-inner-habit`, icon: `task-${color}-control-icon` }
+              ? {
+                bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+                inner: _nonInteractive(task) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
+                icon: `task-${color}-control-icon`,
+              }
              : { bg: 'task-disabled-habit-control-bg', inner: 'task-disabled-habit-control-inner', icon: `task-${color}-control-icon` },
            down: task.down
-              ? { bg: task.group && task.group.id && !task.userId ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`, inner: `task-${color}-control-inner-habit`, icon: `task-${color}-control-icon` }
+              ? {
+                bg: _nonInteractive(task) ? `task-${color}-control-bg-noninteractive` : `task-${color}-control-bg`,
+                inner: _nonInteractive(task) ? `task-${color}-control-inner-habit-noninteractive` : `task-${color}-control-inner-habit`,
+                icon: `task-${color}-control-icon`,
+              }
              : { bg: 'task-disabled-habit-control-bg', inner: 'task-disabled-habit-control-inner', icon: `task-${color}-control-icon` },
          };
        }
@@ -435,7 +435,7 @@
    "backgrounds032019": "58a sèrie: març del 2019",
    "backgroundValentinesDayFeastingHallNotes": "Sent l'amor al saló de festes de Sant Valentí.",
    "backgroundValentinesDayFeastingHallText": "Saló de festes de Sant Valentí",
-    "backgroundOldFashionedBakeryNotes": "Gaudeix d'olors boníssimes fora d'una fleca antiga.",
+    "backgroundOldFashionedBakeryNotes": "Gaudeix d'olors boníssimes fora d'una Fleca Antiga.",
    "backgroundOldFashionedBakeryText": "Fleca antiga",
    "backgroundMedievalKitchenNotes": "Cuina una tempesta a una cuina medieval.",
    "backgroundMedievalKitchenText": "Cuina medieval",
@@ -16,7 +16,7 @@
    "photoUrl": "URL de la foto",
    "imageUrl": "URL de la imatge",
    "inventory": "Inventari",
-    "social": "Social",
+    "social": "Xarxes socials",
    "lvl": "Nvll",
    "buffed": "Polit",
    "bodyBody": "Cos",
@@ -156,7 +156,7 @@
    "optOutOfClasses": "Abandona-les",
    "optOutOfPMs": "Abandona-les",
    "chooseClass": "Tria la teva classe",
-    "chooseClassLearnMarkdown": "[Aprèn més sobre el sistema de classes d'Habitica](http://habitica.wikia.com/wiki/Class_System)",
+    "chooseClassLearnMarkdown": "[Aprèn més sobre el sistema de classes d'Habitica](https://habitica.wikia.com/wiki/Class_System)",
    "optOutOfClassesText": "No t'importen les classes? Vols triar més tard? Cap problema - seràs un guerrer sense cap habilitat especial. Pots informar-te sobre els sistema de classes més tard a la wiki i habilitar les classes en qualsevol moment a Icona de l'usuari > Configuració.",
    "selectClass": "Selecciona <%= heroClass %>",
    "select": "Selecciona",
@@ -5,7 +5,7 @@
    "commGuideHeadingWelcome": "Benvingut a Habitica!",
    "commGuidePara001": "Salutacions, aventurer! Benvingut a Habitica, la terra de la productivitat, la vida saludable i un griu ocasionalment desbocat. Tenim una comunitat alegre plena de gent atenta que es recolza mútuament de camí cap a la superació personal. Per encaixar només es necessita tenir una actitud positiva, una manera respectuosa i comprendre que cadascú té diferents habilitats i limitacions, fins i tot tu! Els habitants d'Habitica són pacients amb els altres i intenten ajudar sempre que poden.",
    "commGuidePara002": "Per ajudar a que tothom es senti segur, feliç i productiu a la comunitat tenim unes normes. Les hem dissenyat cuidadosament per fer-les tant agradables i fàcils de llegir com ha estat posible. Si us plau, pren-te el temps que necessitis per llegir-les abans que comencis a xatejar.",
-    "commGuidePara003": "Aquestes normes valen per tots els espais socials que utilitzem, incloent (però no necessàriament limitant-se a) Trello, Github, Transifex i la Wikia (la wiki). A vegades esdeveniràn situacions imprevistes, com un nou origen de conflicte o un feroç ocultista.  Quan això passi, els moderadors poden intervenir editant aquestes normes per mantenir-nos a tots segurs de nous perills. No pateixis: seràs notificat per un anunci d'en Bailey si canvien les normes.",
+    "commGuidePara003": "Aquestes normes valen per tots els espais socials que utilitzem, incloent (però no necessàriament limitant-se a) Trello, Github, Weblate i la Wikia (la wiki). A vegades esdeveniràn situacions imprevistes, com un nou origen de conflicte o un feroç ocultista. Quan això passi, els moderadors poden intervenir editant aquestes normes per mantenir-nos a tots segurs de nous perills. No pateixis: seràs notificat per un anunci d'en Bailey si canvien les normes.",
    "commGuidePara004": "Ara prepara les teves plomes i pergamins per prendre nota, i comencem!",
    "commGuideHeadingInteractions": "Interaccions a Habitica",
    "commGuidePara015": "Habitica té dos tipus d'espais socials: públic i privat. Els espais públics inclouen la taverna, els gremis públics, GitHub, Trello i la Wiki. Els espais privats són gremis privats, xat de l'equip i missatges privats. Tots els noms públics han de seguir la normativa dels espais públics. Per canviar el vostre nom públic, aneu a la pàgina web a Usuari  > Perfil i feu clic al botó \"Edita\".",
@@ -104,9 +104,9 @@
    "commGuideAKA": "<%= habitName %> aka <%= realName %>",
    "commGuideOnTrello": "<%= trelloName %> on Trello",
    "commGuideOnGitHub": "<%= gitHubName %> on GitHub",
-    "commGuidePara010": "També hi han alguns moderadors que ajuden amb els administradors. Han sigut seleccionats amb cura, si us plau dona-l-s'hi el teu respecte i escolta els seus suggeriments.   ",
+    "commGuidePara010": "També hi han alguns moderadors que ajuden amb els administradors. Han sigut seleccionats amb cura, si us plau dona-l-s'hi el teu respecte i escolta els seus suggeriments.",
    "commGuidePara011": "Els Moderadors actuals són (d'esquerra a dreta):",
-    "commGuidePara011a": "al Xat de la Taverna. ",
+    "commGuidePara011a": "al Xat de la Taverna",
    "commGuidePara011b": "a GitHub/Wikia",
    "commGuidePara011c": "a Wikia",
    "commGuidePara011d": "a GitHub",
@@ -1,7 +1,7 @@
 {
-    "lostAllHealth": "T'estas quedant sense vida",
+    "lostAllHealth": "T'estas quedant sense vida!",
    "dontDespair": "No et desesperis!",
-    "deathPenaltyDetails": "Has perdut un nivell, el teu or, i una peca del teu equip, però les pots recuperar amb treballant dur! Molta sort--Ho faràs bé",
+    "deathPenaltyDetails": "Has perdut un nivell, el teu or, i una peca del teu equip, però les pots recuperar amb treballant dur! Molta sort--Ho faràs bé.",
    "refillHealthTryAgain": "Recarrega salut & Torna-ho a provar",
    "dyingOftenTips": "Passa massa sobint?  <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'> Aquí tens alguns consells! </a>",
    "losingHealthWarning": "Vigila - Estàs perdent vida!",
@@ -14,4 +14,4 @@
    "lowHealthTips4": "Si una tasca diària no s'ha de completar en un dia en concret, la pots desactivar clicant en la icona del llapis.",
    "goodLuck": "Bona sort!",
    "cannotRevive": "No pots reviure si no estàs mort"
-}
+}
@@ -5,24 +5,61 @@
    "defaultHabit2Notes": "Exemples de mal hàbit: - Fumar - Perdre el temps",
    "defaultHabit3Text": "Agafa les escales/ascensor (premeu el llapis per editar)",
    "defaultHabit3Notes": "Exemples de bons o mals hàbits: +/- Pren les escales/ascensor ; +/- Beu aigua/refresc",
-    "defaultHabit4Text": "Add a task to Habitica",
-    "defaultHabit4Notes": "Either a Habit, a Daily, or a To-Do",
-    "defaultHabit5Text": "Tap here to edit this into a bad habit you'd like to quit",
-    "defaultHabit5Notes": "Or delete from the edit screen",
-    "defaultDaily1Text": "Use Habitica to keep track of your tasks",
+    "defaultHabit4Text": "Afegeix una tasca a Habitica",
+    "defaultHabit4Notes": "Ja sigui un hàbit, una tasca diària o una tasca pendent",
+    "defaultHabit5Text": "Fes clic aquí per editar un mal hàbit que t'agradaria deixar",
+    "defaultHabit5Notes": "O elimina-ho de la pantalla d'edició",
+    "defaultDaily1Text": "Utilitza Habitica per fer un seguiment de les teves tasques",
    "defaultTodo1Text": "Vine a Habitica (Elimina'm!)",
-    "defaultTodoNotes": "Encara pots completar la Tasca Pendent, editar-la, o eliminar-la ",
-    "defaultTodo2Text": "Finish Justin's task walkthrough",
-    "defaultTodo2Notes": "Visit all the sections of the bottom bar",
+    "defaultTodoNotes": "Encara pots completar aquesta tasca pendent, editar-la, o eliminar-la.",
+    "defaultTodo2Text": "Acaba la guia de tasques de Justin",
+    "defaultTodo2Notes": "Visita totes les seccions de la barra inferior",
    "defaultReward1Text": "Pausa de 15 minuts",
    "defaultReward1Notes": "Les recompenses poden ser de molts tipus. Algunes persones deixarien de mirar la seva serie preferida fins que tinguessin prou or per pagar-ho.",
-    "defaultReward2Text": "Reward yourself",
-    "defaultReward2Notes": "Watch TV, play a game, eat a treat, it's up to you!",
-    "defaultTag1": "Work",
-    "defaultTag2": "Exercise",
-    "defaultTag3": "Health + Wellness",
-    "defaultTag4": "School",
-    "defaultTag5": "Teams",
-    "defaultTag6": "Chores",
-    "defaultTag7": "Creativity"
-}
+    "defaultReward2Text": "Recompensa't",
+    "defaultReward2Notes": "Mira la televisió, juga a un joc, menja't un premi, tu tries!",
+    "defaultTag1": "Feina",
+    "defaultTag2": "Exercici",
+    "defaultTag3": "Salut i benestar",
+    "defaultTag4": "Estudis",
+    "defaultTag5": "Equips",
+    "defaultTag6": "Feines de casa",
+    "defaultTag7": "Creativitat",
+    "defaultHabitNotes": "O elimina'l de la pantalla d'edició",
+    "defaultHabitText": "Fes clic aquí per editar un mal hàbit que vulguis deixar",
+    "creativityTodoNotes": "Toca per especificar el nom del projecte",
+    "creativityTodoText": "Acaba el projecte creatiu",
+    "creativityDailyNotes": "Toca per especificar el nom del projecte actual i definir la programació!",
+    "creativityDailyText": "Treballa en un projecte creatiu",
+    "creativityHabit": "Estudia una art mestra >> + Practica una nova tècnica creativa",
+    "choresTodoNotes": "Toca per especificar l'àrea desordenada!",
+    "choresTodoText": "Organitza l'armari >> Organitza el desordre",
+    "choresDailyNotes": "Toca per triar el teu programa!",
+    "choresDailyText": "Renta els plats",
+    "choresHabit": "10 minuts de neteja",
+    "selfCareTodoNotes": "Toca per especificar què vols fer!",
+    "selfCareTodoText": "Involucra't en una activitat divertida",
+    "selfCareDailyNotes": "Toca per triar la programació!",
+    "selfCareDailyText": "5 minuts de respiració tranquil·la",
+    "selfCareHabit": "Descansa una mica",
+    "schoolTodoNotes": "Toca per posar nom i data límit al treball!",
+    "schoolTodoText": "Acaba el treball de classe",
+    "schoolDailyNotes": "Toca per programar els deures!",
+    "schoolDailyText": "Acaba els deures",
+    "schoolHabit": "Estudia/Procastina",
+    "healthTodoNotes": "Fes clic per afegir llistes de tasques!",
+    "healthTodoText": "Programa una revisió >> Pensa en un canvi saludable",
+    "healthDailyNotes": "Fes clic per fer canvis!",
+    "healthDailyText": "Utilitza fil dental",
+    "healthHabit": "Menja menjar saludable/brossa",
+    "exerciseTodoNotes": "Fes clic per afegir una llista de tasques!",
+    "exerciseTodoText": "Fes-te un horari d'exercici",
+    "exerciseDailyNotes": "Fes clic per definir el teu programa i especificar els exercicis!",
+    "exerciseDailyText": "Estirar >> Rutina d'exercici diari",
+    "exerciseHabit": "10 min de cardio >> + 10 minuts de cardio",
+    "workTodoProjectNotes": "Fes clic per especificar el nom del projecte actual i determinar una data límit!",
+    "workTodoProject": "Projecte de treball >> Completa el projecte de treball",
+    "workDailyImportantTaskNotes": "Fes clic per especificar la tasca més important",
+    "workDailyImportantTask": "Tasca més important >> He fet la tasca més important d'avui",
+    "workHabitMail": "Llegeix correus electrònics"
+}
@@ -3,15 +3,15 @@
    "equipmentType": "Tipus",
    "klass": "Classe",
    "groupBy": "Agrupa per <%= type %>",
-    "classBonus": "(This item matches your class, so it gets an additional 1.5 Stat multiplier.)",
+    "classBonus": "(Aquest equipament és de la teva classe, per tant, guanyes un multiplicador d'1,5 als atributs)",
    "classArmor": "Armadura de Classe",
    "featuredset": "Conjunt destacat <%= name %>",
-    "mysterySets": "Conjunt Misteriós ",
+    "mysterySets": "Conjunt Misteriós",
    "gearNotOwned": "No tens aquest ítem.",
    "noGearItemsOfType": "No tens en propietat qualsevol d'aquests ítems.",
    "noGearItemsOfClass": "Ja tens totes les equipacions de la teva classe! En sortiran més durant les Grand Galas, amb els solsticis i equinoccis.",
-    "classLockedItem": "This item is only available to a specific class. Change your class under the User icon > Settings > Character Build!",
-    "tierLockedItem": "This item is only available once you've purchased the previous items in sequence. Keep working your way up!",
+    "classLockedItem": "Aquest equipament només està disponible per una classe específica. A partir del nivell 10 pot canviar de classe a la Icona del usuari > Configuració > Personatge!",
+    "tierLockedItem": "Aquest objecte només està disponible si has comprat els objectes anteriors de la seqüència. Segueix treballant per arribar-hi!",
    "sortByType": "Tipus",
    "sortByPrice": "Preu",
    "sortByCon": "CON",
@@ -27,7 +27,7 @@
    "weaponWarrior1Text": "Espasa",
    "weaponWarrior1Notes": "Espasa comuna de soldat. Augmenta la Força per <%= str %>.",
    "weaponWarrior2Text": "Destral",
-    "weaponWarrior2Notes": "Double-bitted chopping weapon. Increases Strength by <%= str %>",
+    "weaponWarrior2Notes": "Arma de tallar de doble fulla. Augmenta <%= str %> a Força.",
    "weaponWarrior3Text": "Estrella de l'alba",
    "weaponWarrior3Notes": "Maça pesada amb punxes brutals. Augmenta la Força per <%= str %>.",
    "weaponWarrior4Text": "Fulla de safir",
@@ -45,50 +45,50 @@
    "weaponRogue3Text": "Ganivet Kukri",
    "weaponRogue3Notes": "Falç distintiva, eina que serveix tant per lluitar com per sobreviure. Augmenta Força per <%= str %>.",
    "weaponRogue4Text": "Nunchaku",
-    "weaponRogue4Notes": "Heavy batons whirled about on a length of chain. Increases Strength by <%= str %>.",
-    "weaponRogue5Text": "Ninja-to",
-    "weaponRogue5Notes": "Sleek and deadly as the ninja themselves. Increases Strength by <%= str %>.",
+    "weaponRogue4Notes": "Bastons pesats que giren en una cadena. Augmenta <%= str %> punts a Força.",
+    "weaponRogue5Text": "Ninjatō",
+    "weaponRogue5Notes": "Elegant i mortal com els ninjes. Augmenta <%= str %> punts a Força.",
    "weaponRogue6Text": "Espasa corbada",
-    "weaponRogue6Notes": "Complex weapon adept at ensnaring and disarming opponents. Increases Strength by <%= str %>.",
+    "weaponRogue6Notes": "Arma complexa pensada per atrapar i desarmar els oponents. Augmenta <%= str %> punts a Força.",
    "weaponWizard0Text": "Vara d'aprenent",
    "weaponWizard0Notes": "Vara de pràctica. No atorga cap benefici.",
    "weaponWizard1Text": "Vara de fusta",
-    "weaponWizard1Notes": "Basic implement of carven wood. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard1Notes": "Bastó bàsic de fusta. Augmenta <%= int %> punts a Intel·ligència i <%= per %> punts a Percepció.",
    "weaponWizard2Text": "Vara enjoiada",
-    "weaponWizard2Notes": "Focuses power through a precious stone. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard2Notes": "Enfoca el poder a través d'una pedra preciosa. Augmenta <%= int %> punts a Intel·ligència i <%= per %> a Percepció.",
    "weaponWizard3Text": "Vara de ferro",
-    "weaponWizard3Notes": "Plated in metal to channel heat, cold, and lightning. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard3Notes": "Coberta de metall per canalitzar la calor, el fred i la llum. Augmenta <%= int %> punts a Intel·ligència i <%= per %> a Percepció.",
    "weaponWizard4Text": "Vara de llautó",
-    "weaponWizard4Notes": "As powerful as it is heavy. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard4Notes": "És igualment forta i pesada. Augmenta <%= int %> punts a Intel·ligència i <%= per %> a Percepció.",
    "weaponWizard5Text": "Vara d'arximag",
-    "weaponWizard5Notes": "Assists in weaving the most complex of spells. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard5Notes": "Ajuda a llançar els encantaments més difícils. Augmenta <%= int %> punts a Intel·ligència i <%= per %> a Percepció.",
    "weaponWizard6Text": "Vara daurada",
-    "weaponWizard6Notes": "Fashioned of orichalcum, the alchemic gold, mighty and rare. Increases Intelligence by <%= int %> and Perception by <%= per %>.",
+    "weaponWizard6Notes": "Fet d'oricalc, l'or alquímic més fort i rar. Augmenta <%= int %> punts a Intel·ligència i <%= per %> punts a Percepció.",
    "weaponHealer0Text": "Barra de novell",
    "weaponHealer0Notes": "Per a sanadors en pràctiques. No atorga cap benefici.",
    "weaponHealer1Text": "Barra de l'acòlit",
-    "weaponHealer1Notes": "Crafted during a healer's initiation. Increases Intelligence by <%= int %>.",
+    "weaponHealer1Notes": "Creat durant la iniciació d'un sanador. Augmenta <%= int %> punts a Intel·ligència.",
    "weaponHealer2Text": "Barra de quars",
-    "weaponHealer2Notes": "Topped with a gem bearing curative properties. Increases Intelligence by <%= int %>.",
+    "weaponHealer2Notes": "Coronat amb una joia amb propietats sanadores. Augmenta <%= int %> punts a Intel·ligència.",
    "weaponHealer3Text": "Barra d'ametista",
    "weaponHealer3Notes": "Purifica el verí amb un toc. Aumenta la intel·ligència per <%= int %>.",
    "weaponHealer4Text": "Barra mèdica",
-    "weaponHealer4Notes": "As much a badge of office as a healing tool. Increases Intelligence by <%= int %>.",
+    "weaponHealer4Notes": "És tant un símbol de l'ofici com una eina de curació. Augmenta <%= int %> punts a Intel·ligència.",
    "weaponHealer5Text": "Ceptre reial",
-    "weaponHealer5Notes": "Fit to grace the hand of a monarch, or of one who stands at a monarch's right hand. Increases Intelligence by <%= int %>.",
+    "weaponHealer5Notes": "Fet per adornar la mà d'un monarca o al que està a la seva mà dreta. Augmenta <%= int %> punts a Intel·ligència.",
    "weaponHealer6Text": "Ceptre daurat",
-    "weaponHealer6Notes": "Soothes the pain of all who look upon it. Increases Intelligence by <%= int %>.",
+    "weaponHealer6Notes": "Calma el dolor a tots els que el miren. Augmenta <%= int %> punts a Intel·ligència.",
    "weaponSpecial0Text": "Fulla de les ànimes fosques",
-    "weaponSpecial0Notes": "Feasts upon foes' life essence to power its wicked strokes. Increases Strength by <%= str %>.",
+    "weaponSpecial0Notes": "S'alimenta de l'essència de la vida dels enemics per fer més forts els seus cops endimoniats. Augmenta <%= str %> punts a Força.",
    "weaponSpecial1Text": "Fulla de cristal",
-    "weaponSpecial1Notes": "Its glittering facets tell the tale of a hero. Increases all Stats by <%= attrs %>.",
-    "weaponSpecial2Text": "Stephen Weber's Shaft of the Dragon",
-    "weaponSpecial2Notes": "Feel the potency of the dragon surge from within! Increases Strength and Perception by <%= attrs %> each.",
+    "weaponSpecial1Notes": "Les seves cares brillants expliquen la història d'un heroi. Augmenta <%= attrs %> punts a tots els atributs.",
+    "weaponSpecial2Text": "Vara del drac de Stephen Weber",
+    "weaponSpecial2Notes": "Nota com surt del seu interior la potència del drac! Augmenta <%= attrs %> punts a Força i a Percepció.",
    "weaponSpecial3Text": "Mustaine's Milestone Mashing Morning Star",
    "weaponSpecial3Notes": "Meetings, monsters, malaise: managed! Mash! Increases Strength, Intelligence, and Constitution by <%= attrs %> each.",
    "weaponSpecialCriticalText": "Martell Crític de Aixafa-Insectes",
    "weaponSpecialCriticalNotes": "This champion slew a critical GitHub foe where many warriors fell. Fashioned from the bones of Bug, this hammer deals a mighty critical hit. Increases Strength and Perception by <%= attrs %> each.",
-    "weaponSpecialTakeThisText": "Take This Espassa ",
+    "weaponSpecialTakeThisText": "Take This Espassa",
    "weaponSpecialTakeThisNotes": "This sword was earned by participating in a sponsored Challenge made by Take This. Congratulations! Increases all Stats by <%= attrs %>.",
    "weaponSpecialTridentOfCrashingTidesText": "Trident de les marees estavellades",
    "weaponSpecialTridentOfCrashingTidesNotes": "Gives you the ability to command fish, and also deliver some mighty stabs to your tasks. Increases Intelligence by <%= int %>.",
@@ -1742,4 +1742,4 @@
    "eyewearArmoireGoofyGlassesText": "Goofy Glasses",
    "eyewearArmoireGoofyGlassesNotes": "Perfect for going incognito or just making your partymates giggle. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
    "twoHandedItem": "Two-handed item."
-}
+}
@@ -1,8 +1,8 @@
 {
-  "noItemsAvailableForType": "You have no <%= type %>.",
-  "foodItemType": "Food",
-  "eggsItemType": "Eggs",
-  "hatchingPotionsItemType": "Hatching Potions",
-  "specialItemType": "Special items",
-  "lockedItem": "Locked Item"
+    "noItemsAvailableForType": "No tens <%= type %>.",
+    "foodItemType": "Menjar d'animals",
+    "eggsItemType": "Ous",
+    "hatchingPotionsItemType": "Pocions de covació",
+    "specialItemType": "Objectes especials",
+    "lockedItem": "Objecte bloquejat"
 }
@@ -1,29 +1,29 @@
 {
-  "unlockedReward": "You have received <%= reward %>",
-  "earnedRewardForDevotion": "You have earned <%= reward %> for being committed to improving your life.",
-  "nextRewardUnlocksIn": "Check-ins until your next prize: <%= numberOfCheckinsLeft %>",
-  "awesome": "Awesome!",
-  "totalCount": "<%= count %> total count",
-  "countLeft": "Check-ins until next reward: <%= count %>",
-  "incentivesDescription": "When it comes to building habits, consistency is key. Each day you check-in you get closer to a prize.",
-  "totalCheckins": "<%= count %> Check-Ins",
-  "checkinEarned": "Your Check-In Counter went up!",
-  "unlockedCheckInReward": "You unlocked a Check-In Prize!",
-  "totalCheckinsTitle": "Total Check-Ins",
-  "checkinProgressTitle": "Progress until next",
-  "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
-  "checkinReceivedAllRewardsMessage": "You have received all the Check-In prizes available! Congratulations!",
-  "oneOfAllPetEggs": "one of each standard Pet Egg",
-  "twoOfAllPetEggs": "two of each standard Pet Egg",
-  "threeOfAllPetEggs": "three of each standard Pet Egg",
-  "oneOfAllHatchingPotions": "one of each standard Hatching Potion",
-  "threeOfEachFood": "three of each standard Pet Food",
-  "fourOfEachFood": "four of each standard Pet Food",
-  "twoSaddles": "two Saddles",
-  "threeSaddles": "three Saddles",
-  "incentiveAchievement": "the Royally Loyal achievement",
-  "royallyLoyal": "Royally Loyal",
-  "royallyLoyalText": "This user has checked in over 500 times, and has earned every Check-In Prize!",
-  "checkInRewards": "Check-In Rewards",
-  "backloggedCheckInRewards": "You received Check-In Prizes! Visit your Inventory and Equipment to see what's new."
+    "unlockedReward": "Has rebut <%= reward %>",
+    "earnedRewardForDevotion": "Has rebut <%= reward %> per estar compromès a millorar la teva vida.",
+    "nextRewardUnlocksIn": "Entrades fins el pròxim premi: <%= numberOfCheckinsLeft %>",
+    "awesome": "Genial!",
+    "totalCount": "<%= count %> en total",
+    "countLeft": "Entrades fins la pròxima recompensa: <%= count %>",
+    "incentivesDescription": "Quan es tracta de formar hàbits, la consistència és la clau. Cada dia que entris estàs més a prop d'obtenir un premi.",
+    "totalCheckins": "<%= count %> entrades",
+    "checkinEarned": "El teu comptador d'entrades ha augmentat!",
+    "unlockedCheckInReward": "Has desbloquejat un premi per entrades!",
+    "totalCheckinsTitle": "Entrades totals",
+    "checkinProgressTitle": "Progrés fins el pròxim",
+    "incentiveBackgroundsUnlockedWithCheckins": "Els fons bàsics es desbloquejen amb les entrades diàries.",
+    "checkinReceivedAllRewardsMessage": "Has rebut tots els premis per entrades disponibles! Felicitats!",
+    "oneOfAllPetEggs": "un ou de cada mascota estàndard",
+    "twoOfAllPetEggs": "dos ous de cada mascota estàndard",
+    "threeOfAllPetEggs": "tres ous de cada mascota estàndard",
+    "oneOfAllHatchingPotions": "una poció de covar estàndard de cada tipus",
+    "threeOfEachFood": "tres aliments de cada mascota estàndard",
+    "fourOfEachFood": "quatre aliments de cada mascota estàndard",
+    "twoSaddles": "dues muntures",
+    "threeSaddles": "tres muntures",
+    "incentiveAchievement": "l'assoliment reialment lleial",
+    "royallyLoyal": "Reialment lleial",
+    "royallyLoyalText": "Aquest usuari ha entrat més de 500 vegades i ha guanyat tots els premis per entrades!",
+    "checkInRewards": "Recompenses per entrades",
+    "backloggedCheckInRewards": "Has rebut premis per entrades! Mira el teu inventari i equipament per veure les novetats."
 }
@@ -1,34 +1,33 @@
 {
-  "habiticaBackSoon": "No et preocupis, Habitica tornarà d'aquí poc!",
-  "importantMaintenance": "We are doing important maintenance that we estimate will last until 10pm Pacific Time (5am UTC).",
-  "maintenance": "Manteniment",
-  "maintenanceMoreInfo": "Vols més informació sobre el manteniment? <%= linkStart %>Visita la nostra pàgina d'informació<%= linkEnd %>.",
-  "noDamageKeepStreaks": "No rebràs danys o perdràs ratxes!",
-  "thanksForPatience": "Gràcies per la teva paciència!",
-  "twitterMaintenanceUpdates": "Si vols les notificacions més recents, ves al nostre <a href='https://twitter.com/habitica'>Twitter</a>, on penjarem informació sobre l'estat de la web.",
-  "veteranPetAward": "Al final, rebràs una Mascota Veterana!",
-
-  "maintenanceInfoTitle": "Information about Upcoming Maintenance to Habitica",
-  "maintenanceInfoWhat": "Qué està passant?",
-  "maintenanceInfoWhatText": "On May 21, Habitica will be down for maintenance for most of the day. You will not take any damage or have your account harmed during that weekend, even if you can’t log in to check off your Dailies in time! We will be working very hard to make the downtime as short as possible, and will be posting regular updates on <a href='https://twitter.com/habitica' target='_blank'>our Twitter account</a>. At the end of the downtime, to thank everyone for their patience, you will all receive a rare pet!",
-  "maintenanceInfoWhy": "Perqué està passant?",
-  "maintenanceInfoWhyText": "For the past several months, we have been thoroughly revamping Habitica behind-the-scenes. Specifically, we have rewritten the API. While it may not look much different on the surface, it’s a whole new world underneath. This will allow us WAY more flexibility when we want to build features in the future, and lead to improved performance!",
-  "maintenanceInfoTechDetails": "Want more details on the technical side of the process? Visit <a href='http://devs.habitica.com/' target='_blank'>The Forge, our dev blog</a>.",
-  "maintenanceInfoMore": "Més informació",
-  "maintenanceInfoAccountChanges": "What changes will I see to my account after the rewrite is complete?",
-  "maintenanceInfoAccountChangesText": "At first, there won’t be any notable changes aside from performance improvements for features such as Challenges. If you notice any changes that shouldn’t be there, email us at <%= hrefTechAssistanceEmail %> and we will investigate them for you!",
-  "maintenanceInfoAddFeatures": "What kind of features will this allow Habitica to add?",
-  "maintenanceInfoAddFeaturesText": "Completing this rewrite will allow us to start building out improved chat and Guilds, plans for organizations and families, and additional productivity features like Monthlies and the ability to record yesterday’s activity! Those are all involved features on their own, so it will take time to build them, but until we were finished with this rewrite, there was no way we could start them.",
-  "maintenanceInfoHowLong": "Quan de temps durarà el manteniment?",
-  "maintenanceInfoHowLongText": "We have to migrate tasks and data for all 1.3 million Habitica users -- not an easy task! We anticipate that it will take place between approximately 1pm Pacific Time (8pm UTC) and 10pm Pacific Time (5am UTC). Rest assured that we’re doing everything we can to make it go as quickly as possible! You can follow <a href='https://twitter.com/habitica' target='_blank'>updates on our Twitter</a>.",
-  "maintenanceInfoStatsAffected": "Com es veuran afectats les meves Tasques Diàries, Ratxes, Millores i Missions?",
-  "maintenanceInfoStatsAffectedText1": "You will NOT take any damage or lose any streaks that weekend, but otherwise, your day will reset normally! Dailies that you checked will become unchecked, buffs will reset, etc. If you are in a Collection Quest, you will still find items. If you are in a Boss Battle, you will still deal damage to the Boss, but the Boss will not deal damage to you. (Even monsters need a break!)",
-  "maintenanceInfoStatsAffectedText2": "After a lot of thought, our team concluded that this was the most fair way to handle the fact that many users will not be able to check off their Dailies normally during the maintenance. We’re sorry for any inconvenience this causes!",
-  "maintenanceInfoSeeTasks": "Qué passa si necessito veure la meva llista de tasques?",
-  "maintenanceInfoSeeTasksText": "If you know that you will need to see your task list on Saturday to remind yourself what you have to do, we recommend that before the maintenance begins, you take a screenshot of your tasks so that you can use it as a reference.",
-  "maintenanceInfoRarePet": "Quin tipus de mascota estranya rebré?",
-  "maintenanceInfoRarePetText": "To thank you for your patience during the downtime, everyone will get a rare Veteran Pet. If you’ve never received a Veteran Pet before, you will receive a Veteran Wolf. If you already have a Veteran Wolf, you will receive a Veteran Tiger. And if you already have a Veteran Wolf and a Veteran Tiger, you will receive a never-before-seen Veteran pet! After the migration is completed, it may take several hours for your pet to show up, but never fear, everyone will get one.",
-  "maintenanceInfoWho": "Who worked on this massive project?",
-  "maintenanceInfoWhoText": "We’re glad you asked! It was spearheaded by our amazing contributor paglias, with lots of help from Blade, TheHollidayInn, SabreCat, Victor Pudeyev, TheUnknown, and Alys.",
-  "maintenanceInfoTesting": "The new version was also tirelessly tested by a bunch of our amazing open-source volunteers. Thank you -- we couldn't have done this without you."
+    "habiticaBackSoon": "No et preocupis, Habitica tornarà d'aquí poc!",
+    "importantMaintenance": "Estem fent un manteniment important que durarà fins les 22h Zona horària del Pacífic (5h UTC).",
+    "maintenance": "Manteniment",
+    "maintenanceMoreInfo": "Vols més informació sobre el manteniment? <%= linkStart %>Visita la nostra pàgina d'informació<%= linkEnd %>.",
+    "noDamageKeepStreaks": "No rebràs danys o perdràs ratxes!",
+    "thanksForPatience": "Gràcies per la teva paciència!",
+    "twitterMaintenanceUpdates": "Si vols les notificacions més recents, ves al nostre <a href='https://twitter.com/habitica'>Twitter</a>, on penjarem informació sobre l'estat de la web.",
+    "veteranPetAward": "Al final, rebràs una Mascota Veterana!",
+    "maintenanceInfoTitle": "Informació sobre el pròxim manteniment d'Habitica",
+    "maintenanceInfoWhat": "Qué està passant?",
+    "maintenanceInfoWhatText": "El 21 de maig, Habitica estarà fora de servei per manteniment quasi tot el dia. Les tasques i el compte no quedaran afectats durant aquest cap de setmana, encara que no hagis pogut entrar i completar les tasques diàries a temps! Treballarem dur perquè aquesta interrupció duri poc i anirem publicant regularment el progrés al <a href='https://twitter.com/habitica' target='_blank'>nostre compte de Twitter</a>. Quan acabi aquest procés, tothom rebrà una mascota rara per agraïr la vostra paciència!",
+    "maintenanceInfoWhy": "Perqué està passant?",
+    "maintenanceInfoWhyText": "Els últims mesos hem estat fent millores a Habitica. En concret, hem rescrit l'API. Encara que per fora no sembli gaire diferent, per dins és un món nou. Això ens permetrà MOLTA més flexibilitat quan vulguem afegir funcions en el futur i, a més, millorarà el rendiment!",
+    "maintenanceInfoTechDetails": "Vols més detalls de la part tècnica d'aquest procés? Visita <a href='http://devs.habitica.com/' target='_blank'>The Forge, el nostre blog de desenvolupadors</a>.",
+    "maintenanceInfoMore": "Més informació",
+    "maintenanceInfoAccountChanges": "Quins canvis veuré al meu compte quan s'hagi acabat la reescriptura?",
+    "maintenanceInfoAccountChangesText": "Al principi no hi haurà canvis significatius a part de les millores de rendiment a característiques com els reptes. Si notes qualsevol canvi que no hi hauria de ser, envia'ns un correu elecrònica a <%= hrefTechAssistanceEmail %> i ho investigarem!",
+    "maintenanceInfoAddFeatures": "Quin tipus de funcions es podràn afegir a Habitica?",
+    "maintenanceInfoAddFeaturesText": "Completar aquesta reescriptura permetrà començar a crear un xat i gremis millorats, plans per organitzacions i famílies i més funcions de productivitat com tasques mensuals o la possibilitat de registar l'activitat del dia anterior! Totes aquestes funcions són bastant complexes i tardarem temps a desenvolupar-les, però sense tenir acabada aquesta reescriptura no les podem començar.",
+    "maintenanceInfoHowLong": "Quan de temps durarà el manteniment?",
+    "maintenanceInfoHowLongText": "Hem de migrar les tasques i les dades dels 1,3 milions d'usuaris d'Habitica, cosa que no és fàcil! Calculem que tindrà lloc aproximadament entre les 22h i les 7h hora de la península d'Espanya (de 20h a 5h UTC). Estem fent tot el que podem per acabar el més aviat possible! Pots seguir les <a href='https://twitter.com/habitica' target='_blank'>actualitzacions a Twitter</a>.",
+    "maintenanceInfoStatsAffected": "Com es veuran afectats les meves Tasques Diàries, Ratxes, Millores i Missions?",
+    "maintenanceInfoStatsAffectedText1": "NO perdras vida ni ràfegues aquest cap de setmana però la resta del dia es reiniciarà com de costum! Les tasques diàries que hagis marcat es desmarcaran, es reiniciaran les millores, etc. Si participes en una missió de recopilar objectes, continuaràs trobant-los. Si estas lluitant contra un enemic final, continuaras traient-li vida però el monstre no et farà mal. (Fins i tot els monstres necessiten descansar de tant en tant!)",
+    "maintenanceInfoStatsAffectedText2": "Després de fer-hi moltes voltes, hem arribat a la conclusió que era la manera més justa d'actuar davant el fet que molts usuaris no podran marcar les tasques diaries amb normalitat durant les tasques de manteniment. Sentim les molèsties que pugui causar!",
+    "maintenanceInfoSeeTasks": "Què passa si necessito veure la meva llista de tasques?",
+    "maintenanceInfoSeeTasksText": "Si saps que necessitaràs la teva llista de tasques el dissabte per recordar el que has de fer, et recomanem que, abans que comencin les tasques de manteniment, facis una captura de pantalla de les tasques per poder consultar-la més tard.",
+    "maintenanceInfoRarePet": "Quin tipus de mascota estranya rebré?",
+    "maintenanceInfoRarePetText": "Per agraïr la vostra paciència durant aquest procés, tothom rebrà una mascota veterana rara. Si no n'has rebut mai cap, rebràs un llop veterà. So ja tens un llop veterà, rebràs un tigre veterà i si ja tens aquests dos, rebràs una mascota veterana mai vista! Quan s'hagi acabat la migració, és possible que la mascota tardi unes hores a aparèixer però no et preocupis que tothom rebrà la seva.",
+    "maintenanceInfoWho": "Qui ha col·laborat en aquest gran projecte?",
+    "maintenanceInfoWhoText": "Gràcies per fer aquesta pregunta! El cap de tot això és el nostre increïble col·laborador paglias, amb la gran ajuda de Blade, TheHollidayInn, SabreCat, Victor Pudeyev, TheUnknown i Alys.",
+    "maintenanceInfoTesting": "Un grup magnífic de voluntaris de codi lliure ha provat sense descans la nova versió. Gràcies, no ho podríem haver aconseguit sense vosaltres."
 }
@@ -1,20 +1,14 @@
 {
-  "merch" : "Merchandise",
-  "merchandiseDescription": "Looking for t-shirts, mugs, or stickers to show off your Habitica pride? Click here!",
-
-  "merch-teespring-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
-  "merch-teespring-goto" : "Get a Habitica T-shirt",
-
-  "merch-teespring-mug-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
-  "merch-teespring-mug-goto" : "Get a Habitica Mug",
-
-  "merch-teespring-eu-summary" : "EUROPEAN VERSION : Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
-  "merch-teespring-eu-goto" : "Get a Habitica T-shirt (EU)",
-
-  "merch-teespring-mug-eu-summary" : "EUROPEAN VERSION : Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",
-  "merch-teespring-mug-eu-goto" : "Get a Habitica Mug (EU)",
-
-  "merch-stickermule-summary" : "Stick proud Melior wherever you (or someone else) need a reminder of both present and future accomplishments!",
-  "merch-stickermule-goto" : "Get Habitica stickers"
-
+    "merch": "Marxandatge",
+    "merchandiseDescription": "Busques camisetes, tasses o enganxines per demostrar el teu orgull d'Habitica? Fes clic aquí!",
+    "merch-teespring-summary": "Teespring és una plataforma que fa que sigui fàcil per tohom crear i vendre productes d'alta qualitat que agradin, sense cost ni risc.",
+    "merch-teespring-goto": "Aconsegueix una samarreta d'Habitica",
+    "merch-teespring-mug-summary": "Teespring és una plataforma que fa que sigui fàcil per tohom crear i vendre productes d'alta qualitat que agradin, sense cost ni risc.",
+    "merch-teespring-mug-goto": "Aconsegueix una tassa d'Habitica",
+    "merch-teespring-eu-summary": "VERSIÓ EUROPEA: Teespring és una plataforma que fa que sigui fàcil per tohom crear i vendre productes d'alta qualitat que agradin, sense cost ni risc.",
+    "merch-teespring-eu-goto": "Acosengueix una samarreta d'Habitica (EU)",
+    "merch-teespring-mug-eu-summary": "VERSIÓ EUROPEA: Teespring és una plataforma que fa que sigui fàcil per tohom crear i vendre productes d'alta qualitat que agradin, sense cost ni risc.",
+    "merch-teespring-mug-eu-goto": "Aconsegueix una tassa d'Habitica (EU)",
+    "merch-stickermule-summary": "Posa al imponent Melior on tu (o algú altre) necessitis un recordatori dels teus assoliments presents i futurs!",
+    "merch-stickermule-goto": "Aconsegueix adhesius d'Habitica"
 }
@@ -1,6 +1,6 @@
 {
-    "jsDisabledHeading": "Apa! El teu navegador no te el JavaScript activat",
-    "jsDisabledHeadingFull": "Apa! El teu navegador no te el JavaScript activat i sense això, Habitica no pot funcionar correctament.",
+    "jsDisabledHeading": "Apa! El teu navegador no té JavaScript activat",
+    "jsDisabledHeadingFull": "Apa! El teu navegador no te el JavaScript activat i sense això, Habitica no pot funcionar correctament",
    "jsDisabledText": "Habitica no pot exposar correctament el lloc web sense això!",
    "jsDisabledLink": "Si us plau activeu el JavaScript per continuar!"
-}
+}
@@ -1,29 +1,30 @@
 {
    "rebirthNew": "Renéixer: Una nova aventura está disponible!",
    "rebirthUnlock": "Has desbloquejat Renéixer! Aquest objecte especial del Mercat et permet començar una nova partida des del nivell 1 conservant les teves tasques, fites, mascotes, i més. Utilitza-ho per refrescar la teva experiència a Habitica si creus que ja ho has fet tot, o per utilitzar els nous trets amb els ulls d'un personatge novell!",
-    "rebirthBegin": "Renéixer: Comença una nova aventura!",
+    "rebirthBegin": "Renéixer: Comença una nova aventura",
    "rebirthStartOver": "Renéixer fa que el teu personatge torni a començar des de el nivell 1.",
-    "rebirthAdvList1": "Recuperes tota la vida",
-    "rebirthAdvList2": "You have no Experience or Gold.",
-    "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.",
-    "rebirthAdvList4": "You have the starting class of Warrior until you earn a new class.",
-    "rebirthInherit": "Your new character inherits a few things from their predecessor:",
-    "rebirthInList1": "Tasks, history, equipment, and settings remain.",
-    "rebirthInList2": "Challenge, Guild, and Party memberships remain.",
-    "rebirthInList3": "Gems, backer tiers, and contributor levels remain.",
-    "rebirthInList4": "Items obtained from Gems or drops (such as pets and mounts) remain.",
-    "rebirthEarnAchievement": "You also earn an Achievement for beginning a new adventure!",
+    "rebirthAdvList1": "Recuperes tota la vida.",
+    "rebirthAdvList2": "No tens experiència ni or.",
+    "rebirthAdvList3": "Els teus hàbits, tasques diàries o tasques pendents tornen a ser grocs i les ràfegues es restableixen, excepte les tasques dels reptes.",
+    "rebirthAdvList4": "Al principi tens la classe de guerrer fins que aconsegueixis una classe nova.",
+    "rebirthInherit": "El teu personatge nou hereda unes quantes coses del seu predecessor:",
+    "rebirthInList1": "Es conserven les tasques, l'historial, l'equipament i la configuració.",
+    "rebirthInList2": "Es conserven els reptes, els gremis i els grups.",
+    "rebirthInList3": "Es conserven les gemmes, els nivells de patrocinador i de col·laborador.",
+    "rebirthInList4": "Es conserven els objectes obtinguts de gemmes o de botíns (com mascotes i muntures).",
+    "rebirthEarnAchievement": "També guanyes un assoliment per començar una nova aventura!",
    "beReborn": "Ser Renascut",
-    "rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!",
-    "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!",
+    "rebirthAchievement": "Has començat una nova aventura! Aquest és el renaixement <%= number %> per a tu, i el nivell més alt que has aconseguit és <%= level %>. Per millorar aquest assoliment, comença la teva pròxima aventura quan hagis arribat a un nivell encara més alt!",
+    "rebirthAchievement100": "Has començat una nova aventura! Aquest és el renaixement <%= number %> per a tu, i el nivell més alt que has aconseguit és 100 o superior. Per millorar aquest assoliment, comença la teva pròxima aventura quan hagis arribat com a mínim al nivell 100!",
    "rebirthBegan": "Comença una Nova Aventura",
    "rebirthText": "Comença <%= rebirths %> Nova Aventura",
-    "rebirthOrb": "Used an Orb of Rebirth to start over after attaining Level <%= level %>.",
-    "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher.",
-    "rebirthOrbNoLevel": "Used an Orb of Rebirth to start over.",
-    "rebirthPop": "Instantly restart your character as a Level 1 Warrior while retaining achievements, collectibles, and equipment. Your tasks and their history will remain but they will be reset to yellow. Your streaks will be removed except from challenge tasks. Your Gold, Experience, Mana, and the effects of all Skills will be removed. All of this will take effect immediately. For more information, see the wiki's <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orb of Rebirth</a> page.",
-    "rebirthName": "Orbe del Renaixement",
+    "rebirthOrb": "Utilitza una orbe de renaixement per començar de nou després d'arribar al nivell <%= level %>.",
+    "rebirthOrb100": "Has utilizat una esfera de renaixement per tornar a començar després d'arribar o superar el nivell 100.",
+    "rebirthOrbNoLevel": "Has utilitzat una esfera de renaixement per tornar a començar.",
+    "rebirthPop": "Reinicia instantment el teu personatge com a guerrer de nivell 1, mantenint els assoliments, les col·leccions i l'equipament. Es conservaran les tasques i l'historial però tornaran a ser grogues. S'eliminaran totes les ràfegues menys les de les tasques que pertanyin a reptes actius i a grups. S'eliminarà l'or, l'experiència, la màgia i els efectes de les habilitats. Tot això tindrà efecte immediat. Per més informació, mira la pàgina de la wili <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Esfera de renaixement</a>.",
+    "rebirthName": "Esfera de renaixement",
    "reborn": "Reneix, nivell màxim <%= reLevel %>",
-    "confirmReborn": "Estàs segur?",
-    "rebirthComplete": "You have been reborn!"
-}
+    "confirmReborn": "N'estàs segur?",
+    "rebirthComplete": "Has tornat a nèixer!",
+    "nextFreeRebirth": "<strong><%= days %> dies</strong> fins a tenir l'esfera de renaixement <strong>GRATUÏTA</strong>"
+}
@@ -527,5 +527,10 @@
    "backgroundHabitCityRooftopsNotes": "Springe abenteuerlich zwischen den Dächern von Habit City umher.",
    "backgroundHabitCityRooftopsText": "Dächer von Habit City",
    "backgrounds052020": "Set 72: Veröffentlicht im Mai 2020",
-    "backgroundHotAirBalloonNotes": "Schwebe über der Landschaft in einem Heißluftballon."
+    "backgroundHotAirBalloonNotes": "Schwebe über der Landschaft in einem Heißluftballon.",
+    "backgroundVikingShipNotes": "Setze die Segel für Abenteuer an Bord eines Wikingerschiffes.",
+    "backgroundVikingShipText": "Wikingerschiff",
+    "backgroundSaltLakeText": "Salzwassersee",
+    "backgroundRelaxationRiverText": "Freizeitfluss",
+    "backgrounds062020": "Set 73: Veröffentlicht im Juni 2020"
 }
@@ -120,7 +120,7 @@
    "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Stell eine Frage</a>: eine Gilde für Benutzer, die Fragen haben!",
    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>Das Wiki</a>: Die größte Informationssammlung über Habitica.",
    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: für Fehlermeldungen oder für das Mithelfen beim Programmieren!",
-    "commGuideLink04": "<a href='https://trello.com/b/EpoYEYod/' target='_blank'>Der Haupt-Trello</a>: für Vorschläge neuer Funktionen der Webseite.",
+    "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>Das Feedback Formular</a>: für Vorschläge neuer Funktionen der Webseite und App.",
    "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>Der Mobile-Trello</a>: für Vorschläge neuer Funktionen der Apps.",
    "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>Der Kunst-Trello</a>: um Pixel-Kunst einzureichen.",
    "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>Der Quest-Trello</a>: reiche Deine Quest-Entwürfe ein.",
@@ -47,7 +47,7 @@
    "faqQuestion11": "Wie melde ich einen Fehler oder schlage ein Feature vor?",
    "iosFaqAnswer11": "Du kannst Fehler melden, ein Feature vorschlagen oder Feedback geben, indem Du Menü > Über > Einen Fehler melden oder Menü > Über > Feedback senden auswählst! Wir werden alles Mögliche tun, um Dir zu helfen.",
    "androidFaqAnswer11": "Um einen Fehler zu melden, ein Feature vorzuschlagen oder Feedback zu senden, gehe im Menü unter Hilfe > Melde einen Fehler und Hilfe > Feature vorschlagen! Wir werden alles tun, um Dir zu helfen.",
-    "webFaqAnswer11": "Um einen Fehler zu melden, gehe zu [Hilfe > Melde einen Fehler](https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac) und lies die Punkte oberhalb des Chatfensters. Falls Du Dich nicht in Habitica anmelden kannst, sende Deine Anmeldedaten (nicht Dein Passwort!) an [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Keine Sorge, wir werden Dir schnellstmöglich helfen!  Vorschläge für Funktionen werden in Trello gesammelt. Gehe zu [Hilfe > Eine Funktion Vorschlagen](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) und folge den Anweisungen. Ta-da!",
+    "webFaqAnswer11": "Um einen Fehler zu melden, gehe zu [Hilfe > Melde einen Fehler](https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac) und lies die Punkte oberhalb des Chatfensters. Falls Du Dich nicht in Habitica anmelden kannst, sende Deine Anmeldedaten (nicht Dein Passwort!) an [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Keine Sorge, wir werden Dir schnellstmöglich helfen! Vorschläge für Funktionen werden über ein Google Formular gesammelt. Gehe zu [Hilfe > Eine Funktion vorschlagen](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) und folge den Anweisungen. Ta-da!",
    "faqQuestion12": "Wie bekämpfe ich einen Weltboss?",
    "iosFaqAnswer12": "Weltbosse sind spezielle Monster, die in der Taverne erscheinen. Alle aktiven Nutzer kämpfen automatisch gegen den Boss und ihre Aufgaben und Fähigkeiten werden dem Boss wie üblich schaden. \n\nDu kannst Dich gleichzeitig in einer normalen Quest befinden. Deine Aufgaben und Fähigkeiten zählen sowohl dem Weltboss wie auch dem Boss/der Sammelquest gegenüber.\n\nEin Weltboss wird niemals Dich oder Deinen Account verletzen. Stattdessen gibt es einen Raserei-Balken, welcher sich füllt, wenn Benutzer ihre Tagesaufgaben auslassen. Wenn der Raserei-Balken gefüllt ist, wird der Weltboss einen der Nicht-Spieler-Charakter der Seite angreifen und ihr Aussehen wird sich verändern. \n\nErfahre mehr über [vergangene Weltbosse](http://habitica.fandom.com/wiki/World_Bosses) im Wiki.",
    "androidFaqAnswer12": "Weltbosse sind spezielle Monster, die in der Taverne erscheinen. Alle aktiven Nutzer kämpfen automatisch gegen den Boss und ihre Aufgaben und Fähigkeiten werden dem Boss wie üblich schaden. \n\nDu kannst Dich gleichzeitig in einer normalen Quest befinden. Deine Aufgaben und Fähigkeiten zählen sowohl dem Weltboss wie auch dem Boss/der Sammelquest gegenüber.\n\nEin Weltboss wird niemals Dich oder Deinen Account verletzen. Stattdessen gibt es einen Raserei-Balken, welcher sich füllt, wenn Benutzer ihre Tagesaufgaben auslassen. Wenn der Raserei-Balken gefüllt ist, wird der Weltboss einen der Nicht-Spieler-Charakter der Seite angreifen und ihr Aussehen wird sich verändern. \n\nErfahre mehr über [vergangene Weltbosse](http://habitica.fandom.com/wiki/World_Bosses) im Wiki.",
@@ -2101,5 +2101,12 @@
    "headArmoireFiddlersCapText": "Fiedler-Mütze",
    "armorArmoireFiddlersCoatNotes": "Ein praktisches Outfit, das Dir viel Bewegungsfreiheit lässt! Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Fiedler-Set (Gegenstand 2 von 4).",
    "armorArmoireFiddlersCoatText": "Fiedler-Mantel",
-    "weaponArmoireFiddlersBowNotes": "Mit diesem Bogen kannst Du aus Allem Musik kitzeln! … Eine Violine würde zwar wahrscheinlich am besten funktionieren. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Fiedler-Set (Gegenstand 3 von 4)."
+    "weaponArmoireFiddlersBowNotes": "Mit diesem Bogen kannst Du aus Allem Musik kitzeln! … Eine Violine würde zwar wahrscheinlich am besten funktionieren. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Fiedler-Set (Gegenstand 3 von 4).",
+    "headMystery202006Text": "Sugilithdiadem",
+    "armorMystery202006Notes": "Selbst inmitten der knalligsten Korallen und Anemonen, sticht diese Flosse aus der Masse heraus! Gewährt keinen Attributbonus. Abonnentengegenstand, Juni 2020.",
+    "headMystery202006Notes": "Die positive Energie dieser strahlend violetten Steine wird die freundlichsten Meeresbewohner zu Dir locken. Gewährt keinen Attributbonus. Abonnentengegenstand, Juni 2020.",
+    "armorMystery202006Text": "Mehrfarbige Meermenschenflosse",
+    "bodyArmoireLifeguardWhistleText": "Rettungsschwimmerpfeife",
+    "shieldArmoireLifeBuoyText": "Rettungsring",
+    "weaponArmoireBeachFlagText": "Strandflagge"
 }
@@ -493,5 +493,6 @@
    "selectGift": "Geschenk auswählen",
    "PMCanNotReply": "Du kannst auf diese Nachricht nicht antworten",
    "PMUnblockUserToSendMessages": "Entblocke diese Person, um wieder Nachrichten versenden und empfangen zu können.",
-    "PMUserDoesNotReceiveMessages": "Diese Person empfängt keine privaten Nachrichten mehr"
+    "PMUserDoesNotReceiveMessages": "Diese Person empfängt keine privaten Nachrichten mehr",
+    "newPartyPlaceholder": "Gib den Namen Deiner Party ein."
 }
@@ -90,7 +90,7 @@
    "pathRequired": "Pfad ist erforderlich",
    "unlocked": "Gegenstände wurden freigeschaltet",
    "alreadyUnlocked": "Komplettes Set ist bereits freigeschaltet.",
-    "alreadyUnlockedPart": "Set ist bereits teilweise freigeschaltet.",
+    "alreadyUnlockedPart": "Set ist bereits teilweise freigeschaltet. Es ist günstiger die übrigen Gegenstände einzeln zu kaufen.",
    "invalidQuantity": "Die zu kaufende Menge muss eine positive ganze Zahl sein.",
    "USD": "(USD)",
    "newStuff": "Neuigkeiten von Bailey",
@@ -171,5 +171,6 @@
    "paymentAutoRenew": "Dieses Abonnement wird automatisch erneuert bis es gekündigt wird. Wenn Du dieses Abonnement kündigen musst, kannst Du dies in Deinen Einstellungen tun.",
    "paymentCanceledDisputes": "Wir haben eine Bestätigung der Kündigung an Deine E-Mailadresse gesendet. Falls Du die E-Mail nicht erhältst, kontaktiere uns bitte um zu verhindern, dass es zu Zahlungsstreitigkeiten kommt.",
    "cannotUnpinItem": "Dieser Gegenstand kann nicht von der Pinnwand entfernt werden.",
-    "paymentSubBillingWithMethod": "Dein Abonnement wird in Höhe von <strong>$<%= amount %></strong> alle <strong><%= months %> Monat(e)</strong> per <strong><%= paymentMethod %></strong> abgerechnet."
+    "paymentSubBillingWithMethod": "Dein Abonnement wird in Höhe von <strong>$<%= amount %></strong> alle <strong><%= months %> Monat(e)</strong> per <strong><%= paymentMethod %></strong> abgerechnet.",
+    "invalidUnlockSet": "Dieses Set an Gegenständen ist abgelaufen und kann nicht freigeschaltet werden."
 }
@@ -139,5 +139,6 @@
    "tavernBossTired": "<%= bossName %> versucht, seinen <%= rageName %> loszulassen, aber er ist zu müde.",
    "chatBossDontAttack": "<%= username %> greift <%= bossName %> für <%= userDamage %> Schaden an. <%= bossName %> greift nicht an, weil er die Tatsache respektiert, dass es nach der Wartung einige Bugs gibt, und er will niemanden unfair verletzen will. Bald wird er seine Randale weiterführen!",
    "questAlreadyStarted": "Die Quest hat bereits begonnen.",
-    "questAlreadyStartedFriendly": "Die Quest hat bereits begonnen, aber Du kannst bei der nächsten mithelfen!"
+    "questAlreadyStartedFriendly": "Die Quest hat bereits begonnen, aber Du kannst bei der nächsten mithelfen!",
+    "bossDamage": "Du hast dem Boss Schaden zugefügt!"
 }
@@ -404,8 +404,8 @@
    "questDustBunniesBoss": "Ungezähmte Staubmäuse",
    "questGroupMoon": "Mondschlacht",
    "questMoon1Text": "Mondkampf, Teil 1: Finde die geheimnisvollen Scherben",
-    "questMoon1Notes": "Habiticaner wurde durch etwas seltsames von Ihren Aufgaben abgelenkt: Gewundene Steinsplitter erscheinen überall im Land. Besorgt ruft Die @Starsystemic zu Ihrem Turm. Sie meint: \"Ich lese besorgniserregende Omen über diese Splitter, die das Land vereiteln und die hartarbeitenden Habiticaner ablenken. Ich kann die Quelle zurückverfolgen, aber dazu muss ich diese Steinsplitter zuerst untersuchen. Könnt Ihr einige davon zu mir bringen?\"",
-    "questMoon1Completion": "@Starsystemic verschwindet in ihren Turm, um die Splitter zu begutachten, die du gesammelt hast. \"Das könnte komplizierter werden, als wir dachten,\" meint @Beffymaroo, ihr treuer Gehilfe. \"Es wird etwas dauern, bis wir die Ursache herausgefunden haben. Komm täglich wieder, sobald wir mehr wissen, werden wir dir die nächste Questschriftrolle zukommen lassen.\"",
+    "questMoon1Notes": "Die Bevölkerung von Habitica wurde durch etwas seltsames von ihren Aufgaben abgelenkt: Gewundene Steinsplitter erscheinen überall im Land. Besorgt ruft Dich die Seherin, @Starsystemic, zu ihrem Turm. Sie sagt: \"Ich erkenne ein besorgniserregendes Omen in diesen Splittern, die sich über das Land vereiteln und die hartarbeitende Bevölkerung ablenken. Ich kann die Quelle zurückverfolgen, aber dazu muss ich diese Steinsplitter zuerst untersuchen. Kannst Du einige davon zu mir bringen?\"",
+    "questMoon1Completion": "@Starsystemic verschwindet in ihren Turm, um die Splitter zu begutachten, die Du gesammelt hast. \"Das könnte komplizierter werden, als wir dachten,\" meint @Beffymaroo, ihre treue Gehilfin. \"Es wird etwas dauern, bis wir die Ursache herausgefunden haben. Schau täglich vorbei und, sobald wir mehr wissen, werden wir Dir die nächste Questschriftrolle zukommen lassen.\"",
    "questMoon1CollectShards": "Mondscherben",
    "questMoon1DropHeadgear": "Mondkriegerhelm (Kopfbedeckung)",
    "questMoon2Text": "Mondkampf, Teil 2: Stoppt den Überschattenden Stress",
@@ -2,7 +2,7 @@
    "settings": "Einstellungen",
    "language": "Sprache",
    "americanEnglishGovern": "Im Fall von Bedeutungsunterschieden gilt die englische Version.",
-    "helpWithTranslation": "Möchtest Du bei der Übersetzung von Habitica helfen? Toll! Dann besuche doch <a href=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">diese</a> Trello-Karte.",
+    "helpWithTranslation": "Möchtest Du bei der Übersetzung von Habitica helfen? Toll! Dann besuche doch die <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">Aspiring Linguists Guild</a>!",
    "showHeaderPop": "Zeigt Deinen Avatar, den Lebens- und Erfahrungsbalken und Deine Party an.",
    "stickyHeader": "Kopfzeile anheften",
    "stickyHeaderPop": "Fixiert die Kopfzeile am oberen Ende der Seite. Abgewählt bedeutet, dass die Kopfzeile aus dem Fokus verschwinden kann.",
@@ -249,5 +249,6 @@
    "doubleDropCap": "Verdopple die Beute",
    "mysterySet202003": "Stachliges Streitgewandset",
    "mysterySet202004": "Mächtiger-Monarch-Set",
-    "mysterySet202005": "Wunderliches Wyvern-Set"
+    "mysterySet202005": "Wunderliches Wyvern-Set",
+    "mysterySet202006": "Mehrfarbiges Meermenschenset"
 }
@@ -300,6 +300,8 @@
  "hatchingPotionRuby": "Ruby",
  "hatchingPotionBirchBark": "Birch Bark",
  "hatchingPotionDessert": "Confection",
+  "hatchingPotionFluorite": "Fluorite",
+  "hatchingPotionSandSculpture": "Sand Sculpture",

  "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
  "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
@@ -9,7 +9,7 @@
  "defaultHabit3Notes": "Sample Good or Bad Habits: +/- Took Stairs/Elevator ; +/- Drank Water/Soda",

  "defaultHabit4Text": "Add a task to Habitica",
-  "defaultHabit4Notes": "Either a Habit, a Daily, or a To-Do",
+  "defaultHabit4Notes": "Either a Habit, a Daily, or a To Do",

  "defaultHabit5Text": "Tap here to edit this into a bad habit you'd like to quit",
  "defaultHabit5Notes": "Or delete from the edit screen",
@@ -17,7 +17,7 @@
  "defaultDaily1Text": "Use Habitica to keep track of your tasks",

  "defaultTodo1Text": "Join Habitica (Check me off!)",
-  "defaultTodoNotes": "You can either complete this To-Do, edit it, or remove it.",
+  "defaultTodoNotes": "You can either complete this To Do, edit it, or remove it.",

  "defaultTodo2Text": "Finish Justin's task walkthrough",
  "defaultTodo2Notes": "Visit all the sections of the bottom bar",
@@ -7,14 +7,14 @@
  "webFaqAnswer0": "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! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).",

  "faqQuestion1": "How do I set up my tasks?",
-  "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.",
-  "androidFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your character will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.",
-  "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.",
+  "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To Do's are your To Do list. Completing a To Do earns you gold and experience. You never lose health from To Do's. You can add a due date to a To Do by tapping to edit.",
+  "androidFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your character will take damage overnight. Be careful not to add too many Dailies at once!\n\n To Do's are your To Do list. Completing a To Do earns you gold and experience. You never lose health from To Do's. You can add a due date to a To Do by tapping to edit.",
+  "webFaqAnswer1": "* Good Habits (the ones with a :heavy_plus_sign:) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a :heavy_minus_sign:) are tasks that you should avoid, like biting nails. Habits with a :heavy_plus_sign: and a :heavy_minus_sign: have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n* Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n* To Do's are your To Do list. Completing a To Do earns you Gold and Experience. You never lose Health from To Do's. You can add a due date to a To Do by clicking the pencil icon to edit.",

  "faqQuestion2": "What are some sample tasks?",
-  "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-  "androidFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
-  "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+  "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+  "androidFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n<br><br>\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",
+  "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies)\n * [Sample To Do's](http://habitica.fandom.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards)",

  "faqQuestion3": "Why do my tasks change color?",
  "iosFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.",
@@ -42,9 +42,9 @@
  "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members. If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under Settings.",

  "faqQuestion8": "What is the blue Stat bar that appears in the Header after level 10?",
-  "iosFaqAnswer8": "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 > Use 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-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
-  "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-Dos, 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-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
+  "iosFaqAnswer8": "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 > Use 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.",
+  "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 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.",
@@ -2,7 +2,7 @@
  "FAQ": "FAQ",
  "termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
  "alexandraQuote": "Couldn't NOT talk about [Habitica] during my speech in Madrid. Must-have tool for freelancers who still need a boss.",
-  "althaireQuote": "Having a quest constantly on really motivates me to do all my dailies and do all my to-dos. My biggest motivation is not letting my party down.",
+  "althaireQuote": "Having a quest constantly on really motivates me to do all my Dailies and do all my To Do's. My biggest motivation is not letting my party down.",
  "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
  "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
  "businessSample1": "Confirm 1 page of Inventory",
@@ -84,7 +84,7 @@
  "landingend": "Not convinced yet?",
  "landingend2": "See a more detailed list of [our features](/static/overview). Are you looking for a more private approach? Check out our [administrative packages](/static/plans), which are perfect for families, teachers, support groups, and businesses.",
  "landingp1": "The problem with most productivity apps on the market is that they provide no incentive to continue using them. Habitica fixes this by making habit building fun! By rewarding you for your successes and penalizing you for slip-ups, Habitica provides external motivation for completing your day-to-day activities.",
-  "landingp2": "Whenever you reinforce a positive habit, complete a daily task, or take care of an old to-do, Habitica immediately rewards you with Experience points and Gold. As you gain experience, you can level up, increasing your Stats and unlocking more features, like classes and pets. Gold can be spent on in-game items that change your experience or personalized rewards you've created for motivation. When even the smallest successes provide you with an immediate reward, you're less likely to procrastinate.",
+  "landingp2": "Whenever you reinforce a positive habit, complete a daily task, or take care of an old To Do, Habitica immediately rewards you with Experience points and Gold. As you gain experience, you can level up, increasing your Stats and unlocking more features, like classes and pets. Gold can be spent on in-game items that change your experience or personalized rewards you've created for motivation. When even the smallest successes provide you with an immediate reward, you're less likely to procrastinate.",
  "landingp2header": "Instant Gratification",
  "landingp3": "Whenever you indulge in a bad habit or fail to complete one of your daily tasks, you lose health. If your health drops too low, you lose some of the progress you've made. By providing immediate consequences, Habitica can help break bad habits and procrastination cycles before they cause real-world problems.",
  "landingp3header": "Consequences",
@@ -98,7 +98,7 @@
  "logout": "Log Out",
  "marketing1Header": "Improve Your Habits by Playing a Game",
  "marketing1Lead1Title": "Your Life, the Role Playing Game",
-  "marketing1Lead1": "Habitica is a video game to help you improve real life habits. It \"gamifies\" your life by turning all your tasks (habits, dailies, and to-dos) into little monsters you have to conquer. The better you are at this, the more you progress in the game. If you slip up in life, your character starts backsliding in the game.",
+  "marketing1Lead1": "Habitica is a video game to help you improve real life habits. It \"gamifies\" your life by turning all your tasks (Habits, Dailies, and To Do's) into little monsters you have to conquer. The better you are at this, the more you progress in the game. If you slip up in life, your character starts backsliding in the game.",
  "marketing1Lead2Title": "Get Sweet Gear",
  "marketing1Lead2": "Improve your habits to build up your avatar. Show off the sweet gear you've earned!",
  "marketing1Lead3Title": "Find Random Prizes",
@@ -179,7 +179,7 @@
  "rewardHeading": "Complete a task to earn gold!",
  "sampleDailies": "Sample Dailies",
  "sampleHabits": "Sample Habits",
-  "sampleToDo": "Sample To-Dos",
+  "sampleToDo": "Sample To Do's",
  "school": "School",
  "schoolSample1": "Finish 1 Assignment",
  "schoolSample2": "Study 1 hour",
@@ -307,7 +307,7 @@
  "gamifyYourLife": "Gamify Your Life",
  "aboutHabitica": "Habitica is a free habit-building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, Habitica can help you achieve your goals to become healthy, hard-working, and happy.",
  "trackYourGoals": "Track Your Habits and Goals",
-  "trackYourGoalsDesc": "Stay accountable by tracking and managing your Habits, Daily goals, and To-Do list with Habitica’s easy-to-use mobile apps and web interface.",
+  "trackYourGoalsDesc": "Stay accountable by tracking and managing your Habits, Daily goals, and To Do list with Habitica’s easy-to-use mobile apps and web interface.",
  "earnRewards": "Earn Rewards for Your Goals",
  "earnRewardsDesc": "Check off tasks to level up your Avatar and unlock in-game features such as battle armor, mysterious pets, magic skills, and even quests!",
  "battleMonsters": "Battle Monsters with Friends",
@@ -146,7 +146,7 @@
  "weaponSpecialSummerRogueText": "Pirate Cutlass",
  "weaponSpecialSummerRogueNotes": "Avast! You'll make those Dailies walk the plank! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
  "weaponSpecialSummerWarriorText": "Seafaring Slicer",
-  "weaponSpecialSummerWarriorNotes": "There isn't a task in any To-Do list willing to tangle with this gnarly knife! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
+  "weaponSpecialSummerWarriorNotes": "There isn't a task in any To Do list willing to tangle with this gnarly knife! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
  "weaponSpecialSummerMageText": "Kelp Catcher",
  "weaponSpecialSummerMageNotes": "This trident is used to spear seaweed effectively, for extra-productive kelp harvesting! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Summer Gear.",
  "weaponSpecialSummerHealerText": "Wand of the Shallows",
@@ -189,7 +189,7 @@
  "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",

  "weaponSpecialFall2015RogueText": "Bat-tle Ax",
-  "weaponSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
+  "weaponSpecialFall2015RogueNotes": "Fearsome To Do's cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
  "weaponSpecialFall2015WarriorText": "Wooden Plank",
  "weaponSpecialFall2015WarriorNotes": "Great for elevating things in cornfields and/or smacking tasks. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
  "weaponSpecialFall2015MageText": "Enchanted Thread",
@@ -263,7 +263,7 @@
  "weaponSpecialFall2017RogueText": "Candied Apple Mace",
  "weaponSpecialFall2017RogueNotes": "Defeat your foes with sweetness! Increases Strength by <%= str %>. Limited Edition 2017 Autumn Gear.",
  "weaponSpecialFall2017WarriorText": "Candy Corn Lance",
-  "weaponSpecialFall2017WarriorNotes": "All your foes will cower before this tasty-looking lance, regardless of whether they're ghosts, monsters, or red To-Dos. Increases Strength by <%= str %>. Limited Edition 2017 Autumn Gear.",
+  "weaponSpecialFall2017WarriorNotes": "All your foes will cower before this tasty-looking lance, regardless of whether they're ghosts, monsters, or red To Do's. Increases Strength by <%= str %>. Limited Edition 2017 Autumn Gear.",
  "weaponSpecialFall2017MageText": "Spooky Staff",
  "weaponSpecialFall2017MageNotes": "The eyes of the glowing skull on this staff radiate magic and mystery. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2017 Autumn Gear.",
  "weaponSpecialFall2017HealerText": "Creepy Candelabra",
@@ -359,6 +359,15 @@
  "weaponSpecialSpring2020HealerText": "Sword-Lily Staff",
  "weaponSpecialSpring2020HealerNotes": "An iris is beautiful, but the leaves are like swords... don't be deceived by the flowers, this staff is tough as steel! Increases Intelligence by <%= int %>. Limited Edition 2020 Spring Gear.",

+  "weaponSpecialSummer2020RogueText": "Fang Blade",
+  "weaponSpecialSummer2020RogueNotes": "Your enemies don't see you coming, but your Fangs are inescapable! Increases Strength by <%= str %>. Limited Edition 2020 Summer Gear.",
+  "weaponSpecialSummer2020WarriorText": "Fish Hook",
+  "weaponSpecialSummer2020WarriorNotes": "If your foes mock your choice of weapon, don't take the bait. This wicked hook is the reel deal! Increases Strength by <%= str %>. Limited Edition 2020 Summer Gear.",
+  "weaponSpecialSummer2020MageText": "Mighty Oar",
+  "weaponSpecialSummer2020MageNotes": "Steer your way through the most treacherous seas and turbulent battles. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2020 Summer Gear.",
+  "weaponSpecialSummer2020HealerText": "Frosted Glass Rod",
+  "weaponSpecialSummer2020HealerNotes": "As the currents wear away sharp edges, so shall your magic soften your friends' pain. Increases Intelligence by <%= int %>. Limited Edition 2020 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",
@@ -455,7 +464,7 @@
  "weaponArmoireSpearOfSpadesText": "Spear of Spades",
  "weaponArmoireSpearOfSpadesNotes": "This knightly lance is perfect for attacking your reddest Habits and Dailies. Increases Constitution by <%= con %>. Enchanted Armoire: Ace of Spades Set (Item 3 of 3).",
  "weaponArmoireArcaneScrollText": "Arcane Scroll",
-  "weaponArmoireArcaneScrollNotes": "This ancient To-Do list is filled with strange symbols and spells from a forgotten age. Increases Intelligence by <%= int %>. Enchanted Armoire: Scribe Set (Item 3 of 3).",
+  "weaponArmoireArcaneScrollNotes": "This ancient To Do list is filled with strange symbols and spells from a forgotten age. Increases Intelligence by <%= int %>. Enchanted Armoire: Scribe Set (Item 3 of 3).",
  "weaponArmoireChefsSpoonText": "Chef's Spoon",
  "weaponArmoireChefsSpoonNotes": "Raise it as you release your battle cry: “SPOOOON!!” Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 3 of 4).",
  "weaponArmoireVernalTaperText": "Vernal Taper",
@@ -833,6 +842,15 @@
  "armorSpecialSpring2020HealerText": "Protective Petals",
  "armorSpecialSpring2020HealerNotes": "Wrap yourself in soft iris leaves and petals to fool enemies into underestimating your healing power. Increases Constitution by <%= con %>. Limited Edition 2020 Spring Gear.",

+  "armorSpecialSummer2020RogueText": "Crocodile Disguise",
+  "armorSpecialSummer2020RogueNotes": "A crocodile makes the perfect Rogue, waiting for the perfect moment to strike. Borrow their skills--and their explosive speed. Increases Perception by <%= per %>. Limited Edition 2020 Summer Gear.",
+  "armorSpecialSummer2020WarriorText": "Rainbow Trout Tail",
+  "armorSpecialSummer2020WarriorNotes": "You'll be the bright fish in a dull stream, with these dazzling scales! Increases Constitution by <%= con %>. Limited Edition 2020 Summer Gear.",
+  "armorSpecialSummer2020MageText": "Oarfish Armor",
+  "armorSpecialSummer2020MageNotes": "Harness the power of the sea's depths with this oar-mazing armor. Increases Intelligence by <%= int %>. Limited Edition 2020 Summer Gear.",
+  "armorSpecialSummer2020HealerText": "Regalia of Tumbling Waves",
+  "armorSpecialSummer2020HealerNotes": "You are as patient as the ocean, as strong as the currents, as dependable as the tides. Increases Constitution by <%= con %>. Limited Edition 2020 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",
@@ -1400,6 +1418,15 @@
  "headSpecialSpring2020HealerText": "Iris Fascinator",
  "headSpecialSpring2020HealerNotes": "Beguile your foes with this headpiece made of flowers! Increases Intelligence by <%= int %>. Limited Edition 2020 Spring Gear.",

+  "headSpecialSummer2020RogueText": "Crocodile Helm",
+  "headSpecialSummer2020RogueNotes": "Complete your Rogue-ish disguise with this helm! Maybe you can fool your enemies with your crocodile tears... Increases Perception by <%= per %>. Limited Edition 2020 Summer Gear.",
+  "headSpecialSummer2020WarriorText": "Flashy Fishy Cap",
+  "headSpecialSummer2020WarriorNotes": "Trout your strength and skill with this highly visible headgear. Increases Strength by <%= str %>. Limited Edition 2020 Summer Gear.",
+  "headSpecialSummer2020MageText": "Oarfish Crest",
+  "headSpecialSummer2020MageNotes": "Who needs a crown with this crest? Increases Perception by <%= per %>. Limited Edition 2020 Summer Gear.",
+  "headSpecialSummer2020HealerText": "Glass-Studded Helm",
+  "headSpecialSummer2020HealerNotes": "Stand tall, that beachcombers may keep their hands out of your hair. Increases Intelligence by <%= int %>. Limited Edition 2020 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.",

@@ -1615,7 +1642,7 @@
  "headArmoireToqueBlancheText": "Toque Blanche",
  "headArmoireToqueBlancheNotes": "According to legend, the number of folds in this hat indicate the number of ways you know how to cook an egg! Is it accurate? Increases Perception by <%= per %>. Enchanted Armoire: Chef Set (Item 1 of 4).",
  "headArmoireVernalHenninText": "Vernal Hennin",
-  "headArmoireVernalHenninNotes": "More than just a pretty hat, this conical chapeau can also hold a rolled-up To-Do list inside. Increases Perception by <%= per %>. Enchanted Armoire: Vernal Vestments Set (Item 1 of 3).",
+  "headArmoireVernalHenninNotes": "More than just a pretty hat, this conical chapeau can also hold a rolled-up To Do list inside. Increases Perception by <%= per %>. Enchanted Armoire: Vernal Vestments Set (Item 1 of 3).",
  "headArmoireTricornHatText": "Tricorn Hat",
  "headArmoireTricornHatNotes": "Become a revolutionary jokester! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
  "headArmoireNephriteHelmText": "Nephrite Helm",
@@ -1701,113 +1728,81 @@
  "shieldSpecialSnowflakeText": "Snowflake Shield",
  "shieldSpecialSnowflakeNotes": "Every shield is unique. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",

-  "shieldSpecialSpringRogueText": "Hook Claws",
-  "shieldSpecialSpringRogueNotes": "Great for scaling tall buildings, and also for shredding carpets. Increases Strength <%= str %>. Limited Edition 2014 Spring Gear.",
  "shieldSpecialSpringWarriorText": "Egg Shield",
  "shieldSpecialSpringWarriorNotes": "This shield never cracks, no matter how hard you hit it! Increases Constitution by <%= con %>. Limited Edition 2014 Spring Gear.",
  "shieldSpecialSpringHealerText": "Squeaky Ball of Ultimate Protection",
  "shieldSpecialSpringHealerNotes": "Lets out an obnoxious, continuous squeak when bitten, driving enemies away. Increases Constitution by <%= con %>. Limited Edition 2014 Spring Gear.",

-  "shieldSpecialSummerRogueText": "Pirate Cutlass",
-  "shieldSpecialSummerRogueNotes": "Avast! You'll make those Dailies walk the plank! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.",
  "shieldSpecialSummerWarriorText": "Driftwood Shield",
  "shieldSpecialSummerWarriorNotes": "This shield, made from the wood of wrecked ships, can deter even the stormiest Dailies. Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.",
  "shieldSpecialSummerHealerText": "Shield of the Shallows",
  "shieldSpecialSummerHealerNotes": "No one will dare to attack the coral reef when faced with this shiny shield! Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.",

-  "shieldSpecialFallRogueText": "Silver Stake",
-  "shieldSpecialFallRogueNotes": "Dispatches undead. Also grants a bonus against werewolves, because you can never be too careful. Increases Strength by <%= str %>.  Limited Edition 2014 Autumn Gear.",
  "shieldSpecialFallWarriorText": "Potent Potion of Science",
  "shieldSpecialFallWarriorNotes": "Spills mysteriously on lab coats. Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
  "shieldSpecialFallHealerText": "Jeweled Shield",
  "shieldSpecialFallHealerNotes": "This glittery shield was found in an ancient tomb. Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",

-  "shieldSpecialWinter2015RogueText": "Ice Spike",
-  "shieldSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
  "shieldSpecialWinter2015WarriorText": "Gumdrop Shield",
  "shieldSpecialWinter2015WarriorNotes": "This seemingly-sugary shield is actually made of nutritious, gelatinous vegetables. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
  "shieldSpecialWinter2015HealerText": "Soothing Shield",
  "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",

-  "shieldSpecialSpring2015RogueText": "Exploding Squeak",
-  "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
  "shieldSpecialSpring2015WarriorText": "Dish Discus",
  "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
  "shieldSpecialSpring2015HealerText": "Patterned Pillow",
  "shieldSpecialSpring2015HealerNotes": "You can rest your head on this soft pillow, or you can wrestle it with your fearsome claws. Rawr! Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",

-  "shieldSpecialSummer2015RogueText": "Firing Coral",
-  "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
  "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
  "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
  "shieldSpecialSummer2015HealerText": "Strapping Shield",
  "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",

-  "shieldSpecialFall2015RogueText": "Bat-tle Ax",
-  "shieldSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
  "shieldSpecialFall2015WarriorText": "Birdseed Bag",
  "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
  "shieldSpecialFall2015HealerText": "Stirring Stick",
  "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",

-  "shieldSpecialWinter2016RogueText": "Cocoa Mug",
-  "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.",
  "shieldSpecialWinter2016WarriorText": "Sled Shield",
  "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",
  "shieldSpecialWinter2016HealerText": "Pixie Present",
  "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",

-  "shieldSpecialSpring2016RogueText": "Fire Bolas",
-  "shieldSpecialSpring2016RogueNotes": "You've mastered the ball, the club, and the knife. Now you advance to juggling fire! Awoo! Increases Strength <%= str %>. Limited Edition 2016 Spring Gear.",
  "shieldSpecialSpring2016WarriorText": "Cheese Wheel",
  "shieldSpecialSpring2016WarriorNotes": "You braved fiendish traps to procure this defense-boosting food. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",
  "shieldSpecialSpring2016HealerText": "Floral Buckler",
  "shieldSpecialSpring2016HealerNotes": "The April Fool claims this little shield will block Shiny Seeds. Don't believe him. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",

-  "shieldSpecialSummer2016RogueText": "Electric Rod",
-  "shieldSpecialSummer2016RogueNotes": "Anyone who battles you is in for a shocking surprise... Increases Strength by <%= str %>. Limited Edition 2016 Summer Gear.",
  "shieldSpecialSummer2016WarriorText": "Shark Tooth",
  "shieldSpecialSummer2016WarriorNotes": "Bite those tough tasks with this toothy shield! Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.",
  "shieldSpecialSummer2016HealerText": "Sea Star Shield",
  "shieldSpecialSummer2016HealerNotes": "Sometimes mistakenly called a Starfish Shield. Increases Constitution by <%= con %>. Limited Edition 2016 Summer Gear.",

-  "shieldSpecialFall2016RogueText": "Spiderbite Dagger",
-  "shieldSpecialFall2016RogueNotes": "Feel the sting of the spider's bite! Increases Strength by <%= str %>. Limited Edition 2016 Autumn Gear.",
  "shieldSpecialFall2016WarriorText": "Defensive Roots",
  "shieldSpecialFall2016WarriorNotes": "Defend against Dailies with these writhing roots! Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.",
  "shieldSpecialFall2016HealerText": "Gorgon Shield",
  "shieldSpecialFall2016HealerNotes": "Don't admire your own reflection in this. Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.",

-  "shieldSpecialWinter2017RogueText": "Ice Axe",
-  "shieldSpecialWinter2017RogueNotes": "This axe is great for attack, defense, and ice-climbing! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.",
  "shieldSpecialWinter2017WarriorText": "Puck Shield",
  "shieldSpecialWinter2017WarriorNotes": "Made from a giant hockey puck, this shield can stand up to quite a beating. Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.",
  "shieldSpecialWinter2017HealerText": "Sugarplum Shield",
  "shieldSpecialWinter2017HealerNotes": "This fibrous armament will help protect you from even the sourest of tasks! Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.",

-  "shieldSpecialSpring2017RogueText": "Karrotana",
-  "shieldSpecialSpring2017RogueNotes": "These blades will make quick work of tasks, but also are handy for slicing vegetables! Yum! Increases Strength by <%= str %>. Limited Edition 2017 Spring Gear.",
  "shieldSpecialSpring2017WarriorText": "Yarn Shield",
  "shieldSpecialSpring2017WarriorNotes": "Every fiber of this shield is woven with protective spells! Try not to play with it (too much). Increases Constitution by <%= con %>. Limited Edition 2017 Spring Gear.",
  "shieldSpecialSpring2017HealerText": "Basket Shield",
  "shieldSpecialSpring2017HealerNotes": "Protective and also handy for holding your many healing herbs and accoutrements. Increases Constitution by <%= con %>. Limited Edition 2017 Spring Gear.",

-  "shieldSpecialSummer2017RogueText": "Sea Dragon Fins",
-  "shieldSpecialSummer2017RogueNotes": "The edges of these fins are razor-sharp. Increases Strength by <%= str %>. Limited Edition 2017 Summer Gear.",
  "shieldSpecialSummer2017WarriorText": "Scallop Shield",
  "shieldSpecialSummer2017WarriorNotes": "This shell that you just found is both decorative AND defensive! Increases Constitution by <%= con %>. Limited Edition 2017 Summer Gear.",
  "shieldSpecialSummer2017HealerText": "Oyster Shield",
  "shieldSpecialSummer2017HealerNotes": "This magical oyster constantly generates pearls as well as protection. Increases Constitution by <%= con %>. Limited Edition 2017 Summer Gear.",

-  "shieldSpecialFall2017RogueText": "Candied Apple Mace",
-  "shieldSpecialFall2017RogueNotes": "Defeat your foes with sweetness! Increases Strength by <%= str %>. Limited Edition 2017 Autumn Gear.",
  "shieldSpecialFall2017WarriorText": "Candy Corn Shield",
  "shieldSpecialFall2017WarriorNotes": "This candy shield has mighty protective powers, so try not to nibble on it! Increases Constitution by <%= con %>. Limited Edition 2017 Autumn Gear.",
  "shieldSpecialFall2017HealerText": "Haunted Orb",
  "shieldSpecialFall2017HealerNotes": "This orb occasionally screeches. We're sorry, we're not sure why. But it sure looks nifty! Increases Constitution by <%= con %>. Limited Edition 2017 Autumn Gear.",

-  "shieldSpecialWinter2018RogueText": "Peppermint Hook",
-  "shieldSpecialWinter2018RogueNotes": "Perfect for climbing walls or distracting your foes with sweet, sweet candy. Increases Strength by <%= str %>. Limited Edition 2017-2018 Winter Gear.",
  "shieldSpecialWinter2018WarriorText": "Magic Gift Bag",
  "shieldSpecialWinter2018WarriorNotes": "Just about any useful thing you need can be found in this sack, if you know the right magic words to whisper. Increases Constitution by <%= con %>. Limited Edition 2017-2018 Winter Gear.",
  "shieldSpecialWinter2018HealerText": "Mistletoe Bell",
@@ -1860,7 +1855,12 @@
  "shieldSpecialSpring2020WarriorText": "Iridescent Shield",
  "shieldSpecialSpring2020WarriorNotes": "Don't let the delicate colors fool you. This shield has got you covered! Increases Constitution by <%= con %>. Limited Edition 2020 Spring Gear.",
  "shieldSpecialSpring2020HealerText": "Perfumed Shield",
-  "shieldSpecialSpring2020HealerNotes": "Ward off those musty old To-Dos with this sweet-smelling shield. Increases Constitution by <%= con %>. Limited Edition 2020 Spring Gear.",
+  "shieldSpecialSpring2020HealerNotes": "Ward off those musty old To Do's with this sweet-smelling shield. Increases Constitution by <%= con %>. Limited Edition 2020 Spring Gear.",
+
+  "shieldSpecialSummer2020WarriorText": "Huge Trout Scale",
+  "shieldSpecialSummer2020WarriorNotes": "This fish you caught one time was SO BIG, a single scale was enough to make a mighty shield! True story! Increases Constitution by <%= con %>. Limited Edition 2020 Summer Gear.",
+  "shieldSpecialSummer2020HealerText": "Tumbled Glass Aegis",
+  "shieldSpecialSummer2020HealerNotes": "As the motion of sand and water turns trash to treasure, so shall your magic turn wounds to strength. Increases Constitution by <%= con %>. Limited Edition 2020 Summer Gear.",

  "shieldMystery201601Text": "Resolution Slayer",
  "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
@@ -1987,7 +1987,7 @@
  "backMystery201704Text": "Fairytale Wings",
  "backMystery201704Notes": "These shimmering wings will carry you anywhere, even the hidden realms ruled by magical creatures. Confers no benefit. April 2017 Subscriber Item.",
  "backMystery201706Text": "Tattered Freebooter's Flag",
-  "backMystery201706Notes": "The sight of this Jolly Roger-emblazoned flag fills any To-Do or Daily with dread! Confers no benefit. June 2017 Subscriber Item.",
+  "backMystery201706Notes": "The sight of this Jolly Roger-emblazoned flag fills any To Do or Daily with dread! Confers no benefit. June 2017 Subscriber Item.",
  "backMystery201709Text": "Stack o' Sorcery Books",
  "backMystery201709Notes": "Learning magic takes a lot of reading, but you're sure to enjoy your studies! Confers no benefit. September 2017 Subscriber Item.",
  "backMystery201801Text": "Frost Sprite Wings",
@@ -173,9 +173,9 @@
  "optional": "Optional",
  "needsText": "Please type a message.",
  "needsTextPlaceholder": "Type your message here.",
-  "copyMessageAsToDo": "Copy message as To-Do",
-  "copyAsTodo": "Copy as To-Do",
-  "messageAddedAsToDo": "Message copied as To-Do.",
+  "copyMessageAsToDo": "Copy message as To Do",
+  "copyAsTodo": "Copy as To Do",
+  "messageAddedAsToDo": "Message copied as To Do.",
  "messageWroteIn": "<%= user %> wrote in <%= group %>",
  "msgPreviewHeading": "Message Preview",
  "leaderOnlyChallenges": "Only group leader can create challenges",
@@ -44,11 +44,11 @@
    "northMageSet": "Mage of the North (Mage)",
    "icicleDrakeSet": "Icicle Drake (Rogue)",
    "soothingSkaterSet": "Soothing Skater (Healer)",
-    "gingerbreadSet": "Gingerbread Warrior (Warrior)",
-    "snowDaySet": "Snow Day Warrior (Warrior)",
+    "gingerbreadSet": "Gingerbread (Warrior)",
+    "snowDaySet": "Snow Day (Warrior)",
    "snowboardingSet": "Snowboarding Sorcerer (Mage)",
    "festiveFairySet": "Festive Fairy (Healer)",
-    "cocoaSet": "Cocoa Rogue (Rogue)",
+    "cocoaSet": "Cocoa (Rogue)",
    "toAndFromCard": "To: <%= toName %>, From: <%= fromName %>",
    "nyeCard": "New Year's Card",
    "nyeCardExplanation": "For celebrating the new year together, you both receive the \"Auld Acquaintance\" badge!",
@@ -59,7 +59,7 @@
    "nye0": "Happy New Year! May you slay many a bad Habit.",
    "nye1": "Happy New Year! May you reap many Rewards.",
    "nye2": "Happy New Year! May you earn many a Perfect Day.",
-    "nye3": "Happy New Year! May your To-Do list stay short and sweet.",
+    "nye3": "Happy New Year! May your To Do list stay short and sweet.",
    "nye4": "Happy New Year! May you not get attacked by a raging Hippogriff.",
    "holidayCard": "Received a holiday card!",
    "mightyBunnySet": "Mighty Bunny (Warrior)",
@@ -78,11 +78,11 @@
    "magicianBunnySet": "Magician's Bunny (Mage)",
    "comfortingKittySet": "Comforting Kitty (Healer)",
    "sneakySqueakerSet": "Sneaky Squeaker (Rogue)",
-    "sunfishWarriorSet": "Sunfish Warrior (Warrior)",
+    "sunfishWarriorSet": "Sunfish (Warrior)",
    "shipSoothsayerSet": "Ship Soothsayer (Mage)",
    "strappingSailorSet": "Strapping Sailor (Healer)",
    "reefRenegadeSet": "Reef Renegade (Rogue)",
-    "scarecrowWarriorSet": "Scarecrow Warrior (Warrior)",
+    "scarecrowWarriorSet": "Scarecrow (Warrior)",
    "stitchWitchSet": "Stitch Witch (Mage)",
    "potionerSet": "Potioner (Healer)",
    "battleRogueSet": "Bat-tle (Rogue)",
@@ -130,7 +130,6 @@
    "fall2018CandymancerMageSet": "Candymancer (Mage)",
    "fall2018CarnivorousPlantSet": "Carnivorous Plant (Healer)",
    "fall2018AlterEgoSet": "Alter Ego (Rogue)",
-    "june2018": "June 2018",
    "winter2019BlizzardSet": "Blizzard (Warrior)",
    "winter2019PyrotechnicSet": "Pyrotechnic (Mage)",
    "winter2019WinterStarSet": "Winter Star (Healer)",
@@ -155,6 +154,10 @@
    "spring2020PuddleMageSet": "Puddle (Mage)",
    "spring2020IrisHealerSet": "Iris (Healer)",
    "spring2020LapisLazuliRogueSet": "Lapis Lazuli (Rogue)",
+    "summer2020RainbowTroutWarriorSet": "Rainbow Trout (Warrior)",
+    "summer2020OarfishMageSet": "Oarfish (Mage)",
+    "summer2020SeaGlassHealerSet": "Sea Glass (Healer)",
+    "summer2020CrocodileRogueSet": "Crocodile (Rogue)",
    "eventAvailability": "Available for purchase until <%= date(locale) %>.",
    "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
    "dateEndMarch": "April 30",
@@ -165,6 +168,7 @@
    "decemberYYYY": "December <%= year %>",
    "marchYYYY": "March <%= year %>",
    "mayYYYY": "May <%= year %>",
+    "juneYYYY": "June <%= year %>",
    "dateEndJuly": "July 31",
    "dateEndAugust": "August 31",
    "dateEndSeptember": "September 21",
@@ -132,12 +132,12 @@
  "autoAllocate": "Auto Allocate",
  "autoAllocateText": "If 'Automatic Allocation' is selected, your avatar gains Stats automatically based on your tasks' Stats, which you can find in <strong>TASK > Edit > Advanced Settings > Stat Allocation</strong>. Eg, if you hit the gym often, and your 'Gym' Daily is set to 'Strength', you'll gain Strength automatically.",
  "spells": "Skills",
-  "spellsText": "You can now unlock class-specific skills. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed <a target='_blank' href='http://habitica.fandom.com/wiki/Todos'>To-Do</a>.",
+  "spellsText": "You can now unlock class-specific skills. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed <a target='_blank' href='http://habitica.fandom.com/wiki/Todos'>To Do</a>.",
  "skillsTitle": "Skills",
-  "toDo": "To-Do",
+  "toDo": "To Do",
  "moreClass": "For more information on the class-system, see <a href='http://habitica.fandom.com/wiki/Class_System' target='_blank'>Wikia</a>.",

-  "tourWelcome": "Welcome to Habitica! This is your To-Do list. Check off a task to proceed!",
+  "tourWelcome": "Welcome to Habitica! This is your To Do list. Check off a task to proceed!",
  "tourExp": "Great job! Checking off a task gives you Experience and Gold!",
  "tourDailies": "This column is for Daily tasks. To proceed, enter a task you should do every day! <strong>Sample Dailies</strong>: <strong>Make Bed</strong>, <strong>Floss</strong>, <strong>Check Work Email</strong>",
  "tourCron": "Splendid! Your Dailies will reset every day.",
@@ -168,7 +168,7 @@

  "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
  "tourAvatarProceed": "Show me my tasks!",
-  "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+  "tourToDosBrief": "<strong>To Do List</strong><ul><li>Check off To Do's to earn Gold & Experience!</li><li>To Do's never make your avatar lose Health.</li></ul>",
  "tourDailiesBrief": "<strong>Daily Tasks</strong><ul><li>Dailies repeat every day.</li><li>You lose Health if you skip Dailies.</li></ul>",
  "tourDailiesProceed": "I'll be careful!",
  "tourHabitsBrief": "<strong>Good & Bad Habits</strong><ul><li>Good Habits award Gold & Experience.</li><li>Bad Habits make you lose Health.</li></ul>",
@@ -2,7 +2,7 @@
  "needTips": "Need some tips on how to begin? Here's a straightforward guide!",

  "step1": "Step 1: Enter Tasks",
-  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To-Dos](http://habitica.fandom.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To-Dos column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.fandom.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.fandom.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.fandom.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies), [Sample To-Dos](http://habitica.fandom.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards).",
+  "webStep1Text": "Habitica is nothing without real-world goals, so enter a few tasks. You can add more later as you think of them! All tasks can be added by clicking the green \"Create\" button.\n* **Set up [To Do's](http://habitica.fandom.com/wiki/To-Dos):** Enter tasks you do once or rarely in the To Do's column, one at a time. You can click on the tasks to edit them and add checklists, due dates, and more!\n* **Set up [Dailies](http://habitica.fandom.com/wiki/Dailies):** Enter activities you need to do daily or on a particular day of the week, month, or year in the Dailies column. Click task to edit when it will be due and/or set a start date. You can also make it due on a repeating basis, for example, every 3 days.\n* **Set up [Habits](http://habitica.fandom.com/wiki/Habits):** Enter habits you want to establish in the Habits column. You can edit the Habit to change it to just a good habit :heavy_plus_sign: or a bad habit :heavy_minus_sign:\n* **Set up [Rewards](http://habitica.fandom.com/wiki/Rewards):** In addition to the in-game Rewards offered, add activities or treats which you want to use as a motivation to the Rewards column. It's important to give yourself a break or allow some indulgence in moderation!\n* If you need inspiration for which tasks to add, you can look at the wiki's pages on [Sample Habits](http://habitica.fandom.com/wiki/Sample_Habits), [Sample Dailies](http://habitica.fandom.com/wiki/Sample_Dailies), [Sample To Do's](http://habitica.fandom.com/wiki/Sample_To-Dos), and [Sample Rewards](http://habitica.fandom.com/wiki/Sample_Custom_Rewards).",

  "step2": "Step 2: Gain Points by Doing Things in Real Life",
  "webStep2Text": "Now, start tackling your goals from the list! As you complete tasks and check them off in Habitica, you will gain [Experience](http://habitica.fandom.com/wiki/Experience_Points), which helps you level up, and [Gold](http://habitica.fandom.com/wiki/Gold_Points), which allows you to purchase Rewards. If you fall into bad habits or miss your Dailies, you will lose [Health](http://habitica.fandom.com/wiki/Health_Points). In that way, the Habitica Experience and Health bars serve as a fun indicator of your progress toward your goals. You'll start seeing your real life improve as your character advances in the game.",
@@ -46,12 +46,12 @@
  "collected": "Collected",
  "collectionItems": "<%= number %> <%= items %>",
  "itemsToCollect": "Items to Collect",
-  "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
+  "bossDmg1": "Each completed Daily and To Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
  "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
-  "bossDmg1Broken": "Each completed Daily and To-Do and each positive Habit hurts the boss... Hurt it more with redder tasks or Brutal Smash and Burst of Flames... The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies... <strong>All damage to and from a boss is tallied on cron (your day roll-over)...</strong>",
+  "bossDmg1Broken": "Each completed Daily and To Do and each positive Habit hurts the boss... Hurt it more with redder tasks or Brutal Smash and Burst of Flames... The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies... <strong>All damage to and from a boss is tallied on cron (your day roll-over)...</strong>",
  "bossDmg2Broken": "Only participants will fight the boss and share in the quest loot...",
-  "tavernBossInfo": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss! Incomplete Dailies fill the Rage Bar. When the Rage bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.",
-  "tavernBossInfoBroken": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss... Incomplete Dailies fill the Exhaust Strike Bar... When the Exhaust Strike bar is full, the World Boss will attack an NPC... A World Boss will never damage individual players or accounts in any way... Only active accounts not resting in the Inn will have their tasks tallied...",
+  "tavernBossInfo": "Complete Dailies and To Do's and score positive Habits to damage the World Boss! Incomplete Dailies fill the Rage Bar. When the Rage bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.",
+  "tavernBossInfoBroken": "Complete Dailies and To Do's and score positive Habits to damage the World Boss... Incomplete Dailies fill the Exhaust Strike Bar... When the Exhaust Strike bar is full, the World Boss will attack an NPC... A World Boss will never damage individual players or accounts in any way... Only active accounts not resting in the Inn will have their tasks tallied...",
  "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; you can monitor your quest item drops by hovering over the quest progress icon.",
  "bossColl2": "Only participants can collect items and share in the quest loot.",
  "bossColl1Broken": "To collect items, do your positive tasks... Quest items drop just like normal items; you can monitor your quest item drops by hovering over the quest progress icon...",
@@ -134,7 +134,7 @@

  "questGroupEarnable": "Earnable Quests",
  "questBasilistText": "The Basi-List",
-  "questBasilistNotes": "There's a commotion in the marketplace--the kind that should make you run away. Being a courageous adventurer, you run towards it instead, and discover a Basi-list, coalescing from a clump of incomplete To-Dos! Nearby Habiticans are paralyzed with fear at the length of the Basi-list, unable to start working. From somewhere in the vicinity, you hear @Arcosine shout: \"Quick! Complete your To-Dos and Dailies to defang the monster, before someone gets a paper cut!\" Strike fast, adventurer, and check something off - but beware! If you leave any Dailies undone, the Basi-list will attack you and your party!",
+  "questBasilistNotes": "There's a commotion in the marketplace--the kind that should make you run away. Being a courageous adventurer, you run towards it instead, and discover a Basi-list, coalescing from a clump of incomplete To Do's! Nearby Habiticans are paralyzed with fear at the length of the Basi-list, unable to start working. From somewhere in the vicinity, you hear @Arcosine shout: \"Quick! Complete your To Do's and Dailies to defang the monster, before someone gets a paper cut!\" Strike fast, adventurer, and check something off - but beware! If you leave any Dailies undone, the Basi-list will attack you and your party!",
  "questBasilistCompletion": "The Basi-list has scattered into paper scraps, which shimmer gently in rainbow colors. \"Whew!\" says @Arcosine. \"Good thing you guys were here!\" Feeling more experienced than before, you gather up some fallen gold from among the papers.",
  "questBasilistBoss": "The Basi-List",

@@ -197,7 +197,7 @@
  "questPenguinUnlockText": "Unlocks Penguin Eggs for purchase in the Market",

  "questStressbeastText": "The Abominable Stressbeast of the Stoïkalm Steppes",
-  "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
+  "questStressbeastNotes": "Complete Dailies and To Do's to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To Do's! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
  "questStressbeastBoss": "The Abominable Stressbeast",
  "questStressbeastBossRageTitle": "Stress Strike",
  "questStressbeastBossRageDescription": "When this gauge fills, the Abominable Stressbeast will unleash its Stress Strike on Habitica!",
@@ -377,7 +377,7 @@
  "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!",

  "questFalconText": "The Birds of Preycrastination",
-  "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To-Dos. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!<br><br>\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"<br><br>No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!",
+  "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To Do's. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!<br><br>\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"<br><br>No more, you vow. You will climb your personal mountain of To Do's and defeat the Birds of Preycrastination!",
  "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.<br><br>\"Wow!\" says @Trogdorina. \"You won!\"<br><br>@Squish adds, \"Here, take these eggs I found as a reward.\"",
  "questFalconBoss": "Birds of Preycrastination",
  "questFalconDropFalconEgg": "Falcon (Egg)",
@@ -401,7 +401,7 @@
  "questAxolotlRageEffect": "`Magical Axolotl uses AXOLOTL REGENERATION!`\n\n`A curtain of colorful bubbles obscures the monster for a moment, and when it clears, some of its wounds have vanished!`",

  "questTurtleText": "Guide the Turtle",
-  "questTurtleNotes": "Help! This giant sea turtle cannot find her way to her nesting beach. She returns there every year to lay her eggs, but this year Inkomplete Bay is filled with toxic Task Flotsam made of red dailies and unchecked to-dos. \"She's thrashing in a panic!\" @JessicaChase says.<br><br>@UncommonCriminal nods. \"It's because her guiding senses are fogged and confused.\"<br><br>@Scarabsi grabs your arm. \"Can you help clear the Task Flotsam blocking her path? It may be hazardous, but we have to help her!\"",
+  "questTurtleNotes": "Help! This giant sea turtle cannot find her way to her nesting beach. She returns there every year to lay her eggs, but this year Inkomplete Bay is filled with toxic Task Flotsam made of red Dailies and unchecked To Do's. \"She's thrashing in a panic!\" @JessicaChase says.<br><br>@UncommonCriminal nods. \"It's because her guiding senses are fogged and confused.\"<br><br>@Scarabsi grabs your arm. \"Can you help clear the Task Flotsam blocking her path? It may be hazardous, but we have to help her!\"",
  "questTurtleCompletion": "Your valiant work has cleared the waters for our sea turtle to find her beach. You, @Bambin, and @JaizakAripaik watch as she buries her brood of eggs deep in the sand so they can grow and hatch into hundreds of little sea turtles. Ever the lady, she gives you three eggs each, asking that you feed and nurture them so one day they become big sea turtles themselves.",
  "questTurtleBoss": "Task Flotsam",
  "questTurtleDropTurtleEgg": "Turtle (Egg)",
@@ -579,7 +579,7 @@
  "featheredFriendsNotes": "Contains 'Help! Harpy!,' 'The Night-Owl,' and 'The Birds of Preycrastination.' Available until May 31.",

  "questNudibranchText": "Infestation of the NowDo Nudibranchs",
-  "questNudibranchNotes": "You finally get around to checking your To-dos on a lazy day in Habitica. Bright against your deepest red tasks are a gaggle of vibrant blue sea slugs. You are entranced! Their sapphire colors make your most intimidating tasks look as easy as your best Habits. In a feverish stupor you get to work, tackling one task after the other in a ceaseless frenzy...<br><br>The next thing you know, @LilithofAlfheim is pouring cold water over you. “The NowDo Nudibranchs have been stinging you all over! You need to take a break!”<br><br>Shocked, you see that your skin is as bright red as your To-Do list was. \"Being productive is one thing,\" @beffymaroo says, \"but you've also got to take care of yourself. Hurry, let's get rid of them!\"",
+  "questNudibranchNotes": "You finally get around to checking your To Do's on a lazy day in Habitica. Bright against your deepest red tasks are a gaggle of vibrant blue sea slugs. You are entranced! Their sapphire colors make your most intimidating tasks look as easy as your best Habits. In a feverish stupor you get to work, tackling one task after the other in a ceaseless frenzy...<br><br>The next thing you know, @LilithofAlfheim is pouring cold water over you. “The NowDo Nudibranchs have been stinging you all over! You need to take a break!”<br><br>Shocked, you see that your skin is as bright red as your To Do list was. \"Being productive is one thing,\" @beffymaroo says, \"but you've also got to take care of yourself. Hurry, let's get rid of them!\"",
  "questNudibranchCompletion": "You see the last of the NowDo Nudibranchs sliding off of a pile of completed tasks as @amadshade washes them away. One leaves behind a cloth bag, and you open it to reveal some gold and a few little ellipsoids you guess are eggs.",
  "questNudibranchBoss": "NowDo Nudibranch",
  "questNudibranchDropNudibranchEgg": "Nudibranch (Egg)",
@@ -660,8 +660,8 @@
  "questPterodactylUnlockText": "Unlocks Pterodactyl Eggs for purchase in the Market",

  "questBadgerText": "Stop Badgering Me!",
-  "questBadgerNotes": "Ah, winter in the Taskwoods. The softly falling snow, the branches sparkling with frost, the Flourishing Fairies… still not snoozing?<br><br>“Why are they still awake?” cries @LilithofAlfheim. “If they don't hibernate soon, they'll never have the energy for planting season.”<br><br>As you and @Willow the Witty hurry to investigate, a furry head pops up from the ground. Before you can yell, “It’s the Badgering Bother!” it’s back in its burrow—but not before snatching up the Fairies' “Hibernate”  To-Dos and dropping a giant list of pesky tasks in their place!<br><br>“No wonder the fairies aren't resting, if they're constantly being badgered like that!”  @plumilla says. Can you chase off this beast and save the Taskwood’s harvest this year?",
-  "questBadgerCompletion": "You finally drive away the Badgering Bother and hurry into its burrow. At the end of a tunnel, you find its hoard of the faeries’ “Hibernate”  To-Dos. The den is otherwise abandoned, except for three eggs that look ready to hatch.",
+  "questBadgerNotes": "Ah, winter in the Taskwoods. The softly falling snow, the branches sparkling with frost, the Flourishing Fairies… still not snoozing?<br><br>“Why are they still awake?” cries @LilithofAlfheim. “If they don't hibernate soon, they'll never have the energy for planting season.”<br><br>As you and @Willow the Witty hurry to investigate, a furry head pops up from the ground. Before you can yell, “It’s the Badgering Bother!” it’s back in its burrow—but not before snatching up the Fairies' “Hibernate”  To Do's and dropping a giant list of pesky tasks in their place!<br><br>“No wonder the fairies aren't resting, if they're constantly being badgered like that!”  @plumilla says. Can you chase off this beast and save the Taskwood’s harvest this year?",
+  "questBadgerCompletion": "You finally drive away the Badgering Bother and hurry into its burrow. At the end of a tunnel, you find its hoard of the faeries’ “Hibernate”  To Do's. The den is otherwise abandoned, except for three eggs that look ready to hatch.",
  "questBadgerBoss": "The Badgering Bother",
  "questBadgerDropBadgerEgg": "Badger (Egg)",
  "questBadgerUnlockText": "Unlocks Badger Eggs for purchase in the Market",
@@ -736,7 +736,7 @@

  "questVelociraptorText": "The Veloci-Rapper",
  "questVelociraptorNotes": "You’re sharing honey cakes with @*~Seraphina~*, @Procyon P, and @Lilith of Alfheim by a lake in the Stoïkalm Steppes. Suddenly, a mournful voice interrupts your picnic.<br><br><em>My Habits took a hit, I missed my Dailies,<br>I’m losing it, sinking with doubt and maybes,<br>At the top of my game I used to be so fly,<br>But now I just let my Due Dates go by.</em><br><br>@*~Seraphina~* peers behind a stand of grass. “It’s the Veloci-Rapper. It seems... distraught?”<br><br>You pump a fist in determination. “There's only one thing to do. Rap battle time!”",
-  "questVelociraptorCompletion": "You burst through the grass, confronting the Veloci-Rapper.<br><br><em>See here, rapper, you’re no quitter,<br>You’re Bad Habits' hardest hitter!<br>Check off your To-Dos like a boss,<br>Don’t mourn over one day’s loss!</em><br><br>Filled with renewed confidence, it bounds off to freestyle another day, leaving behind three eggs where it sat.",
+  "questVelociraptorCompletion": "You burst through the grass, confronting the Veloci-Rapper.<br><br><em>See here, rapper, you’re no quitter,<br>You’re Bad Habits' hardest hitter!<br>Check off your To Do's like a boss,<br>Don’t mourn over one day’s loss!</em><br><br>Filled with renewed confidence, it bounds off to freestyle another day, leaving behind three eggs where it sat.",
  "questVelociraptorBoss": "Veloci-Rapper",
  "questVelociraptorDropVelociraptorEgg": "Velociraptor (Egg)",
  "questVelociraptorUnlockText": "Unlocks Velociraptor Eggs for purchase in the Market",
@@ -754,7 +754,7 @@
  "questDolphinText": "The Dolphin of Doubt",
  "questDolphinNotes": "You walk upon the shores of Inkomplete Bay, pondering the daunting work ahead of you. A splash in the water catches your eye. A magnificent dolphin arcs over the waves. Sunlight glimmers off its fins and tail. But wait...that’s not sunlight, and the dolphin doesn’t dip back into the sea. It fixes its gaze on @khdarkwolf.<br><br>“I’ll never finish all these Dailies,” said @khdarkwolf.<br><br>“I’m not good enough to reach my goals,” said @confusedcicada as the dolphin turned its glare on them.<br><br>“Why did I even bother trying?” asked @mewrose, withering under the stare of the beast.<br><br>Its eyes meet yours, and feel your mind begin to sink under the rising tide of doubt. You steel yourself; someone has to defeat this creature, and it’s going to be you!",
  "questDolphinBoss": "Dolphin of Doubt",
-  "questDolphinCompletion": "Your battle of wills with the dolphin has left you tired but victorious. With your determination and encouragement, @mewrose, @khdarkwolf, and @confusedcicada pick themselves up and shake off the dolphin’s insidious telepathy. The four of you shield yourselves with a sense of accomplishment in your consistent Dailies, strong Habits, and completed To-Dos until it closes its glowing eyes in silent acknowledgment of your successes. With that, it tumbles back into the bay. As you trade high-fives and congratulations, you notice three eggs wash ashore.<br><br>“Hm, I wonder what we can do with those,” @khdarkwolf muses.",
+  "questDolphinCompletion": "Your battle of wills with the dolphin has left you tired but victorious. With your determination and encouragement, @mewrose, @khdarkwolf, and @confusedcicada pick themselves up and shake off the dolphin’s insidious telepathy. The four of you shield yourselves with a sense of accomplishment in your consistent Dailies, strong Habits, and completed To Do's until it closes its glowing eyes in silent acknowledgment of your successes. With that, it tumbles back into the bay. As you trade high-fives and congratulations, you notice three eggs wash ashore.<br><br>“Hm, I wonder what we can do with those,” @khdarkwolf muses.",
  "questDolphinDropDolphinEgg": "Dolphin (Egg)",
  "questDolphinUnlockText": "Unlocks Dolphin Eggs for purchase in the Market",

@@ -809,5 +809,12 @@
  "questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market",

  "jungleBuddiesText": "Jungle Buddies Quest Bundle",
-  "jungleBuddiesNotes": "Contains 'Monstrous Mandrill and the Mischief Monkeys', 'The Somnolent Sloth', and 'The Tangle Tree'. Available until <%= date %>."
+  "jungleBuddiesNotes": "Contains 'Monstrous Mandrill and the Mischief Monkeys', 'The Somnolent Sloth', and 'The Tangle Tree'. Available until <%= date %>.",
+
+  "questFluoriteText": "A Bright Fluorite Fright",
+  "questFluoriteNotes": "Unusual minerals are in high demand these days, so you and a few friends have trekked deep into the mines of the Meandering Mountains, in search of exciting ores. It’s a long and boring expedition, until @-Tyr- stumbles over a large rock, sitting right in the middle of the tunnel.<br><br>“This should help brighten things up,” says @nirbhao, before conjuring up an orb of light.<br><br>A warm brightness fills the tunnel, but something odd starts happening to that large rock. Feeding on the magical light, it begins to glow with fluorescent blues, greens and purples. Then it rears upright into a vaguely humanoid shape, complete with glowing red eyes fixed right on you! You jump into action with flashing spells and shining weapons.",
+  "questFluoriteCompletion": "As you do battle, the crystal creature seems more and more distracted by the light show you are creating. “So shiny…” it mutters.<br><br>“Of course!” @nirbhao exclaims. “It must be a fluorite elemental. All they want is light to let them glow. Let’s help it shine.”<br><br>The elemental giggles happily and glows all the brighter as you light up torches and motes of magic. It’s so glad to be shining again that it leads you to a rich deposit of fluorite crystals.<br><br>“This is the perfect ingredient for a new hatching potion,” says @nirbhao. “One which will make our pets as bright as our new fluorescent friend.”",
+  "questFluoriteBoss": "Fluorite Elemental",
+  "questFluoriteDropFluoritePotion": "Fluorite Hatching Potion",
+  "questFluoriteUnlockText": "Unlocks Fluorite Hatching Potions for purchase in the Market"
 }
@@ -5,7 +5,7 @@
    "rebirthStartOver": "Rebirth starts your character over from Level 1.",
    "rebirthAdvList1": "You return to full Health.",
    "rebirthAdvList2": "You have no Experience or Gold.",
-    "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.",
+    "rebirthAdvList3": "Your Habits, Dailies, and To Do's reset to yellow, and streaks reset, except for challenge tasks.",
    "rebirthAdvList4": "You have the starting class of Warrior until you earn a new class.",
    "rebirthInherit": "Your new character inherits a few things from their predecessor:",
    "rebirthInList1": "Tasks, history, equipment, and settings remain.",
@@ -76,7 +76,7 @@
    "thirdPartyApps": "Third Party Apps",
    "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.",
    "beeminder": "Beeminder",
-    "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)",
+    "beeminderDesc": "Let Beeminder automatically monitor your Habitica To Do's. You can commit to maintaining a target number of To Do's completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To Do's. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)",
    "chatExtension": "<a target='blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb'>Chrome Chat Extension</a> and <a target='blank' href='https://addons.mozilla.org/en-US/firefox/addon/habitica-chat-client-2/'>Firefox Chat Extension</a>",
    "chatExtensionDesc": "The Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.",
    "otherExtensions": "<a target='blank' href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations'>Other Extensions</a>",
@@ -9,7 +9,7 @@
    "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP",
    "reachedGoldToGemCapQuantity": "Your requested amount <%= quantity %> exceeds the amount you can buy for this month (<%= convCap %>). The full amount becomes available within the first three days of each month. Thanks for subscribing!",
    "retainHistory": "Retain additional history entries",
-    "retainHistoryText": "Makes completed To-Dos and task history available for longer.",
+    "retainHistoryText": "Makes completed To Do's and task history available for longer.",
    "doubleDrops": "Daily drop caps doubled",
    "doubleDropsText": "Complete your stable faster!",
    "mysteryItem": "Exclusive monthly items",
@@ -227,7 +227,7 @@
    "gemBenefit4": "Reset your avatar's Stat Points and change its Class.",
    "subscriptionBenefitLeadin": "Support Habitica by becoming a subscriber and you'll receive these useful benefits!",
    "subscriptionBenefit1": "Alexander the Merchant will now sell you Gems from the Market for 20 Gold each!",
-    "subscriptionBenefit2": "Completed To-Dos and task history are available for longer.",
+    "subscriptionBenefit2": "Completed To Do's and task history are available for longer.",
    "subscriptionBenefit3": "Discover even more items in Habitica with a 2x daily drop-cap.",
    "subscriptionBenefit4": "Unique cosmetic item for you to decorate your avatar each month.",
    "subscriptionBenefit5": "Receive the Royal Purple Jackalope pet when you become a new subscriber.",
@@ -1,14 +1,15 @@
 {
  "clearCompleted": "Delete Completed",
-  "clearCompletedDescription": "Completed To-Dos are deleted after 30 days for non-subscribers and 90 days for subscribers.",
-  "clearCompletedConfirm": "Are you sure you want to delete your completed To-Dos?",
-  "sureDeleteCompletedTodos": "Are you sure you want to delete your completed To-Dos?",
-  "lotOfToDos": "Your most recent 30 completed To-Dos are shown here. You can see older completed To-Dos from Data > Data Display Tool or Data > Export Data > User Data.",
-  "deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted, except for To-Dos from active challenges and Group Plans. Export them first if you want to keep a record of them.",
+  "clearCompletedDescription": "Completed To Do's are deleted after 30 days for non-subscribers and 90 days for subscribers.",
+  "clearCompletedConfirm": "Are you sure you want to delete your completed To Do's?",
+  "sureDeleteCompletedTodos": "Are you sure you want to delete your completed To Do's?",
+  "lotOfToDos": "Your most recent 30 completed To Do's are shown here. You can see older completed To Do's from Data > Data Display Tool or Data > Export Data > User Data.",
+  "deleteToDosExplanation": "If you click the button below, all of your completed To Do's and archived To Do's will be permanently deleted, except for To Do's from active challenges and Group Plans. Export them first if you want to keep a record of them.",
  "addMultipleTip": "<strong>Tip:</strong> To add multiple <%= taskType %>, separate each one using a line break (Shift + Enter) and then press \"Enter.\"",
  "addsingle": "Add Single",
  "addATask": "Add a <%= type %>",
-  "editATask": "Edit a <%= type %>",
+  "addATitle": "Add a title",
+  "editATask": "Edit <%= type %>",
  "createTask": "Create <%= type %>",
  "addTaskToUser": "Add Task",
  "scheduled": "Scheduled",
@@ -26,13 +27,14 @@
  "save": "Save",
  "addChecklist": "Add Checklist",
  "checklist": "Checklist",
-  "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
+  "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To Do, and reduce the damage caused by a Daily.",
  "newChecklistItem": "New checklist item",
  "expandChecklist": "Expand Checklist",
  "collapseChecklist": "Collapse Checklist",
  "text": "Title",
  "extraNotes": "Extra Notes",
  "notes": "Notes",
+  "addNotes": "Add notes",
  "direction/Actions": "Direction/Actions",
  "advancedSettings": "Advanced Settings",
  "taskAlias": "Task Alias",
@@ -40,7 +42,7 @@
  "taskAliasPlaceholder": "your-task-alias-here",
  "taskAliasPopoverWarning": "WARNING: Changing this value will break any 3rd party integrations that rely on the task alias.",
  "difficulty": "Difficulty",
-  "difficultyHelp": "Difficulty describes how challenging a Habit, Daily, or To-Do is for you to complete. A higher difficulty results in greater rewards when a Task is completed, but also greater damage when a Daily is missed or a negative Habit is clicked.",
+  "difficultyHelp": "Difficulty describes how challenging a Habit, Daily, or To Do is for you to complete. A higher difficulty results in greater rewards when a Task is completed, but also greater damage when a Daily is missed or a negative Habit is clicked.",
  "trivial": "Trivial",
  "easy": "Easy",
  "medium": "Medium",
@@ -68,11 +70,11 @@
  "days": "Days",
  "restoreStreak": "Adjust Streak",
  "resetStreak": "Reset Streak",
-  "todo": "To-Do",
-  "todos": "To-Dos",
-  "newTodo": "New To-Do",
-  "newTodoBulk": "New To-Dos (one per line)",
-  "todosDesc": "To-Dos need to be completed once. Add checklists to your To-Dos to increase their value.",
+  "todo": "To Do",
+  "todos": "To Do's",
+  "newTodo": "New To Do",
+  "newTodoBulk": "New To Do's (one per line)",
+  "todosDesc": "To Do's need to be completed once. Add checklists to your To Do's to increase their value.",
  "dueDate": "Due Date",
  "remaining": "Active",
  "complete": "Done",
@@ -136,10 +138,10 @@
  "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
  "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
  "dailyHelp5": "For inspiration, check out these <a href='http://habitica.fandom.com/wiki/Sample_Dailies' target='_blank'>sample Dailies</a>!",
-  "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
-  "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
-  "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
-  "toDoHelp4": "For inspiration, check out these <a href='http://habitica.fandom.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+  "toDoHelp1": "To Do's start yellow, and get redder (more valuable) the longer it takes to complete them.",
+  "toDoHelp2": "To Do's never hurt you! They only award Gold and Experience.",
+  "toDoHelp3": "Breaking a To Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+  "toDoHelp4": "For inspiration, check out these <a href='http://habitica.fandom.com/wiki/Sample_To-Dos' target='_blank'>sample To Do's</a>!",
  "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
  "rewardHelp2": "Equipment affects your Stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
  "rewardHelp3": "Special equipment will appear here during World Events.",
@@ -151,7 +153,7 @@
  "invalidTasksType": "Task type must be one of \"habits\", \"dailys\", \"todos\", \"rewards\".",
  "invalidTasksTypeExtra": "Task type must be one of \"habits\", \"dailys\", \"todos\", \"rewards\", \"completedTodos\".",
  "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.",
-  "checklistOnlyDailyTodo": "Checklists are supported only on Dailies and To-Dos",
+  "checklistOnlyDailyTodo": "Checklists are supported only on Dailies and To Do's",
  "checklistItemNotFound": "No checklist item was found with given id.",
  "itemIdRequired": "\"itemId\" must be a valid UUID.",
  "tagNotFound": "No tag item was found with given id.",
@@ -120,7 +120,7 @@
    "commGuideLink01": "<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>: a Guild for users to ask questions!",
    "commGuideLink02": "<a href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank'>The Wiki</a>: the biggest collection of information about Habitica.",
    "commGuideLink03": "<a href='https://github.com/HabitRPG/habitica' target='_blank'>GitHub</a>: for bug reports or helping with code!",
-    "commGuideLink04": "<a href='https://trello.com/b/EpoYEYod/' target='_blank'>The Main Trello</a>: for site feature requests.",
+    "commGuideLink04": "<a href='https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link' target='_blank'>The Feedback Form</a>: for site and app feature requests.",
    "commGuideLink05": "<a href='https://trello.com/b/mXK3Eavg/' target='_blank'>The Mobile Trello</a>: for mobile feature requests.",
    "commGuideLink06": "<a href='https://trello.com/b/vwuE9fbO/' target='_blank'>The Art Trello</a>: for submitting pixel art.",
    "commGuideLink07": "<a href='https://trello.com/b/nnv4QIRX/' target='_blank'>The Quest Trello</a>: for submitting quest writing.",
@@ -47,7 +47,7 @@
    "faqQuestion11": "How do I report a bug or request a feature?",
    "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > About > Report a Bug and Menu > About > Send Feedback! We'll do everything we can to assist you.",
    "androidFaqAnswer11": "You can report a bug, request a feature, or send feedback under About > Report a Bug and About > Send us Feedback! We'll do everything we can to assist you.",
-    "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!",
+    "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected via a Google form. Go to [Help > Request a Feature](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) and follow the instructions. Ta-da!",
    "faqQuestion12": "How do I battle a World Boss?",
    "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.fandom.com/wiki/World_Bosses) on the wiki.",
    "androidFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.fandom.com/wiki/World_Bosses) on the wiki.",
@@ -2101,5 +2101,9 @@
    "armorArmoireFiddlersCoatNotes": "A practical outfit to give you plenty of room to move! Increases Constitution by <%= con %>. Enchanted Armoire: Fiddler Set (Item 2 of 4).",
    "armorArmoireFiddlersCoatText": "Fiddler's Coat",
    "weaponArmoireFiddlersBowNotes": "You can coax music out of anything with this! ...A violin might work best, though. Increases Strength by <%= str %>. Enchanted Armoire: Fiddler Set (Item 3 of 4).",
-    "weaponArmoireFiddlersBowText": "Fiddler's Bow"
+    "weaponArmoireFiddlersBowText": "Fiddler's Bow",
+    "headMystery202006Notes": "The positive energy of these radiant purple stones will draw the sea's friendliest creatures to your side. Confers no benefit. June 2020 Subscriber Item.",
+    "headMystery202006Text": "Sugilite Circlet",
+    "armorMystery202006Notes": "Even among the brightest corals and anemones, this tail proudly stands out from the crowd! Confers no benefit. June 2020 Subscriber Item.",
+    "armorMystery202006Text": "Multichrome Merfolk Tail"
 }
@@ -2,7 +2,7 @@
    "settings": "Settings",
    "language": "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=\"https://trello.com/c/SvTsLdRF/12-translations\" target=\"_blank\">this</a> Trello card.",
+    "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>!",
    "showHeaderPop": "Show your avatar, Health/Experience bars, and party.",
    "stickyHeader": "Sticky header",
    "stickyHeaderPop": "Affix the header to the top of the screen. Unticked means it scrolls out of view.",
@@ -249,5 +249,6 @@
    "giftASubscription": "Gift a Subscription",
    "mysterySet202003": "Barbed Battler Set",
    "mysterySet202004": "Mighty Monarch Set",
-    "mysterySet202005": "Wondrous Wyvern Set"
+    "mysterySet202005": "Wondrous Wyvern Set",
+    "mysterySet202006": "Multichrome Merfolk Set"
 }
@@ -5,7 +5,7 @@
    "commGuideHeadingWelcome": "¡Bienvenido a Habitica!",
    "commGuidePara001": "¡Saludos, aventurero! Bienvenido a Habitica, la tierra de la productividad, vida sana y algún que otro grifo desmadrado ocasional. Tenemos una alegre comunidad llena de gente apoyándose los unos a los otros en su camino hacia la mejora personal. Para encajar, todo lo que se necesita es una actitud positiva, formas respetuosas y la comprensión de que todos tienen diferentes habilidades y limitaciones, ¡lo que te incluye a ti! Los Habiticanos son pacientes los unos con los otros y tratan de ayudar cuando pueden.",
    "commGuidePara002": "Para ayudar a mantener a todos a salvo, felices y productivos en la comunidad, tenemos algunas pautas. Las hemos diseñado cuidadosamente para que sean lo más agradable y fáciles de leer posible. Por favor, tómate el tiempo para leerlas antes de empezar a chatear.",
-    "commGuidePara003": "Estas reglas se aplican a todos los espacios sociales que utilizamos, incluyendo (pero no necesariamente limitándose a) Trello, GitHub, Transifex, y la Wikia (también conocido como wiki). A veces, surgirán situaciones imprevistas, como un nuevo conflicto o un nigromante vicioso. Cuando esto sucede, los moderadores pueden responder mediante la edición de estas pautas para mantener a la comunidad a salvo de las nuevas amenazas. No hay que temer: se le notificará por un anuncio de Bailey si las pautas cambian.",
+    "commGuidePara003": "Estas reglas se aplican a todos los espacios sociales que utilizamos, incluyendo (pero no necesariamente limitándose a) Trello, GitHub, Weblate y la Wikia (también conocido como wiki). A veces, surgirán situaciones imprevistas, como un nuevo conflicto o un nigromante vicioso. Cuando esto sucede, los moderadores pueden responder mediante la edición de estas pautas para mantener a la comunidad a salvo de las nuevas amenazas. No hay que temer: se le notificará por un anuncio de Bailey si las pautas cambian.",
    "commGuidePara004": "Ahora prepara tus plumas y pergaminos para tomar nota y,  ¡pongámonos manos a la obra!",
    "commGuideHeadingInteractions": "Interacciones en Habitica",
    "commGuidePara015": "En Habitica hay dos tipos de espacios para socializar: públicos y privados. Los públicos incluyen la Taberna, los Gremios Públicos, GitHub, Trello y la Wiki. Los espacios privados incluyen los Gremios Privados, el chat del Equipo y los Mensajes Privados. Todos los nombres de usuario deben cumplir las normas de espacios públicos. Si quieres cambiar tu nombre de usuario, ve a Usuario > Perfil y haz clic en el botón \"Editar\".",
@@ -18,13 +18,13 @@
    "commGuideList02F": "<strong>Evita las discusiones extensas de temas divisivos en la Taberna y allí donde esté fuera de lugar</strong>. Si sientes que alguien ha dicho algo grosero o hiriente, no te involucres. Si alguien menciona algo que está permitido por las pautas, pero que te ha resultado hiriente, está bien dejar que alguien lo sepa educadamente. Si va en contra de las pautas o los Términos de uso, debes marcarlo y dejar que un mod responda. En caso de duda, marca la publicación.",
    "commGuideList02G": "<strong>Cumple inmediatamente con cualquier solicitud de un mod</strong>. Esto podría incluir, entre otras cosas, que te pida limitar tus publicaciones en un espacio en particular, editar tu perfil para eliminar contenido inadecuado, pedirte que traslades un debate a un espacio más adecuado, etc.",
    "commGuideList02H": "<strong>Tómate tu tiempo para reflexionar en vez de responder enfadado</strong> si alguien te dice que algo que gas dicho o has hecho le ha incomodado. Hay mucha fuerza en ser capaz de disculparse sinceramente con alguien. Si crees que la forma en la que te han respondido ha sido inapropiada, ponte en contacto con un moderador en vez de reprenderlos públicamente.",
-    "commGuideList02I": "<strong>Las conversaciones controvertidas deben ser reportadas a los moderadores</strong> señalando los mensajes involucrados o mediante el <a href='http://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>. Si crees que una conversación se está intensificando, es demasiado emocional, o hiriente, no sigas involucrándote. En su lugar, reporta las publicaciones para informarnos al respecto. Los moderadores responderán lo más rápido posible. Nuestro trabajo es mantenerte a salvo. Si consideras que se requiere informar de un mayor contexto, puedes reportar el problema utilizando el <a href='http://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>.",
+    "commGuideList02I": "<strong>Las conversaciones controvertidas deben ser reportadas a los moderadores</strong> señalando los mensajes involucrados o mediante el <a href='https://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>. Si crees que una conversación se está intensificando, es demasiado emocional, o hiriente, no sigas involucrándote. En su lugar, reporta las publicaciones para informarnos al respecto. Los moderadores responderán lo más rápido posible. Nuestro trabajo es mantenerte a salvo. Si consideras que se requiere informar de un mayor contexto, puedes reportar el problema utilizando el <a href='https://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>.",
    "commGuideList02J": "<strong>No mandes correo no deseado</strong>. Esto puede incluir, entre otros: publicar el mismo comentario o consulta en varios lugares, publicar enlaces sin explicación ni contexto, publicar mensajes sin sentido, publicar varios mensajes promocionales sobre un Gremio, Equipo o Desafío, o publicar muchos mensajes seguidos. Pedir gemas o una suscripción en cualquier espacio o a través de un mensaje privado también se considera no deseado. Si las gente que hace clic en un enlace resulta en algún beneficio personal, debes explicarlo en el texto del mensaje o también se considerará correo no deseado. <br/><br/>Depende de los mods decidir si algo constituye correo no deseado o puede generarlo, incluso si no sientes que hayas estado enviando correo no deseado. Por ejemplo, anunciar un Gremio es aceptable una o dos veces, pero varias publicaciones en un día probablemente constituyan correo no deseado, ¡sin importar cuán útil sea el Gremio!",
    "commGuideList02K": "<strong>Evita publicar encabezados grandes en los espacios públicos, especialmente en la Taberna</strong>. Al igual que TODO EN MAYÚSCULA, se lee como si estuvieras gritando, e interfiere con un ambiente cómodo.",
-    "commGuideList02L": "<strong>Desaconsejamos encarecidamente el intercambio de información personal, en particular, información que pueda utilizarse para identificarte, en espacios públicos</strong>. La información identificadora puede incluir, entre otros: tu dirección personal, tu dirección de correo electrónico y tu token de API/contraseña. ¡Esto es por tu seguridad! El personal o los moderadores pueden eliminar tales publicaciones a su discreción. Si se te solicita información personal en un Gremio, Equipo o MP,  recomendamos encarecidamente que lo rechaces educadamente  y avises al personal y a los moderadores de alguna de las siguientes maneras: 1) marcando el mensaje si se trata de un Equipo o Gremio privado, o 2) completando el <a href='http://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>, incluyendo capturas de pantalla.",
+    "commGuideList02L": "<strong>Desaconsejamos encarecidamente el intercambio de información personal, en particular, información que pueda utilizarse para identificarte, en espacios públicos</strong>. La información identificadora puede incluir, entre otros: tu dirección personal, tu dirección de correo electrónico y tu token de API/contraseña. ¡Esto es por tu seguridad! El personal o los moderadores pueden eliminar tales publicaciones a su discreción. Si se te solicita información personal en un Gremio, Equipo o MP,  recomendamos encarecidamente que lo rechaces educadamente  y avises al personal y a los moderadores de alguna de las siguientes maneras: 1) marcando el mensaje si se trata de un Equipo o Gremio privado, o 2) completando el <a href='https://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>, incluyendo capturas de pantalla.",
    "commGuidePara019": "<strong>En espacios privados</strong>, los usuarios tienen más libertada para debatir los temas que deseen, pero aun así no deben violar los Términos y Condiciones, incluyendo colgar insultos o cualquier contenido discriminatorio, violento o amenazante. Tened en cuenta que, dado que los nombres de los Desafíos aparecen en el perfil público del ganador, TODOS los desafíos deben obedecer las Normas de Espacios Públicos, incluso si aparecen en espacios privados.",
    "commGuidePara020": "<strong>Los Mensajes Privados (PMs)</strong> tienen reglas adicionales. Si alguien te ha bloqueado, no contactes con él a través de otro medio para pedir que te desbloquee. Del mismo modo, no deberías enviar PMs a alguien para pedir ayuda (ya que las respuestas públicas a dudas o preguntas pueden ser de utilidad para toda la comunidad). Para terminar, no envíes PMs a nadie pidiendo regalos, gemas o una subscripción, eso puede considerarse Abuso.",
-    "commGuidePara020A": "<strong>Si ves una publicación que crees que supone una violación de las Normas de Espacios Públicos, o si ves una publicación que te preocupa o incomoda, puedes llamar la atención de los Moderadores y del Personal sobre esa publicación haciendo click en el icono de la bandera roja para reportarlo</strong>. Un miembro del Personal o un Moderador responderá a la situación lo más pronto posible. Por favor, ten en cuenta que reportar intencionadamente publicaciones inocentes es una infracción de estas Normas (mira debajo en \"Infracciones\"). Mensajes Directos no pueden ser marcados, así que si necesitas reportar uno, por favor contacta a los Moderadores mediante el formulario de la página de \"Contáctanos\", a la que también puedes acceder mediante el menú de ayuda haciendo click en \"<a href='http://contact.habitica.com/' target='_blank'>Contactar al Equipo de Moderación</a>.\" Es preferible hacer esto si hay varias publicaciones problemáticas de la misma persona en distintos Gremios, o si la situación necesita explicación. Puedes contactarnos en tu idioma nativo si te resulta más fácil: es posible que tengamos que usar el Traductor de Google, pero queremos que te sientas cómodo contactando con nosotros si tienes un problema.",
+    "commGuidePara020A": "<strong>Si ves una publicación que crees que supone una violación de las Normas de Espacios Públicos, o si ves una publicación que te preocupa o incomoda, puedes llamar la atención de los Moderadores y del Personal sobre esa publicación haciendo click en el icono de la bandera roja para reportarlo</strong>. Un miembro del Personal o un Moderador responderá a la situación lo más pronto posible. Por favor, ten en cuenta que reportar intencionadamente publicaciones inocentes es una infracción de estas Normas (mira debajo en \"Infracciones\"). Mensajes Directos no pueden ser marcados, así que si necesitas reportar uno, por favor contacta a los Moderadores mediante el formulario de la página de \"Contáctanos\", a la que también puedes acceder mediante el menú de ayuda haciendo click en \"<a href='https://contact.habitica.com/' target='_blank'>Contactar al Equipo de Moderación</a>.\" Es preferible hacer esto si hay varias publicaciones problemáticas de la misma persona en distintos Gremios, o si la situación necesita explicación. Puedes contactarnos en tu idioma nativo si te resulta más fácil: es posible que tengamos que usar el Traductor de Google, pero queremos que te sientas cómodo contactando con nosotros si tienes un problema.",
    "commGuidePara021": "Además, algunos espacios públicos de Habitica tienen normas adicionales.",
    "commGuideHeadingTavern": "La Taberna",
    "commGuidePara022": "La Taberna es el lugar principal para que los Habiticanos socialicen. Daniel el tabernero mantiene el lugar limpio y ordenado, y, con gusto, Lemoness hará aparecer limonada mientras tú te sientas y charlas. Tan solo ten en cuenta...",
@@ -36,7 +36,7 @@
    "commGuidePara031": "En algunos Gremios públicos se tratan temas delicados como la depresión, la religión, la política, etc. Esto no supone un problema siempre que las conversaciones no infrinjan los Términos y Condiciones ni las Normas de Espacios Públicos, y siempre que lo que se hable sea relevante.",
    "commGuidePara033": "<strong>Los Gremios Públicos NO pueden contener contenidos para 18+. Si planean debatir regularmente contenido sensible, deberían decirlo en la descripción del Gremio</strong>. Esto sirve para mantener Habitica segura y cómoda para todos.",
    "commGuidePara035": "<strong>Si el Gremio en cuestión tiene varios tipos de cuestiones delicadas, es respetuoso para con tus compañeros Habiticanos publicar tu comentario a continuación de una advertencia (por ejemplo: \"Advertencia: referencias a auto-lesión\")</strong>. Estos pueden caracterizarse como advertencias desencadenantes y/o notas de contenido, y los Gremios pueden tener sus propias reglas además de las que se dan aquí. Si es posible, utiliza <a href='https://habitica.fandom.com/es/wiki/Gu%C3%ADa_de_Markdown' target='_blank'>la marca</a> para ocultar el contenido potencialmente sensible bajo los saltos de línea para que aquellos que deseen evitar leerlo puedan desplazarse más allá sin ver el contenido. El personal de Habitica y los moderadores podrían aún así eliminar este material a su discreción.",
-    "commGuidePara036": "Además, el material sensible debe estar relacionado con el tema: traer el tema de la auto-lesión en un Gremio centrado en la lucha contra la depresión puede tener sentido, pero probablemente sea menos apropiado en un Gremio musical. Si ves que alguien infringe reiteradamente esta directriz, especialmente después de varias solicitudes, marca las publicaciones y notifícaselo a los moderadores a través del <a href='http://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>.",
+    "commGuidePara036": "Además, el material sensible debe estar relacionado con el tema: traer el tema de la auto-lesión en un Gremio centrado en la lucha contra la depresión puede tener sentido, pero probablemente sea menos apropiado en un Gremio musical. Si ves que alguien infringe reiteradamente esta directriz, especialmente después de varias solicitudes, marca las publicaciones y notifícaselo a los moderadores a través del <a href='https://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a>.",
    "commGuidePara037": "<strong>Ningún Gremio, ni Público ni Privado, debe ser creado con el propósito de atacar a un grupo o individuo</strong>. La creación de un Gremio así es razón para ser expulsado inmediatamente. ¡Lucha contra los malos hábitos, no contra tus compañeros de aventura!",
    "commGuidePara038": "<strong>Todos los Retos de Taberna y los Retos de los Gremios Públicos deben ceñirse a estas reglas asímismo</strong>.",
    "commGuideHeadingInfractionsEtc": "Infracciones, Consecuencias y Restauración",
@@ -114,7 +114,7 @@
    "commGuidePara013": "En una comunidad tan grande como Habitica, los usuarios vienen y van, y a veces un miembro del personal o un moderador necesita soltar su noble manto y relajarse. Los siguientes son el personal y los moderadores eméritos. Estos no poseen por más tiempo el poder de un miembro del personal o de un moderador, ¡pero aún así nos gustaría seguir honrando su trabajo!",
    "commGuidePara014": "Personal y Moderadores Eméritos:",
    "commGuideHeadingFinal": "La Sección Final",
-    "commGuidePara067": "Pues aquí lo tienes, valiente Habiticano: ¡Las Normas de la Comunidad! Límpiate ese sudor de tu frente y proporciónate algunos PE al leerlo todo. Si tienes alguna pregunta o preocupación acerca de estas Normas de la Comunidad, por favor, ponte en contacto con nosotros a través del <a href='http://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a> y estaremos encantados de ayudarte a clarificar las dudas.",
+    "commGuidePara067": "Pues aquí lo tienes, valiente Habiticano: ¡Las Normas de la Comunidad! Límpiate ese sudor de tu frente y proporciónate algunos PE al leerlo todo. Si tienes alguna pregunta o preocupación acerca de estas Normas de la Comunidad, por favor, ponte en contacto con nosotros a través del <a href='https://contact.habitica.com/' target='_blank'>Formulario de Contacto con Moderadores</a> y estaremos encantados de ayudarte a clarificar las dudas.",
    "commGuidePara068": "¡Ahora sal, valiente aventurero, y derrota a algunas tareas Diarias!",
    "commGuideHeadingLinks": "Enlaces Útiles",
    "commGuideLink01": "\"<a href='/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a' target='_blank'>Habitica Help: Ask a Question</a>\": ¡Un Gremio para que los usuarios hagan preguntas!",
@@ -4,7 +4,7 @@
    "armoireText": "Armario encantado",
    "armoireNotesFull": "¡Abre el Armario Encantado para recibir aleatoriamente Equipamiento especial, Experiencia, o comida! Piezas de Equipo restantes:",
    "armoireLastItem": "Has encontrado la última pieza de Equipamiento en el Armario encantado.",
-    "armoireNotesEmpty": "El Armario Encantado tendrá nuevas piezas de Equipo la primera semana de cada mes. Hasta entonces, ¡sigue haciendo clics por Experiencia y Comida!",
+    "armoireNotesEmpty": "El Armario Encantado tendrá nuevas piezas de Equipo la primera semana de cada mes. Hasta entonces, ¡sigue haciendo clics por Experiencia y Comida para mascotas!",
    "dropEggWolfText": "Lobo",
    "dropEggWolfMountText": "Lobo",
    "dropEggWolfAdjective": "un leal",
@@ -353,5 +353,7 @@
    "questEggRobotText": "Robot",
    "premiumPotionUnlimitedNotes": "No puede usarse en huevos de Mascotas de Misiones.",
    "hatchingPotionAmber": "Ámbar",
-    "hatchingPotionAurora": "Aurora"
+    "hatchingPotionAurora": "Aurora",
+    "hatchingPotionBirchBark": "Corteza de Abedul",
+    "hatchingPotionRuby": "Rubí"
 }
--- a/Show More
+++ b/Show More