Merged in develop

2026-07-18 17:54:10 +00:00 · 2017-05-20 19:24:25 -06:00 · 2017-05-20 19:24:25 -06:00 · 19b09b4894
commit 19b09b4894
parent f49d21d7b4 59bfe66c94
467 changed files with 29480 additions and 26851 deletions
--- a/README.md
+++ b/README.md
@ -5,8 +5,7 @@ Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=dev

 We need more programmers! Your assistance will be greatly appreciated.

-For an introduction to the technologies used and how the software is organized, refer to [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29) - "Coders (Web & Mobile)" section.
+For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths).

-To set up a local install of Habitica for development and testing, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally), which contains instructions for Windows, *nix / Mac OS, and Vagrant.
+To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).

-Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.90.1",
+  "version": "3.91.2",
  "main": "./website/server/index.js",
  "dependencies": {
    "@slack/client": "^3.8.1",
@ -13,7 +13,7 @@
    "async": "^1.5.0",
    "autoprefixer": "^6.4.0",
    "aws-sdk": "^2.0.25",
-    "axios": "^0.15.3",
+    "axios": "^0.16.0",
    "babel-core": "^6.0.0",
    "babel-loader": "^6.0.0",
    "babel-plugin-syntax-async-functions": "^6.13.0",
@ -29,13 +29,14 @@
    "bluebird": "^3.3.5",
    "body-parser": "^1.15.0",
    "bootstrap": "^4.0.0-alpha.6",
+    "bootstrap-vue": "^0.15.8",
    "bower": "~1.3.12",
    "browserify": "~12.0.1",
    "compression": "^1.6.1",
    "connect-ratelimit": "0.0.7",
    "cookie-session": "^1.2.0",
    "coupon-code": "^0.4.5",
-    "css-loader": "^0.26.1",
+    "css-loader": "^0.28.0",
    "csv-stringify": "^1.0.2",
    "cwait": "^1.0.0",
    "domain-middleware": "~0.1.0",
@ -96,7 +97,7 @@
    "postcss-easy-import": "^2.0.0",
    "pretty-data": "^0.40.0",
    "ps-tree": "^1.0.0",
-    "pug": "^2.0.0-beta11",
+    "pug": "^2.0.0-beta.12",
    "push-notify": "habitrpg/push-notify#v1.2.0",
    "pusher": "^1.3.0",
    "request": "~2.74.0",
@ -119,10 +120,10 @@
    "vue-loader": "^11.0.0",
    "vue-mugen-scroll": "^0.2.1",
    "vue-router": "^2.0.0-rc.5",
-    "vue-style-loader": "^2.0.0",
+    "vue-style-loader": "^3.0.0",
    "vue-template-compiler": "^2.1.10",
    "webpack": "^2.2.1",
-    "webpack-merge": "^2.6.1",
+    "webpack-merge": "^4.0.0",
    "winston": "^2.1.0",
    "winston-loggly-bulk": "^1.4.2",
    "xml2js": "^0.4.4"
@ -168,7 +169,7 @@
    "chromedriver": "^2.27.2",
    "connect-history-api-fallback": "^1.1.0",
    "coveralls": "^2.11.2",
-    "cross-env": "^3.1.4",
+    "cross-env": "^4.0.0",
    "cross-spawn": "^5.0.1",
    "csv": "~0.3.6",
    "deep-diff": "~0.1.4",
@ -192,7 +193,7 @@
    "karma-mocha": "^0.2.0",
    "karma-mocha-reporter": "^1.1.1",
    "karma-phantomjs-launcher": "^1.0.0",
-    "karma-sinon-chai": "^1.2.0",
+    "karma-sinon-chai": "~1.2.0",
    "karma-sinon-stub-promise": "^1.0.0",
    "karma-sourcemap-loader": "^0.3.7",
    "karma-spec-reporter": "0.0.24",
--- a/test/README.md
+++ b/test/README.md
@ -0,0 +1 @@
+For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).
--- a/test/api/README.md
+++ b/test/api/README.md
@ -1,123 +0,0 @@
-# So you want to write API integration tests?
-
-@TODO rewrite
-
-That's great! This README will serve as a quick primer for style conventions and practices for these tests.
-
-## What is this?
-
-These are integration tests for the Habitica API. They are performed by making HTTP requests to the API's endpoints and asserting on the data that is returned.
-
-If the javascript looks weird to you, that's because it's written in [ES2015](http://www.ecma-international.org/ecma-262/6.0/) and transpiled by [Babel](https://babeljs.io/docs/learn-es2015/).
-
-## How to run the tests
-
-First, install gulp.
-
-```bash
-$ npm install -g gulp
-```
-
-To run the api tests, make sure the mongo db is up and running and then type this on the command line:
-
-```bash
-$ gulp test:api-v2
-```
-
-It may take a little while to get going, since it requires the web server to start up before the tests can run.
-
-You can also run a watch command for the api tests. This will allow the tests to re-run automatically when you make changes in the `/test/api/v2/`.
-
-```bash
-$ gulp test:api-v2:watch
-```
-
-One caveat. If you have a severe syntax error in your files, the tests may fail to run, but they won't alert you that they are not running. If you ever find your test hanging for a while, run this to get the stackstrace. Once you've fixed the problem, you can resume running the watch comand.
-
-```bash
-$ gulp test:api:safe
-```
-
-If you'd like to run the tests individually and inspect the output from the server, in one pane you can run:
-
-```bash
-$ gulp test:nodemon
-```
-
-And run your tests in another pane:
-
-```bash
-$ mocha path/to/file.js
-
-# Mark a test with the `.only` attribute
-$ mocha
-```
-
-## Structure
-
-Each top level route has it's own directory. So, all the routes that begin with `/groups/` live in `/test/api/groups/`.
-
-Each test should:
-
-  * encompase a single route
-  * begin with the REST parameter for the route
-  * display the full name of the route, swapping out `/` for `_`
-  * end with test.js
-
-So, for the `POST` route `/groups/:id/leave`, it would be
-
-```bash
-POST-groups_id_leave.test.js
-```
-
-## Promises
-
-To mitigate [callback hell](http://callbackhell.com/) :imp:, we've written a helper method to generate a user object that can make http requests that [return promises](https://babeljs.io/docs/learn-es2015/#promises).  This makes it very easy to chain together commands. All you need to do to make a subsequent request is return another promise and then call `.then((result) => {})` on the surrounding block, like so:
-
-```js
-it('does something', () => {
-  let user;
-
-  return generateUser().then((_user) => { // We return the initial promise so this test can be run asyncronously
-    user = _user;
-
-    return user.post('/groups', {
-      type: 'party',
-    });
-  }).then((party) => { // the result of the promise above is the argument of the function
-    return user.put(`/groups/${party._id}`, {
-      name: 'My party',
-    });
-  }).then((result) => {
-    return user.get('/groups/party');
-  }).then((party) => {
-    expect(party.name).to.eql('My party');
-  });
-});
-```
-
-If the test is simple, you can use the [chai-as-promised](http://chaijs.com/plugins/chai-as-promised) `return expect(somePromise).to.eventually` syntax to make your assertion.
-
-```js
-it('makes the party creator the leader automatically', () => {
-  return expect(user.post('/groups', {
-    type: 'party',
-  })).to.eventually.have.deep.property('leader._id', user._id);
-});
-```
-
-If the test is checking that the request returns an error, use the `.eventually.be.rejected.and.eql` syntax.
-
-```js
-it('returns an error', () => {
-  return expect(user.get('/groups/id-of-a-party-that-user-does-not-belong-to'))
-    .to.eventually.be.rejected.and.eql({
-      code: 404,
-      text: t('messageGroupNotFound'),
-    });
-});
-```
-
-## Questions?
-
-Ask in the [Aspiring Coder's Guild](https://habitica.com/#/options/groups/guilds/68d4a01e-db97-4786-8ee3-05d612c5af6f)!
--- a/test/api/v3/README.md
+++ b/test/api/v3/README.md
@ -1,4 +0,0 @@
-# How to run tests:
-
-1. `npm test` is equivalent to `gulp test:api-v3` which will run, in order, `gulp lint`, `gulp test:api-v3:unit` and `gulp test:api-v3:integration`. If one of these fails, the whole `npm test` command blocks and fails.  Each of these commands can also be run as a standalone command. 
-2. To run the server and the integrations tests in two different terminals (to better inspect the output in the server) run `npm start` in one and `npm test:api-v3:integration:separate-server` in the other
--- a/test/api/v3/integration/groups/POST-groups.test.js
+++ b/test/api/v3/integration/groups/POST-groups.test.js
@ -74,6 +74,18 @@ describe('POST /group', () => {
      expect(updatedUser.guilds).to.include(guild._id);
    });

+    it('awards the Joined Guild achievement', async () => {
+      await user.post('/groups', {
+        name: 'some guild',
+        type: 'guild',
+        privacy: 'public',
+      });
+
+      let updatedUser = await user.get('/user');
+
+      expect(updatedUser.achievements.joinedGuild).to.eql(true);
+    });
+
    context('public guild', () => {
      it('creates a group', async () => {
        let groupName = 'Test Public Guild';
--- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
+++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
@ -68,6 +68,12 @@ describe('POST /group/:groupId/join', () => {

      await expect(joiningUser.get(`/groups/${publicGuild._id}`)).to.eventually.have.property('memberCount', oldMemberCount + 1);
    });
+
+    it('awards Joined Guild achievement', async () => {
+      await joiningUser.post(`/groups/${publicGuild._id}/join`);
+
+      await expect(joiningUser.get('/user')).to.eventually.have.deep.property('achievements.joinedGuild', true);
+    });
  });

  context('Joining a private guild', () => {
@ -147,8 +153,14 @@ describe('POST /group/:groupId/join', () => {
          }),
        };

-        expect(inviter.notifications[0].type).to.eql('GROUP_INVITE_ACCEPTED');
-        expect(inviter.notifications[0].data).to.eql(expectedData);
+        expect(inviter.notifications[1].type).to.eql('GROUP_INVITE_ACCEPTED');
+        expect(inviter.notifications[1].data).to.eql(expectedData);
+      });
+
+      it('awards Joined Guild achievement', async () => {
+        await invitedUser.post(`/groups/${guild._id}/join`);
+
+        await expect(invitedUser.get('/user')).to.eventually.have.deep.property('achievements.joinedGuild', true);
      });
    });
  });
--- a/test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js
+++ b/test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js
@ -112,8 +112,8 @@ describe('POST /tasks/:id/approve/:userId', () => {

    await user.sync();
    await member2.sync();
-    expect(user.notifications.length).to.equal(1);
-    expect(user.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications.length).to.equal(2);
+    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
    expect(member2.notifications.length).to.equal(1);
    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');

@ -122,7 +122,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
    await user.sync();
    await member2.sync();

-    expect(user.notifications.length).to.equal(0);
+    expect(user.notifications.length).to.equal(1);
    expect(member2.notifications.length).to.equal(0);
  });

--- a/test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js
+++ b/test/api/v3/integration/tasks/groups/POST-group_tasks_id_score_direction.test.js
@ -52,14 +52,14 @@ describe('POST /tasks/:id/score/:direction', () => {

    await user.sync();

-    expect(user.notifications.length).to.equal(1);
-    expect(user.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[0].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(user.notifications.length).to.equal(2);
+    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
      user: member.auth.local.username,
      taskName: updatedTask.text,
      taskId: updatedTask._id,
    }, 'cs')); // This test only works if we have the notification translated
-    expect(user.notifications[0].data.groupId).to.equal(guild._id);
+    expect(user.notifications[1].data.groupId).to.equal(guild._id);

    expect(updatedTask.group.approval.requested).to.equal(true);
    expect(updatedTask.group.approval.requestedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
@ -82,14 +82,14 @@ describe('POST /tasks/:id/score/:direction', () => {
    await user.sync();
    await member2.sync();

-    expect(user.notifications.length).to.equal(1);
-    expect(user.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
-    expect(user.notifications[0].data.message).to.equal(t('userHasRequestedTaskApproval', {
+    expect(user.notifications.length).to.equal(2);
+    expect(user.notifications[1].type).to.equal('GROUP_TASK_APPROVAL');
+    expect(user.notifications[1].data.message).to.equal(t('userHasRequestedTaskApproval', {
      user: member.auth.local.username,
      taskName: updatedTask.text,
      taskId: updatedTask._id,
    }));
-    expect(user.notifications[0].data.groupId).to.equal(guild._id);
+    expect(user.notifications[1].data.groupId).to.equal(guild._id);

    expect(member2.notifications.length).to.equal(1);
    expect(member2.notifications[0].type).to.equal('GROUP_TASK_APPROVAL');
--- a/test/api/v3/integration/user/auth/POST-register_local.test.js
+++ b/test/api/v3/integration/user/auth/POST-register_local.test.js
@ -251,7 +251,6 @@ describe('POST /user/auth/local/register', () => {
        confirmPassword: password,
      });

-      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
    });

--- a/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
+++ b/test/api/v3/integration/user/auth/POST-user_auth_social.test.js
@ -83,7 +83,7 @@ describe('POST /user/auth/social', () => {
        network,
      });

-      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
+      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
    });
  });

@ -139,7 +139,7 @@ describe('POST /user/auth/social', () => {
        network,
      });

-      await expect(getProperty('users', user._id, '_ABtest')).to.eventually.be.a('string');
+      await expect(getProperty('users', user._id, '_ABtests')).to.eventually.be.a('object');
    });
  });
 });
--- a/test/client-old/spec/services/questServicesSpec.js
+++ b/test/client-old/spec/services/questServicesSpec.js
@ -206,6 +206,20 @@ describe('Quests Service', function() {
      });
    });

+    context('quest bundles', function() {
+      it('sends bundle object', function(done) {
+        questsService.buyQuest('featheredFriends')
+          .then(function(res) {
+            expect(res).to.eql(content.bundles.featheredFriends);
+            expect(window.alert).to.not.be.called;
+            expect(rejectSpy).to.not.be.called;
+            done();
+          }, rejectSpy);
+
+        scope.$apply();
+      });
+    });
+
    context('all other quests', function() {
      it('sends quest object', function(done) {
        questsService.buyQuest('whale')
--- a/test/client/.eslintrc
+++ b/test/client/.eslintrc
@ -2,5 +2,10 @@
  "env": {
    "node": true,
    "browser": true,
-  }
+  },
+  "extends": [
+    "habitrpg/browser",
+    "habitrpg/mocha",
+    "habitrpg/esnext",
+  ],
 }
--- a/test/client/unit/specs/components/inventory/drawer.js
+++ b/test/client/unit/specs/components/inventory/drawer.js
@ -0,0 +1,19 @@
+import Vue from 'vue';
+import DrawerComponent from 'client/components/inventory/drawer.vue';
+
+describe('DrawerComponent', () => {
+  it('sets the correct default data', () => {
+    expect(DrawerComponent.data).to.be.a('function');
+    const defaultData = DrawerComponent.data();
+    expect(defaultData.open).to.be.true;
+  });
+
+  it('renders the correct title', () => {
+    const Ctor = Vue.extend(DrawerComponent);
+    const vm = new Ctor({propsData: {
+      title: 'My title',
+    }}).$mount();
+
+    expect(vm.$el.textContent).to.be.equal('My title');
+  });
+});
--- a/test/client/unit/specs/mixins/groupsUtilities.js
+++ b/test/client/unit/specs/mixins/groupsUtilities.js
@ -1,5 +1,6 @@
 import groupsUtilities from 'client/mixins/groupsUtilities';
 import { TAVERN_ID } from 'common/script/constants';
+import generateStore from 'client/store';
 import Vue from 'vue';

 describe('Groups Utilities Mixin', () => {
@ -7,6 +8,7 @@ describe('Groups Utilities Mixin', () => {

  before(() => {
    instance = new Vue({
+      store: generateStore(),
      mixins: [groupsUtilities],
    });

--- a/test/common/libs/shops.js
+++ b/test/common/libs/shops.js
@ -47,11 +47,19 @@ describe('shops', () => {

    it('items contain required fields', () => {
      _.each(shopCategories, (category) => {
-        _.each(category.items, (item) => {
-          _.each(['key', 'text', 'notes', 'value', 'currency', 'locked', 'purchaseType', 'boss', 'class', 'collect', 'drop', 'unlockCondition', 'lvl'], (key) => {
-            expect(_.has(item, key)).to.eql(true);
+        if (category.identifier === 'bundle') {
+          _.each(category.items, (item) => {
+            _.each(['key', 'text', 'notes', 'value', 'currency', 'purchaseType', 'class'], (key) => {
+              expect(_.has(item, key)).to.eql(true);
+            });
          });
-        });
+        } else {
+          _.each(category.items, (item) => {
+            _.each(['key', 'text', 'notes', 'value', 'currency', 'locked', 'purchaseType', 'boss', 'class', 'collect', 'drop', 'unlockCondition', 'lvl'], (key) => {
+              expect(_.has(item, key)).to.eql(true);
+            });
+          });
+        }
      });
    });
  });
--- a/test/common/ops/purchase.js
+++ b/test/common/ops/purchase.js
@ -9,6 +9,8 @@ import i18n from '../../../website/common/script/i18n';
 import {
  generateUser,
 } from '../../helpers/common.helper';
+import forEach from 'lodash/forEach';
+import moment from 'moment';

 describe('shared.ops.purchase', () => {
  const SEASONAL_FOOD = 'Meat';
@ -200,5 +202,28 @@ describe('shared.ops.purchase', () => {

      expect(user.items.gear.owned[key]).to.be.true;
    });
+
+    it('purchases quest bundles', () => {
+      let startingBalance = user.balance;
+      let clock = sandbox.useFakeTimers(moment('2017-05-20').valueOf());
+      let type = 'bundles';
+      let key = 'featheredFriends';
+      let price = 1.75;
+      let questList = [
+        'falcon',
+        'harpy',
+        'owl',
+      ];
+
+      purchase(user, {params: {type, key}});
+
+      forEach(questList, (bundledKey) => {
+        expect(user.items.quests[bundledKey]).to.equal(1);
+      });
+
+      expect(user.balance).to.equal(startingBalance - price);
+
+      clock.restore();
+    });
  });
 });
--- a/test/sanity/README.md
+++ b/test/sanity/README.md
@ -4,6 +4,6 @@

 In development, we [transpile at server start](https://github.com/HabitRPG/habitrpg/blob/1ed7e21542519abe7a3c601f396e1a07f9b050ae/website/server/index.js#L6-L8). This allows us to work quickly while developing, but is not suitable for production. So, in production we transpile the server code before the app starts.

-This system means that requiring any files from `common/script` in `website/server/**/*.js` must be done through the `common/index.js` module. In development, it'll pass through to the pre-transpiled files, but in production it'll point to the transpiled versions. If you try to require or import a file directly, it will error in production as the server doesn't know what to do with some es2015isms (such as the import statement).
+This system means that requiring any files from `website/common/script` in `website/server/**/*.js` must be done through the `website/common/index.js` module. In development, it'll pass through to the pre-transpiled files, but in production it'll point to the transpiled versions. If you try to require or import a file directly, it will error in production as the server doesn't know what to do with some es2015isms (such as the import statement).

 This test just verifies that none of the files in the server code are calling the common files directly.
--- a/webpack/webpack.base.conf.js
+++ b/webpack/webpack.base.conf.js
@ -17,21 +17,31 @@ const baseConfig = {
    path: config.build.assetsRoot,
    publicPath: IS_PROD ? config.build.assetsPublicPath : config.dev.assetsPublicPath,
    filename: '[name].js',
+    devtoolModuleFilenameTemplate (info) {
+      // Fix source maps, code from
+      // https://github.com/Darkside73/bbsmile.com.ua/commit/3596d3c42ef91b69d8380359c3e8908edc08acdb
+      let filename = info.resourcePath;
+      if (info.resource.match(/\.vue$/) && !info.allLoaders.match(/type=script/)) {
+        filename = 'generated';
+      }
+
+      return filename;
+    },
  },
  resolve: {
    extensions: ['*', '.js', '.vue', '.json'],
    modules: [
-      path.join(__dirname, '..', 'website'),
-      path.join(__dirname, '..', 'test/client/unit'),
-      path.join(__dirname, '..', 'node_modules'),
+      path.join(projectRoot, 'website'),
+      path.join(projectRoot, 'test/client/unit'),
+      path.join(projectRoot, 'node_modules'),
    ],
    alias: {
      jquery: 'jquery/src/jquery',
-      website: path.resolve(__dirname, '../website'),
-      common: path.resolve(__dirname, '../website/common'),
-      client: path.resolve(__dirname, '../website/client'),
-      assets: path.resolve(__dirname, '../website/client/assets'),
-      components: path.resolve(__dirname, '../website/client/components'),
+      website: path.resolve(projectRoot, 'website'),
+      common: path.resolve(projectRoot, 'website/common'),
+      client: path.resolve(projectRoot, 'website/client'),
+      assets: path.resolve(projectRoot, 'website/client/assets'),
+      components: path.resolve(projectRoot, 'website/client/components'),
    },
  },
  plugins: [
@ -63,8 +73,14 @@ const baseConfig = {
      {
        test: /\.js$/,
        loader: 'babel-loader',
-        include: projectRoot,
-        exclude: /node_modules/,
+        include: [
+          path.join(projectRoot, 'test'),
+          path.join(projectRoot, 'website'),
+          path.join(projectRoot, 'node_modules', 'bootstrap-vue'),
+        ],
+        options: {
+          cacheDirectory: true,
+        },
      },
      {
        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
--- a/website/assets/sprites/dist/spritesmith-largeSprites-0.css
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-0.css
@ -1,30 +1,30 @@
 .promo_android {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -176px;
+  background-position: -1677px -444px;
  width: 175px;
  height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -295px;
+  background-position: -845px -1042px;
  width: 141px;
  height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px 0px;
+  background-position: -703px -1042px;
  width: 141px;
  height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -442px;
+  background-position: -141px -1042px;
  width: 140px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -442px;
+  background-position: -282px -1042px;
  width: 140px;
  height: 441px;
 }
@ -42,67 +42,73 @@
 }
 .promo_backgrounds_armoire_201608 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -710px -600px;
+  background-position: -852px -600px;
  width: 140px;
  height: 439px;
 }
 .promo_backgrounds_armoire_201609 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -851px -600px;
+  background-position: -993px -600px;
  width: 139px;
  height: 438px;
 }
 .promo_backgrounds_armoire_201610 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px 0px;
+  background-position: -1291px 0px;
  width: 140px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1042px;
+  background-position: -1150px -442px;
  width: 140px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201612 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -141px -1042px;
+  background-position: -423px -1042px;
  width: 140px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201701 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -282px -1042px;
+  background-position: -1150px 0px;
  width: 140px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201702 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -284px -600px;
+  background-position: -568px -600px;
  width: 141px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201703 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -840px -148px;
+  background-position: -426px -600px;
  width: 141px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201704 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -426px -600px;
+  background-position: -284px -600px;
  width: 141px;
  height: 441px;
 }
 .promo_backgrounds_armoire_201705 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -600px;
+  background-position: -142px -600px;
  width: 141px;
  height: 441px;
 }
 .promo_bees {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -142px -600px;
+  background-position: 0px -600px;
+  width: 141px;
+  height: 441px;
+}
+.promo_bundle_feathered {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -982px -148px;
  width: 141px;
  height: 441px;
 }
@ -114,85 +120,85 @@
 }
 .promo_chairs_glasses {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1821px -352px;
+  background-position: 0px -1587px;
  width: 51px;
  height: 210px;
 }
 .promo_checkin_incentives {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -991px -600px;
+  background-position: -987px -1042px;
  width: 141px;
  height: 294px;
 }
 .promo_classes_fall_2014 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -201px -1484px;
+  background-position: -703px -1337px;
  width: 321px;
  height: 100px;
 }
 .promo_classes_fall_2015 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1338px;
+  background-position: -1129px -1190px;
  width: 377px;
  height: 99px;
 }
 .promo_classes_fall_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -590px;
+  background-position: -1573px -444px;
  width: 103px;
  height: 348px;
 }
 .promo_coffee_mug {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1484px;
+  background-position: -1573px -793px;
  width: 200px;
  height: 179px;
 }
 .promo_contrib_spotlight_Keith {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1536px;
+  background-position: -52px -1587px;
  width: 87px;
  height: 111px;
 }
 .promo_contrib_spotlight_beffymaroo {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -626px;
+  background-position: -1677px -620px;
  width: 114px;
  height: 147px;
 }
 .promo_contrib_spotlight_blade {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1424px;
+  background-position: -1412px -1042px;
  width: 89px;
  height: 111px;
 }
 .promo_contrib_spotlight_cantras {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1803px -1536px;
+  background-position: -1854px 0px;
  width: 87px;
  height: 109px;
 }
 .promo_contrib_spotlight_dewines {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -939px;
+  background-position: -140px -1587px;
  width: 89px;
  height: 108px;
 }
 .promo_contrib_spotlight_megan {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1200px;
+  background-position: -1291px -884px;
  width: 90px;
  height: 111px;
 }
 .promo_contrib_spotlight_shanaqui {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1312px;
+  background-position: -1150px -884px;
  width: 90px;
  height: 111px;
 }
 .promo_cow {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -442px;
+  background-position: -1432px 0px;
  width: 140px;
  height: 441px;
 }
@ -204,73 +210,73 @@
 }
 .promo_dilatoryDistress {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1474px -1664px;
+  background-position: -1413px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_egg_mounts {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1190px;
+  background-position: -1573px 0px;
  width: 280px;
  height: 147px;
 }
 .promo_enchanted_armoire {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1081px -1338px;
+  background-position: -1025px -1337px;
  width: 374px;
  height: 76px;
 }
 .promo_enchanted_armoire_201507 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1341px -1042px;
+  background-position: -468px -1484px;
  width: 217px;
  height: 90px;
 }
 .promo_enchanted_armoire_201508 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -468px -1664px;
+  background-position: -686px -1484px;
  width: 180px;
  height: 90px;
 }
 .promo_enchanted_armoire_201509 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -928px -1664px;
+  background-position: -685px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_enchanted_armoire_201511 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1018px;
+  background-position: -1679px -1255px;
  width: 122px;
  height: 90px;
 }
 .promo_enchanted_armoire_201601 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -364px -1767px;
+  background-position: -1322px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_fairy_potions {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -982px -148px;
+  background-position: -840px -148px;
  width: 141px;
  height: 441px;
 }
 .promo_floral_potions {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -352px;
+  background-position: -1573px -1149px;
  width: 105px;
  height: 273px;
 }
 .promo_ghost_potions {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px 0px;
+  background-position: -1291px -442px;
  width: 140px;
  height: 441px;
 }
 .promo_habitica {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px 0px;
+  background-position: -1573px -973px;
  width: 175px;
  height: 175px;
 }
@ -282,31 +288,31 @@
 }
 .promo_habitoween_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px 0px;
+  background-position: -1432px -442px;
  width: 140px;
  height: 441px;
 }
 .promo_haunted_hair {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -774px;
+  background-position: -1749px -973px;
  width: 100px;
  height: 137px;
 }
 .promo_holly_potions {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -568px -600px;
+  background-position: -710px -600px;
  width: 141px;
  height: 440px;
 }
 .promo_item_notif {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1664px;
+  background-position: 0px -1484px;
  width: 249px;
  height: 102px;
 }
 .promo_jackalope {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1264px -1190px;
+  background-position: -1573px -296px;
  width: 276px;
  height: 147px;
 }
@ -318,187 +324,187 @@
 }
 .promo_mystery_201405 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: 0px -1767px;
+  background-position: -1610px -1484px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201406 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -884px;
+  background-position: -594px -1587px;
  width: 90px;
  height: 96px;
 }
 .promo_mystery_201407 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1821px -563px;
+  background-position: -1854px -617px;
  width: 42px;
  height: 62px;
 }
 .promo_mystery_201408 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1821px -912px;
+  background-position: -1854px -341px;
  width: 60px;
  height: 71px;
 }
 .promo_mystery_201409 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -182px -1767px;
+  background-position: -1595px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201410 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1806px -1200px;
+  background-position: -1854px -277px;
  width: 72px;
  height: 63px;
 }
 .promo_mystery_201411 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -837px -1664px;
+  background-position: -1504px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201412 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1836px -1109px;
+  background-position: -1897px -547px;
  width: 42px;
  height: 66px;
 }
 .promo_mystery_201501 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -708px;
+  background-position: -1854px -483px;
  width: 48px;
  height: 63px;
 }
 .promo_mystery_201502 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -91px -1767px;
+  background-position: -1049px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201503 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1656px -1664px;
+  background-position: -776px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201504 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1806px -1312px;
+  background-position: -1854px -413px;
  width: 60px;
  height: 69px;
 }
 .promo_mystery_201505 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1110px -1664px;
+  background-position: -1428px -1484px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201506 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1838px -1018px;
+  background-position: -1854px -547px;
  width: 42px;
  height: 69px;
 }
 .promo_mystery_201507 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1260px;
+  background-position: -230px -1587px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201508 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1291px -884px;
+  background-position: -1149px -1484px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201509 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -273px -1767px;
+  background-position: -1519px -1484px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201510 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1150px -884px;
+  background-position: -1243px -1484px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201511 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1019px -1664px;
+  background-position: -1701px -1484px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201512 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1830px -626px;
+  background-position: -1854px -195px;
  width: 60px;
  height: 81px;
 }
 .promo_mystery_201601 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -1109px;
+  background-position: -1432px -884px;
  width: 120px;
  height: 90px;
 }
 .promo_mystery_201602 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1292px -1664px;
+  background-position: -867px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201603 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1383px -1664px;
+  background-position: -958px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201604 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -991px -895px;
+  background-position: -867px -1484px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201605 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1565px -1664px;
+  background-position: -1140px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201606 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1048px;
+  background-position: -321px -1587px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201607 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1747px -1664px;
+  background-position: -1337px -1484px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201608 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -649px -1664px;
+  background-position: -1055px -1484px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201609 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -743px -1664px;
+  background-position: -961px -1484px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201610 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1816px -774px;
+  background-position: -1854px -110px;
  width: 63px;
  height: 84px;
 }
 .promo_mystery_201611 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1366px;
+  background-position: -503px -1587px;
  width: 90px;
  height: 99px;
 }
@ -510,73 +516,43 @@
 }
 .promo_mystery_201701 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1573px -1154px;
+  background-position: -412px -1587px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201702 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -984px -1190px;
+  background-position: -1573px -148px;
  width: 279px;
  height: 147px;
 }
 .promo_mystery_201703 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1058px -1042px;
+  background-position: -1129px -1042px;
  width: 282px;
  height: 147px;
 }
 .promo_mystery_201704 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1201px -1664px;
+  background-position: -1231px -1587px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_3014 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -250px -1664px;
+  background-position: -250px -1484px;
  width: 217px;
  height: 90px;
 }
 .promo_new_hair_fall2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -423px -1042px;
+  background-position: 0px -1042px;
  width: 140px;
  height: 441px;
 }
 .promo_orca {
  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1715px -912px;
+  background-position: -1679px -1149px;
  width: 105px;
  height: 105px;
 }
-.promo_partyhats {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1432px -981px;
-  width: 115px;
-  height: 47px;
-}
-.promo_pastel_skin {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -523px -1484px;
-  width: 330px;
-  height: 83px;
-}
-.customize-option.promo_pastel_skin {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -548px -1499px;
-  width: 60px;
-  height: 60px;
-}
-.promo_pastel_skin_hair {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -703px -1042px;
-  width: 354px;
-  height: 147px;
-}
-.customize-option.promo_pastel_skin_hair {
-  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -728px -1057px;
-  width: 60px;
-  height: 60px;
-}
--- a/website/assets/sprites/dist/spritesmith-largeSprites-0.png
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-0.png
--- a/website/assets/sprites/dist/spritesmith-largeSprites-1.css
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-1.css
@ -1,330 +1,384 @@
+.promo_partyhats {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1494px -1401px;
+  width: 115px;
+  height: 47px;
+}
+.promo_pastel_skin {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1126px -1274px;
+  width: 330px;
+  height: 83px;
+}
+.customize-option.promo_pastel_skin {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1151px -1289px;
+  width: 60px;
+  height: 60px;
+}
+.promo_pastel_skin_hair {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -401px -948px;
+  width: 354px;
+  height: 147px;
+}
+.customize-option.promo_pastel_skin_hair {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -426px -963px;
+  width: 60px;
+  height: 60px;
+}
 .promo_peppermint_flame {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1629px -934px;
+  background-position: -1735px -601px;
  width: 140px;
  height: 147px;
 }
 .promo_pet_skins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -934px;
+  background-position: -1735px -453px;
  width: 140px;
  height: 147px;
 }
 .customize-option.promo_pet_skins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1513px -949px;
+  background-position: -1760px -468px;
  width: 60px;
  height: 60px;
 }
 .promo_pyromancer {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -632px;
+  background-position: -1735px -1340px;
  width: 113px;
  height: 113px;
 }
 .promo_rainbow_armor {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1358px -556px;
+  background-position: -1635px -392px;
  width: 92px;
  height: 103px;
 }
 .promo_seasonal_shop_fall_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -301px -1207px;
+  background-position: -608px -1099px;
  width: 279px;
  height: 147px;
 }
 .promo_shimmer_hair {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -581px -1207px;
+  background-position: 0px -1455px;
  width: 330px;
  height: 83px;
 }
 .promo_shimmer_potions {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -934px 0px;
+  background-position: -884px -277px;
  width: 141px;
  height: 441px;
 }
 .promo_shinySeeds {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -792px 0px;
+  background-position: -1026px -277px;
  width: 141px;
  height: 441px;
 }
 .promo_splashyskins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1230px;
+  background-position: -1494px -1309px;
  width: 198px;
  height: 91px;
 }
 .customize-option.promo_splashyskins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1513px -1245px;
+  background-position: -1519px -1324px;
  width: 60px;
  height: 60px;
 }
 .promo_spooky_sparkles_fall_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px -377px;
+  background-position: -1494px -392px;
  width: 140px;
  height: 294px;
 }
 .promo_spring_classes_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -1091px;
+  background-position: -830px -728px;
  width: 362px;
  height: 102px;
 }
 .promo_spring_classes_2017 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -899px -916px;
+  background-position: -1066px -948px;
  width: 309px;
  height: 147px;
 }
 .promo_springclasses2014 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -91px;
+  background-position: -289px -1628px;
  width: 288px;
  height: 90px;
 }
 .promo_springclasses2015 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px 0px;
+  background-position: 0px -1628px;
  width: 288px;
  height: 90px;
 }
 .promo_staff_spotlight_Lemoness {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -330px;
+  background-position: -1735px -1045px;
  width: 102px;
  height: 146px;
 }
 .promo_staff_spotlight_Viirus {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1645px -182px;
+  background-position: -1735px -897px;
  width: 119px;
  height: 147px;
 }
 .promo_staff_spotlight_paglias {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -481px;
+  background-position: -1735px -1192px;
  width: 99px;
  height: 147px;
 }
 .promo_steampunk_3017 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -141px -765px;
+  background-position: -1212px 0px;
  width: 140px;
  height: 441px;
 }
 .promo_summer_classes_2014 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -340px -220px;
+  background-position: -340px -605px;
  width: 429px;
  height: 102px;
 }
 .promo_summer_classes_2015 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -1358px;
+  background-position: 0px -1539px;
  width: 300px;
  height: 88px;
 }
 .promo_summer_classes_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -765px;
+  background-position: 0px -948px;
  width: 400px;
  height: 150px;
 }
 .promo_takeThis_gear {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -783px;
+  background-position: -1735px -1618px;
  width: 114px;
  height: 87px;
 }
 .promo_takethis_armor {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1358px -377px;
+  background-position: -1735px -1530px;
  width: 114px;
  height: 87px;
 }
 .promo_task_planning {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px -181px;
+  background-position: -1494px 0px;
  width: 240px;
  height: 195px;
 }
 .promo_turkey_day_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1076px 0px;
+  background-position: -1212px -442px;
  width: 140px;
  height: 441px;
 }
 .promo_unconventional_armor {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1639px -871px;
+  background-position: -1635px -571px;
  width: 60px;
  height: 60px;
 }
 .promo_unconventional_armor2 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1687px -1230px;
+  background-position: -1635px -496px;
  width: 70px;
  height: 74px;
 }
 .promo_updos {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -182px;
+  background-position: -1494px -859px;
  width: 156px;
  height: 147px;
 }
 .promo_veteran_pets {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1627px -1082px;
+  background-position: -1735px -1454px;
  width: 146px;
  height: 75px;
 }
 .promo_winter_classes_2016 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -645px -1091px;
+  background-position: -765px -1274px;
  width: 360px;
  height: 90px;
 }
 .promo_winter_classes_2017 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -620px;
+  background-position: -397px -728px;
  width: 432px;
  height: 144px;
 }
 .promo_winter_fireworks {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1082px;
+  background-position: -1735px -749px;
  width: 138px;
  height: 147px;
 }
 .promo_winterclasses2015 {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -433px -620px;
+  background-position: -888px -1099px;
  width: 325px;
  height: 110px;
 }
 .promo_wintery_skins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -765px;
+  background-position: -1353px 0px;
  width: 140px;
  height: 441px;
 }
 .customize-option.promo_wintery_skins {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -25px -780px;
+  background-position: -1378px -15px;
  width: 60px;
  height: 60px;
 }
 .promo_winteryhair {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -1322px;
+  background-position: -1214px -1099px;
  width: 152px;
  height: 75px;
 }
 .avatar_variety {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -683px -765px;
+  background-position: -385px -250px;
  width: 498px;
  height: 95px;
 }
 .npc_viirus {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1358px -465px;
+  background-position: -1353px -442px;
  width: 108px;
  height: 90px;
 }
 .party_preview {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -340px 0px;
+  background-position: -340px -385px;
  width: 451px;
  height: 219px;
 }
 .promo_backtoschool {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -632px;
+  background-position: -1735px 0px;
  width: 150px;
  height: 150px;
 }
 .promo_cooking {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -328px -343px;
+  background-position: 0px -728px;
  width: 396px;
  height: 219px;
 }
 .promo_startingover {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -783px;
+  background-position: -1735px -151px;
  width: 150px;
  height: 150px;
 }
 .promo_valentines {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -589px -916px;
+  background-position: -756px -948px;
  width: 309px;
  height: 147px;
 }
 .promo_working_out {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -1207px;
+  background-position: -307px -1099px;
  width: 300px;
  height: 150px;
 }
+.scene_arts_crafts {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: 0px 0px;
+  width: 384px;
+  height: 384px;
+}
 .scene_coding {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -481px;
+  background-position: -1494px -1007px;
  width: 150px;
  height: 150px;
 }
 .scene_dailies {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px -343px;
+  background-position: -884px 0px;
  width: 327px;
  height: 276px;
 }
 .scene_eco_friendly {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px -1004px;
+  background-position: -1494px -687px;
  width: 222px;
  height: 171px;
 }
+.scene_guilds {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -385px 0px;
+  width: 498px;
+  height: 249px;
+}
 .scene_habits {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -282px -916px;
+  background-position: 0px -1099px;
  width: 306px;
  height: 174px;
 }
-.scene_phone_peek {
+.scene_meditation {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1488px -330px;
+  background-position: -1494px -1158px;
  width: 150px;
  height: 150px;
 }
+.scene_phone_peek {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1735px -302px;
+  width: 150px;
+  height: 150px;
+}
+.scene_todos {
+  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
+  background-position: -1494px -196px;
+  width: 240px;
+  height: 195px;
+}
 .scene_video_games {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: 0px 0px;
+  background-position: 0px -385px;
  width: 339px;
  height: 342px;
 }
 .welcome_basic_avatars {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px -838px;
+  background-position: -518px -1274px;
  width: 246px;
  height: 165px;
 }
 .welcome_promo_party {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px 0px;
+  background-position: 0px -1274px;
  width: 270px;
  height: 180px;
 }
 .welcome_sample_tasks {
  background-image: url(/static/sprites/spritesmith-largeSprites-1.png);
-  background-position: -1217px -672px;
+  background-position: -271px -1274px;
  width: 246px;
  height: 165px;
 }
--- a/website/assets/sprites/dist/spritesmith-largeSprites-1.png
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-1.png
--- a/website/assets/sprites/dist/spritesmith-main-0.css
+++ b/website/assets/sprites/dist/spritesmith-main-0.css
--- a/website/assets/sprites/dist/spritesmith-main-0.png
+++ b/website/assets/sprites/dist/spritesmith-main-0.png
--- a/website/assets/sprites/dist/spritesmith-main-1.css
+++ b/website/assets/sprites/dist/spritesmith-main-1.css
--- a/website/assets/sprites/dist/spritesmith-main-1.png
+++ b/website/assets/sprites/dist/spritesmith-main-1.png
--- a/website/assets/sprites/dist/spritesmith-main-10.css
+++ b/website/assets/sprites/dist/spritesmith-main-10.css
--- a/website/assets/sprites/dist/spritesmith-main-10.png
+++ b/website/assets/sprites/dist/spritesmith-main-10.png
--- a/website/assets/sprites/dist/spritesmith-main-11.css
+++ b/website/assets/sprites/dist/spritesmith-main-11.css
--- a/website/assets/sprites/dist/spritesmith-main-11.png
+++ b/website/assets/sprites/dist/spritesmith-main-11.png
--- a/website/assets/sprites/dist/spritesmith-main-12.css
+++ b/website/assets/sprites/dist/spritesmith-main-12.css
--- a/website/assets/sprites/dist/spritesmith-main-12.png
+++ b/website/assets/sprites/dist/spritesmith-main-12.png
--- a/website/assets/sprites/dist/spritesmith-main-13.css
+++ b/website/assets/sprites/dist/spritesmith-main-13.css
--- a/website/assets/sprites/dist/spritesmith-main-13.png
+++ b/website/assets/sprites/dist/spritesmith-main-13.png
--- a/website/assets/sprites/dist/spritesmith-main-14.css
+++ b/website/assets/sprites/dist/spritesmith-main-14.css
--- a/website/assets/sprites/dist/spritesmith-main-14.png
+++ b/website/assets/sprites/dist/spritesmith-main-14.png
--- a/website/assets/sprites/dist/spritesmith-main-15.css
+++ b/website/assets/sprites/dist/spritesmith-main-15.css
--- a/website/assets/sprites/dist/spritesmith-main-15.png
+++ b/website/assets/sprites/dist/spritesmith-main-15.png
--- a/website/assets/sprites/dist/spritesmith-main-16.css
+++ b/website/assets/sprites/dist/spritesmith-main-16.css
--- a/website/assets/sprites/dist/spritesmith-main-16.png
+++ b/website/assets/sprites/dist/spritesmith-main-16.png
--- a/website/assets/sprites/dist/spritesmith-main-17.css
+++ b/website/assets/sprites/dist/spritesmith-main-17.css
--- a/website/assets/sprites/dist/spritesmith-main-17.png
+++ b/website/assets/sprites/dist/spritesmith-main-17.png
--- a/website/assets/sprites/dist/spritesmith-main-2.css
+++ b/website/assets/sprites/dist/spritesmith-main-2.css
--- a/website/assets/sprites/dist/spritesmith-main-2.png
+++ b/website/assets/sprites/dist/spritesmith-main-2.png
--- a/website/assets/sprites/dist/spritesmith-main-3.css
+++ b/website/assets/sprites/dist/spritesmith-main-3.css
--- a/website/assets/sprites/dist/spritesmith-main-3.png
+++ b/website/assets/sprites/dist/spritesmith-main-3.png
--- a/website/assets/sprites/dist/spritesmith-main-4.css
+++ b/website/assets/sprites/dist/spritesmith-main-4.css
--- a/website/assets/sprites/dist/spritesmith-main-4.png
+++ b/website/assets/sprites/dist/spritesmith-main-4.png
--- a/website/assets/sprites/dist/spritesmith-main-5.css
+++ b/website/assets/sprites/dist/spritesmith-main-5.css
--- a/website/assets/sprites/dist/spritesmith-main-5.png
+++ b/website/assets/sprites/dist/spritesmith-main-5.png
--- a/website/assets/sprites/dist/spritesmith-main-6.css
+++ b/website/assets/sprites/dist/spritesmith-main-6.css
--- a/website/assets/sprites/dist/spritesmith-main-6.png
+++ b/website/assets/sprites/dist/spritesmith-main-6.png
--- a/website/assets/sprites/dist/spritesmith-main-7.css
+++ b/website/assets/sprites/dist/spritesmith-main-7.css
--- a/website/assets/sprites/dist/spritesmith-main-7.png
+++ b/website/assets/sprites/dist/spritesmith-main-7.png
--- a/website/assets/sprites/dist/spritesmith-main-8.css
+++ b/website/assets/sprites/dist/spritesmith-main-8.css
@ -1,42 +1,36 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1153px -1326px;
+  background-position: -936px -1326px;
  width: 221px;
  height: 39px;
 }
 .quest_dilatory {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -660px -672px;
+  background-position: -880px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_dilatoryDistress1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -868px;
+  background-position: -1540px -651px;
  width: 210px;
  height: 210px;
 }
 .quest_dilatoryDistress2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -1023px;
+  background-position: -1757px -721px;
  width: 150px;
  height: 150px;
 }
 .quest_dilatoryDistress3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -440px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_dilatory_derby {
-  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -880px -220px;
+  background-position: -660px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_dustbunnies {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: 0px -232px;
+  background-position: -440px 0px;
  width: 219px;
  height: 219px;
 }
@ -54,19 +48,19 @@
 }
 .quest_evilsanta2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -660px 0px;
+  background-position: -440px -232px;
  width: 219px;
  height: 219px;
 }
 .quest_falcon {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -660px -220px;
+  background-position: -660px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_ferret {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: 0px -452px;
+  background-position: -660px -220px;
  width: 219px;
  height: 219px;
 }
@ -78,19 +72,19 @@
 }
 .quest_ghost_stag {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -440px -452px;
+  background-position: -220px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -660px -452px;
+  background-position: -440px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_goldenknight2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -902px -1326px;
+  background-position: -685px -1326px;
  width: 250px;
  height: 150px;
 }
@ -102,19 +96,19 @@
 }
 .quest_gryphon {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: 0px -1326px;
+  background-position: -885px -1112px;
  width: 216px;
  height: 177px;
 }
 .quest_guineapig {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: 0px -672px;
+  background-position: -880px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_harpy {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -220px -672px;
+  background-position: 0px -672px;
  width: 219px;
  height: 219px;
 }
@ -126,19 +120,19 @@
 }
 .quest_horse {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -220px 0px;
+  background-position: -440px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_kraken {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1319px -1112px;
+  background-position: -1540px -862px;
  width: 216px;
  height: 177px;
 }
 .quest_mayhemMistiflying1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -570px;
+  background-position: -1757px -872px;
  width: 150px;
  height: 150px;
 }
@ -162,37 +156,37 @@
 }
 .quest_moon1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -434px;
+  background-position: -1540px -217px;
  width: 216px;
  height: 216px;
 }
 .quest_moon2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1100px -660px;
+  background-position: 0px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moon3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: 0px -892px;
+  background-position: -220px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -220px -892px;
+  background-position: -440px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -440px -892px;
+  background-position: -220px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_moonstone3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -660px -892px;
+  background-position: -880px -892px;
  width: 219px;
  height: 219px;
 }
@ -204,13 +198,13 @@
 }
 .quest_owl {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1100px -892px;
+  background-position: -1320px 0px;
  width: 219px;
  height: 219px;
 }
 .quest_peacock {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -217px;
+  background-position: -1320px -880px;
  width: 216px;
  height: 216px;
 }
@ -222,13 +216,13 @@
 }
 .quest_rat {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1320px -440px;
+  background-position: -1320px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_rock {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px 0px;
+  background-position: -1540px -434px;
  width: 216px;
  height: 216px;
 }
@ -240,25 +234,25 @@
 }
 .quest_sabretooth {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -220px -452px;
+  background-position: -1100px -892px;
  width: 219px;
  height: 219px;
 }
 .quest_sheep {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1320px -880px;
+  background-position: -1100px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_slime {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1320px -660px;
+  background-position: -880px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_sloth {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1320px -220px;
+  background-position: -660px -672px;
  width: 219px;
  height: 219px;
 }
@ -270,55 +264,55 @@
 }
 .quest_snake {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -885px -1112px;
+  background-position: -1102px -1112px;
  width: 216px;
  height: 177px;
 }
 .quest_spider {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -651px -1326px;
+  background-position: -434px -1326px;
  width: 250px;
  height: 150px;
 }
 .quest_stoikalmCalamity1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -872px;
+  background-position: -1757px -570px;
  width: 150px;
  height: 150px;
 }
 .quest_stoikalmCalamity2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1320px 0px;
+  background-position: -220px -672px;
  width: 219px;
  height: 219px;
 }
 .quest_stoikalmCalamity3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -880px -892px;
+  background-position: -880px -220px;
  width: 219px;
  height: 219px;
 }
 .quest_taskwoodsTerror1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -721px;
+  background-position: -1757px -1023px;
  width: 150px;
  height: 150px;
 }
 .quest_taskwoodsTerror2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -651px;
+  background-position: -1540px 0px;
  width: 216px;
  height: 216px;
 }
 .quest_taskwoodsTerror3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -880px -672px;
+  background-position: 0px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_treeling {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -217px -1326px;
+  background-position: 0px -1326px;
  width: 216px;
  height: 177px;
 }
@ -330,43 +324,43 @@
 }
 .quest_trex_undead {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -434px -1326px;
+  background-position: -1319px -1112px;
  width: 216px;
  height: 177px;
 }
 .quest_triceratops {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -440px -672px;
+  background-position: -1320px -660px;
  width: 219px;
  height: 219px;
 }
 .quest_turtle {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -880px -440px;
+  background-position: 0px -232px;
  width: 219px;
  height: 219px;
 }
 .quest_unicorn {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -880px 0px;
+  background-position: -660px -452px;
  width: 219px;
  height: 219px;
 }
 .quest_vice1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1102px -1112px;
+  background-position: -1540px -1040px;
  width: 216px;
  height: 177px;
 }
 .quest_vice2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -440px -232px;
+  background-position: -1320px -440px;
  width: 219px;
  height: 219px;
 }
 .quest_vice3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -1079px;
+  background-position: -217px -1326px;
  width: 216px;
  height: 177px;
 }
@ -378,25 +372,25 @@
 }
 .quest_dilatoryDistress1_blueFins {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1806px -1358px;
+  background-position: -1806px -1462px;
  width: 51px;
  height: 48px;
 }
 .quest_dilatoryDistress1_fireCoral {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1806px -1462px;
+  background-position: -1426px -1366px;
  width: 48px;
  height: 51px;
 }
 .quest_egg_plainEgg {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1251px -1418px;
+  background-position: -704px -1504px;
  width: 48px;
  height: 51px;
 }
 .quest_goldenknight1_testimony {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1292px -1504px;
+  background-position: -949px -1504px;
  width: 48px;
  height: 51px;
 }
@ -468,55 +462,55 @@
 }
 .inventory_quest_scroll_atom1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -1410px;
+  background-position: -1855px -1358px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_atom1_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1488px -1504px;
+  background-position: -1806px -1358px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_atom2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1855px -1410px;
+  background-position: -1757px -1410px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_atom2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1806px -1410px;
+  background-position: -1904px -1358px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_atom3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1757px -1462px;
+  background-position: -1855px -1410px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_atom3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1904px -1410px;
+  background-position: -1806px -1410px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_axolotl {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1908px -623px;
+  background-position: -1908px -570px;
  width: 48px;
  height: 52px;
 }
 .inventory_quest_scroll_basilist {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1855px -1462px;
+  background-position: -1757px -1462px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_beetle {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1904px -1462px;
+  background-position: -1635px -1504px;
  width: 48px;
  height: 51px;
 }
@ -594,349 +588,439 @@
 }
 .inventory_quest_scroll_evilsanta {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1540px -1257px;
+  background-position: -1540px -1218px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_evilsanta2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1589px -1257px;
+  background-position: -1589px -1218px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_falcon {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1638px -1257px;
+  background-position: -1638px -1218px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_ferret {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1687px -1257px;
+  background-position: -1687px -1218px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_frog {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1153px -1366px;
+  background-position: -1540px -1270px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_ghost_stag {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1202px -1366px;
+  background-position: -1589px -1270px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1300px -1366px;
+  background-position: -1687px -1270px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight1_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1251px -1366px;
+  background-position: -1638px -1270px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1398px -1366px;
+  background-position: -985px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1349px -1366px;
+  background-position: -936px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1496px -1366px;
+  background-position: -1083px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_goldenknight3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1447px -1366px;
+  background-position: -1034px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_gryphon {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1545px -1366px;
+  background-position: -1132px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_guineapig {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1594px -1366px;
+  background-position: -1181px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_harpy {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1643px -1366px;
+  background-position: -1230px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_hedgehog {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1692px -1366px;
+  background-position: -1279px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_horse {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1153px -1418px;
+  background-position: -1328px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_kraken {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1202px -1418px;
+  background-position: -1377px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_mayhemMistiflying1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1908px -721px;
+  background-position: -1908px -623px;
  width: 48px;
  height: 52px;
 }
 .inventory_quest_scroll_mayhemMistiflying2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1349px -1418px;
+  background-position: -1524px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_mayhemMistiflying2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1300px -1418px;
+  background-position: -1475px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_mayhemMistiflying3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1447px -1418px;
+  background-position: -1622px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_mayhemMistiflying3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1398px -1418px;
+  background-position: -1573px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_monkey {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1496px -1418px;
+  background-position: -1671px -1366px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1594px -1418px;
+  background-position: -985px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon1_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1545px -1418px;
+  background-position: -936px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1692px -1418px;
+  background-position: -1083px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1643px -1418px;
+  background-position: -1034px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -263px -1504px;
+  background-position: -1181px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moon3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -214px -1504px;
+  background-position: -1132px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -361px -1504px;
+  background-position: -1279px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone1_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -312px -1504px;
+  background-position: -1230px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -459px -1504px;
+  background-position: -1377px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -410px -1504px;
+  background-position: -1328px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -557px -1504px;
+  background-position: -1475px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_moonstone3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -508px -1504px;
+  background-position: -1426px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_octopus {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -606px -1504px;
+  background-position: -1524px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_owl {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -655px -1504px;
+  background-position: -1573px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_peacock {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -704px -1504px;
+  background-position: -1622px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_penguin {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -753px -1504px;
+  background-position: -1671px -1418px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_rat {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -802px -1504px;
+  background-position: -214px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_rock {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -851px -1504px;
+  background-position: -263px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_rooster {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -900px -1504px;
+  background-position: -312px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_sabretooth {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -949px -1504px;
+  background-position: -361px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_sheep {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -998px -1504px;
+  background-position: -410px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_slime {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1047px -1504px;
+  background-position: -459px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_sloth {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1096px -1504px;
+  background-position: -508px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_snail {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1145px -1504px;
+  background-position: -557px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_snake {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1194px -1504px;
+  background-position: -606px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_spider {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1243px -1504px;
+  background-position: -655px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_stoikalmCalamity1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1908px -774px;
+  background-position: -1908px -721px;
  width: 48px;
  height: 52px;
 }
 .inventory_quest_scroll_stoikalmCalamity2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1390px -1504px;
+  background-position: -802px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_stoikalmCalamity2_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1341px -1504px;
+  background-position: -753px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_stoikalmCalamity3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1904px -1306px;
+  background-position: -900px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_stoikalmCalamity3_locked {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1439px -1504px;
+  background-position: -851px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_taskwoodsTerror1 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1908px -570px;
+  background-position: -1908px -774px;
  width: 48px;
  height: 52px;
 }
 .inventory_quest_scroll_taskwoodsTerror2 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
-  background-position: -1876px -1174px;
+  background-position: -1047px -1504px;
  width: 48px;
  height: 51px;
 }
 .inventory_quest_scroll_taskwoodsTerror2_locked {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -998px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_taskwoodsTerror3 {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1145px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_taskwoodsTerror3_locked {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1096px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_treeling {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1194px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_trex {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1292px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_trex_undead {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1243px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_triceratops {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1341px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_turtle {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1390px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_unicorn {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1439px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice1 {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1537px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice1_locked {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1488px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice2 {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1904px -1306px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice2_locked {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1586px -1504px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_vice3 {
  background-image: url(/static/sprites/spritesmith-main-8.png);
  background-position: -1908px -1075px;
  width: 48px;
  height: 51px;
 }
+.inventory_quest_scroll_vice3_locked {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1876px -1174px;
+  width: 48px;
+  height: 51px;
+}
+.inventory_quest_scroll_whale {
+  background-image: url(/static/sprites/spritesmith-main-8.png);
+  background-position: -1904px -1410px;
+  width: 48px;
+  height: 51px;
+}
--- a/website/assets/sprites/dist/spritesmith-main-8.png
+++ b/website/assets/sprites/dist/spritesmith-main-8.png
--- a/website/assets/sprites/dist/spritesmith-main-9.css
+++ b/website/assets/sprites/dist/spritesmith-main-9.css
--- a/website/assets/sprites/dist/spritesmith-main-9.png
+++ b/website/assets/sprites/dist/spritesmith-main-9.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-alpha.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-alpha.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-armor.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-armor.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-boot.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-boot.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-bow.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-bow.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-burnout.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-burnout.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-cactus.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-cactus.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-cake.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-cake.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-cave.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-cave.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-coffin.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-coffin.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-comment.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-comment.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-costumeContest.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-costumeContest.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-dilatory.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-dilatory.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-firefox.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-firefox.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-greeting.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-greeting.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-bewilder.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-bewilder.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-habitBirthday.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-habitBirthday.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-habiticaDay.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-habiticaDay.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-heart.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-heart.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-ninja.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-ninja.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-nye.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-nye.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-partyOn.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-partyOn.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-partyUp.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-partyUp.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-perfect.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-perfect.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-rat.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-rat.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-seafoam.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-seafoam.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-shield.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-shield.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-shinySeed.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-shinySeed.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-snowball.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-snowball.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-spookySparkles.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-spookySparkles.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-stoikalm.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-stoikalm.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-sun.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-sun.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-sword.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-sword.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-thankyou.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-thankyou.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-thermometer.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-thermometer.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-tree.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-tree.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-triadbingo.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-triadbingo.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-ultimate-healer.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-ultimate-healer.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-ultimate-mage.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-ultimate-mage.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-ultimate-rogue.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-ultimate-rogue.png
--- a/website/assets/sprites/spritesmith/achievements/achievement-ultimate-warrior.png
+++ b/website/assets/sprites/spritesmith/achievements/achievement-ultimate-warrior.png
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`For information about writing and running tests, see [Using Your Local Install to Modify Habitica's Website and API](http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica%27s_Website_and_API).`