diff --git a/README.md b/README.md
index e546a4295d..79581bd175 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,21 @@ For an introduction to the technologies used and how the software is organized,
 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.
 
 Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.
+
+## Debug Scripts
+
+In the `./debug-scripts/` folder, there are a few files. Here's a sample:
+
+```bash
+grant-all-equipment.js
+grant-all-mounts.js
+grant-all-pets.js
+```
+
+You can run them by doing:
+
+```bash
+node debug-scripts/name-of-script.js
+```
+
+If there are more arguments required to make the script work, it will print out the usage and an explanation of what the script does.
diff --git a/common/css/index.css b/common/css/index.css
index deec1cd518..c5c00de4a2 100644
--- a/common/css/index.css
+++ b/common/css/index.css
@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-.npc_ian {
+/* .npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} 
+} */
 
 .quest_burnout {
   background: url("/common/img/sprites/quest_burnout.gif") no-repeat;
diff --git a/common/dist/sprites/spritesmith-largeSprites-0.css b/common/dist/sprites/spritesmith-largeSprites-0.css
index 2273dca0e5..6cdedb560f 100644
--- a/common/dist/sprites/spritesmith-largeSprites-0.css
+++ b/common/dist/sprites/spritesmith-largeSprites-0.css
@@ -1,30 +1,30 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -820px -724px;
+  background-position: -543px -429px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -761px;
+  background-position: -814px -181px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -943px;
+  background-position: -1371px -915px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -363px;
+  background-position: -364px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -277px;
+  background-position: -943px -332px;
   width: 175px;
   height: 175px;
 }
@@ -42,7 +42,7 @@
 }
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1051px;
+  background-position: -1190px -342px;
   width: 150px;
   height: 150px;
 }
@@ -54,7 +54,7 @@
 }
 .promo_classes_fall_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px 0px;
+  background-position: -326px -872px;
   width: 321px;
   height: 100px;
 }
@@ -66,49 +66,55 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -642px -1051px;
+  background-position: 0px -1156px;
   width: 90px;
   height: 90px;
 }
+.promo_egg_mounts {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: 0px -724px;
+  width: 280px;
+  height: 147px;
+}
 .promo_enchanted_armoire {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -890px;
+  background-position: -648px -872px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1051px;
+  background-position: -1190px -732px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -92px;
+  background-position: -1190px -915px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -369px -1051px;
+  background-position: -91px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -503px;
+  background-position: -943px -684px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -915px -1051px;
+  background-position: -637px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -101px;
+  background-position: -943px -508px;
   width: 175px;
   height: 175px;
 }
@@ -120,91 +126,91 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -183px;
+  background-position: -1347px -194px;
   width: 100px;
   height: 137px;
 }
 .customize-option.promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -198px;
+  background-position: -1372px -209px;
   width: 60px;
   height: 60px;
 }
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -724px;
+  background-position: -1190px -91px;
   width: 249px;
   height: 102px;
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1371px -943px;
+  background-position: -819px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1371px -397px;
+  background-position: -452px -241px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -827px;
+  background-position: -1300px -1082px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1386px -761px;
+  background-position: -1408px -732px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -460px -1051px;
+  background-position: -182px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1386px -670px;
+  background-position: -1389px -823px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -824px -1051px;
+  background-position: -546px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1193px -724px;
+  background-position: -1119px -402px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1412px -594px;
+  background-position: -1251px -1082px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -181px;
+  background-position: -546px -338px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -814px -272px;
+  background-position: -452px -429px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1374px -852px;
+  background-position: -1190px -1082px;
   width: 60px;
   height: 69px;
 }
@@ -216,139 +222,145 @@
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1418px -321px;
+  background-position: -1119px -332px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1366px -183px;
+  background-position: -814px -363px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -1034px;
+  background-position: -543px -241px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -551px -1051px;
+  background-position: -273px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1359px -1034px;
+  background-position: -452px -338px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -733px -1051px;
+  background-position: -455px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1388px -503px;
+  background-position: -1408px -641px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -670px;
+  background-position: -1066px -684px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1006px -1051px;
+  background-position: -728px -1156px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -389px;
+  background-position: -1190px -641px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -397px;
+  background-position: -1341px -342px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -1125px;
+  background-position: -1343px -1006px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -967px;
+  background-position: -331px -983px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -25px -982px;
+  background-position: -356px -998px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -277px;
+  background-position: -1190px -493px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -101px;
+  background-position: -1331px -493px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1144px -116px;
+  background-position: -1356px -508px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -967px;
+  background-position: 0px -983px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -982px;
+  background-position: -25px -998px;
   width: 60px;
   height: 60px;
 }
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px 0px;
+  background-position: -1190px -823px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -15px;
+  background-position: -1215px -838px;
   width: 60px;
   height: 60px;
 }
+.promo_spring_classes_2016 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -281px -724px;
+  width: 362px;
+  height: 102px;
+}
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -542px;
+  background-position: -1190px 0px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -633px;
+  background-position: -644px -724px;
   width: 288px;
   height: 90px;
 }
@@ -360,19 +372,19 @@
 }
 .promo_summer_classes_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -453px;
+  background-position: 0px -1067px;
   width: 300px;
   height: 88px;
 }
 .promo_updos {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -241px;
+  background-position: -1190px -194px;
   width: 156px;
   height: 147px;
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -594px;
+  background-position: -943px -775px;
   width: 146px;
   height: 75px;
 }
@@ -384,19 +396,19 @@
 }
 .promo_winterclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -494px -724px;
+  background-position: 0px -872px;
   width: 325px;
   height: 110px;
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -321px;
+  background-position: -1190px -1006px;
   width: 152px;
   height: 75px;
 }
 .customize-option.promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1290px -336px;
+  background-position: -1215px -1021px;
   width: 60px;
   height: 60px;
 }
@@ -408,7 +420,7 @@
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1265px -852px;
+  background-position: -814px -272px;
   width: 108px;
   height: 90px;
 }
@@ -420,7 +432,7 @@
 }
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -247px -724px;
+  background-position: -943px 0px;
   width: 246px;
   height: 165px;
 }
@@ -432,7 +444,7 @@
 }
 .welcome_sample_tasks {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -724px;
+  background-position: -943px -166px;
   width: 246px;
   height: 165px;
 }
diff --git a/common/dist/sprites/spritesmith-largeSprites-0.png b/common/dist/sprites/spritesmith-largeSprites-0.png
index a1bdfee053..002b5de5c1 100644
Binary files a/common/dist/sprites/spritesmith-largeSprites-0.png and b/common/dist/sprites/spritesmith-largeSprites-0.png differ
diff --git a/common/dist/sprites/spritesmith-main-0.css b/common/dist/sprites/spritesmith-main-0.css
index 6dc4de71b8..aa09a656fa 100644
--- a/common/dist/sprites/spritesmith-main-0.css
+++ b/common/dist/sprites/spritesmith-main-0.css
@@ -1,6 +1,6 @@
 .achievement-alien {
   background-image: url(spritesmith-main-0.png);
-  background-position: -307px -1601px;
+  background-position: -357px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -12,250 +12,274 @@
 }
 .achievement-alpha {
   background-image: url(spritesmith-main-0.png);
-  background-position: -557px -1601px;
+  background-position: -707px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-armor {
   background-image: url(spritesmith-main-0.png);
-  background-position: -532px -1601px;
+  background-position: -682px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-armor2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1113px -1548px;
+  background-position: -1211px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-birthday {
   background-image: url(spritesmith-main-0.png);
-  background-position: -482px -1601px;
+  background-position: -632px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-birthday2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1064px -1548px;
+  background-position: -1162px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-boot {
   background-image: url(spritesmith-main-0.png);
-  background-position: -432px -1601px;
+  background-position: -582px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-boot2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1015px -1548px;
+  background-position: -1113px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-bow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -382px -1601px;
+  background-position: -532px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-bow2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -966px -1548px;
+  background-position: -1064px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-burnout {
   background-image: url(spritesmith-main-0.png);
-  background-position: -332px -1601px;
+  background-position: -482px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-burnout2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -917px -1548px;
+  background-position: -1015px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-cactus {
   background-image: url(spritesmith-main-0.png);
-  background-position: -282px -1601px;
+  background-position: -432px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-cactus2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -868px -1548px;
+  background-position: -966px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-cake {
   background-image: url(spritesmith-main-0.png);
-  background-position: -232px -1601px;
+  background-position: -382px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-cake2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1548px;
+  background-position: -917px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-cave {
   background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1601px;
+  background-position: -332px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-cave2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -770px -1548px;
+  background-position: -868px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-coffin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1662px -1548px;
+  background-position: -282px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-comment {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1637px -1548px;
+  background-position: -257px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-comment2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -721px -1548px;
+  background-position: -819px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-costumeContest {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -1548px;
+  background-position: -207px -1601px;
   width: 24px;
   height: 26px;
 }
 .achievement-costumeContest2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -672px -1548px;
+  background-position: -770px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-dilatory {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1537px -1548px;
+  background-position: -1685px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-firefox {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1512px -1548px;
+  background-position: -1660px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-greeting {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1487px -1548px;
+  background-position: -1635px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-greeting2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -623px -1548px;
+  background-position: -721px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-habitBirthday {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1437px -1548px;
+  background-position: -1585px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-habitBirthday2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -574px -1548px;
+  background-position: -672px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-habiticaDay {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1387px -1548px;
+  background-position: -1535px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-habiticaDay2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -525px -1548px;
+  background-position: -623px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-heart {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1337px -1548px;
+  background-position: -1485px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-heart2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -476px -1548px;
+  background-position: -574px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-karaoke-2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -427px -1548px;
+  background-position: -525px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-karaoke {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1262px -1548px;
+  background-position: -1410px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-ninja {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1237px -1548px;
+  background-position: -1385px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-ninja2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -378px -1548px;
+  background-position: -476px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-nye {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1187px -1548px;
+  background-position: -1335px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-nye2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -329px -1548px;
+  background-position: -427px -1548px;
   width: 48px;
   height: 52px;
 }
-.achievement-perfect {
+.achievement-partyOn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -582px -1601px;
+  background-position: -1285px -1548px;
   width: 24px;
   height: 26px;
 }
-.achievement-perfect2x {
+.achievement-partyOn2x {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -378px -1548px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-partyUp {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -732px -1601px;
+  width: 24px;
+  height: 26px;
+}
+.achievement-partyUp2x {
   background-image: url(spritesmith-main-0.png);
   background-position: -423px -1127px;
   width: 48px;
   height: 52px;
 }
-.achievement-rat {
+.achievement-perfect {
   background-image: url(spritesmith-main-0.png);
   background-position: -1242px -1036px;
   width: 24px;
   height: 26px;
 }
+.achievement-perfect2x {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -231px -1548px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-rat {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -607px -1601px;
+  width: 24px;
+  height: 26px;
+}
 .achievement-rat2x {
   background-image: url(spritesmith-main-0.png);
   background-position: -182px -1548px;
@@ -264,7 +288,7 @@
 }
 .achievement-seafoam {
   background-image: url(spritesmith-main-0.png);
-  background-position: -457px -1601px;
+  background-position: -507px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -276,7 +300,7 @@
 }
 .achievement-shield {
   background-image: url(spritesmith-main-0.png);
-  background-position: -357px -1601px;
+  background-position: -407px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -288,7 +312,7 @@
 }
 .achievement-shinySeed {
   background-image: url(spritesmith-main-0.png);
-  background-position: -257px -1601px;
+  background-position: -307px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -300,7 +324,7 @@
 }
 .achievement-snowball {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1687px -1548px;
+  background-position: -182px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -312,7 +336,7 @@
 }
 .achievement-spookDust {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1562px -1548px;
+  background-position: -1560px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -324,13 +348,13 @@
 }
 .achievement-stoikalm {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1412px -1548px;
+  background-position: -1460px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-sun {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1362px -1548px;
+  background-position: -1435px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -342,7 +366,7 @@
 }
 .achievement-sword {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1287px -1548px;
+  background-position: -1310px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -354,7 +378,7 @@
 }
 .achievement-thankyou {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1162px -1548px;
+  background-position: -1242px -1090px;
   width: 24px;
   height: 26px;
 }
@@ -366,7 +390,7 @@
 }
 .achievement-thermometer {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1242px -1063px;
+  background-position: -657px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -378,7 +402,7 @@
 }
 .achievement-tree {
   background-image: url(spritesmith-main-0.png);
-  background-position: -407px -1601px;
+  background-position: -457px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -390,7 +414,7 @@
 }
 .achievement-triadbingo {
   background-image: url(spritesmith-main-0.png);
-  background-position: -207px -1601px;
+  background-position: -232px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -402,7 +426,7 @@
 }
 .achievement-ultimate-healer {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1462px -1548px;
+  background-position: -1510px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -414,7 +438,7 @@
 }
 .achievement-ultimate-mage {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1212px -1548px;
+  background-position: -1260px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -426,7 +450,7 @@
 }
 .achievement-ultimate-rogue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -507px -1601px;
+  background-position: -557px -1601px;
   width: 24px;
   height: 26px;
 }
@@ -438,7 +462,7 @@
 }
 .achievement-ultimate-warrior {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1612px -1548px;
+  background-position: -1610px -1548px;
   width: 24px;
   height: 26px;
 }
@@ -450,25 +474,25 @@
 }
 .achievement-valentine {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1242px -1090px;
+  background-position: -1242px -1063px;
   width: 24px;
   height: 26px;
 }
 .achievement-valentine2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -231px -1548px;
+  background-position: -280px -1548px;
   width: 48px;
   height: 52px;
 }
 .achievement-wolf {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1312px -1548px;
+  background-position: -1360px -1548px;
   width: 24px;
   height: 26px;
 }
 .achievement-wolf2x {
   background-image: url(spritesmith-main-0.png);
-  background-position: -280px -1548px;
+  background-position: -329px -1548px;
   width: 48px;
   height: 52px;
 }
@@ -870,901 +894,901 @@
 }
 .hair_beard_1_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -637px;
+  background-position: -1547px -1001px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -652px;
+  background-position: -1572px -1016px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1092px;
+  background-position: -91px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1107px;
+  background-position: -116px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1183px;
+  background-position: -423px -1036px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1198px;
+  background-position: -448px -1051px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1274px;
+  background-position: -273px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1289px;
+  background-position: -298px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -423px -1036px;
+  background-position: -364px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -448px -1051px;
+  background-position: -389px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1366px;
+  background-position: -455px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -116px -1381px;
+  background-position: -480px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1366px;
+  background-position: -546px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -207px -1381px;
+  background-position: -571px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1366px;
+  background-position: -637px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -298px -1381px;
+  background-position: -662px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1366px;
+  background-position: -728px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -389px -1381px;
+  background-position: -753px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1366px;
+  background-position: -819px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -480px -1381px;
+  background-position: -844px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1366px;
+  background-position: -910px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -571px -1381px;
+  background-position: -935px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1366px;
+  background-position: -1001px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -662px -1381px;
+  background-position: -1026px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1366px;
+  background-position: -1092px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -753px -1381px;
+  background-position: -1117px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1366px;
+  background-position: -1183px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -844px -1381px;
+  background-position: -1208px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1366px;
+  background-position: -1274px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -935px -1381px;
+  background-position: -1299px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1366px;
+  background-position: -1365px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1026px -1381px;
+  background-position: -1390px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1092px -1366px;
+  background-position: -1456px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1117px -1381px;
+  background-position: -1481px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1183px -1366px;
+  background-position: -1547px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1208px -1381px;
+  background-position: -1572px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1366px;
+  background-position: -1547px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1381px;
+  background-position: -1572px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1366px;
+  background-position: -1547px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1381px;
+  background-position: -1572px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1366px;
+  background-position: -1547px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1381px;
+  background-position: -1572px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px 0px;
+  background-position: -1547px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -15px;
+  background-position: -1572px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -91px;
+  background-position: -1547px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -106px;
+  background-position: -1572px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -182px;
+  background-position: -1547px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -197px;
+  background-position: -1572px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -273px;
+  background-position: -1547px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -288px;
+  background-position: -1572px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -364px;
+  background-position: -1547px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -379px;
+  background-position: -1572px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -455px;
+  background-position: -1547px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -470px;
+  background-position: -1572px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -546px;
+  background-position: -1547px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -561px;
+  background-position: -1572px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -728px;
+  background-position: -1547px -1092px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -743px;
+  background-position: -1572px -1107px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -819px;
+  background-position: -1547px -1183px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -834px;
+  background-position: -1572px -1198px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -910px;
+  background-position: -1547px -1274px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -925px;
+  background-position: -1572px -1289px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1001px;
+  background-position: -1547px -1365px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1016px;
+  background-position: -1572px -1380px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_1_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1092px;
+  background-position: 0px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_1_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1107px;
+  background-position: -25px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -546px;
+  background-position: -1638px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -561px;
+  background-position: -1663px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1183px;
+  background-position: -91px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1198px;
+  background-position: -116px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1274px;
+  background-position: -182px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1289px;
+  background-position: -207px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1365px;
+  background-position: -273px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1380px;
+  background-position: -298px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1457px;
+  background-position: -364px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -25px -1472px;
+  background-position: -389px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1457px;
+  background-position: -455px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -116px -1472px;
+  background-position: -480px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1457px;
+  background-position: -546px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -207px -1472px;
+  background-position: -571px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1457px;
+  background-position: -637px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -298px -1472px;
+  background-position: -662px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1457px;
+  background-position: -728px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -389px -1472px;
+  background-position: -753px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1457px;
+  background-position: -819px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -480px -1472px;
+  background-position: -844px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1457px;
+  background-position: -910px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -571px -1472px;
+  background-position: -935px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1457px;
+  background-position: -1001px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -662px -1472px;
+  background-position: -1026px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1457px;
+  background-position: -1092px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -753px -1472px;
+  background-position: -1117px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1457px;
+  background-position: -1183px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -844px -1472px;
+  background-position: -1208px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1457px;
+  background-position: -1274px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -935px -1472px;
+  background-position: -1299px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1457px;
+  background-position: -1365px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1026px -1472px;
+  background-position: -1390px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1092px -1457px;
+  background-position: -1456px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1117px -1472px;
+  background-position: -1481px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1183px -1457px;
+  background-position: -1547px -1457px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1208px -1472px;
+  background-position: -1572px -1472px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1457px;
+  background-position: -1638px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1472px;
+  background-position: -1663px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1457px;
+  background-position: -1638px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1472px;
+  background-position: -1663px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1457px;
+  background-position: -1638px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1472px;
+  background-position: -1663px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1547px -1457px;
+  background-position: -1638px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1572px -1472px;
+  background-position: -1663px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px 0px;
+  background-position: -1638px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -15px;
+  background-position: -1663px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -91px;
+  background-position: -1638px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -106px;
+  background-position: -1663px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -182px;
+  background-position: -1638px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -197px;
+  background-position: -1663px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -273px;
+  background-position: -1638px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -288px;
+  background-position: -1663px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -364px;
+  background-position: -1638px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -379px;
+  background-position: -1663px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -455px;
+  background-position: -1638px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -470px;
+  background-position: -1663px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -637px;
+  background-position: -1638px -1001px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -652px;
+  background-position: -1663px -1016px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -728px;
+  background-position: -1638px -1092px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -743px;
+  background-position: -1663px -1107px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -819px;
+  background-position: -1638px -1183px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -834px;
+  background-position: -1663px -1198px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -910px;
+  background-position: -1638px -1274px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -925px;
+  background-position: -1663px -1289px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_2_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1001px;
+  background-position: -1638px -1365px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_2_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1016px;
+  background-position: -1663px -1380px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -364px;
+  background-position: -1456px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -379px;
+  background-position: -1481px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1092px;
+  background-position: -1638px -1456px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1107px;
+  background-position: -1663px -1471px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1183px;
+  background-position: 0px -1548px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1198px;
+  background-position: -25px -1563px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1274px;
+  background-position: -91px -1548px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1289px;
+  background-position: -116px -1563px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1365px;
+  background-position: -182px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1380px;
+  background-position: -207px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1638px -1456px;
+  background-position: -1274px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1663px -1471px;
+  background-position: -1299px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1548px;
+  background-position: -1274px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -25px -1563px;
+  background-position: -1299px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1548px;
+  background-position: -1274px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -116px -1563px;
+  background-position: -1299px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1366px;
+  background-position: -1274px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -25px -1381px;
+  background-position: -1299px -379px;
   width: 60px;
   height: 60px;
 }
@@ -1914,781 +1938,781 @@
 }
 .hair_beard_3_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -1001px;
+  background-position: 0px -1366px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -1016px;
+  background-position: -25px -1381px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -910px;
+  background-position: -1456px -1274px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -925px;
+  background-position: -1481px -1289px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -819px;
+  background-position: -1456px -1183px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -834px;
+  background-position: -1481px -1198px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -728px;
+  background-position: -1456px -1092px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -743px;
+  background-position: -1481px -1107px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -637px;
+  background-position: -1456px -1001px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -652px;
+  background-position: -1481px -1016px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -546px;
+  background-position: -1456px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -561px;
+  background-position: -1481px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -455px;
+  background-position: -1456px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -470px;
+  background-position: -1481px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -273px;
+  background-position: -1456px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -288px;
+  background-position: -1481px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -182px;
+  background-position: -1456px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -197px;
+  background-position: -1481px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px -91px;
+  background-position: -1456px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -106px;
+  background-position: -1481px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1456px 0px;
+  background-position: -1456px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1481px -15px;
+  background-position: -1481px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_beard_3_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1275px;
+  background-position: -1456px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_beard_3_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1290px;
+  background-position: -1481px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -91px;
+  background-position: -1365px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_TRUred {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -106px;
+  background-position: -1390px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1275px;
+  background-position: -1456px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1290px;
+  background-position: -1481px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1183px -1275px;
+  background-position: -1456px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1208px -1290px;
+  background-position: -1481px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1092px -1275px;
+  background-position: -1456px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1117px -1290px;
+  background-position: -1481px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1275px;
+  background-position: -1365px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1026px -1290px;
+  background-position: -1390px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1275px;
+  background-position: -1274px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -935px -1290px;
+  background-position: -1299px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1275px;
+  background-position: -1183px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -844px -1290px;
+  background-position: -1208px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1275px;
+  background-position: -1092px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -753px -1290px;
+  background-position: -1117px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1275px;
+  background-position: -1001px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -662px -1290px;
+  background-position: -1026px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1275px;
+  background-position: -910px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -571px -1290px;
+  background-position: -935px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1275px;
+  background-position: -819px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -480px -1290px;
+  background-position: -844px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1275px;
+  background-position: -728px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -389px -1290px;
+  background-position: -753px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1275px;
+  background-position: -637px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -298px -1290px;
+  background-position: -662px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1275px;
+  background-position: -546px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -207px -1290px;
+  background-position: -571px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1275px;
+  background-position: -455px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -116px -1290px;
+  background-position: -480px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1275px;
+  background-position: -364px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -25px -1290px;
+  background-position: -389px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1183px;
+  background-position: -273px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1198px;
+  background-position: -298px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1092px;
+  background-position: -182px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1107px;
+  background-position: -207px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -1001px;
+  background-position: -91px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -1016px;
+  background-position: -116px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -910px;
+  background-position: 0px -1275px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -925px;
+  background-position: -25px -1290px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -819px;
+  background-position: -1365px -1183px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -834px;
+  background-position: -1390px -1198px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -728px;
+  background-position: -1365px -1092px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_ppurple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -743px;
+  background-position: -1390px -1107px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -637px;
+  background-position: -1365px -1001px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_pumpkin {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -652px;
+  background-position: -1390px -1016px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -546px;
+  background-position: -1365px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_purple {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -561px;
+  background-position: -1390px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -455px;
+  background-position: -1365px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_pyellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -470px;
+  background-position: -1390px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -364px;
+  background-position: -1365px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_rainbow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -379px;
+  background-position: -1390px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -273px;
+  background-position: -1365px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_red {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -288px;
+  background-position: -1390px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px -182px;
+  background-position: -1365px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_snowy {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -197px;
+  background-position: -1390px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1365px 0px;
+  background-position: -1365px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_white {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1390px -15px;
+  background-position: -1390px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1184px;
+  background-position: -1365px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_winternight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1199px;
+  background-position: -1390px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1183px -1184px;
+  background-position: -1365px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_winterstar {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1208px -1199px;
+  background-position: -1390px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1092px -1184px;
+  background-position: -1365px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_yellow {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1117px -1199px;
+  background-position: -1390px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_1_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1184px;
+  background-position: -1365px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_zombie {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1026px -1199px;
+  background-position: -1390px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1184px;
+  background-position: -1274px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_aurora {
   background-image: url(spritesmith-main-0.png);
-  background-position: -935px -1199px;
+  background-position: -1299px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1184px;
+  background-position: -1183px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_black {
   background-image: url(spritesmith-main-0.png);
-  background-position: -844px -1199px;
+  background-position: -1208px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1184px;
+  background-position: -1092px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_blond {
   background-image: url(spritesmith-main-0.png);
-  background-position: -753px -1199px;
+  background-position: -1117px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1184px;
+  background-position: -1001px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_blue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -662px -1199px;
+  background-position: -1026px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1184px;
+  background-position: -910px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_brown {
   background-image: url(spritesmith-main-0.png);
-  background-position: -571px -1199px;
+  background-position: -935px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1184px;
+  background-position: -819px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_candycane {
   background-image: url(spritesmith-main-0.png);
-  background-position: -480px -1199px;
+  background-position: -844px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1184px;
+  background-position: -728px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_candycorn {
   background-image: url(spritesmith-main-0.png);
-  background-position: -389px -1199px;
+  background-position: -753px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1184px;
+  background-position: -637px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_festive {
   background-image: url(spritesmith-main-0.png);
-  background-position: -298px -1199px;
+  background-position: -662px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1184px;
+  background-position: -546px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_frost {
   background-image: url(spritesmith-main-0.png);
-  background-position: -207px -1199px;
+  background-position: -571px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1184px;
+  background-position: -455px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_ghostwhite {
   background-image: url(spritesmith-main-0.png);
-  background-position: -116px -1199px;
+  background-position: -480px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1184px;
+  background-position: -364px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_green {
   background-image: url(spritesmith-main-0.png);
-  background-position: -25px -1199px;
+  background-position: -389px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1092px;
+  background-position: -273px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_halloween {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1107px;
+  background-position: -298px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -1001px;
+  background-position: -182px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_holly {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -1016px;
+  background-position: -207px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -910px;
+  background-position: -91px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_hollygreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -925px;
+  background-position: -116px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -819px;
+  background-position: 0px -1184px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_midnight {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -834px;
+  background-position: -25px -1199px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -728px;
+  background-position: -1274px -1092px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_pblue {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -743px;
+  background-position: -1299px -1107px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -637px;
+  background-position: -1274px -1001px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_peppermint {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -652px;
+  background-position: -1299px -1016px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -546px;
+  background-position: -1274px -910px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_pgreen {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -561px;
+  background-position: -1299px -925px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -455px;
+  background-position: -1274px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_porange {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -470px;
+  background-position: -1299px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_mustache_2_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1274px -364px;
+  background-position: -1274px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_2_ppink {
   background-image: url(spritesmith-main-0.png);
-  background-position: -1299px -379px;
+  background-position: -1299px -743px;
   width: 60px;
   height: 60px;
 }
diff --git a/common/dist/sprites/spritesmith-main-0.png b/common/dist/sprites/spritesmith-main-0.png
index ed55249463..b03b2c3146 100644
Binary files a/common/dist/sprites/spritesmith-main-0.png and b/common/dist/sprites/spritesmith-main-0.png differ
diff --git a/common/dist/sprites/spritesmith-main-10.css b/common/dist/sprites/spritesmith-main-10.css
index 5bd228202d..3c0e20c361 100644
--- a/common/dist/sprites/spritesmith-main-10.css
+++ b/common/dist/sprites/spritesmith-main-10.css
@@ -1,42 +1,222 @@
-.Mount_Icon_Fox-Peppermint {
+.Mount_Icon_Dragon-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -424px -100px;
+  background-position: 0px -545px;
   width: 81px;
   height: 99px;
 }
-.Mount_Icon_Fox-Red {
+.Mount_Icon_Dragon-White {
   background-image: url(spritesmith-main-10.png);
   background-position: -1244px -100px;
   width: 81px;
   height: 99px;
 }
-.Mount_Icon_Fox-Shade {
+.Mount_Icon_Dragon-Zombie {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -82px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Base {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -164px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-CottonCandyBlue {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -246px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-CottonCandyPink {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -328px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Desert {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -410px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Golden {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -492px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Red {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -574px -545px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Shade {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -670px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Skeleton {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -670px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-White {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -328px -745px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Egg-Zombie {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -1162px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Base {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -424px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
   background-position: -424px -200px;
   width: 81px;
   height: 99px;
 }
-.Mount_Icon_Fox-Skeleton {
+.Mount_Icon_FlyingPig-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
   background-position: 0px -345px;
   width: 81px;
   height: 99px;
 }
-.Mount_Icon_Fox-Spooky {
+.Mount_Icon_FlyingPig-Desert {
   background-image: url(spritesmith-main-10.png);
   background-position: -82px -345px;
   width: 81px;
   height: 99px;
 }
+.Mount_Icon_FlyingPig-Golden {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -164px -345px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Peppermint {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -246px -345px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Red {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -328px -345px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Shade {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -410px -345px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Skeleton {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -506px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Spooky {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -506px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-White {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -506px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_FlyingPig-Zombie {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -506px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Base {
+  background-image: url(spritesmith-main-10.png);
+  background-position: 0px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-CottonCandyBlue {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -82px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-CottonCandyPink {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -164px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Desert {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -246px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Golden {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -328px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Peppermint {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -410px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Red {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -492px -445px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Shade {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -588px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Skeleton {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -588px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Mount_Icon_Fox-Spooky {
+  background-image: url(spritesmith-main-10.png);
+  background-position: -588px -200px;
+  width: 81px;
+  height: 99px;
+}
 .Mount_Icon_Fox-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px -300px;
+  background-position: -588px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Fox-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px 0px;
+  background-position: -588px -400px;
   width: 81px;
   height: 99px;
 }
@@ -102,187 +282,187 @@
 }
 .Mount_Icon_Gryphon-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -345px;
+  background-position: -670px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -345px;
+  background-position: -670px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -345px;
+  background-position: -670px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -345px;
+  background-position: -670px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -506px 0px;
+  background-position: 0px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -506px -100px;
+  background-position: -82px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-RoyalPurple {
   background-image: url(spritesmith-main-10.png);
-  background-position: -506px -200px;
+  background-position: -164px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -506px -300px;
+  background-position: -246px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -445px;
+  background-position: -328px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -445px;
+  background-position: -410px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Gryphon-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -445px;
+  background-position: -492px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -445px;
+  background-position: -574px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -445px;
+  background-position: -656px -645px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -445px;
+  background-position: -752px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -445px;
+  background-position: -752px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -588px 0px;
+  background-position: -752px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -588px -100px;
+  background-position: -752px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -588px -200px;
+  background-position: -752px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -588px -300px;
+  background-position: -752px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -588px -400px;
+  background-position: -752px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Hedgehog-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -545px;
+  background-position: -834px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -545px;
+  background-position: -834px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -545px;
+  background-position: -834px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -545px;
+  background-position: -834px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -545px;
+  background-position: -834px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -545px;
+  background-position: -834px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -545px;
+  background-position: -834px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -545px;
+  background-position: 0px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px 0px;
+  background-position: -82px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px -100px;
+  background-position: -164px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Horse-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px -200px;
+  background-position: -246px -745px;
   width: 81px;
   height: 99px;
 }
@@ -294,469 +474,469 @@
 }
 .Mount_Icon_LionCub-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px -400px;
+  background-position: -410px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -670px -500px;
+  background-position: -492px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -645px;
+  background-position: -574px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -645px;
+  background-position: -656px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Ethereal {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -645px;
+  background-position: -738px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -645px;
+  background-position: -820px -745px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -645px;
+  background-position: -916px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -645px;
+  background-position: -916px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -645px;
+  background-position: -916px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -645px;
+  background-position: -916px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -645px;
+  background-position: -916px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px 0px;
+  background-position: -916px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_LionCub-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -100px;
+  background-position: -916px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Mammoth-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -200px;
+  background-position: -916px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_MantisShrimp-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -300px;
+  background-position: 0px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -400px;
+  background-position: -82px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -500px;
+  background-position: -164px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -752px -600px;
+  background-position: -246px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px 0px;
+  background-position: -328px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -100px;
+  background-position: -410px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -200px;
+  background-position: -492px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -300px;
+  background-position: -574px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -400px;
+  background-position: -656px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -500px;
+  background-position: -738px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Monkey-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -834px -600px;
+  background-position: -820px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -745px;
+  background-position: -902px -845px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -745px;
+  background-position: -998px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -745px;
+  background-position: -998px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -745px;
+  background-position: -998px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -745px;
+  background-position: -998px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -745px;
+  background-position: -998px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -745px;
+  background-position: -998px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -745px;
+  background-position: -998px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -745px;
+  background-position: -998px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Octopus-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -745px;
+  background-position: -998px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Orca-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -745px;
+  background-position: 0px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px 0px;
+  background-position: -82px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -100px;
+  background-position: -164px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -200px;
+  background-position: -246px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -300px;
+  background-position: -328px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -400px;
+  background-position: -410px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -500px;
+  background-position: -492px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -600px;
+  background-position: -574px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -916px -700px;
+  background-position: -656px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -845px;
+  background-position: -738px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Owl-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -845px;
+  background-position: -820px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -845px;
+  background-position: -902px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -845px;
+  background-position: -984px -945px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -845px;
+  background-position: -1080px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -845px;
+  background-position: -1080px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -845px;
+  background-position: -1080px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -845px;
+  background-position: -1080px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -845px;
+  background-position: -1080px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -845px;
+  background-position: -1080px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -845px;
+  background-position: -1080px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -845px;
+  background-position: -1080px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px 0px;
+  background-position: -1080px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_PandaCub-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -100px;
+  background-position: -1080px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -200px;
+  background-position: 0px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -300px;
+  background-position: -82px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -400px;
+  background-position: -164px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -500px;
+  background-position: -246px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -600px;
+  background-position: -328px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -700px;
+  background-position: -410px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -998px -800px;
+  background-position: -492px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -945px;
+  background-position: -574px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -945px;
+  background-position: -656px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Parrot-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -945px;
+  background-position: -738px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -945px;
+  background-position: -820px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -945px;
+  background-position: -902px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -945px;
+  background-position: -984px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -945px;
+  background-position: -1066px -1045px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -945px;
+  background-position: -1162px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -945px;
+  background-position: -1162px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -945px;
+  background-position: -1162px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -945px;
+  background-position: -1162px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -945px;
+  background-position: -1162px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Penguin-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -945px;
+  background-position: -1162px -500px;
   width: 81px;
   height: 99px;
 }
@@ -768,1193 +948,1013 @@
 }
 .Mount_Icon_Rat-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -100px;
+  background-position: -1162px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -200px;
+  background-position: -1162px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -300px;
+  background-position: -1162px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -400px;
+  background-position: -1162px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -500px;
+  background-position: -1244px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -600px;
+  background-position: -424px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -700px;
+  background-position: -1244px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -800px;
+  background-position: -1244px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1080px -900px;
+  background-position: -1244px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rat-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1045px;
+  background-position: -1244px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1045px;
+  background-position: -1244px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1045px;
+  background-position: -1244px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1045px;
+  background-position: -1244px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1045px;
+  background-position: -1244px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1045px;
+  background-position: -1244px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1045px;
+  background-position: 0px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1045px;
+  background-position: -82px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1045px;
+  background-position: -164px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1045px;
+  background-position: -246px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rock-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1045px;
+  background-position: -328px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1045px;
+  background-position: -410px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1045px;
+  background-position: -492px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1045px;
+  background-position: -574px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px 0px;
+  background-position: -656px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -100px;
+  background-position: -738px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -200px;
+  background-position: -820px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -300px;
+  background-position: -902px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -400px;
+  background-position: -984px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -500px;
+  background-position: -1066px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Rooster-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -600px;
+  background-position: -1148px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -700px;
+  background-position: -1230px -1145px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -800px;
+  background-position: -1326px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -900px;
+  background-position: -1326px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1162px -1000px;
+  background-position: -1326px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px 0px;
+  background-position: -1326px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -424px 0px;
+  background-position: -1326px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -200px;
+  background-position: -1326px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -300px;
+  background-position: -1326px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -400px;
+  background-position: -1326px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sabretooth-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -500px;
+  background-position: -1326px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -600px;
+  background-position: -1326px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -700px;
+  background-position: -1326px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -800px;
+  background-position: -1326px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -900px;
+  background-position: 0px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1244px -1000px;
+  background-position: -82px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1145px;
+  background-position: -164px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1145px;
+  background-position: -246px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1145px;
+  background-position: -328px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1145px;
+  background-position: -410px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Seahorse-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1145px;
+  background-position: -492px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1145px;
+  background-position: -574px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1145px;
+  background-position: -656px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1145px;
+  background-position: -738px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1145px;
+  background-position: -820px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1145px;
+  background-position: -902px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1145px;
+  background-position: -984px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1145px;
+  background-position: -1066px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1145px;
+  background-position: -1148px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1145px;
+  background-position: -1230px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Sheep-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1145px;
+  background-position: -1312px -1245px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1230px -1145px;
+  background-position: -1408px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px 0px;
+  background-position: -1408px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -100px;
+  background-position: -1408px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -200px;
+  background-position: -1408px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -300px;
+  background-position: -1408px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -400px;
+  background-position: -1408px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -500px;
+  background-position: -1408px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -600px;
+  background-position: -1408px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -700px;
+  background-position: -1408px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Slime-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -800px;
+  background-position: -1408px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -900px;
+  background-position: -1408px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -1000px;
+  background-position: -1408px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1326px -1100px;
+  background-position: -1408px -1200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1245px;
+  background-position: 0px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1245px;
+  background-position: -82px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1245px;
+  background-position: -164px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1245px;
+  background-position: -246px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1245px;
+  background-position: -328px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1245px;
+  background-position: -410px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snail-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1245px;
+  background-position: -492px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1245px;
+  background-position: -574px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1245px;
+  background-position: -656px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1245px;
+  background-position: -738px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1245px;
+  background-position: -820px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1245px;
+  background-position: -902px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1245px;
+  background-position: -984px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1245px;
+  background-position: -1066px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1245px;
+  background-position: -1148px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1230px -1245px;
+  background-position: -1230px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Snake-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1312px -1245px;
+  background-position: -1312px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px 0px;
+  background-position: -1394px -1345px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -100px;
+  background-position: -1490px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -200px;
+  background-position: -1490px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -300px;
+  background-position: -1490px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -400px;
+  background-position: -1490px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -500px;
+  background-position: -1490px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -600px;
+  background-position: -1490px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -700px;
+  background-position: -1490px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -800px;
+  background-position: -1490px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Spider-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -900px;
+  background-position: -1490px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1345px;
+  background-position: -574px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1345px;
+  background-position: -656px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1345px;
+  background-position: -738px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1345px;
+  background-position: -820px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1345px;
+  background-position: -902px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1345px;
+  background-position: -984px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1230px -1345px;
+  background-position: -1066px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1312px -1345px;
+  background-position: -1148px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1394px -1345px;
+  background-position: -1230px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TRex-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px 0px;
+  background-position: -1312px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -1000px;
+  background-position: -1490px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -1100px;
+  background-position: -1490px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1408px -1200px;
+  background-position: -1490px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1345px;
+  background-position: -1490px -1200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1345px;
+  background-position: -1490px -1300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1345px;
+  background-position: 0px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1345px;
+  background-position: -82px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1345px;
+  background-position: -164px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1345px;
+  background-position: -246px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1345px;
+  background-position: -328px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1345px;
+  background-position: -410px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_TigerCub-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1345px;
+  background-position: -492px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Turkey-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -100px;
+  background-position: -1394px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -200px;
+  background-position: -1476px -1445px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -300px;
+  background-position: -1572px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -400px;
+  background-position: -1572px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -500px;
+  background-position: -1572px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -600px;
+  background-position: -1572px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -700px;
+  background-position: -1572px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -800px;
+  background-position: -1572px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -900px;
+  background-position: -1572px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -1000px;
+  background-position: -1572px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Unicorn-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -1100px;
+  background-position: -1572px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -1200px;
+  background-position: -1572px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1490px -1300px;
+  background-position: -1572px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1445px;
+  background-position: -1572px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1445px;
+  background-position: -1572px -1200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1445px;
+  background-position: -1572px -1300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1445px;
+  background-position: -1572px -1400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1445px;
+  background-position: 0px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1445px;
+  background-position: -82px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1445px;
+  background-position: -164px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Whale-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1445px;
+  background-position: -246px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1445px;
+  background-position: -328px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1445px;
+  background-position: -410px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1445px;
+  background-position: -492px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1445px;
+  background-position: -574px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1445px;
+  background-position: -656px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1445px;
+  background-position: -738px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1445px;
+  background-position: -820px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1230px -1445px;
+  background-position: -902px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1312px -1445px;
+  background-position: -984px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1394px -1445px;
+  background-position: -1066px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1476px -1445px;
+  background-position: -1148px -1545px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Wolf-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px 0px;
+  background-position: -1230px -1545px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Base {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -100px;
+  background-position: -1312px -1545px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-CottonCandyBlue {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -200px;
+  background-position: -1394px -1545px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-CottonCandyPink {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -300px;
+  background-position: -1476px -1545px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Desert {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -400px;
+  background-position: -1558px -1545px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Golden {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -500px;
+  background-position: -1654px 0px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Peppermint {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -600px;
+  background-position: -1654px -100px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Polar {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -700px;
+  background-position: -1654px -200px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Red {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -800px;
+  background-position: -1654px -300px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Shade {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -900px;
+  background-position: -1654px -400px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Skeleton {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -1000px;
+  background-position: -1654px -500px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Spooky {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -1100px;
+  background-position: -1654px -600px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-White {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -1200px;
+  background-position: -1654px -700px;
   width: 81px;
   height: 99px;
 }
 .Pet-BearCub-Zombie {
   background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -1300px;
+  background-position: -1654px -800px;
   width: 81px;
   height: 99px;
 }
 .Pet-Bunny-Base {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1572px -1400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-CottonCandyBlue {
-  background-image: url(spritesmith-main-10.png);
-  background-position: 0px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-CottonCandyPink {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -82px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Desert {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -164px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Golden {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -246px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Red {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -328px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Shade {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -410px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Skeleton {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -492px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-White {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -574px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Bunny-Zombie {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -656px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Base {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -738px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-CottonCandyBlue {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -820px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-CottonCandyPink {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -902px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Desert {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -984px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Golden {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1066px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Peppermint {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1148px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Red {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1230px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Shade {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1312px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Skeleton {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1394px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Spooky {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1476px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-White {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1558px -1545px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cactus-Zombie {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Base {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-CottonCandyBlue {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-CottonCandyPink {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Desert {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Golden {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Red {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -600px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Shade {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -700px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-Skeleton {
-  background-image: url(spritesmith-main-10.png);
-  background-position: -1654px -800px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Cheetah-White {
   background-image: url(spritesmith-main-10.png);
   background-position: -1654px -900px;
   width: 81px;
diff --git a/common/dist/sprites/spritesmith-main-10.png b/common/dist/sprites/spritesmith-main-10.png
index 5c9846249c..80c6973329 100644
Binary files a/common/dist/sprites/spritesmith-main-10.png and b/common/dist/sprites/spritesmith-main-10.png differ
diff --git a/common/dist/sprites/spritesmith-main-11.css b/common/dist/sprites/spritesmith-main-11.css
index cdd2e59cf9..7bb889d0ee 100644
--- a/common/dist/sprites/spritesmith-main-11.css
+++ b/common/dist/sprites/spritesmith-main-11.css
@@ -1,1992 +1,1992 @@
-.Pet-Cheetah-Zombie {
+.Pet-Bunny-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Base {
+.Pet-Bunny-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-CottonCandyBlue {
+.Pet-Bunny-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-CottonCandyPink {
+.Pet-Bunny-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Desert {
+.Pet-Bunny-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Golden {
+.Pet-Bunny-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Red {
+.Pet-Bunny-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Shade {
+.Pet-Bunny-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Skeleton {
+.Pet-Bunny-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-White {
+.Pet-Cactus-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Cuttlefish-Zombie {
+.Pet-Cactus-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Base {
+.Pet-Cactus-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-CottonCandyBlue {
+.Pet-Cactus-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-CottonCandyPink {
+.Pet-Cactus-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Desert {
+.Pet-Cactus-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Golden {
+.Pet-Cactus-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Red {
+.Pet-Cactus-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Shade {
+.Pet-Cactus-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Skeleton {
+.Pet-Cactus-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-White {
+.Pet-Cactus-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Deer-Zombie {
+.Pet-Cactus-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Base {
+.Pet-Cheetah-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-CottonCandyBlue {
+.Pet-Cheetah-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-CottonCandyPink {
+.Pet-Cheetah-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Desert {
+.Pet-Cheetah-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Golden {
+.Pet-Cheetah-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Hydra {
+.Pet-Cheetah-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Peppermint {
+.Pet-Cheetah-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Red {
+.Pet-Cheetah-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Shade {
+.Pet-Cheetah-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Skeleton {
+.Pet-Cheetah-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Spooky {
+.Pet-Cuttlefish-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-White {
+.Pet-Cuttlefish-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Zombie {
+.Pet-Cuttlefish-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Base {
+.Pet-Cuttlefish-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-CottonCandyBlue {
+.Pet-Cuttlefish-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-CottonCandyPink {
+.Pet-Cuttlefish-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Desert {
+.Pet-Cuttlefish-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Golden {
+.Pet-Cuttlefish-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Red {
+.Pet-Cuttlefish-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Shade {
+.Pet-Cuttlefish-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Skeleton {
+.Pet-Deer-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-White {
+.Pet-Deer-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Egg-Zombie {
+.Pet-Deer-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Base {
+.Pet-Deer-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-CottonCandyBlue {
+.Pet-Deer-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-CottonCandyPink {
+.Pet-Deer-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Desert {
+.Pet-Deer-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Golden {
+.Pet-Deer-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Peppermint {
+.Pet-Deer-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Red {
+.Pet-Deer-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Shade {
+.Pet-Dragon-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Skeleton {
+.Pet-Dragon-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Spooky {
+.Pet-Dragon-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-White {
+.Pet-Dragon-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Zombie {
+.Pet-Dragon-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Base {
+.Pet-Dragon-Hydra {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-CottonCandyBlue {
+.Pet-Dragon-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-CottonCandyPink {
+.Pet-Dragon-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Desert {
+.Pet-Dragon-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Golden {
+.Pet-Dragon-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Peppermint {
+.Pet-Dragon-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Red {
+.Pet-Dragon-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Shade {
+.Pet-Dragon-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Skeleton {
+.Pet-Egg-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Spooky {
+.Pet-Egg-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-White {
+.Pet-Egg-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Zombie {
+.Pet-Egg-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Base {
+.Pet-Egg-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-CottonCandyBlue {
+.Pet-Egg-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-CottonCandyPink {
+.Pet-Egg-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Desert {
+.Pet-Egg-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Golden {
+.Pet-Egg-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Red {
+.Pet-Egg-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Shade {
+.Pet-FlyingPig-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Skeleton {
+.Pet-FlyingPig-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-White {
+.Pet-FlyingPig-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Frog-Zombie {
+.Pet-FlyingPig-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Base {
+.Pet-FlyingPig-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-CottonCandyBlue {
+.Pet-FlyingPig-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-CottonCandyPink {
+.Pet-FlyingPig-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Desert {
+.Pet-FlyingPig-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Golden {
+.Pet-FlyingPig-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Red {
+.Pet-FlyingPig-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Shade {
+.Pet-FlyingPig-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Skeleton {
+.Pet-FlyingPig-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-White {
+.Pet-Fox-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Gryphon-Zombie {
+.Pet-Fox-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Base {
+.Pet-Fox-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-CottonCandyBlue {
+.Pet-Fox-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-CottonCandyPink {
+.Pet-Fox-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Desert {
+.Pet-Fox-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Golden {
+.Pet-Fox-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Red {
+.Pet-Fox-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Shade {
+.Pet-Fox-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Skeleton {
+.Pet-Fox-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-White {
+.Pet-Fox-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Hedgehog-Zombie {
+.Pet-Fox-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Base {
+.Pet-Frog-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-CottonCandyBlue {
+.Pet-Frog-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-CottonCandyPink {
+.Pet-Frog-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Desert {
+.Pet-Frog-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Golden {
+.Pet-Frog-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Red {
+.Pet-Frog-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Shade {
+.Pet-Frog-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Skeleton {
+.Pet-Frog-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-White {
+.Pet-Frog-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Horse-Zombie {
+.Pet-Frog-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-JackOLantern-Base {
+.Pet-Gryphon-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Base {
+.Pet-Gryphon-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-CottonCandyBlue {
+.Pet-Gryphon-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-CottonCandyPink {
+.Pet-Gryphon-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Desert {
+.Pet-Gryphon-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Golden {
+.Pet-Gryphon-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Peppermint {
+.Pet-Gryphon-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Red {
+.Pet-Gryphon-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Shade {
+.Pet-Gryphon-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Skeleton {
+.Pet-Gryphon-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Spooky {
+.Pet-Hedgehog-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-White {
+.Pet-Hedgehog-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Zombie {
+.Pet-Hedgehog-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Mammoth-Base {
+.Pet-Hedgehog-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-MantisShrimp-Base {
+.Pet-Hedgehog-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Base {
+.Pet-Hedgehog-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-CottonCandyBlue {
+.Pet-Hedgehog-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-CottonCandyPink {
+.Pet-Hedgehog-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Desert {
+.Pet-Hedgehog-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Golden {
+.Pet-Hedgehog-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Red {
+.Pet-Horse-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Shade {
+.Pet-Horse-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Skeleton {
+.Pet-Horse-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-White {
+.Pet-Horse-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Monkey-Zombie {
+.Pet-Horse-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Base {
+.Pet-Horse-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-CottonCandyBlue {
+.Pet-Horse-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-CottonCandyPink {
+.Pet-Horse-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Desert {
+.Pet-Horse-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Golden {
+.Pet-Horse-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Red {
+.Pet-JackOLantern-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Shade {
+.Pet-LionCub-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Skeleton {
+.Pet-LionCub-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-White {
+.Pet-LionCub-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Octopus-Zombie {
+.Pet-LionCub-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Base {
+.Pet-LionCub-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-CottonCandyBlue {
+.Pet-LionCub-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-CottonCandyPink {
+.Pet-LionCub-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Desert {
+.Pet-LionCub-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Golden {
+.Pet-LionCub-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Red {
+.Pet-LionCub-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Shade {
+.Pet-LionCub-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Skeleton {
+.Pet-LionCub-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-White {
+.Pet-Mammoth-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Owl-Zombie {
+.Pet-MantisShrimp-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Base {
+.Pet-Monkey-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-CottonCandyBlue {
+.Pet-Monkey-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-CottonCandyPink {
+.Pet-Monkey-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Desert {
+.Pet-Monkey-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Golden {
+.Pet-Monkey-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Peppermint {
+.Pet-Monkey-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Red {
+.Pet-Monkey-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Shade {
+.Pet-Monkey-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Skeleton {
+.Pet-Monkey-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Spooky {
+.Pet-Monkey-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-White {
+.Pet-Octopus-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Zombie {
+.Pet-Octopus-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Base {
+.Pet-Octopus-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-CottonCandyBlue {
+.Pet-Octopus-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-CottonCandyPink {
+.Pet-Octopus-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Desert {
+.Pet-Octopus-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Golden {
+.Pet-Octopus-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Red {
+.Pet-Octopus-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Shade {
+.Pet-Octopus-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Skeleton {
+.Pet-Octopus-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-White {
+.Pet-Owl-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Parrot-Zombie {
+.Pet-Owl-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Base {
+.Pet-Owl-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-CottonCandyBlue {
+.Pet-Owl-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-CottonCandyPink {
+.Pet-Owl-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Desert {
+.Pet-Owl-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Golden {
+.Pet-Owl-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Red {
+.Pet-Owl-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Shade {
+.Pet-Owl-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Skeleton {
+.Pet-Owl-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-White {
+.Pet-PandaCub-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Penguin-Zombie {
+.Pet-PandaCub-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Phoenix-Base {
+.Pet-PandaCub-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Base {
+.Pet-PandaCub-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-CottonCandyBlue {
+.Pet-PandaCub-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-CottonCandyPink {
+.Pet-PandaCub-Peppermint {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Desert {
+.Pet-PandaCub-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Golden {
+.Pet-PandaCub-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Red {
+.Pet-PandaCub-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Shade {
+.Pet-PandaCub-Spooky {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Skeleton {
+.Pet-PandaCub-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-White {
+.Pet-PandaCub-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rat-Zombie {
+.Pet-Parrot-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Base {
+.Pet-Parrot-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-CottonCandyBlue {
+.Pet-Parrot-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-CottonCandyPink {
+.Pet-Parrot-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Desert {
+.Pet-Parrot-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Golden {
+.Pet-Parrot-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Red {
+.Pet-Parrot-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Shade {
+.Pet-Parrot-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Skeleton {
+.Pet-Parrot-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-White {
+.Pet-Parrot-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rock-Zombie {
+.Pet-Penguin-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Base {
+.Pet-Penguin-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-CottonCandyBlue {
+.Pet-Penguin-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-CottonCandyPink {
+.Pet-Penguin-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Desert {
+.Pet-Penguin-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Golden {
+.Pet-Penguin-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Red {
+.Pet-Penguin-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Shade {
+.Pet-Penguin-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Skeleton {
+.Pet-Penguin-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-White {
+.Pet-Penguin-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Rooster-Zombie {
+.Pet-Phoenix-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Base {
+.Pet-Rat-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-CottonCandyBlue {
+.Pet-Rat-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-CottonCandyPink {
+.Pet-Rat-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Desert {
+.Pet-Rat-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Golden {
+.Pet-Rat-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Red {
+.Pet-Rat-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Shade {
+.Pet-Rat-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Skeleton {
+.Pet-Rat-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-White {
+.Pet-Rat-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sabretooth-Zombie {
+.Pet-Rat-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Base {
+.Pet-Rock-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-CottonCandyBlue {
+.Pet-Rock-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-CottonCandyPink {
+.Pet-Rock-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Desert {
+.Pet-Rock-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Golden {
+.Pet-Rock-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Red {
+.Pet-Rock-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Shade {
+.Pet-Rock-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Skeleton {
+.Pet-Rock-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-White {
+.Pet-Rock-White {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Seahorse-Zombie {
+.Pet-Rock-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Base {
+.Pet-Rooster-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-CottonCandyBlue {
+.Pet-Rooster-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-CottonCandyPink {
+.Pet-Rooster-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Desert {
+.Pet-Rooster-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Golden {
+.Pet-Rooster-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Red {
+.Pet-Rooster-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Shade {
+.Pet-Rooster-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Skeleton {
+.Pet-Rooster-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-White {
+.Pet-Rooster-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Sheep-Zombie {
+.Pet-Rooster-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Base {
+.Pet-Sabretooth-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-CottonCandyBlue {
+.Pet-Sabretooth-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-CottonCandyPink {
+.Pet-Sabretooth-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Desert {
+.Pet-Sabretooth-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Golden {
+.Pet-Sabretooth-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Red {
+.Pet-Sabretooth-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Shade {
+.Pet-Sabretooth-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Skeleton {
+.Pet-Sabretooth-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-White {
+.Pet-Sabretooth-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Slime-Zombie {
+.Pet-Sabretooth-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Base {
+.Pet-Seahorse-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-CottonCandyBlue {
+.Pet-Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-CottonCandyPink {
+.Pet-Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Desert {
+.Pet-Seahorse-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Golden {
+.Pet-Seahorse-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Red {
+.Pet-Seahorse-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Shade {
+.Pet-Seahorse-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Skeleton {
+.Pet-Seahorse-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-White {
+.Pet-Seahorse-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snail-Zombie {
+.Pet-Seahorse-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Base {
+.Pet-Sheep-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-CottonCandyBlue {
+.Pet-Sheep-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-CottonCandyPink {
+.Pet-Sheep-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Desert {
+.Pet-Sheep-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Golden {
+.Pet-Sheep-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Red {
+.Pet-Sheep-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Shade {
+.Pet-Sheep-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -492px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Skeleton {
+.Pet-Sheep-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -574px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-White {
+.Pet-Sheep-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -656px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Snake-Zombie {
+.Pet-Sheep-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Base {
+.Pet-Slime-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-CottonCandyBlue {
+.Pet-Slime-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-CottonCandyPink {
+.Pet-Slime-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Desert {
+.Pet-Slime-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Golden {
+.Pet-Slime-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Red {
+.Pet-Slime-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Shade {
+.Pet-Slime-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1312px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Skeleton {
+.Pet-Slime-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1394px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-White {
+.Pet-Slime-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1476px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Spider-Zombie {
+.Pet-Slime-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-TRex-Base {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1558px -1400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-CottonCandyBlue {
-  background-image: url(spritesmith-main-11.png);
-  background-position: 0px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-CottonCandyPink {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -82px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Desert {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -164px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Golden {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -246px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Red {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -328px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Shade {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -410px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Skeleton {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -492px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-White {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -574px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-TRex-Zombie {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -656px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Tiger-Veteran {
+.Pet-Snail-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Base {
+.Pet-Snail-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-CottonCandyBlue {
+.Pet-Snail-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-CottonCandyPink {
+.Pet-Snail-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Desert {
+.Pet-Snail-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Golden {
+.Pet-Snail-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Peppermint {
+.Pet-Snail-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Red {
+.Pet-Snail-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Shade {
+.Pet-Snail-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Skeleton {
+.Pet-Snail-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Spooky {
+.Pet-Snake-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-White {
+.Pet-Snake-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Zombie {
+.Pet-Snake-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1558px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Turkey-Base {
+.Pet-Snake-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1558px -1400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -738px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Turkey-Gilded {
+.Pet-Spider-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -820px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Base {
+.Pet-Spider-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -902px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-CottonCandyBlue {
+.Pet-Spider-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -984px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-CottonCandyPink {
+.Pet-Spider-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -1066px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Desert {
+.Pet-Spider-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -1148px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Golden {
+.Pet-Spider-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -1230px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Red {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1312px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Shade {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1394px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Skeleton {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1476px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-White {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1558px -1500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Zombie {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Base {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyBlue {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyPink {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Desert {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Golden {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Red {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -600px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Shade {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -700px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Skeleton {
-  background-image: url(spritesmith-main-11.png);
-  background-position: -1640px -800px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-White {
+.Pet-TRex-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -1640px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Zombie {
+.Pet-TRex-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -1640px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Base {
+.Pet-TRex-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -1640px -1100px;
   width: 81px;
   height: 99px;
 }
+.Pet-Tiger-Veteran {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1312px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1394px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1476px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1558px -1500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Peppermint {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Spooky {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -1640px -800px;
+  width: 81px;
+  height: 99px;
+}
diff --git a/common/dist/sprites/spritesmith-main-11.png b/common/dist/sprites/spritesmith-main-11.png
index b7b875c13e..231fc27eb6 100644
Binary files a/common/dist/sprites/spritesmith-main-11.png and b/common/dist/sprites/spritesmith-main-11.png differ
diff --git a/common/dist/sprites/spritesmith-main-12.css b/common/dist/sprites/spritesmith-main-12.css
index 348d26879c..f3c130f5a1 100644
--- a/common/dist/sprites/spritesmith-main-12.css
+++ b/common/dist/sprites/spritesmith-main-12.css
@@ -1,144 +1,324 @@
-.Pet-Wolf-CottonCandyBlue {
+.Pet-TRex-Desert {
   background-image: url(spritesmith-main-12.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-CottonCandyPink {
+.Pet-TRex-Golden {
   background-image: url(spritesmith-main-12.png);
-  background-position: -246px -200px;
+  background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Desert {
-  background-image: url(spritesmith-main-12.png);
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Golden {
+.Pet-TRex-Red {
   background-image: url(spritesmith-main-12.png);
   background-position: -164px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-TRex-Shade {
   background-image: url(spritesmith-main-12.png);
   background-position: 0px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-TRex-Skeleton {
   background-image: url(spritesmith-main-12.png);
   background-position: -82px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-TRex-White {
   background-image: url(spritesmith-main-12.png);
   background-position: -164px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-TRex-Zombie {
   background-image: url(spritesmith-main-12.png);
-  background-position: 0px 0px;
+  background-position: -246px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Turkey-Base {
   background-image: url(spritesmith-main-12.png);
   background-position: -246px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Turkey-Gilded {
   background-image: url(spritesmith-main-12.png);
   background-position: 0px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Unicorn-Base {
   background-image: url(spritesmith-main-12.png);
   background-position: -82px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Unicorn-CottonCandyBlue {
   background-image: url(spritesmith-main-12.png);
   background-position: -164px -200px;
   width: 81px;
   height: 99px;
 }
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(spritesmith-main-12.png);
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(spritesmith-main-12.png);
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Base {
   background-image: url(spritesmith-main-12.png);
-  background-position: -294px -300px;
+  background-position: -213px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url(spritesmith-main-12.png);
-  background-position: -328px -52px;
+  background-position: -458px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url(spritesmith-main-12.png);
-  background-position: -328px -104px;
+  background-position: -262px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url(spritesmith-main-12.png);
-  background-position: -328px -156px;
+  background-position: -311px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url(spritesmith-main-12.png);
-  background-position: -328px -208px;
+  background-position: -360px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url(spritesmith-main-12.png);
-  background-position: 0px -300px;
+  background-position: -409px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url(spritesmith-main-12.png);
-  background-position: -49px -300px;
+  background-position: -164px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url(spritesmith-main-12.png);
-  background-position: -98px -300px;
+  background-position: -507px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url(spritesmith-main-12.png);
-  background-position: -147px -300px;
+  background-position: -556px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url(spritesmith-main-12.png);
-  background-position: -196px -300px;
+  background-position: -605px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_White {
   background-image: url(spritesmith-main-12.png);
-  background-position: -245px -300px;
+  background-position: 0px -600px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url(spritesmith-main-12.png);
-  background-position: -328px 0px;
+  background-position: -49px -600px;
   width: 48px;
   height: 51px;
 }
diff --git a/common/dist/sprites/spritesmith-main-12.png b/common/dist/sprites/spritesmith-main-12.png
index 9e87c01766..5259b95a72 100644
Binary files a/common/dist/sprites/spritesmith-main-12.png and b/common/dist/sprites/spritesmith-main-12.png differ
diff --git a/common/dist/sprites/spritesmith-main-4.css b/common/dist/sprites/spritesmith-main-4.css
index 0e5676daaf..fea161eb9a 100644
--- a/common/dist/sprites/spritesmith-main-4.css
+++ b/common/dist/sprites/spritesmith-main-4.css
@@ -1,48 +1,48 @@
 .slim_armor_special_birthday {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1152px;
+  background-position: 0px -1046px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_birthday2015 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -1183px;
+  background-position: -1488px -273px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_birthday2016 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1152px;
+  background-position: -1215px -91px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -670px -788px;
+  background-position: 0px -864px;
   width: 93px;
   height: 90px;
 }
 .broad_armor_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -409px -576px;
+  background-position: -106px -576px;
   width: 105px;
   height: 90px;
 }
 .broad_armor_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -364px;
+  background-position: -455px -1137px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -91px;
+  background-position: -910px -1137px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px 0px;
+  background-position: -1124px -455px;
   width: 90px;
   height: 90px;
 }
@@ -54,1735 +54,1987 @@
 }
 .broad_armor_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -576px;
+  background-position: -91px -667px;
   width: 105px;
   height: 90px;
 }
 .broad_armor_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1152px;
+  background-position: -91px -1137px;
   width: 90px;
   height: 90px;
 }
 .head_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -94px -879px;
+  background-position: -394px -773px;
   width: 93px;
   height: 90px;
 }
 .head_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -197px -576px;
+  background-position: -436px -485px;
   width: 105px;
   height: 90px;
 }
 .head_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -364px;
+  background-position: -364px -1228px;
   width: 90px;
   height: 90px;
 }
 .head_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -819px;
+  background-position: -937px -864px;
   width: 90px;
   height: 90px;
 }
 .head_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1061px;
+  background-position: -1033px -182px;
   width: 90px;
   height: 90px;
 }
 .head_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -121px -91px;
+  background-position: -242px 0px;
   width: 120px;
   height: 90px;
 }
 .head_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -621px -576px;
+  background-position: -212px -576px;
   width: 105px;
   height: 90px;
 }
 .head_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1152px;
+  background-position: -1215px 0px;
   width: 90px;
   height: 90px;
 }
 .shield_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -879px;
+  background-position: -564px -864px;
   width: 93px;
   height: 90px;
 }
 .shield_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -330px -485px;
+  background-position: -318px -576px;
   width: 105px;
   height: 90px;
 }
 .shield_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1092px -1152px;
+  background-position: -182px -1137px;
   width: 90px;
   height: 90px;
 }
 .shield_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -91px;
+  background-position: -364px -1137px;
   width: 90px;
   height: 90px;
 }
 .shield_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -436px -485px;
+  background-position: -424px -576px;
   width: 105px;
   height: 90px;
 }
 .shield_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -455px;
+  background-position: -819px -1137px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -861px;
+  background-position: -1394px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -820px;
+  background-position: -1353px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -779px;
+  background-position: -1312px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -738px;
+  background-position: -1271px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -697px;
+  background-position: -1230px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -656px;
+  background-position: -1189px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -615px;
+  background-position: -1148px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -574px;
+  background-position: -1107px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -533px;
+  background-position: -1066px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -492px;
+  background-position: -1025px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -451px;
+  background-position: -984px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -410px;
+  background-position: -943px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -41px -1598px;
+  background-position: -902px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1598px;
+  background-position: -861px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1599px -1557px;
+  background-position: -820px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1558px -1557px;
+  background-position: -779px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1517px -1557px;
+  background-position: -738px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1476px -1557px;
+  background-position: -697px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1435px -1557px;
+  background-position: -656px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1394px -1557px;
+  background-position: -615px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1353px -1557px;
+  background-position: -574px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1312px -1557px;
+  background-position: -533px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1271px -1557px;
+  background-position: -492px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1230px -1557px;
+  background-position: -451px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1189px -1557px;
+  background-position: -410px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1148px -1557px;
+  background-position: -369px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1107px -1557px;
+  background-position: -328px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1066px -1557px;
+  background-position: -287px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1025px -1557px;
+  background-position: -246px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -984px -1557px;
+  background-position: -205px -1624px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -91px;
+  background-position: -658px -864px;
   width: 93px;
   height: 90px;
 }
 .slim_armor_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -303px -576px;
+  background-position: -530px -576px;
   width: 105px;
   height: 90px;
 }
 .slim_armor_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1152px;
+  background-position: -1215px -455px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1152px;
+  background-position: -1215px -546px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1152px;
+  background-position: 0px -1137px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -121px 0px;
+  background-position: -121px -91px;
   width: 120px;
   height: 90px;
 }
 .slim_armor_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -515px -576px;
+  background-position: -224px -485px;
   width: 105px;
   height: 90px;
 }
 .slim_armor_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -182px;
+  background-position: -273px -1137px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fall2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px 0px;
+  background-position: -94px -864px;
   width: 93px;
   height: 90px;
 }
 .weapon_special_fall2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -561px -682px;
+  background-position: -330px -485px;
   width: 105px;
   height: 90px;
 }
 .weapon_special_fall2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -546px;
+  background-position: -546px -1137px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fall2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -637px;
+  background-position: -637px -1137px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fallHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -910px;
+  background-position: -728px -1137px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fallMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -91px;
+  background-position: 0px 0px;
   width: 120px;
   height: 90px;
 }
 .weapon_special_fallRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -224px -485px;
+  background-position: 0px -576px;
   width: 105px;
   height: 90px;
 }
 .weapon_special_fallWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1243px;
+  background-position: -1001px -1137px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_gaymerx {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1243px;
+  background-position: -1092px -1137px;
   width: 90px;
   height: 90px;
 }
 .head_special_gaymerx {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1243px;
+  background-position: -1183px -1137px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_special_gaymerx {
   background-image: url(spritesmith-main-4.png);
-  background-position: -943px -1557px;
+  background-position: -164px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_gaymerx {
   background-image: url(spritesmith-main-4.png);
-  background-position: -902px -1557px;
+  background-position: -123px -1624px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_gaymerx {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -91px;
+  background-position: -1306px -455px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -182px;
+  background-position: -1306px -546px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -273px;
+  background-position: -1306px -1001px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -364px;
+  background-position: -1306px -1092px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -861px -1557px;
+  background-position: -82px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_back_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -820px -1557px;
+  background-position: -41px -1624px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -779px -1557px;
+  background-position: 0px -1624px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201402 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1425px;
+  background-position: -637px -1228px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201403 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1425px;
+  background-position: -1397px -455px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201403 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1425px;
+  background-position: -728px -1319px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201403 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -738px -1557px;
+  background-position: -1599px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_201403 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -697px -1557px;
+  background-position: -1558px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201403 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -685px;
+  background-position: -1001px -1410px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -188px -879px;
+  background-position: -942px -285px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -279px -879px;
+  background-position: -942px -376px;
   width: 90px;
   height: 90px;
 }
 .shop_back_mystery_201404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -656px -1557px;
+  background-position: -1517px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_201404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -615px -1557px;
+  background-position: -1476px -1583px;
   width: 40px;
   height: 40px;
 }
 .broad_armor_mystery_201405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -552px -879px;
+  background-position: -942px -649px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -643px -879px;
+  background-position: -942px -740px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -574px -1557px;
+  background-position: -1435px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -533px -1557px;
+  background-position: -1394px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -916px -879px;
+  background-position: -1033px 0px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201406 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -406px;
+  background-position: -942px -97px;
   width: 90px;
   height: 96px;
 }
 .head_mystery_201406 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -309px;
+  background-position: -942px 0px;
   width: 90px;
   height: 96px;
 }
 .shop_armor_mystery_201406 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -492px -1557px;
+  background-position: -1353px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201406 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -451px -1557px;
+  background-position: -1312px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201406 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -212px;
+  background-position: -851px -636px;
   width: 90px;
   height: 96px;
 }
 .broad_armor_mystery_201407 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -455px;
+  background-position: -1033px -546px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201407 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -546px;
+  background-position: -1033px -637px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201407 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -410px -1557px;
+  background-position: -1271px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201407 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -369px -1557px;
+  background-position: -1230px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201407 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -819px;
+  background-position: 0px -955px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201408 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -970px;
+  background-position: -91px -955px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201408 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -970px;
+  background-position: -182px -955px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201408 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -328px -1557px;
+  background-position: -1189px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201408 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -287px -1557px;
+  background-position: -1148px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201408 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -970px;
+  background-position: -455px -955px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201409 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -970px;
+  background-position: -546px -955px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201409 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -970px;
+  background-position: -637px -955px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201409 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -246px -1557px;
+  background-position: -1189px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_201409 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -205px -1557px;
+  background-position: -1148px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201409 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -970px;
+  background-position: -910px -955px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201410 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -455px;
+  background-position: -770px -773px;
   width: 93px;
   height: 90px;
 }
 .broad_armor_mystery_201410 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -364px;
+  background-position: -582px -773px;
   width: 93px;
   height: 90px;
 }
 .shop_armor_mystery_201410 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -164px -1557px;
+  background-position: -1107px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_back_mystery_201410 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -123px -1557px;
+  background-position: -1066px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201410 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -182px;
+  background-position: -282px -864px;
   width: 93px;
   height: 90px;
 }
 .head_mystery_201411 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -273px;
+  background-position: -1124px -364px;
   width: 90px;
   height: 90px;
 }
 .shop_head_mystery_201411 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -82px -1557px;
+  background-position: -1025px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_mystery_201411 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -41px -1557px;
+  background-position: -984px -1542px;
   width: 40px;
   height: 40px;
 }
 .weapon_mystery_201411 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -546px;
+  background-position: -1124px -637px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201412 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -637px;
+  background-position: -1124px -728px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201412 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -728px;
+  background-position: -1124px -819px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201412 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1557px;
+  background-position: -943px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201412 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1599px -1516px;
+  background-position: -1435px -1624px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201412 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1061px;
+  background-position: -91px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201501 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1061px;
+  background-position: -182px -1046px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201501 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1061px;
+  background-position: -273px -1046px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201501 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1558px -1516px;
+  background-position: -861px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201501 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1517px -1516px;
+  background-position: -820px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201501 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1061px;
+  background-position: -546px -1046px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_201502 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1061px;
+  background-position: -637px -1046px;
   width: 90px;
   height: 90px;
 }
 .shop_headAccessory_mystery_201502 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1476px -1516px;
+  background-position: -779px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_mystery_201502 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -902px;
+  background-position: -738px -1542px;
   width: 40px;
   height: 40px;
 }
 .weapon_mystery_201502 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1061px;
+  background-position: -910px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201503 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1061px;
+  background-position: -1001px -1046px;
   width: 90px;
   height: 90px;
 }
 .eyewear_mystery_201503 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1061px;
+  background-position: -1092px -1046px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201503 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1394px -1516px;
+  background-position: -697px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_mystery_201503 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1353px -1516px;
+  background-position: -656px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201503 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -91px;
+  background-position: -1215px -182px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201504 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -182px;
+  background-position: -1215px -273px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201504 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -273px;
+  background-position: -1215px -364px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201504 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1312px -1516px;
+  background-position: -615px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_back_mystery_201504 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1271px -1516px;
+  background-position: -574px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201504 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -546px;
+  background-position: -1215px -637px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201505 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -637px;
+  background-position: -1215px -728px;
   width: 90px;
   height: 90px;
 }
 .shop_head_mystery_201505 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1230px -1516px;
+  background-position: -533px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_mystery_201505 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -404px -212px;
+  background-position: -492px -1542px;
   width: 40px;
   height: 40px;
 }
 .weapon_mystery_201505 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -910px;
+  background-position: -1215px -1001px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201506 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -424px;
+  background-position: -760px -106px;
   width: 90px;
   height: 105px;
 }
 .eyewear_mystery_201506 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -530px;
+  background-position: -760px -212px;
   width: 90px;
   height: 105px;
 }
 .shop_armor_mystery_201506 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -363px -212px;
+  background-position: -451px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_mystery_201506 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -619px -530px;
+  background-position: -410px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201506 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -682px;
+  background-position: -760px -424px;
   width: 90px;
   height: 105px;
 }
 .back_mystery_201507 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -682px;
+  background-position: -760px -530px;
   width: 90px;
   height: 105px;
 }
 .eyewear_mystery_201507 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -682px;
+  background-position: 0px -667px;
   width: 90px;
   height: 105px;
 }
 .shop_back_mystery_201507 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px -530px;
+  background-position: -369px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_mystery_201507 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -710px -530px;
+  background-position: -328px -1542px;
   width: 40px;
   height: 40px;
 }
 .broad_armor_mystery_201508 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -482px -788px;
+  background-position: -376px -864px;
   width: 93px;
   height: 90px;
 }
 .head_mystery_201508 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -764px -788px;
+  background-position: -470px -864px;
   width: 93px;
   height: 90px;
 }
 .shop_armor_mystery_201508 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px -530px;
+  background-position: -287px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201508 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -801px -636px;
+  background-position: -246px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201508 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -637px;
+  background-position: -752px -864px;
   width: 93px;
   height: 90px;
 }
 .broad_armor_mystery_201509 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1183px -1152px;
+  background-position: -1306px 0px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201509 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px 0px;
+  background-position: -1306px -91px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201509 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -636px;
+  background-position: -205px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201509 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -983px -819px;
+  background-position: -164px -1542px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201509 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -273px;
+  background-position: -1306px -364px;
   width: 90px;
   height: 90px;
 }
 .back_mystery_201510 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -682px;
+  background-position: -197px -667px;
   width: 105px;
   height: 90px;
 }
 .headAccessory_mystery_201510 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -576px -788px;
+  background-position: -676px -773px;
   width: 93px;
   height: 90px;
 }
 .shop_back_mystery_201510 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -819px;
+  background-position: -123px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_201510 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1077px -910px;
+  background-position: -82px -1542px;
   width: 40px;
   height: 40px;
 }
 .broad_armor_mystery_201511 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -728px;
+  background-position: -1306px -819px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201511 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -819px;
+  background-position: -1306px -910px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201511 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1625px -637px;
+  background-position: -1622px -1274px;
   width: 42px;
   height: 42px;
 }
 .shop_head_mystery_201511 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -637px;
+  background-position: -1579px -1274px;
   width: 42px;
   height: 42px;
 }
 .slim_armor_mystery_201511 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -1092px;
+  background-position: 0px -1228px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_mystery_201512 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1243px;
+  background-position: -91px -1228px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201512 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1243px;
+  background-position: -182px -1228px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_201512 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -1001px;
+  background-position: -1599px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201512 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1259px -1092px;
+  background-position: -1558px -1501px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_201512 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1243px;
+  background-position: -455px -1228px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201601 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -242px 0px;
+  background-position: 0px -91px;
   width: 120px;
   height: 90px;
 }
 .shield_mystery_201601 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px 0px;
+  background-position: -121px 0px;
   width: 120px;
   height: 90px;
 }
 .shop_head_mystery_201601 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -1092px;
+  background-position: -1517px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_mystery_201601 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1350px -1183px;
+  background-position: -1476px -1501px;
   width: 40px;
   height: 40px;
 }
 .back_mystery_201602 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1243px;
+  background-position: -910px -1228px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_201602 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1243px;
+  background-position: -1001px -1228px;
   width: 90px;
   height: 90px;
 }
 .shop_back_mystery_201602 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -1183px;
+  background-position: -1435px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_201602 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1441px -1274px;
+  background-position: -1394px -1501px;
   width: 40px;
   height: 40px;
 }
 .broad_armor_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1183px -1243px;
+  background-position: -1274px -1228px;
   width: 90px;
   height: 90px;
 }
 .eyewear_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1274px -1243px;
+  background-position: -1397px 0px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px 0px;
+  background-position: -1397px -91px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1274px;
+  background-position: -1353px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1532px -1365px;
+  background-position: -1312px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -1365px;
+  background-position: -1271px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1459px;
+  background-position: -1230px -1501px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -455px;
+  background-position: -1397px -546px;
   width: 90px;
   height: 90px;
 }
 .weapon_mystery_301404 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -546px;
+  background-position: -1397px -637px;
   width: 90px;
   height: 90px;
 }
 .eyewear_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -637px;
+  background-position: -1397px -728px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -819px;
+  background-position: -1397px -910px;
   width: 90px;
   height: 90px;
 }
 .head_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -728px;
+  background-position: -1397px -819px;
   width: 90px;
   height: 90px;
 }
 .shield_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -910px;
+  background-position: -1397px -1001px;
   width: 90px;
   height: 90px;
 }
 .shop_eyewear_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1459px;
+  background-position: -1189px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1418px;
+  background-position: -1107px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1418px;
+  background-position: -1148px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_mystery_301405 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1377px;
+  background-position: -1066px -1501px;
   width: 40px;
   height: 40px;
 }
 .broad_armor_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -91px -1334px;
+  background-position: -182px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1334px;
+  background-position: -273px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1334px;
+  background-position: -364px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1334px;
+  background-position: -455px -1319px;
+  width: 90px;
+  height: 90px;
+}
+.broad_armor_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -546px -1319px;
+  width: 90px;
+  height: 90px;
+}
+.broad_armor_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -637px -1319px;
+  width: 90px;
+  height: 90px;
+}
+.broad_armor_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -511px -667px;
+  width: 102px;
+  height: 90px;
+}
+.broad_armor_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -819px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1334px;
+  background-position: -910px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1334px;
+  background-position: -1001px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1334px;
+  background-position: -1092px -1319px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1334px;
+  background-position: -1183px -1319px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -91px;
+  background-position: -1488px -910px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -182px;
+  background-position: -1488px -1001px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -273px;
+  background-position: -1488px -1092px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -364px;
+  background-position: -1488px -1183px;
+  width: 90px;
+  height: 90px;
+}
+.headAccessory_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1488px -1274px;
+  width: 90px;
+  height: 90px;
+}
+.headAccessory_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: 0px -1410px;
+  width: 90px;
+  height: 90px;
+}
+.headAccessory_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: 0px -773px;
+  width: 102px;
+  height: 90px;
+}
+.headAccessory_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -182px -1410px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -455px;
+  background-position: -273px -1410px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -546px;
+  background-position: -364px -1410px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -637px;
+  background-position: -455px -1410px;
   width: 90px;
   height: 90px;
 }
 .headAccessory_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -728px;
+  background-position: -546px -1410px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1334px;
+  background-position: -1274px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1334px;
+  background-position: -1365px -1319px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1334px;
+  background-position: -1488px 0px;
   width: 90px;
   height: 90px;
 }
 .head_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1092px -1334px;
+  background-position: -1488px -91px;
+  width: 90px;
+  height: 90px;
+}
+.head_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1488px -182px;
+  width: 90px;
+  height: 90px;
+}
+.head_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -942px -194px;
+  width: 90px;
+  height: 90px;
+}
+.head_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -717px -667px;
+  width: 102px;
+  height: 90px;
+}
+.head_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1488px -455px;
   width: 90px;
   height: 90px;
 }
 .head_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1183px -1334px;
+  background-position: -1488px -546px;
   width: 90px;
   height: 90px;
 }
 .head_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1274px -1334px;
+  background-position: -1488px -637px;
   width: 90px;
   height: 90px;
 }
 .head_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1365px -1334px;
+  background-position: -1488px -728px;
   width: 90px;
   height: 90px;
 }
 .head_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px 0px;
+  background-position: -1488px -819px;
   width: 90px;
   height: 90px;
 }
 .shield_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -819px;
+  background-position: -637px -1410px;
   width: 90px;
   height: 90px;
 }
 .shield_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -910px;
+  background-position: -728px -1410px;
   width: 90px;
   height: 90px;
 }
 .shield_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -1001px;
+  background-position: -819px -1410px;
+  width: 90px;
+  height: 90px;
+}
+.shield_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -910px -1410px;
+  width: 90px;
+  height: 90px;
+}
+.shield_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -408px -667px;
+  width: 102px;
+  height: 90px;
+}
+.shield_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1092px -1410px;
   width: 90px;
   height: 90px;
 }
 .shield_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -1092px;
+  background-position: -1183px -1410px;
   width: 90px;
   height: 90px;
 }
 .shield_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -503px;
+  background-position: -1274px -1410px;
   width: 90px;
   height: 90px;
 }
 .shield_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1491px -1274px;
+  background-position: -1365px -1410px;
   width: 90px;
   height: 90px;
 }
 .shop_armor_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1377px;
+  background-position: -1025px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1336px;
+  background-position: -984px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1336px;
+  background-position: -943px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1295px;
+  background-position: -902px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -861px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -820px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -779px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -738px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1295px;
+  background-position: -697px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1254px;
+  background-position: -656px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1254px;
+  background-position: -615px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1213px;
+  background-position: -574px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1049px;
+  background-position: -1620px -1440px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1008px;
+  background-position: -1488px -1365px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1008px;
+  background-position: -1529px -1365px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -967px;
+  background-position: -1397px -1274px;
+  width: 40px;
+  height: 40px;
+}
+.shop_headAccessory_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1438px -1274px;
+  width: 40px;
+  height: 40px;
+}
+.shop_headAccessory_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1306px -1183px;
+  width: 40px;
+  height: 40px;
+}
+.shop_headAccessory_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1347px -1183px;
+  width: 40px;
+  height: 40px;
+}
+.shop_headAccessory_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1215px -1092px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -967px;
+  background-position: -1256px -1092px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -926px;
+  background-position: -1124px -1001px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -926px;
+  background-position: -1165px -1001px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1168px -1001px;
+  background-position: -1033px -910px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1213px;
+  background-position: -533px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1172px;
+  background-position: -492px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1172px;
+  background-position: 0px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1131px;
+  background-position: -902px -1542px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -41px -1542px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -1317px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1620px -1317px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -1358px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1131px;
+  background-position: -1620px -1358px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1090px;
+  background-position: -1579px -1399px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -1090px;
+  background-position: -1620px -1399px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -1049px;
+  background-position: -1579px -1440px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1435px -1516px;
+  background-position: -1074px -910px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -910px;
+  background-position: -578px -530px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -680px;
+  background-position: -619px -530px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -363px -212px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -404px -212px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -309px -182px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -680px;
+  background-position: -309px -223px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -721px;
+  background-position: -864px -773px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -721px;
+  background-position: -864px -814px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -762px;
+  background-position: 0px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -762px;
+  background-position: -41px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -803px;
+  background-position: -82px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -803px;
+  background-position: -123px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -164px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -205px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -246px -1501px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -287px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -844px;
+  background-position: -328px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -844px;
+  background-position: -369px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -885px;
+  background-position: -410px -1501px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1623px -885px;
+  background-position: -451px -1501px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -455px;
+  background-position: -1579px -1092px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -364px;
+  background-position: -1579px -1001px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -273px;
+  background-position: -1579px -910px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -182px;
+  background-position: -1579px -819px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -728px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -637px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -546px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1579px -455px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -91px;
+  background-position: -1579px -364px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1582px 0px;
+  background-position: -1579px -273px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1456px -1425px;
+  background-position: -1579px -182px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1365px -1425px;
+  background-position: -1579px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_spring2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1274px -1425px;
+  background-position: -1579px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_spring2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1183px -1425px;
+  background-position: -1456px -1410px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_spring2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1092px -1425px;
+  background-position: -91px -1319px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_spring2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1425px;
+  background-position: 0px -1319px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_spring2016Healer {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1397px -1183px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_spring2016Mage {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1397px -1092px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_spring2016Rogue {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -614px -667px;
+  width: 102px;
+  height: 90px;
+}
+.weapon_special_spring2016Warrior {
+  background-image: url(spritesmith-main-4.png);
+  background-position: -1397px -364px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_springHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1425px;
+  background-position: -1397px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_springMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -819px -1425px;
+  background-position: -1397px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_springRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1425px;
+  background-position: -1183px -1228px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_springWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1425px;
+  background-position: -1092px -1228px;
   width: 90px;
   height: 90px;
 }
 .body_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -546px -1425px;
+  background-position: -819px -1228px;
   width: 90px;
   height: 90px;
 }
 .body_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1425px;
+  background-position: -728px -1228px;
   width: 90px;
   height: 90px;
 }
@@ -1794,499 +2046,499 @@
 }
 .body_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px 0px;
+  background-position: -851px -530px;
   width: 90px;
   height: 105px;
 }
 .body_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -106px;
+  background-position: -760px -318px;
   width: 90px;
   height: 105px;
 }
 .body_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px 0px;
+  background-position: -851px -424px;
   width: 90px;
   height: 105px;
 }
 .broad_armor_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1425px;
+  background-position: -1306px -728px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1334px;
+  background-position: -1306px -637px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -103px -182px;
+  background-position: -363px 0px;
   width: 102px;
   height: 105px;
 }
 .broad_armor_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px 0px;
+  background-position: -851px -212px;
   width: 90px;
   height: 105px;
 }
 .broad_armor_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px -106px;
+  background-position: -851px -106px;
   width: 90px;
   height: 105px;
 }
 .broad_armor_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px -318px;
+  background-position: -851px 0px;
   width: 90px;
   height: 105px;
 }
 .broad_armor_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -466px -182px;
+  background-position: 0px -485px;
   width: 111px;
   height: 90px;
 }
 .broad_armor_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -112px -394px;
+  background-position: -448px -394px;
   width: 111px;
   height: 90px;
 }
 .eyewear_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -448px -394px;
+  background-position: -336px -394px;
   width: 111px;
   height: 90px;
 }
 .eyewear_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -215px -288px;
+  background-position: -224px -394px;
   width: 111px;
   height: 90px;
 }
 .head_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -1243px;
+  background-position: -1215px -910px;
   width: 90px;
   height: 90px;
 }
 .head_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1243px;
+  background-position: -1215px -819px;
   width: 90px;
   height: 90px;
 }
 .head_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -206px -182px;
+  background-position: 0px -288px;
   width: 102px;
   height: 105px;
 }
 .head_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px -106px;
+  background-position: -760px 0px;
   width: 90px;
   height: 105px;
 }
 .head_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px -212px;
+  background-position: -669px -530px;
   width: 90px;
   height: 105px;
 }
 .head_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px -424px;
+  background-position: -669px -424px;
   width: 90px;
   height: 105px;
 }
 .head_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -327px -288px;
+  background-position: 0px -394px;
   width: 111px;
   height: 90px;
 }
 .head_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -466px -91px;
+  background-position: -466px -273px;
   width: 111px;
   height: 90px;
 }
 .Healer_Summer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -106px;
+  background-position: -669px -106px;
   width: 90px;
   height: 105px;
 }
 .Mage_Summer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px 0px;
+  background-position: -669px 0px;
   width: 90px;
   height: 105px;
 }
 .SummerRogue14 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -103px -288px;
+  background-position: -466px -182px;
   width: 111px;
   height: 90px;
 }
 .SummerWarrior14 {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -485px;
+  background-position: -466px -91px;
   width: 111px;
   height: 90px;
 }
 .shield_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -910px -1152px;
+  background-position: -1124px -546px;
   width: 90px;
   height: 90px;
 }
 .shield_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -288px;
+  background-position: -363px -106px;
   width: 102px;
   height: 105px;
 }
 .shield_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -682px;
+  background-position: -578px -212px;
   width: 90px;
   height: 105px;
 }
 .shield_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -682px;
+  background-position: -578px -318px;
   width: 90px;
   height: 105px;
 }
 .shield_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -336px -394px;
+  background-position: -112px -394px;
   width: 111px;
   height: 90px;
 }
 .shield_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -224px -394px;
+  background-position: -112px -485px;
   width: 111px;
   height: 90px;
 }
 .shop_armor_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -309px -182px;
+  background-position: -1230px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -309px -223px;
+  background-position: -1271px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -772px -682px;
+  background-position: -1312px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -772px -723px;
+  background-position: -1353px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -858px -788px;
+  background-position: -1394px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -899px -788px;
+  background-position: -1435px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -858px -829px;
+  background-position: -1476px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_armor_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -899px -829px;
+  background-position: -1517px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1516px;
+  background-position: -1558px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -41px -1516px;
+  background-position: -1599px -1542px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -82px -1516px;
+  background-position: 0px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -123px -1516px;
+  background-position: -41px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -164px -1516px;
+  background-position: -82px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -205px -1516px;
+  background-position: -123px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -246px -1516px;
+  background-position: -164px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -287px -1516px;
+  background-position: -205px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -328px -1516px;
+  background-position: -246px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -369px -1516px;
+  background-position: -287px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -410px -1516px;
+  background-position: -328px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -451px -1516px;
+  background-position: -369px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -492px -1516px;
+  background-position: -410px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -533px -1516px;
+  background-position: -451px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -574px -1516px;
+  background-position: -492px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -615px -1516px;
+  background-position: -533px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -656px -1516px;
+  background-position: -574px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -697px -1516px;
+  background-position: -615px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -738px -1516px;
+  background-position: -656px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -779px -1516px;
+  background-position: -697px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -820px -1516px;
+  background-position: -738px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -861px -1516px;
+  background-position: -779px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -902px -1516px;
+  background-position: -820px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -943px -1516px;
+  background-position: -861px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -984px -1516px;
+  background-position: -902px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1025px -1516px;
+  background-position: -943px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1066px -1516px;
+  background-position: -984px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1107px -1516px;
+  background-position: -1025px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1148px -1516px;
+  background-position: -1066px -1583px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1189px -1516px;
+  background-position: -1107px -1583px;
   width: 40px;
   height: 40px;
 }
 .slim_armor_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -728px;
+  background-position: -364px -955px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -455px;
+  background-position: -273px -955px;
   width: 90px;
   height: 90px;
 }
 .slim_armor_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -363px -106px;
+  background-position: -103px -182px;
   width: 102px;
   height: 105px;
 }
 .slim_armor_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -318px;
+  background-position: -578px -106px;
   width: 90px;
   height: 105px;
 }
 .slim_armor_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -760px -212px;
+  background-position: -578px 0px;
   width: 90px;
   height: 105px;
 }
 .slim_armor_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -578px -318px;
+  background-position: -851px -318px;
   width: 90px;
   height: 105px;
 }
 .slim_armor_special_summerRogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -394px;
+  background-position: -215px -288px;
   width: 111px;
   height: 90px;
 }
 .slim_armor_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -466px -273px;
+  background-position: -103px -288px;
   width: 111px;
   height: 90px;
 }
 .weapon_special_summer2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -1061px;
+  background-position: -942px -558px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_summer2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -910px;
+  background-position: -942px -467px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_summer2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -363px 0px;
+  background-position: -206px -182px;
   width: 102px;
   height: 105px;
 }
 .weapon_special_summer2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -576px;
+  background-position: -669px -318px;
   width: 90px;
   height: 105px;
 }
 .weapon_special_summerHealer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px -424px;
+  background-position: -669px -212px;
   width: 90px;
   height: 105px;
 }
 .weapon_special_summerMage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -669px -212px;
+  background-position: -578px -424px;
   width: 90px;
   height: 105px;
 }
@@ -2298,589 +2550,199 @@
 }
 .weapon_special_summerWarrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -112px -485px;
+  background-position: -327px -288px;
   width: 111px;
   height: 90px;
 }
 .broad_armor_special_candycane {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -970px;
+  background-position: -1306px -182px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_ski {
   background-image: url(spritesmith-main-4.png);
-  background-position: -273px -970px;
+  background-position: -819px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_snowflake {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -970px;
+  background-position: -728px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -728px;
+  background-position: -455px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -637px;
+  background-position: -364px -1046px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -788px;
+  background-position: -103px -773px;
   width: 96px;
   height: 90px;
 }
 .broad_armor_special_winter2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -182px;
+  background-position: -1124px -910px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2016Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -388px -788px;
+  background-position: -188px -864px;
   width: 93px;
   height: 90px;
 }
 .broad_armor_special_winter2016Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -734px -879px;
+  background-position: -1124px -273px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2016Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -461px -879px;
+  background-position: -1124px -182px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_winter2016Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -370px -879px;
+  background-position: -1124px -91px;
   width: 90px;
   height: 90px;
 }
 .broad_armor_special_yeti {
   background-image: url(spritesmith-main-4.png);
-  background-position: -851px -594px;
+  background-position: -1124px 0px;
   width: 90px;
   height: 90px;
 }
 .head_special_candycane {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1425px;
+  background-position: -1001px -955px;
   width: 90px;
   height: 90px;
 }
 .head_special_nye {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1183px;
+  background-position: -819px -955px;
   width: 90px;
   height: 90px;
 }
 .head_special_nye2014 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1092px;
+  background-position: -728px -955px;
   width: 90px;
   height: 90px;
 }
 .head_special_nye2015 {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1400px -1001px;
+  background-position: -1033px -819px;
   width: 90px;
   height: 90px;
 }
 .head_special_ski {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1092px -1243px;
+  background-position: -1033px -728px;
   width: 90px;
   height: 90px;
 }
 .head_special_snowflake {
   background-image: url(spritesmith-main-4.png);
-  background-position: -637px -1243px;
+  background-position: -1033px -455px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -455px -1152px;
+  background-position: -1033px -364px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2015Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1152px;
+  background-position: -1033px -273px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -97px -788px;
+  background-position: -200px -773px;
   width: 96px;
   height: 90px;
 }
 .head_special_winter2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1152px;
+  background-position: -1033px -91px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2016Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -942px -273px;
+  background-position: -488px -773px;
   width: 93px;
   height: 90px;
 }
 .head_special_winter2016Mage {
   background-image: url(spritesmith-main-4.png);
-  background-position: 0px -1152px;
+  background-position: -846px -864px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2016Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -1001px;
+  background-position: -91px -1410px;
   width: 90px;
   height: 90px;
 }
 .head_special_winter2016Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -819px;
+  background-position: -1488px -364px;
   width: 90px;
   height: 90px;
 }
 .head_special_yeti {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1218px -364px;
+  background-position: -546px -1228px;
   width: 90px;
   height: 90px;
 }
 .shield_special_ski {
   background-image: url(spritesmith-main-4.png);
-  background-position: -667px -682px;
+  background-position: -303px -667px;
   width: 104px;
   height: 90px;
 }
 .shield_special_snowflake {
   background-image: url(spritesmith-main-4.png);
-  background-position: -1092px -1061px;
+  background-position: -273px -1228px;
   width: 90px;
   height: 90px;
 }
 .shield_special_winter2015Healer {
   background-image: url(spritesmith-main-4.png);
-  background-position: -728px -1061px;
+  background-position: -1306px -273px;
   width: 90px;
   height: 90px;
 }
 .shield_special_winter2015Rogue {
   background-image: url(spritesmith-main-4.png);
-  background-position: -194px -788px;
+  background-position: -297px -773px;
   width: 96px;
   height: 90px;
 }
 .shield_special_winter2015Warrior {
   background-image: url(spritesmith-main-4.png);
-  background-position: -364px -1061px;
-  width: 90px;
-  height: 90px;
-}
-.shield_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -942px -546px;
-  width: 93px;
-  height: 90px;
-}
-.shield_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -455px;
-  width: 90px;
-  height: 90px;
-}
-.shield_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -364px;
-  width: 90px;
-  height: 90px;
-}
-.shield_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -182px;
-  width: 90px;
-  height: 90px;
-}
-.shop_armor_special_candycane {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -82px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_ski {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -123px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_snowflake {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -164px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2015Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -205px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2015Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -246px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2015Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -287px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2015Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -328px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -369px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2016Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -410px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -451px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -492px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_armor_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -533px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_candycane {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -574px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_nye {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -615px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_nye2014 {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -656px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_nye2015 {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -697px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_ski {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -738px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_snowflake {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -779px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2015Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -820px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2015Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -861px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2015Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -902px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2015Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -943px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -984px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2016Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1025px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1066px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1107px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_head_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1148px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_ski {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1189px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_snowflake {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1230px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2015Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1271px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2015Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1312px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2015Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1353px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1394px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1435px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1476px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_shield_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1517px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_candycane {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1558px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_ski {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1599px -1598px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_snowflake {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px 0px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2015Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -41px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2015Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -82px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2015Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -123px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2015Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -164px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -205px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2016Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -246px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -287px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -328px;
-  width: 40px;
-  height: 40px;
-}
-.shop_weapon_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1673px -369px;
-  width: 40px;
-  height: 40px;
-}
-.slim_armor_special_candycane {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1127px -91px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_ski {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1127px 0px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_snowflake {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1001px -970px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2015Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -910px -970px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2015Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -728px -970px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2015Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -291px -788px;
-  width: 96px;
-  height: 90px;
-}
-.slim_armor_special_winter2015Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1036px -273px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2016Healer {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -942px -728px;
-  width: 93px;
-  height: 90px;
-}
-.slim_armor_special_winter2016Mage {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1036px 0px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2016Rogue {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -825px -879px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_winter2016Warrior {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -182px -1243px;
-  width: 90px;
-  height: 90px;
-}
-.slim_armor_special_yeti {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1309px -1001px;
-  width: 90px;
-  height: 90px;
-}
-.weapon_special_candycane {
-  background-image: url(spritesmith-main-4.png);
-  background-position: -1582px -546px;
+  background-position: -1579px -1183px;
   width: 90px;
   height: 90px;
 }
diff --git a/common/dist/sprites/spritesmith-main-4.png b/common/dist/sprites/spritesmith-main-4.png
index 8fc203cd4a..ace18e0271 100644
Binary files a/common/dist/sprites/spritesmith-main-4.png and b/common/dist/sprites/spritesmith-main-4.png differ
diff --git a/common/dist/sprites/spritesmith-main-5.css b/common/dist/sprites/spritesmith-main-5.css
index 024cc840da..9fd292581b 100644
--- a/common/dist/sprites/spritesmith-main-5.css
+++ b/common/dist/sprites/spritesmith-main-5.css
@@ -1,2070 +1,2472 @@
+.shield_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -291px -1149px;
+  width: 93px;
+  height: 90px;
+}
+.shield_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1521px -91px;
+  width: 90px;
+  height: 90px;
+}
+.shield_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1028px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.shield_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px 0px;
+  width: 90px;
+  height: 90px;
+}
+.shop_armor_special_candycane {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -123px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_ski {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -533px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_snowflake {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -492px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2015Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -451px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2015Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -410px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2015Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -369px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2015Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -287px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -246px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2016Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -205px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -164px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -123px;
+  width: 40px;
+  height: 40px;
+}
+.shop_armor_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -41px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_candycane {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px 0px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_nye {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1640px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_nye2014 {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1517px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_nye2015 {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1476px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_ski {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1435px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_snowflake {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1394px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2015Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1353px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2015Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1312px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2015Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1271px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2015Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1230px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -410px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2016Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -369px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -287px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -246px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_head_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -205px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_ski {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -164px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_snowflake {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -82px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2015Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -41px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2015Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1581px -1568px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2015Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1540px -1568px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -174px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -133px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -328px;
+  width: 40px;
+  height: 40px;
+}
+.shop_shield_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1710px -82px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_candycane {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -574px -1661px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_ski {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -379px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_snowflake {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -297px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2015Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -256px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2015Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -1076px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2015Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -215px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2015Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -338px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -420px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2016Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1417px -1568px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -328px -1620px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -1527px;
+  width: 40px;
+  height: 40px;
+}
+.shop_weapon_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1661px -1486px;
+  width: 40px;
+  height: 40px;
+}
+.slim_armor_special_candycane {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -664px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_ski {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -455px -1422px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_snowflake {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -755px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2015Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -846px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2015Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -937px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2015Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -194px -1149px;
+  width: 96px;
+  height: 90px;
+}
+.slim_armor_special_winter2015Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1119px -1149px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2016Healer {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -385px -1149px;
+  width: 93px;
+  height: 90px;
+}
+.slim_armor_special_winter2016Mage {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px -91px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2016Rogue {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px -182px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_winter2016Warrior {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px -273px;
+  width: 90px;
+  height: 90px;
+}
+.slim_armor_special_yeti {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px -364px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_special_candycane {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1248px -455px;
+  width: 90px;
+  height: 90px;
+}
 .weapon_special_ski {
   background-image: url(spritesmith-main-5.png);
-  background-position: -743px -1212px;
+  background-position: -1248px -546px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_snowflake {
   background-image: url(spritesmith-main-5.png);
-  background-position: -728px -1485px;
+  background-position: -1248px -637px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2015Healer {
   background-image: url(spritesmith-main-5.png);
-  background-position: -925px -1212px;
+  background-position: -1248px -728px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2015Mage {
   background-image: url(spritesmith-main-5.png);
-  background-position: -652px -1212px;
+  background-position: -1248px -819px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2015Rogue {
   background-image: url(spritesmith-main-5.png);
-  background-position: -97px -1212px;
+  background-position: -97px -1149px;
   width: 96px;
   height: 90px;
 }
 .weapon_special_winter2015Warrior {
   background-image: url(spritesmith-main-5.png);
-  background-position: -834px -1212px;
+  background-position: -1248px -1001px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2016Healer {
   background-image: url(spritesmith-main-5.png);
-  background-position: -194px -1212px;
+  background-position: -479px -1149px;
   width: 93px;
   height: 90px;
 }
 .weapon_special_winter2016Mage {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1016px -1212px;
+  background-position: 0px -1240px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2016Rogue {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1107px -1212px;
+  background-position: -91px -1240px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_winter2016Warrior {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1198px -1212px;
+  background-position: -182px -1240px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_yeti {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -91px;
+  background-position: -273px -1240px;
   width: 90px;
   height: 90px;
 }
 .back_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -182px;
+  background-position: -364px -1240px;
   width: 90px;
   height: 90px;
 }
 .back_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -273px;
+  background-position: -455px -1240px;
   width: 90px;
   height: 90px;
 }
 .body_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -455px -1485px;
+  background-position: -546px -1240px;
   width: 90px;
   height: 90px;
 }
 .body_special_wondercon_gold {
   background-image: url(spritesmith-main-5.png);
-  background-position: -288px -1212px;
+  background-position: -637px -1240px;
   width: 90px;
   height: 90px;
 }
 .body_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -379px -1212px;
+  background-position: -728px -1240px;
   width: 90px;
   height: 90px;
 }
 .eyewear_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -470px -1212px;
+  background-position: -819px -1240px;
   width: 90px;
   height: 90px;
 }
 .eyewear_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -561px -1212px;
+  background-position: -910px -1240px;
   width: 90px;
   height: 90px;
 }
 .shop_back_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -741px -1113px;
+  background-position: -1376px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_back_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -782px -1113px;
+  background-position: -1294px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -697px -1680px;
+  background-position: -1599px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_wondercon_gold {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1107px -1680px;
+  background-position: -1558px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_body_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1066px -1680px;
+  background-position: -1189px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_wondercon_black {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1025px -1680px;
+  background-position: -1148px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_eyewear_special_wondercon_red {
   background-image: url(spritesmith-main-5.png);
-  background-position: -984px -1680px;
+  background-position: -1107px -1661px;
   width: 40px;
   height: 40px;
 }
 .head_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1289px -1212px;
+  background-position: -1339px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.head_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1314px -1227px;
+  background-position: -1364px -379px;
   width: 60px;
   height: 60px;
 }
 .head_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1303px;
+  background-position: -1339px -455px;
   width: 90px;
   height: 90px;
 }
 .head_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -91px -1303px;
+  background-position: -1339px -546px;
   width: 90px;
   height: 90px;
 }
 .head_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -182px -1303px;
+  background-position: -1339px -637px;
   width: 90px;
   height: 90px;
 }
 .head_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -273px -1303px;
+  background-position: -1339px -728px;
   width: 90px;
   height: 90px;
 }
 .head_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -364px -1303px;
+  background-position: -1339px -819px;
   width: 90px;
   height: 90px;
 }
 .head_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -455px -1303px;
+  background-position: -1339px -910px;
   width: 90px;
   height: 90px;
 }
 .head_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -546px -1303px;
+  background-position: -1339px -1001px;
   width: 90px;
   height: 90px;
 }
 .head_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -637px -1303px;
+  background-position: -1339px -1092px;
   width: 90px;
   height: 90px;
 }
 .head_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -182px;
+  background-position: -1339px -1183px;
   width: 90px;
   height: 90px;
 }
 .head_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -273px;
+  background-position: 0px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_special_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -364px;
+  background-position: -91px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_special_fireCoralCirclet {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -455px;
+  background-position: -182px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -546px;
+  background-position: -273px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -637px;
+  background-position: -364px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1394px;
+  background-position: -455px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -91px -1394px;
+  background-position: -546px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -182px -1394px;
+  background-position: -637px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -273px -1394px;
+  background-position: -728px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -364px -1394px;
+  background-position: -819px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -455px -1394px;
+  background-position: -910px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_wizard_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -637px -1394px;
+  background-position: -1001px -1331px;
   width: 90px;
   height: 90px;
 }
 .head_wizard_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px 0px;
+  background-position: -1092px -1331px;
   width: 90px;
   height: 90px;
 }
 .shop_head_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -943px -1680px;
+  background-position: -1066px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -902px -1680px;
+  background-position: -1025px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -861px -1680px;
+  background-position: -984px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -820px -1680px;
+  background-position: -943px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -779px -1680px;
+  background-position: -902px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -738px -1680px;
+  background-position: -861px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -656px -1680px;
+  background-position: -820px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -615px -1680px;
+  background-position: -779px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -574px -1680px;
+  background-position: -738px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -533px -1680px;
+  background-position: -697px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -492px -1680px;
+  background-position: -656px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -410px -1680px;
+  background-position: -615px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -369px -1680px;
+  background-position: -533px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_fireCoralCirclet {
   background-image: url(spritesmith-main-5.png);
-  background-position: -328px -1680px;
+  background-position: -492px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -205px -1680px;
+  background-position: -451px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -164px -1680px;
+  background-position: -410px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -123px -1680px;
+  background-position: -369px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -82px -1680px;
+  background-position: -328px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -41px -1680px;
+  background-position: -287px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1680px;
+  background-position: -246px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1380px -1253px;
+  background-position: -205px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1380px -1212px;
+  background-position: -164px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -442px;
+  background-position: -123px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_head_wizard_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -401px;
+  background-position: -82px -1661px;
   width: 40px;
   height: 40px;
 }
 .headAccessory_special_bearEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -728px -1303px;
+  background-position: -637px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_bearEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -753px -1318px;
+  background-position: -662px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_cactusEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -819px -1303px;
+  background-position: -728px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_cactusEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -844px -1318px;
+  background-position: -753px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_foxEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -910px -1303px;
+  background-position: -819px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_foxEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -935px -1318px;
+  background-position: -844px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_lionEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1001px -1303px;
+  background-position: -910px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_lionEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1026px -1318px;
+  background-position: -935px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_pandaEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1092px -1303px;
+  background-position: -1001px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_pandaEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1117px -1318px;
+  background-position: -1026px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_pigEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1183px -1303px;
+  background-position: -1092px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_pigEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1208px -1318px;
+  background-position: -1117px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_tigerEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1274px -1303px;
+  background-position: -1183px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_tigerEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1299px -1318px;
+  background-position: -1208px -1437px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_wolfEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px 0px;
+  background-position: -1274px -1422px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_wolfEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1452px -15px;
+  background-position: -1299px -1437px;
   width: 60px;
   height: 60px;
 }
 .shop_headAccessory_special_bearEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -360px;
+  background-position: -41px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_cactusEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -319px;
+  background-position: 0px -1661px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_foxEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -278px;
+  background-position: -738px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_lionEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -237px;
+  background-position: -1661px -625px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_pandaEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1148px -1680px;
+  background-position: -1661px -584px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_pigEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -451px -1680px;
+  background-position: -1661px -543px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_tigerEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -246px -1680px;
+  background-position: -1661px -502px;
   width: 40px;
   height: 40px;
 }
 .shop_headAccessory_special_wolfEars {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1151px -1113px;
+  background-position: -1661px -461px;
   width: 40px;
   height: 40px;
 }
 .shield_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -819px;
+  background-position: -1521px -637px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -910px;
+  background-position: -1521px -728px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -1001px;
+  background-position: -1521px -819px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -1092px;
+  background-position: -1521px -910px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -1183px;
+  background-position: -1521px -1001px;
   width: 90px;
   height: 90px;
 }
 .shield_rogue_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -1274px;
+  background-position: -1521px -1092px;
   width: 90px;
   height: 90px;
 }
 .shield_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -1108px;
+  background-position: -563px -1010px;
   width: 103px;
   height: 90px;
 }
 .shield_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -1017px;
+  background-position: -667px -1010px;
   width: 103px;
   height: 90px;
 }
 .shield_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -132px;
+  background-position: -1097px -528px;
   width: 114px;
   height: 90px;
 }
 .shield_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1212px;
+  background-position: 0px -1149px;
   width: 96px;
   height: 90px;
 }
 .shield_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -314px;
+  background-position: -1097px -710px;
   width: 114px;
   height: 90px;
 }
 .shield_rogue_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -223px;
+  background-position: -1097px -619px;
   width: 114px;
   height: 90px;
 }
 .shield_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -546px -1394px;
+  background-position: -1521px -1274px;
   width: 90px;
   height: 90px;
 }
 .shield_special_goldenknight {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -526px;
+  background-position: -965px -734px;
   width: 111px;
   height: 90px;
 }
 .shield_special_moonpearlShield {
   background-image: url(spritesmith-main-5.png);
-  background-position: -728px -1394px;
+  background-position: -1521px -1183px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -819px -1394px;
+  background-position: -1521px -546px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -910px -1394px;
+  background-position: -1521px -455px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1001px -1394px;
+  background-position: -1521px -364px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1092px -1394px;
+  background-position: -1521px -273px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1183px -1394px;
+  background-position: -1521px -182px;
   width: 90px;
   height: 90px;
 }
 .shop_shield_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1110px -1113px;
+  background-position: -1661px -666px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1028px -1113px;
+  background-position: -1661px -707px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1098px;
+  background-position: -1661px -748px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1057px;
+  background-position: -1661px -789px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1016px;
+  background-position: -1661px -830px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -975px;
+  background-position: -1661px -871px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -934px;
+  background-position: -1661px -912px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -893px;
+  background-position: -1661px -953px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -852px;
+  background-position: -1661px -994px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -811px;
+  background-position: -1661px -1035px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -770px;
+  background-position: -1661px -1117px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_rogue_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -729px;
+  background-position: -1661px -1158px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -688px;
+  background-position: -1661px -1199px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -647px;
+  background-position: -1661px -1240px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_goldenknight {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -606px;
+  background-position: -1661px -1281px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_special_moonpearlShield {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -565px;
+  background-position: -1661px -1322px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -524px;
+  background-position: -1661px -1363px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -483px;
+  background-position: -1661px -1404px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -287px -1680px;
+  background-position: -1661px -1445px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -987px -1113px;
+  background-position: -1661px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_shield_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -946px -1113px;
+  background-position: -1130px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -905px -1113px;
+  background-position: -1171px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -864px -1113px;
+  background-position: -1212px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -823px -1113px;
+  background-position: -1253px -1568px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -700px -1113px;
+  background-position: 0px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -659px -1113px;
+  background-position: -451px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -618px -1113px;
+  background-position: -492px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_healer_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -577px -1113px;
+  background-position: -533px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -536px -1113px;
+  background-position: -574px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -495px -1113px;
+  background-position: -615px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -454px -1113px;
+  background-position: -656px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1262px -988px;
+  background-position: -697px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1221px -988px;
+  background-position: -1710px -574px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1263px -890px;
+  background-position: -779px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_rogue_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1263px -849px;
+  background-position: -820px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1251px -802px;
+  background-position: -861px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1650px -1531px;
+  background-position: -902px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1531px;
+  background-position: -943px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1139px;
+  background-position: -984px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_critical {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -196px;
+  background-position: -1025px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_special_tridentOfCrashingTides {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1180px;
+  background-position: -1066px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1221px;
+  background-position: -1107px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1262px;
+  background-position: -1148px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1303px;
+  background-position: -1189px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1344px;
+  background-position: -1230px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1385px;
+  background-position: -1271px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1426px;
+  background-position: -1312px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_warrior_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1467px;
+  background-position: -1353px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1508px;
+  background-position: -1394px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1549px;
+  background-position: -1435px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1590px;
+  background-position: -1476px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -1631px;
+  background-position: -1517px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1658px -1375px;
+  background-position: -1558px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1658px -1427px;
+  background-position: -1599px -1620px;
   width: 40px;
   height: 40px;
 }
 .shop_weapon_wizard_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1658px -1479px;
+  background-position: -1640px -1620px;
   width: 40px;
   height: 40px;
 }
 .weapon_healer_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -182px;
+  background-position: -1521px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -91px;
+  background-position: -1365px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px 0px;
+  background-position: -546px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1456px -1485px;
+  background-position: -573px -1149px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1365px -1485px;
+  background-position: -364px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1274px -1485px;
+  background-position: -273px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1183px -1485px;
+  background-position: -182px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1092px -1485px;
+  background-position: -91px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1001px -1485px;
+  background-position: 0px -1422px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -910px -1485px;
+  background-position: -1430px -1274px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -819px -1485px;
+  background-position: -1430px -1183px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -273px;
+  background-position: -1430px -1092px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -637px -1485px;
+  background-position: -1430px -1001px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -546px -1485px;
+  background-position: -1430px -910px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -299px -1073px;
+  background-position: -771px -1010px;
   width: 102px;
   height: 90px;
 }
 .weapon_special_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -364px -1485px;
+  background-position: -1430px -819px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -273px -1485px;
+  background-position: -1430px -728px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tridentOfCrashingTides {
   background-image: url(spritesmith-main-5.png);
-  background-position: -182px -1485px;
+  background-position: -1430px -637px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -91px -1485px;
+  background-position: -1430px -546px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1485px;
+  background-position: -1430px -455px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -1365px;
+  background-position: -1430px -364px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -1274px;
+  background-position: -1430px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -1183px;
+  background-position: -1430px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -1092px;
+  background-position: -1430px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -1001px;
+  background-position: -1430px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_0 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -910px;
+  background-position: -1274px -1331px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -819px;
+  background-position: -1183px -1331px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -728px;
+  background-position: -1339px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -637px;
+  background-position: -1339px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_4 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -546px;
+  background-position: -1339px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_5 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -455px;
+  background-position: -1339px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_6 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1518px -364px;
+  background-position: -1183px -1240px;
   width: 90px;
   height: 90px;
 }
 .GrimReaper {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -437px;
+  background-position: -1521px -1438px;
   width: 57px;
   height: 66px;
 }
 .Pet_Currency_Gem {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -156px;
+  background-position: -1661px -52px;
   width: 45px;
   height: 39px;
 }
 .Pet_Currency_Gem1x {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1670px -364px;
+  background-position: -1710px -682px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1667px -468px;
+  background-position: -1710px -655px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1323px;
+  background-position: -278px -1513px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1271px;
+  background-position: -226px -1513px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1219px;
+  background-position: -174px -1513px;
   width: 51px;
   height: 51px;
 }
 .avatar_floral_healer {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -817px;
+  background-position: -463px -1010px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_rogue {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -917px;
+  background-position: -363px -1010px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_warrior {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -617px;
+  background-position: -263px -1010px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_wizard {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -717px;
+  background-position: -163px -1010px;
   width: 99px;
   height: 99px;
 }
 .empty_bottles {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -504px;
+  background-position: -1430px -1365px;
   width: 64px;
   height: 54px;
 }
 .inventory_present {
   background-image: url(spritesmith-main-5.png);
-  background-position: -245px -1576px;
+  background-position: -1016px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_01 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1078px -1576px;
+  background-position: -1612px -260px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_02 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1375px;
+  background-position: -379px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_03 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1427px;
+  background-position: -428px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_04 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1479px;
+  background-position: -477px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_05 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1251px -698px;
+  background-position: -526px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_06 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1251px -750px;
+  background-position: -575px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_07 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1365px -1303px;
+  background-position: -624px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_08 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1456px -1394px;
+  background-position: -673px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_09 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1576px;
+  background-position: -771px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_10 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -49px -1576px;
+  background-position: -820px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_11 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -147px -1576px;
+  background-position: -918px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_12 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -196px -1576px;
+  background-position: -967px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll {
   background-image: url(spritesmith-main-5.png);
-  background-position: -343px -1576px;
+  background-position: -1114px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -294px -1576px;
+  background-position: -1065px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_birthday {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1054px;
+  background-position: -1456px -1422px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_fortify {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -559px;
+  background-position: -58px -1513px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_greeting {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -834px;
+  background-position: -1339px -1274px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_nye {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -614px;
+  background-position: -1248px -1183px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_opaquePotion {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1263px -931px;
+  background-position: -1661px -92px;
   width: 40px;
   height: 40px;
 }
 .inventory_special_seafoam {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -944px;
+  background-position: -1173px -801px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_shinySeed {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -669px;
+  background-position: -1173px -856px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_snowball {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -724px;
+  background-position: -1018px -859px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_spookDust {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -779px;
+  background-position: -1018px -914px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_thankyou {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1164px;
+  background-position: -1274px -1240px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_trinket {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1547px -1485px;
+  background-position: -722px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_valentine {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -889px;
+  background-position: -1365px -1331px;
   width: 57px;
   height: 54px;
 }
 .knockout {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -988px;
+  background-position: -1097px -937px;
   width: 120px;
   height: 47px;
 }
 .pet_key {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -999px;
+  background-position: 0px -1513px;
   width: 57px;
   height: 54px;
 }
 .rebirth_orb {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -1109px;
+  background-position: -116px -1513px;
   width: 57px;
   height: 54px;
 }
 .seafoam_star {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1365px -1394px;
+  background-position: -1092px -1240px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1069px -1113px;
+  background-position: -1335px -1568px;
   width: 40px;
   height: 40px;
 }
 .snowman {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1274px -1394px;
+  background-position: -1001px -1240px;
   width: 90px;
   height: 90px;
 }
 .spookman {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -728px;
+  background-position: -1248px -1092px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1233px -1113px;
+  background-position: -1499px -1568px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1192px -1113px;
+  background-position: -1458px -1568px;
   width: 40px;
   height: 40px;
 }
 .npc_alex {
   background-image: url(spritesmith-main-5.png);
-  background-position: -930px -886px;
+  background-position: 0px -1010px;
   width: 162px;
   height: 138px;
 }
+.npc_aprilFool {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1097px -407px;
+  width: 120px;
+  height: 120px;
+}
 .npc_bailey {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1609px -364px;
+  background-position: -1521px -1365px;
   width: 60px;
   height: 72px;
 }
 .npc_daniel {
   background-image: url(spritesmith-main-5.png);
-  background-position: -163px -1073px;
+  background-position: -1097px -151px;
   width: 135px;
   height: 123px;
 }
+.npc_ian {
+  background-image: url(spritesmith-main-5.png);
+  background-position: -1097px -801px;
+  width: 75px;
+  height: 135px;
+}
 .npc_justin {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px -405px;
+  background-position: -880px -734px;
   width: 84px;
   height: 120px;
 }
 .npc_justin_head {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1661px -1219px;
+  background-position: -1710px -615px;
   width: 36px;
   height: 39px;
 }
 .npc_matt {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -417px;
+  background-position: -880px -317px;
   width: 195px;
   height: 138px;
 }
 .npc_timetravelers {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -278px;
+  background-position: -880px -595px;
   width: 195px;
   height: 138px;
 }
 .npc_timetravelers_active {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -139px;
+  background-position: -880px -456px;
   width: 195px;
   height: 138px;
 }
 .npc_tyler {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1427px -91px;
+  background-position: -1248px -910px;
   width: 90px;
   height: 90px;
 }
 .seasonalshop_closed {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -849px;
+  background-position: -855px -859px;
   width: 162px;
   height: 138px;
 }
 .seasonalshop_open {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1073px;
+  background-position: -692px -859px;
   width: 162px;
   height: 138px;
 }
 .inventory_quest_scroll_atom1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -490px -1576px;
+  background-position: -1261px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_atom1_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -441px -1576px;
+  background-position: -1212px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_atom2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -588px -1576px;
+  background-position: -1359px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_atom2_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -539px -1576px;
+  background-position: -1310px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_atom3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -686px -1576px;
+  background-position: -1457px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_atom3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -637px -1576px;
+  background-position: -1408px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_basilist {
   background-image: url(spritesmith-main-5.png);
-  background-position: -735px -1576px;
+  background-position: -1506px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_bunny {
   background-image: url(spritesmith-main-5.png);
-  background-position: -784px -1576px;
+  background-position: -1555px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_cheetah {
   background-image: url(spritesmith-main-5.png);
-  background-position: -833px -1576px;
+  background-position: -1612px 0px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatoryDistress1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -931px -1576px;
+  background-position: -1612px -104px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatoryDistress2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1029px -1576px;
+  background-position: -1612px -208px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatoryDistress2_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -980px -1576px;
+  background-position: -1612px -156px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatoryDistress3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1127px -1576px;
+  background-position: -1612px -312px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatoryDistress3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -104px;
+  background-position: -330px -1513px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_dilatory_derby {
   background-image: url(spritesmith-main-5.png);
-  background-position: -882px -1576px;
+  background-position: -1612px -52px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_egg {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1176px -1576px;
+  background-position: -1612px -364px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_evilsanta {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1225px -1576px;
+  background-position: -1612px -416px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_evilsanta2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1274px -1576px;
+  background-position: -1612px -468px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_frog {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1323px -1576px;
+  background-position: -1612px -520px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_ghost_stag {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1372px -1576px;
+  background-position: -1612px -572px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1470px -1576px;
+  background-position: -1612px -676px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight1_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1421px -1576px;
+  background-position: -1612px -624px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1568px -1576px;
+  background-position: -1612px -780px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight2_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1519px -1576px;
+  background-position: -1612px -728px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -1628px;
+  background-position: -1612px -884px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_goldenknight3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1617px -1576px;
+  background-position: -1612px -832px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_gryphon {
   background-image: url(spritesmith-main-5.png);
-  background-position: -49px -1628px;
+  background-position: -1612px -936px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_harpy {
   background-image: url(spritesmith-main-5.png);
-  background-position: -98px -1628px;
+  background-position: -1612px -988px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_hedgehog {
   background-image: url(spritesmith-main-5.png);
-  background-position: -147px -1628px;
+  background-position: -1612px -1040px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_horse {
   background-image: url(spritesmith-main-5.png);
-  background-position: -196px -1628px;
+  background-position: -1612px -1092px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_kraken {
   background-image: url(spritesmith-main-5.png);
-  background-position: -245px -1628px;
+  background-position: -1612px -1144px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_monkey {
   background-image: url(spritesmith-main-5.png);
-  background-position: -294px -1628px;
+  background-position: -1612px -1196px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -392px -1628px;
+  background-position: -1612px -1300px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone1_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -343px -1628px;
+  background-position: -1612px -1248px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -490px -1628px;
+  background-position: -1612px -1404px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone2_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -441px -1628px;
+  background-position: -1612px -1352px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -588px -1628px;
+  background-position: -1612px -1508px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_moonstone3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -539px -1628px;
+  background-position: -1612px -1456px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_octopus {
   background-image: url(spritesmith-main-5.png);
-  background-position: -637px -1628px;
+  background-position: 0px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_owl {
   background-image: url(spritesmith-main-5.png);
-  background-position: -686px -1628px;
+  background-position: -49px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_penguin {
   background-image: url(spritesmith-main-5.png);
-  background-position: -735px -1628px;
+  background-position: -98px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_rat {
   background-image: url(spritesmith-main-5.png);
-  background-position: -784px -1628px;
+  background-position: -147px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_rock {
   background-image: url(spritesmith-main-5.png);
-  background-position: -833px -1628px;
+  background-position: -196px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_rooster {
   background-image: url(spritesmith-main-5.png);
-  background-position: -882px -1628px;
+  background-position: -245px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_sabretooth {
   background-image: url(spritesmith-main-5.png);
-  background-position: -931px -1628px;
+  background-position: -294px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_sheep {
   background-image: url(spritesmith-main-5.png);
-  background-position: -980px -1628px;
+  background-position: -343px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_slime {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1029px -1628px;
+  background-position: -392px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_snail {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1078px -1628px;
+  background-position: -441px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_snake {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1127px -1628px;
+  background-position: -490px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_spider {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1176px -1628px;
+  background-position: -539px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_trex {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1274px -1628px;
+  background-position: -637px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_trex_undead {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1225px -1628px;
+  background-position: -588px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_unicorn {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1323px -1628px;
+  background-position: -686px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1421px -1628px;
+  background-position: -784px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice1_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1372px -1628px;
+  background-position: -735px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1519px -1628px;
+  background-position: -882px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice2_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1470px -1628px;
+  background-position: -833px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1617px -1628px;
+  background-position: -980px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_vice3_locked {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1568px -1628px;
+  background-position: -931px -1568px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_whale {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px 0px;
+  background-position: -1029px -1568px;
   width: 48px;
   height: 51px;
 }
 .quest_atom1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -679px -886px;
+  background-position: -251px -859px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px 0px;
+  background-position: -880px -178px;
   width: 207px;
   height: 138px;
 }
 .quest_atom3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -211px -886px;
+  background-position: -431px -672px;
   width: 216px;
   height: 180px;
 }
 .quest_basilist {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -556px;
+  background-position: -502px -859px;
   width: 189px;
   height: 141px;
 }
 .quest_bunny {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -886px;
+  background-position: -220px -672px;
   width: 210px;
   height: 186px;
 }
 .quest_cheetah {
   background-image: url(spritesmith-main-5.png);
-  background-position: -220px 0px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -232px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatoryDistress1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -880px -440px;
+  background-position: -662px -452px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress1_blueFins {
   background-image: url(spritesmith-main-5.png);
-  background-position: -402px -1113px;
+  background-position: -1078px -1568px;
   width: 51px;
   height: 48px;
 }
 .quest_dilatoryDistress1_fireCoral {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1700px -52px;
+  background-position: -1661px 0px;
   width: 48px;
   height: 51px;
 }
 .quest_dilatoryDistress2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1100px -698px;
+  background-position: -1097px 0px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -452px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url(spritesmith-main-5.png);
-  background-position: -440px 0px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_egg {
   background-image: url(spritesmith-main-5.png);
-  background-position: -402px -1073px;
+  background-position: -874px -1010px;
   width: 221px;
   height: 39px;
 }
 .quest_egg_plainEgg {
   background-image: url(spritesmith-main-5.png);
-  background-position: -98px -1576px;
+  background-position: -869px -1513px;
   width: 48px;
   height: 51px;
 }
 .quest_evilsanta {
   background-image: url(spritesmith-main-5.png);
-  background-position: -1308px 0px;
+  background-position: -1097px -275px;
   width: 118px;
   height: 131px;
 }
 .quest_evilsanta2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -440px -452px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_frog {
   background-image: url(spritesmith-main-5.png);
-  background-position: 0px -672px;
+  background-position: -440px -452px;
   width: 221px;
   height: 213px;
 }
 .quest_ghost_stag {
   background-image: url(spritesmith-main-5.png);
-  background-position: -880px 0px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -624px -1073px;
+  background-position: -874px -1050px;
   width: 221px;
   height: 39px;
 }
 .quest_goldenknight1_testimony {
   background-image: url(spritesmith-main-5.png);
-  background-position: -392px -1576px;
+  background-position: -1163px -1513px;
   width: 48px;
   height: 51px;
 }
 .quest_goldenknight2 {
   background-image: url(spritesmith-main-5.png);
-  background-position: -428px -886px;
+  background-position: 0px -859px;
   width: 250px;
   height: 150px;
 }
@@ -2076,73 +2478,37 @@
 }
 .quest_gryphon {
   background-image: url(spritesmith-main-5.png);
-  background-position: -882px -672px;
+  background-position: -880px 0px;
   width: 216px;
   height: 177px;
 }
 .quest_harpy {
   background-image: url(spritesmith-main-5.png);
-  background-position: -660px -452px;
+  background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url(spritesmith-main-5.png);
-  background-position: -222px -672px;
+  background-position: 0px -672px;
   width: 219px;
   height: 186px;
 }
 .quest_horse {
   background-image: url(spritesmith-main-5.png);
-  background-position: -220px -452px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url(spritesmith-main-5.png);
-  background-position: -665px -672px;
+  background-position: -648px -672px;
   width: 216px;
   height: 177px;
 }
 .quest_monkey {
   background-image: url(spritesmith-main-5.png);
-  background-position: -660px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone1 {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -660px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone1_moonstone {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -1667px -437px;
-  width: 30px;
-  height: 30px;
-}
-.quest_moonstone2 {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -440px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_moonstone3 {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -220px -232px;
-  width: 219px;
-  height: 219px;
-}
-.quest_octopus {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -442px -672px;
-  width: 222px;
-  height: 177px;
-}
-.quest_owl {
-  background-image: url(spritesmith-main-5.png);
-  background-position: -880px -220px;
+  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
diff --git a/common/dist/sprites/spritesmith-main-5.png b/common/dist/sprites/spritesmith-main-5.png
index 1da9d1a6a6..33021c13d9 100644
Binary files a/common/dist/sprites/spritesmith-main-5.png and b/common/dist/sprites/spritesmith-main-5.png differ
diff --git a/common/dist/sprites/spritesmith-main-6.css b/common/dist/sprites/spritesmith-main-6.css
index 0156bc9b52..517c549b41 100644
--- a/common/dist/sprites/spritesmith-main-6.css
+++ b/common/dist/sprites/spritesmith-main-6.css
@@ -1,1512 +1,1416 @@
 .quest_TEMPLATE_FOR_MISSING_IMAGE {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1564px;
+  background-position: 0px -1597px;
   width: 221px;
   height: 39px;
 }
-.quest_penguin {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -880px -531px;
-  width: 190px;
-  height: 183px;
-}
-.quest_rat {
+.quest_moonstone1 {
   background-image: url(spritesmith-main-6.png);
   background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_rock {
+.quest_moonstone1_moonstone {
   background-image: url(spritesmith-main-6.png);
-  background-position: -660px -440px;
-  width: 216px;
-  height: 216px;
+  background-position: -1738px -382px;
+  width: 30px;
+  height: 30px;
 }
-.quest_rooster {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -880px -178px;
-  width: 213px;
-  height: 174px;
-}
-.quest_sabretooth {
-  background-image: url(spritesmith-main-6.png);
-  background-position: 0px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sheep {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -220px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_slime {
+.quest_moonstone2 {
   background-image: url(spritesmith-main-6.png);
   background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_snail {
-  background-image: url(spritesmith-main-6.png);
-  background-position: 0px -660px;
-  width: 219px;
-  height: 213px;
-}
-.quest_snake {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -654px -660px;
-  width: 216px;
-  height: 177px;
-}
-.quest_spider {
-  background-image: url(spritesmith-main-6.png);
-  background-position: 0px -874px;
-  width: 250px;
-  height: 150px;
-}
-.quest_stressbeast {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -660px -220px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stressbeast_bailey {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -440px -440px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stressbeast_guide {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -660px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_stressbeast_stables {
-  background-image: url(spritesmith-main-6.png);
-  background-position: 0px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_trex {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -880px -353px;
-  width: 204px;
-  height: 177px;
-}
-.quest_trex_undead {
+.quest_moonstone3 {
   background-image: url(spritesmith-main-6.png);
   background-position: -220px -660px;
-  width: 216px;
-  height: 177px;
-}
-.quest_unicorn {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -220px -440px;
   width: 219px;
   height: 219px;
 }
-.quest_vice1 {
+.quest_octopus {
   background-image: url(spritesmith-main-6.png);
-  background-position: -437px -660px;
-  width: 216px;
+  background-position: 0px -880px;
+  width: 222px;
   height: 177px;
 }
-.quest_vice2 {
+.quest_owl {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -440px;
+  background-position: -220px -220px;
   width: 219px;
   height: 219px;
 }
-.quest_vice2_lightCrystal {
+.quest_penguin {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -257px;
-  width: 40px;
-  height: 40px;
+  background-position: -1100px -353px;
+  width: 190px;
+  height: 183px;
 }
-.quest_vice3 {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -880px 0px;
-  width: 216px;
-  height: 177px;
-}
-.quest_whale {
+.quest_rat {
   background-image: url(spritesmith-main-6.png);
   background-position: -440px -220px;
   width: 219px;
   height: 219px;
 }
+.quest_rock {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -660px -660px;
+  width: 216px;
+  height: 216px;
+}
+.quest_rooster {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -1100px 0px;
+  width: 213px;
+  height: 174px;
+}
+.quest_sabretooth {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -440px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_sheep {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -660px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_slime {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -660px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_snail {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -880px 0px;
+  width: 219px;
+  height: 213px;
+}
+.quest_snake {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -880px -570px;
+  width: 216px;
+  height: 177px;
+}
+.quest_spider {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -440px -880px;
+  width: 250px;
+  height: 150px;
+}
+.quest_stressbeast {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -220px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_stressbeast_bailey {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -440px -660px;
+  width: 219px;
+  height: 219px;
+}
+.quest_stressbeast_guide {
+  background-image: url(spritesmith-main-6.png);
+  background-position: 0px -660px;
+  width: 219px;
+  height: 219px;
+}
+.quest_stressbeast_stables {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -660px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_trex {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -1100px -175px;
+  width: 204px;
+  height: 177px;
+}
+.quest_trex_undead {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -880px -214px;
+  width: 216px;
+  height: 177px;
+}
+.quest_unicorn {
+  background-image: url(spritesmith-main-6.png);
+  background-position: 0px -440px;
+  width: 219px;
+  height: 219px;
+}
+.quest_vice1 {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -223px -880px;
+  width: 216px;
+  height: 177px;
+}
+.quest_vice2 {
+  background-image: url(spritesmith-main-6.png);
+  background-position: 0px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_vice2_lightCrystal {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -1738px -86px;
+  width: 40px;
+  height: 40px;
+}
+.quest_vice3 {
+  background-image: url(spritesmith-main-6.png);
+  background-position: -880px -392px;
+  width: 216px;
+  height: 177px;
+}
+.quest_whale {
+  background-image: url(spritesmith-main-6.png);
+  background-position: 0px -220px;
+  width: 219px;
+  height: 219px;
+}
 .shop_copper {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -430px;
+  background-position: -1738px -413px;
   width: 32px;
   height: 22px;
 }
 .shop_eyes {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -216px;
+  background-position: -1738px -45px;
   width: 40px;
   height: 40px;
 }
 .shop_gold {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -453px;
+  background-position: -1738px -436px;
   width: 32px;
   height: 22px;
 }
 .shop_opaquePotion {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -93px;
+  background-position: -1738px -127px;
   width: 40px;
   height: 40px;
 }
 .shop_potion {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -175px;
+  background-position: -1738px -209px;
   width: 40px;
   height: 40px;
 }
 .shop_reroll {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -134px;
+  background-position: -1738px -168px;
   width: 40px;
   height: 40px;
 }
 .shop_seafoam {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -331px;
+  background-position: -1738px -250px;
   width: 32px;
   height: 32px;
 }
 .shop_shinySeed {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -397px;
+  background-position: -1738px -283px;
   width: 32px;
   height: 32px;
 }
 .shop_silver {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -476px;
+  background-position: -1738px -459px;
   width: 32px;
   height: 22px;
 }
 .shop_snowball {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -298px;
+  background-position: -1738px -349px;
   width: 32px;
   height: 32px;
 }
 .shop_spookDust {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -364px;
+  background-position: -1738px -316px;
   width: 32px;
   height: 32px;
 }
 .Pet_Egg_BearCub {
   background-image: url(spritesmith-main-6.png);
-  background-position: -946px -1604px;
+  background-position: -1149px -997px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Bunny {
   background-image: url(spritesmith-main-6.png);
-  background-position: -995px -1604px;
+  background-position: -1198px -997px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Cactus {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1044px -1604px;
+  background-position: -1247px -997px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Cheetah {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1093px -1604px;
+  background-position: -1009px -880px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Cuttlefish {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1142px -1604px;
+  background-position: -1009px -932px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Deer {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1191px -1604px;
+  background-position: 0px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Dragon {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1240px -1604px;
+  background-position: -49px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Egg {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1289px -1604px;
+  background-position: -98px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_FlyingPig {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1338px -1604px;
+  background-position: -147px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Fox {
   background-image: url(spritesmith-main-6.png);
-  background-position: -980px -1670px;
+  background-position: -1519px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Frog {
   background-image: url(spritesmith-main-6.png);
-  background-position: -931px -1670px;
+  background-position: -1470px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Gryphon {
   background-image: url(spritesmith-main-6.png);
-  background-position: -882px -1670px;
+  background-position: -1421px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Hedgehog {
   background-image: url(spritesmith-main-6.png);
-  background-position: -833px -1670px;
+  background-position: -1372px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Horse {
   background-image: url(spritesmith-main-6.png);
-  background-position: -784px -1670px;
+  background-position: -1323px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_LionCub {
   background-image: url(spritesmith-main-6.png);
-  background-position: -735px -1670px;
+  background-position: -1274px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Monkey {
   background-image: url(spritesmith-main-6.png);
-  background-position: -686px -1670px;
+  background-position: -1225px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Octopus {
   background-image: url(spritesmith-main-6.png);
-  background-position: -637px -1670px;
+  background-position: -1176px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Owl {
   background-image: url(spritesmith-main-6.png);
-  background-position: -588px -1670px;
+  background-position: -1127px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_PandaCub {
   background-image: url(spritesmith-main-6.png);
-  background-position: -539px -1670px;
+  background-position: -1078px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Parrot {
   background-image: url(spritesmith-main-6.png);
-  background-position: -490px -1670px;
+  background-position: -1029px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Penguin {
   background-image: url(spritesmith-main-6.png);
-  background-position: -441px -1670px;
+  background-position: -980px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_PolarBear {
   background-image: url(spritesmith-main-6.png);
-  background-position: -392px -1670px;
+  background-position: -931px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Rat {
   background-image: url(spritesmith-main-6.png);
-  background-position: -343px -1670px;
+  background-position: -882px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Rock {
   background-image: url(spritesmith-main-6.png);
-  background-position: -294px -1670px;
+  background-position: -833px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Rooster {
   background-image: url(spritesmith-main-6.png);
-  background-position: -245px -1670px;
+  background-position: -784px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Sabretooth {
   background-image: url(spritesmith-main-6.png);
-  background-position: -196px -1670px;
+  background-position: -735px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Seahorse {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1029px -1670px;
+  background-position: -1632px -1060px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Sheep {
   background-image: url(spritesmith-main-6.png);
-  background-position: -98px -1670px;
+  background-position: -637px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Slime {
   background-image: url(spritesmith-main-6.png);
-  background-position: -49px -1670px;
+  background-position: -588px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Snail {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1670px;
+  background-position: -539px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Snake {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1681px -1604px;
+  background-position: -490px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Spider {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1632px -1604px;
+  background-position: -441px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_TRex {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1534px -1604px;
+  background-position: -343px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_TigerCub {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1583px -1604px;
+  background-position: -392px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Unicorn {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1485px -1604px;
+  background-position: -294px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Whale {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1436px -1604px;
+  background-position: -245px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Egg_Wolf {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1387px -1604px;
+  background-position: -196px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Cake_Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -880px -830px;
+  background-position: -175px -1689px;
   width: 43px;
   height: 43px;
 }
 .Pet_Food_Cake_CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px -48px;
+  background-position: -1738px 0px;
   width: 42px;
   height: 44px;
 }
 .Pet_Food_Cake_CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1722px;
+  background-position: -43px -1689px;
   width: 43px;
   height: 45px;
 }
 .Pet_Food_Cake_Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1169px -1670px;
+  background-position: -1659px -1637px;
   width: 43px;
   height: 44px;
 }
 .Pet_Food_Cake_Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -924px -830px;
+  background-position: -219px -1689px;
   width: 43px;
   height: 42px;
 }
 .Pet_Food_Cake_Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1213px -1670px;
+  background-position: -87px -1689px;
   width: 43px;
   height: 44px;
 }
 .Pet_Food_Cake_Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1257px -1670px;
+  background-position: -131px -1689px;
   width: 43px;
   height: 44px;
 }
 .Pet_Food_Cake_Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1733px 0px;
+  background-position: 0px -1689px;
   width: 42px;
   height: 47px;
 }
 .Pet_Food_Cake_White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1124px -1670px;
+  background-position: -1614px -1637px;
   width: 44px;
   height: 44px;
 }
 .Pet_Food_Cake_Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1078px -1670px;
+  background-position: -1568px -1637px;
   width: 45px;
   height: 44px;
 }
 .Pet_Food_Candy_Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1604px;
+  background-position: -1681px -1528px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1042px -926px;
+  background-position: -1632px -1528px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -993px -926px;
+  background-position: -1681px -1476px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1042px -874px;
+  background-position: -1632px -1476px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -993px -874px;
+  background-position: -1681px -1424px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1146px -972px;
+  background-position: -1632px -1424px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -972px;
+  background-position: -1681px -1372px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1146px -920px;
+  background-position: -1632px -1372px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -920px;
+  background-position: -1681px -1320px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Candy_Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1252px -1060px;
+  background-position: -1632px -1320px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Chocolate {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -1060px;
+  background-position: -1681px -1268px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1358px -1166px;
+  background-position: -1632px -1268px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -1166px;
+  background-position: -1681px -1216px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Fish {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1464px -1272px;
+  background-position: -1632px -1216px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Honey {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -1272px;
+  background-position: -1681px -1164px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Meat {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1570px -1378px;
+  background-position: -1632px -1164px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Milk {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -1378px;
+  background-position: -1681px -1112px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Potatoe {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1676px -1484px;
+  background-position: -1632px -1112px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_RottenMeat {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -1484px;
+  background-position: -1681px -1060px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Saddle {
   background-image: url(spritesmith-main-6.png);
-  background-position: -147px -1670px;
+  background-position: -686px -1637px;
   width: 48px;
   height: 51px;
 }
 .Pet_Food_Strawberry {
   background-image: url(spritesmith-main-6.png);
-  background-position: -897px -1604px;
+  background-position: -1100px -997px;
   width: 48px;
   height: 51px;
 }
 .Mount_Body_BearCub-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -742px;
+  background-position: -742px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -848px;
+  background-position: -848px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -954px;
+  background-position: -954px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -1060px;
+  background-position: -1060px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -1166px;
+  background-position: -1166px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Peppermint {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1352px;
+  background-position: -1272px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Polar {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1352px;
+  background-position: -1378px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1352px;
+  background-position: -1526px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1352px;
+  background-position: -1526px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1352px;
+  background-position: -1526px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Spooky {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1352px;
+  background-position: -742px -1058px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1352px;
+  background-position: -1526px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_BearCub-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1352px;
+  background-position: -1526px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1352px;
+  background-position: -1526px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -954px -1352px;
+  background-position: -1526px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1060px -1352px;
+  background-position: -1526px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1166px -1352px;
+  background-position: -1526px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1272px -1352px;
+  background-position: -1526px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1378px -1352px;
+  background-position: -1526px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px 0px;
+  background-position: -1526px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -106px;
+  background-position: -1526px -1378px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -212px;
+  background-position: 0px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Bunny-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -318px;
+  background-position: -106px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -424px;
+  background-position: -212px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1564px;
+  background-position: -318px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -636px;
+  background-position: -424px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -742px;
+  background-position: -530px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -848px;
+  background-position: -636px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Peppermint {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -954px;
+  background-position: -742px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -1060px;
+  background-position: -848px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -1166px;
+  background-position: -954px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -1272px;
+  background-position: -1060px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Spooky {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1458px;
+  background-position: -1166px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1458px;
+  background-position: -1272px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1458px;
+  background-position: -1378px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1458px;
+  background-position: -1484px -1491px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1458px;
+  background-position: -1632px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1458px;
+  background-position: -1632px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1458px;
+  background-position: -1632px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1458px;
+  background-position: -1632px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1458px;
+  background-position: -1632px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -954px -1458px;
+  background-position: -1632px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1060px -1458px;
+  background-position: -1632px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1166px -1458px;
+  background-position: -1632px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cheetah-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1272px -1458px;
+  background-position: -1632px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cuttlefish-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -115px;
+  background-position: -636px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -230px;
+  background-position: -530px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -345px;
+  background-position: -424px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -460px;
+  background-position: -318px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -575px;
+  background-position: -212px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -690px;
+  background-position: -106px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px -805px;
+  background-position: 0px -1058px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1025px;
+  background-position: -903px -880px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1025px;
+  background-position: -797px -880px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Cuttlefish-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1097px 0px;
+  background-position: -691px -880px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Deer-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -848px;
+  background-position: -1420px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -954px;
+  background-position: -1420px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -1060px;
+  background-position: -1420px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -1166px;
+  background-position: -1420px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -1272px;
+  background-position: -1420px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -1378px;
+  background-position: -1420px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1564px;
+  background-position: -1420px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1564px;
+  background-position: -1420px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1564px;
+  background-position: -1420px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1564px;
+  background-position: -1420px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1564px;
+  background-position: -1420px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1564px;
+  background-position: -1272px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1564px;
+  background-position: -1166px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -636px;
+  background-position: -1060px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -530px;
+  background-position: -954px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Peppermint {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -424px;
+  background-position: -848px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -318px;
+  background-position: -742px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -212px;
+  background-position: -636px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px -106px;
+  background-position: -530px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Spooky {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1415px 0px;
+  background-position: -424px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1272px -1246px;
+  background-position: -318px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1166px -1246px;
+  background-position: -212px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1060px -1246px;
+  background-position: -106px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -954px -1246px;
+  background-position: 0px -1279px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1246px;
+  background-position: -1314px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1246px;
+  background-position: -1314px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1246px;
+  background-position: -1314px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1246px;
+  background-position: -1314px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1246px;
+  background-position: -1314px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1246px;
+  background-position: -1314px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1246px;
+  background-position: -1314px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Egg-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1246px;
+  background-position: -1314px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1246px;
+  background-position: -1314px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -1060px;
+  background-position: -1314px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -954px;
+  background-position: -1314px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -848px;
+  background-position: -1314px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -742px;
+  background-position: -1166px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Peppermint {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -636px;
+  background-position: -1060px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -530px;
+  background-position: -954px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -424px;
+  background-position: -848px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -318px;
+  background-position: -742px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Spooky {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -212px;
+  background-position: -636px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px -106px;
+  background-position: -530px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_FlyingPig-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1309px 0px;
+  background-position: -424px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1166px -1140px;
+  background-position: -318px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1060px -1140px;
+  background-position: -212px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -954px -1140px;
+  background-position: -106px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1140px;
+  background-position: 0px -1173px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1140px;
+  background-position: -1166px -1058px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Peppermint {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1140px;
+  background-position: -1060px -1058px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1140px;
+  background-position: -954px -1058px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1140px;
+  background-position: -848px -1058px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1140px;
+  background-position: -1632px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Spooky {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1140px;
+  background-position: -1526px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -106px -1140px;
+  background-position: -636px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Fox-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: 0px -1140px;
+  background-position: -530px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Frog-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -887px -874px;
+  background-position: -986px -748px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -781px -874px;
+  background-position: -880px -748px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -675px -874px;
+  background-position: -1206px -882px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -569px -874px;
+  background-position: -1100px -882px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -463px -874px;
+  background-position: -1206px -767px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -357px -874px;
+  background-position: -1100px -767px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Shade {
   background-image: url(spritesmith-main-6.png);
-  background-position: -251px -874px;
+  background-position: -1206px -652px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Skeleton {
   background-image: url(spritesmith-main-6.png);
-  background-position: -986px -715px;
+  background-position: -1100px -652px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-White {
   background-image: url(spritesmith-main-6.png);
-  background-position: -880px -715px;
+  background-position: -1206px -537px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Frog-Zombie {
   background-image: url(spritesmith-main-6.png);
-  background-position: -212px -1025px;
+  background-position: -1100px -537px;
   width: 105px;
   height: 114px;
 }
 .Mount_Body_Gryphon-Base {
   background-image: url(spritesmith-main-6.png);
-  background-position: -1060px -1025px;
+  background-position: -106px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-CottonCandyBlue {
   background-image: url(spritesmith-main-6.png);
-  background-position: -954px -1025px;
+  background-position: 0px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-CottonCandyPink {
   background-image: url(spritesmith-main-6.png);
-  background-position: -848px -1025px;
+  background-position: -1420px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-Desert {
   background-image: url(spritesmith-main-6.png);
-  background-position: -742px -1025px;
+  background-position: -1420px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-Golden {
   background-image: url(spritesmith-main-6.png);
-  background-position: -636px -1025px;
+  background-position: -424px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-Red {
   background-image: url(spritesmith-main-6.png);
-  background-position: -530px -1025px;
+  background-position: -318px -1385px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Gryphon-RoyalPurple {
   background-image: url(spritesmith-main-6.png);
-  background-position: -424px -1025px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Gryphon-Shade {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -318px -1025px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Gryphon-Skeleton {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -742px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Gryphon-White {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -636px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Gryphon-Zombie {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -530px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Base {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -424px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-CottonCandyBlue {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -318px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-CottonCandyPink {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -212px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Desert {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px -106px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Golden {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1627px 0px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Red {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1484px -1458px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Shade {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1378px -1458px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Skeleton {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1521px -530px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-White {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -954px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Hedgehog-Zombie {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -848px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Base {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -742px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-CottonCandyBlue {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -636px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-CottonCandyPink {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -530px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Desert {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -424px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Golden {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -318px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Red {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -212px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Shade {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px -106px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Horse-Skeleton {
-  background-image: url(spritesmith-main-6.png);
-  background-position: -1203px 0px;
+  background-position: -212px -1385px;
   width: 105px;
   height: 105px;
 }
diff --git a/common/dist/sprites/spritesmith-main-6.png b/common/dist/sprites/spritesmith-main-6.png
index 6ff4d0eb24..b7e04ebb3a 100644
Binary files a/common/dist/sprites/spritesmith-main-6.png and b/common/dist/sprites/spritesmith-main-6.png differ
diff --git a/common/dist/sprites/spritesmith-main-7.css b/common/dist/sprites/spritesmith-main-7.css
index 9dafac8198..cad820c0d9 100644
--- a/common/dist/sprites/spritesmith-main-7.css
+++ b/common/dist/sprites/spritesmith-main-7.css
@@ -1,1098 +1,1230 @@
+.Mount_Body_Gryphon-Shade {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -212px -668px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Gryphon-Skeleton {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1210px -636px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Gryphon-White {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -636px -668px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Gryphon-Zombie {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -786px 0px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Base {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px 0px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-CottonCandyBlue {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -106px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-CottonCandyPink {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -212px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Desert {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -318px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Golden {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -424px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Red {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -530px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Shade {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -636px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Skeleton {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -742px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-White {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -848px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Hedgehog-Zombie {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1316px -954px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Base {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -106px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-CottonCandyBlue {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -212px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-CottonCandyPink {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -318px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Desert {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -424px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Golden {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -530px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Red {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -636px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Shade {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -742px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Horse-Skeleton {
+  background-image: url(spritesmith-main-7.png);
+  background-position: -1634px -848px;
+  width: 105px;
+  height: 105px;
+}
 .Mount_Body_Horse-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1634px;
+  background-position: -1634px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Horse-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -636px;
+  background-position: -1634px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_JackOLantern-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1634px;
+  background-position: -424px -1622px;
   width: 90px;
   height: 105px;
 }
 .Mount_Body_LionCub-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1634px;
+  background-position: -539px -544px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -1484px;
+  background-position: -680px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -1378px;
+  background-position: -680px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -1272px;
+  background-position: -680px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Ethereal {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -1528px;
+  background-position: -680px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -1528px;
+  background-position: -680px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Peppermint {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1528px;
+  background-position: -680px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1528px;
+  background-position: 0px -668px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1528px;
+  background-position: -106px -668px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -680px -260px;
+  background-position: -106px -544px;
   width: 111px;
   height: 105px;
 }
 .Mount_Body_LionCub-Spooky {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -1378px;
+  background-position: -318px -668px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -1272px;
+  background-position: -424px -668px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_LionCub-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -1166px;
+  background-position: -530px -668px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Mammoth-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -680px -136px;
+  background-position: 0px -544px;
   width: 105px;
   height: 123px;
 }
 .Mount_Body_MantisShrimp-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -680px -366px;
+  background-position: -218px -544px;
   width: 108px;
   height: 105px;
 }
 .Mount_Body_Monkey-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1210px;
+  background-position: -786px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -1060px;
+  background-position: -786px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -954px;
+  background-position: -786px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -848px;
+  background-position: -786px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -742px;
+  background-position: -786px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -530px;
+  background-position: -786px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -424px;
+  background-position: 0px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -318px;
+  background-position: -106px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1210px;
+  background-position: -212px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Monkey-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1210px;
+  background-position: -318px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -1060px;
+  background-position: -424px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1528px;
+  background-position: -530px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -680px;
+  background-position: -636px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -680px;
+  background-position: -742px -774px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -680px;
+  background-position: -892px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -680px;
+  background-position: -892px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -680px;
+  background-position: -892px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -680px;
+  background-position: -892px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -680px;
+  background-position: -892px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Octopus-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px 0px;
+  background-position: -892px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Orca-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -106px;
+  background-position: -892px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -212px;
+  background-position: -892px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -318px;
+  background-position: 0px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -424px;
+  background-position: -106px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -530px;
+  background-position: -212px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -816px -636px;
+  background-position: -318px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -786px;
+  background-position: -424px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -786px;
+  background-position: -530px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -786px;
+  background-position: -636px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -786px;
+  background-position: -742px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Owl-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -786px;
+  background-position: -848px -880px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -786px;
+  background-position: -998px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -786px;
+  background-position: -998px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -786px;
+  background-position: -998px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px 0px;
+  background-position: -998px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -106px;
+  background-position: -998px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Peppermint {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -212px;
+  background-position: -998px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -318px;
+  background-position: -998px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -424px;
+  background-position: -998px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -530px;
+  background-position: -998px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Spooky {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -636px;
+  background-position: 0px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -922px -742px;
+  background-position: -106px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_PandaCub-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -892px;
+  background-position: -212px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -892px;
+  background-position: -318px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -892px;
+  background-position: -424px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -892px;
+  background-position: -530px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -892px;
+  background-position: -636px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -892px;
+  background-position: -742px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -892px;
+  background-position: -848px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -892px;
+  background-position: -954px -986px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -892px;
+  background-position: -1104px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px 0px;
+  background-position: -1104px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Parrot-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -106px;
+  background-position: -1104px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -212px;
+  background-position: -1104px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -318px;
+  background-position: -1104px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -424px;
+  background-position: -1104px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -530px;
+  background-position: -1104px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -636px;
+  background-position: -1104px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -742px;
+  background-position: -1104px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1028px -848px;
+  background-position: -1104px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -998px;
+  background-position: 0px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -998px;
+  background-position: -106px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Penguin-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -998px;
+  background-position: -212px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Phoenix-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -998px;
+  background-position: -318px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -998px;
+  background-position: -424px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -998px;
+  background-position: -530px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -998px;
+  background-position: -636px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -998px;
+  background-position: -742px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -998px;
+  background-position: -848px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -998px;
+  background-position: -954px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px 0px;
+  background-position: -1060px -1092px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -106px;
+  background-position: -1210px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -212px;
+  background-position: -1210px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rat-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -318px;
+  background-position: -1210px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -424px;
+  background-position: -1210px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -530px;
+  background-position: -1210px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -636px;
+  background-position: -1210px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -742px;
+  background-position: -327px -544px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -848px;
+  background-position: -1210px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1134px -954px;
+  background-position: -1210px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1104px;
+  background-position: -1210px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1104px;
+  background-position: -1210px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1104px;
+  background-position: 0px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rock-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1104px;
+  background-position: -106px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -1104px;
+  background-position: -212px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -1104px;
+  background-position: -318px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -1104px;
+  background-position: -424px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -1104px;
+  background-position: -530px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1104px;
+  background-position: -636px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1104px;
+  background-position: -742px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1104px;
+  background-position: -848px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px 0px;
+  background-position: -954px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -106px;
+  background-position: -1060px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Rooster-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1240px -212px;
+  background-position: -1166px -1198px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sabretooth-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -680px 0px;
+  background-position: -272px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -544px -544px;
+  background-position: -272px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -408px -544px;
+  background-position: 0px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px 0px;
+  background-position: -136px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -272px -544px;
+  background-position: -272px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -136px -544px;
+  background-position: -408px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -544px;
+  background-position: -408px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -544px -408px;
+  background-position: -408px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -544px -272px;
+  background-position: 0px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Sabretooth-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -544px -136px;
+  background-position: -136px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_Seahorse-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1210px;
+  background-position: -1316px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1210px;
+  background-position: -1316px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -1210px;
+  background-position: 0px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -1210px;
+  background-position: -106px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -1210px;
+  background-position: -212px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -1210px;
+  background-position: -318px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -680px -472px;
+  background-position: -424px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1210px;
+  background-position: -530px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1210px;
+  background-position: -636px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Seahorse-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1166px -1210px;
+  background-position: -742px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px 0px;
+  background-position: -848px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -106px;
+  background-position: -954px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -212px;
+  background-position: -1060px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -318px;
+  background-position: -1166px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -424px;
+  background-position: -1272px -1304px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -530px;
+  background-position: -1422px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -636px;
+  background-position: -1422px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -742px;
+  background-position: -1422px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -848px;
+  background-position: -1422px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Sheep-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -954px;
+  background-position: -1422px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -1060px;
+  background-position: -1422px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1346px -1166px;
+  background-position: -1422px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1316px;
+  background-position: -1422px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1316px;
+  background-position: -1422px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1316px;
+  background-position: -1422px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1316px;
+  background-position: -1422px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -1316px;
+  background-position: -1422px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -1316px;
+  background-position: -1422px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -1316px;
+  background-position: 0px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Slime-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -1316px;
+  background-position: -106px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1316px;
+  background-position: -212px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1316px;
+  background-position: -318px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1316px;
+  background-position: -424px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1166px -1316px;
+  background-position: -530px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1272px -1316px;
+  background-position: -636px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px 0px;
+  background-position: -742px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -106px;
+  background-position: -848px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -212px;
+  background-position: -954px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -318px;
+  background-position: -1060px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snail-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -424px;
+  background-position: -1166px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -530px;
+  background-position: -1272px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -636px;
+  background-position: -1378px -1410px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -742px;
+  background-position: -1528px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -848px;
+  background-position: -1528px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -954px;
+  background-position: -1528px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1060px;
+  background-position: -1528px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1166px;
+  background-position: -1528px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1452px -1272px;
+  background-position: -1528px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -1422px;
+  background-position: -1528px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Snake-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -106px -1422px;
+  background-position: -1528px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -212px -1422px;
+  background-position: -1528px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -318px -1422px;
+  background-position: -1528px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -424px -1422px;
+  background-position: -1528px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -530px -1422px;
+  background-position: -1528px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -1422px;
+  background-position: -1528px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -1422px;
+  background-position: -1528px -1378px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1422px;
+  background-position: 0px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1422px;
+  background-position: -106px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1422px;
+  background-position: -212px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Spider-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1166px -1422px;
+  background-position: -318px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TRex-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -544px 0px;
+  background-position: -272px -408px;
   width: 135px;
   height: 135px;
 }
@@ -1104,283 +1236,175 @@
 }
 .Mount_Body_TRex-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -272px -408px;
+  background-position: -544px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -136px -408px;
+  background-position: -544px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: 0px -408px;
+  background-position: -544px -272px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -408px -272px;
+  background-position: -544px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -408px -136px;
+  background-position: 0px -408px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -408px 0px;
+  background-position: -136px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -272px -272px;
+  background-position: 0px -136px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TRex-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -136px -272px;
+  background-position: -136px 0px;
   width: 135px;
   height: 135px;
 }
 .Mount_Body_TigerCub-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1272px -1422px;
+  background-position: -424px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1378px -1422px;
+  background-position: -530px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px 0px;
+  background-position: -636px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -106px;
+  background-position: -742px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -212px;
+  background-position: -848px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Peppermint {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -318px;
+  background-position: -954px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -424px;
+  background-position: -1060px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -530px;
+  background-position: -1166px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -636px;
+  background-position: -1272px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Spooky {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -742px;
+  background-position: -1378px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-White {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -848px;
+  background-position: -1484px -1516px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_TigerCub-Zombie {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1558px -954px;
+  background-position: -1634px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Turkey-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -636px -1528px;
+  background-position: -1634px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Base {
   background-image: url(spritesmith-main-7.png);
-  background-position: -742px -1528px;
+  background-position: -1634px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-CottonCandyBlue {
   background-image: url(spritesmith-main-7.png);
-  background-position: -848px -1528px;
+  background-position: -1634px -1378px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-CottonCandyPink {
   background-image: url(spritesmith-main-7.png);
-  background-position: -954px -1528px;
+  background-position: -1634px -1484px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Desert {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1060px -1528px;
+  background-position: 0px -1622px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Golden {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1166px -1528px;
+  background-position: -106px -1622px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Red {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1272px -1528px;
+  background-position: -212px -1622px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Shade {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1378px -1528px;
+  background-position: -433px -544px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Unicorn-Skeleton {
   background-image: url(spritesmith-main-7.png);
-  background-position: -1484px -1528px;
+  background-position: -318px -1622px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Unicorn-White {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px 0px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Unicorn-Zombie {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -106px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Base {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -212px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-CottonCandyBlue {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -318px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-CottonCandyPink {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -424px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Desert {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -530px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Golden {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -636px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Red {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -742px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Shade {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -848px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Skeleton {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -954px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-White {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -1060px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Whale-Zombie {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -1664px -1166px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Wolf-Base {
-  background-image: url(spritesmith-main-7.png);
-  background-position: 0px -272px;
-  width: 135px;
-  height: 135px;
-}
-.Mount_Body_Wolf-CottonCandyBlue {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -272px -136px;
-  width: 135px;
-  height: 135px;
-}
-.Mount_Body_Wolf-CottonCandyPink {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -272px 0px;
-  width: 135px;
-  height: 135px;
-}
-.Mount_Body_Wolf-Desert {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -136px -136px;
-  width: 135px;
-  height: 135px;
-}
-.Mount_Body_Wolf-Golden {
-  background-image: url(spritesmith-main-7.png);
-  background-position: 0px -136px;
-  width: 135px;
-  height: 135px;
-}
-.Mount_Body_Wolf-Peppermint {
-  background-image: url(spritesmith-main-7.png);
-  background-position: -136px 0px;
-  width: 135px;
-  height: 135px;
-}
diff --git a/common/dist/sprites/spritesmith-main-7.png b/common/dist/sprites/spritesmith-main-7.png
index 6db6a1ec75..aa77543ab6 100644
Binary files a/common/dist/sprites/spritesmith-main-7.png and b/common/dist/sprites/spritesmith-main-7.png differ
diff --git a/common/dist/sprites/spritesmith-main-8.css b/common/dist/sprites/spritesmith-main-8.css
index b1fc41d08f..7077469ad6 100644
--- a/common/dist/sprites/spritesmith-main-8.css
+++ b/common/dist/sprites/spritesmith-main-8.css
@@ -1,1452 +1,1428 @@
-.Mount_Body_Wolf-Red {
+.Mount_Body_Unicorn-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px 0px;
-  width: 135px;
-  height: 135px;
+  background-position: -1286px -212px;
+  width: 105px;
+  height: 105px;
 }
-.Mount_Body_Wolf-Shade {
+.Mount_Body_Unicorn-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -272px -136px;
-  width: 135px;
-  height: 135px;
+  background-position: -1180px -954px;
+  width: 105px;
+  height: 105px;
 }
-.Mount_Body_Wolf-Skeleton {
+.Mount_Body_Whale-Base {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -848px -859px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-CottonCandyBlue {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px 0px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-CottonCandyPink {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -106px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Desert {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -212px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Golden {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -318px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Red {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -424px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Shade {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -530px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Skeleton {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -636px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-White {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -742px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Whale-Zombie {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -968px -848px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Wolf-Base {
   background-image: url(spritesmith-main-8.png);
   background-position: -136px 0px;
   width: 135px;
   height: 135px;
 }
-.Mount_Body_Wolf-Spooky {
+.Mount_Body_Wolf-CottonCandyBlue {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -408px -272px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-CottonCandyPink {
+  background-image: url(spritesmith-main-8.png);
+  background-position: 0px -272px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-Desert {
   background-image: url(spritesmith-main-8.png);
   background-position: 0px -136px;
   width: 135px;
   height: 135px;
 }
-.Mount_Body_Wolf-White {
+.Mount_Body_Wolf-Golden {
   background-image: url(spritesmith-main-8.png);
   background-position: -136px -136px;
   width: 135px;
   height: 135px;
 }
-.Mount_Body_Wolf-Zombie {
+.Mount_Body_Wolf-Peppermint {
   background-image: url(spritesmith-main-8.png);
   background-position: -272px 0px;
   width: 135px;
   height: 135px;
 }
+.Mount_Body_Wolf-Red {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -272px -136px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-Shade {
+  background-image: url(spritesmith-main-8.png);
+  background-position: 0px 0px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-Skeleton {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -136px -272px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-Spooky {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -272px -272px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-White {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -408px 0px;
+  width: 135px;
+  height: 135px;
+}
+.Mount_Body_Wolf-Zombie {
+  background-image: url(spritesmith-main-8.png);
+  background-position: -408px -136px;
+  width: 135px;
+  height: 135px;
+}
 .Mount_Head_BearCub-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1368px;
+  background-position: -1286px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1156px;
+  background-position: -1286px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1156px;
+  background-position: -1286px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1156px;
+  background-position: -1286px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1156px;
+  background-position: -1286px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1156px;
+  background-position: -1286px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Polar {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1156px;
+  background-position: -1286px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1156px;
+  background-position: -1286px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -954px;
+  background-position: -1286px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -848px;
+  background-position: -1498px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -742px;
+  background-position: -1498px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -424px;
+  background-position: -1498px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_BearCub-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -318px;
+  background-position: -756px -332px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -212px;
+  background-position: -756px -438px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -106px;
+  background-position: -109px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px 0px;
+  background-position: -215px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -732px;
+  background-position: -321px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -732px;
+  background-position: -427px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -732px;
+  background-position: -533px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -732px;
+  background-position: -639px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -732px;
+  background-position: -745px -647px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1368px;
+  background-position: 0px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Bunny-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -212px;
+  background-position: -106px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1368px;
+  background-position: -212px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -726px 0px;
+  background-position: -318px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -726px -106px;
+  background-position: -424px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -726px -212px;
+  background-position: -530px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -726px -318px;
+  background-position: -636px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -726px -424px;
+  background-position: -742px -753px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -626px;
+  background-position: -862px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -626px;
+  background-position: -862px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -626px;
+  background-position: -862px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -626px;
+  background-position: -862px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -626px;
+  background-position: -862px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cactus-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -626px;
+  background-position: -862px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -626px;
+  background-position: -862px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px 0px;
+  background-position: -862px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px -106px;
+  background-position: 0px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px -212px;
+  background-position: -106px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px -318px;
+  background-position: -212px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px -424px;
+  background-position: -318px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -832px -530px;
+  background-position: -424px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -732px;
+  background-position: -530px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -732px;
+  background-position: -636px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cheetah-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -732px;
+  background-position: -742px -859px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Cuttlefish-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -511px;
+  background-position: -544px 0px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -511px;
+  background-position: -212px -408px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -511px;
+  background-position: -212px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -620px -345px;
+  background-position: -318px -408px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -620px -230px;
+  background-position: -424px -408px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -620px -115px;
+  background-position: -756px 0px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -620px 0px;
+  background-position: -544px -115px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -514px -345px;
+  background-position: -544px -230px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -514px -230px;
+  background-position: -544px -345px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Cuttlefish-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -514px -115px;
+  background-position: 0px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Deer-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -530px;
+  background-position: 0px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -938px -636px;
+  background-position: -106px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -838px;
+  background-position: -212px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -838px;
+  background-position: -318px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -838px;
+  background-position: -424px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -838px;
+  background-position: -530px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -838px;
+  background-position: -636px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -838px;
+  background-position: -742px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -838px;
+  background-position: -848px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Deer-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -838px;
+  background-position: -954px -965px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -838px;
+  background-position: -1074px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px 0px;
+  background-position: -1074px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -106px;
+  background-position: -1074px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -212px;
+  background-position: -1074px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -318px;
+  background-position: -1074px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -424px;
+  background-position: -1074px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -530px;
+  background-position: -1074px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -636px;
+  background-position: -1074px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1044px -742px;
+  background-position: -1074px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -944px;
+  background-position: -1074px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -944px;
+  background-position: 0px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Dragon-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -944px;
+  background-position: -106px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -944px;
+  background-position: -212px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -944px;
+  background-position: -318px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -944px;
+  background-position: -424px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -944px;
+  background-position: -530px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -944px;
+  background-position: -636px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -944px;
+  background-position: -742px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -944px;
+  background-position: -848px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px 0px;
+  background-position: -954px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -106px;
+  background-position: -1060px -1071px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Egg-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -212px;
+  background-position: -1180px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -318px;
+  background-position: -1180px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -424px;
+  background-position: -1180px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -530px;
+  background-position: -1180px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -636px;
+  background-position: -1180px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -742px;
+  background-position: -1180px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1150px -848px;
+  background-position: -1180px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1050px;
+  background-position: -1180px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1050px;
+  background-position: -1180px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1050px;
+  background-position: -756px -226px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1050px;
+  background-position: -1180px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1050px;
+  background-position: 0px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_FlyingPig-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1050px;
+  background-position: -106px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1050px;
+  background-position: -212px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1050px;
+  background-position: -318px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1050px;
+  background-position: -424px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1050px;
+  background-position: -530px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1050px;
+  background-position: -636px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px 0px;
+  background-position: -742px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -106px;
+  background-position: -848px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -212px;
+  background-position: -954px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -318px;
+  background-position: -1060px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -424px;
+  background-position: -1166px -1177px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -530px;
+  background-position: -1286px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Fox-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1256px -636px;
+  background-position: -1286px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Frog-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -514px 0px;
+  background-position: -106px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -396px;
+  background-position: -106px -408px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -396px;
+  background-position: -318px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -396px;
+  background-position: -424px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -396px;
+  background-position: -530px -532px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -408px -230px;
+  background-position: -650px 0px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -408px -115px;
+  background-position: -650px -115px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -408px 0px;
+  background-position: -650px -230px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -272px;
+  background-position: -650px -345px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Frog-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -272px;
+  background-position: -650px -460px;
   width: 105px;
   height: 114px;
 }
 .Mount_Head_Gryphon-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1156px;
+  background-position: 0px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1156px;
+  background-position: -106px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1156px;
+  background-position: -212px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1156px;
+  background-position: -318px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1166px -1156px;
+  background-position: -424px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px 0px;
+  background-position: -530px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-RoyalPurple {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -106px;
+  background-position: -636px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -533px -511px;
+  background-position: -742px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -318px;
+  background-position: -848px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -424px;
+  background-position: -954px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Gryphon-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -530px;
+  background-position: -1060px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -636px;
+  background-position: -1166px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -742px;
+  background-position: -1272px -1283px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -848px;
+  background-position: -1392px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -954px;
+  background-position: -1392px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1362px -1060px;
+  background-position: -1392px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1262px;
+  background-position: -1392px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1262px;
+  background-position: -1392px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1262px;
+  background-position: -1392px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1262px;
+  background-position: -1392px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Hedgehog-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1262px;
+  background-position: -1392px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1262px;
+  background-position: -1392px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1262px;
+  background-position: -1392px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1262px;
+  background-position: -1392px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1262px;
+  background-position: -1392px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1262px;
+  background-position: -1392px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1262px;
+  background-position: 0px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1166px -1262px;
+  background-position: -106px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1272px -1262px;
+  background-position: -212px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px 0px;
+  background-position: -318px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Horse-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -106px;
+  background-position: -424px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_JackOLantern-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1786px -106px;
+  background-position: -848px -1601px;
   width: 90px;
   height: 105px;
 }
 .Mount_Head_LionCub-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -318px;
+  background-position: -636px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -424px;
+  background-position: -742px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -530px;
+  background-position: -848px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -636px;
+  background-position: -954px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Ethereal {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -742px;
+  background-position: -1060px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -848px;
+  background-position: -1166px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -954px;
+  background-position: -1272px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -1060px;
+  background-position: -1378px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -1166px;
+  background-position: -1498px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -511px;
+  background-position: -756px -115px;
   width: 105px;
   height: 110px;
 }
 .Mount_Head_LionCub-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1368px;
+  background-position: -1498px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1368px;
+  background-position: -1498px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_LionCub-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1368px;
+  background-position: -1498px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Mammoth-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -272px;
+  background-position: 0px -408px;
   width: 105px;
   height: 123px;
 }
 .Mount_Head_MantisShrimp-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -511px;
+  background-position: 0px -647px;
   width: 108px;
   height: 105px;
 }
 .Mount_Head_Monkey-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1368px;
+  background-position: -1498px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1368px;
+  background-position: -1498px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1368px;
+  background-position: -1498px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1368px;
+  background-position: -1498px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1368px;
+  background-position: -1498px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1166px -1368px;
+  background-position: -1498px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1272px -1368px;
+  background-position: -1498px -1378px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1378px -1368px;
+  background-position: 0px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px 0px;
+  background-position: -106px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Monkey-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -106px;
+  background-position: -212px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -212px;
+  background-position: -318px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -318px;
+  background-position: -424px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -424px;
+  background-position: -530px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -530px;
+  background-position: -636px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -636px;
+  background-position: -742px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -742px;
+  background-position: -848px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -848px;
+  background-position: -954px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -954px;
+  background-position: -1060px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -1060px;
+  background-position: -1166px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Octopus-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -1166px;
+  background-position: -1272px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Orca-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1574px -1272px;
+  background-position: -1378px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1474px;
+  background-position: -1484px -1495px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1474px;
+  background-position: -1604px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1474px;
+  background-position: -1604px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1474px;
+  background-position: -1604px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1474px;
+  background-position: -1604px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1474px;
+  background-position: -1604px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1474px;
+  background-position: -1604px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1474px;
+  background-position: -1604px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1474px;
+  background-position: -1604px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Owl-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1474px;
+  background-position: -1604px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1474px;
+  background-position: -1604px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1166px -1474px;
+  background-position: -1604px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1272px -1474px;
+  background-position: -1604px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Desert {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1378px -1474px;
+  background-position: -1604px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Golden {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1484px -1474px;
+  background-position: -1604px -1378px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Peppermint {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px 0px;
+  background-position: -1604px -1484px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Red {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -106px;
+  background-position: 0px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Shade {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -212px;
+  background-position: -106px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Skeleton {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -318px;
+  background-position: -212px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Spooky {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -424px;
+  background-position: -318px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-White {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -530px;
+  background-position: -424px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_PandaCub-Zombie {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -636px;
+  background-position: -530px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Parrot-Base {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -742px;
+  background-position: -636px -1601px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Parrot-CottonCandyBlue {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -848px;
+  background-position: -530px -1389px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Parrot-CottonCandyPink {
   background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -954px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Desert {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -1060px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Golden {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -1166px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Red {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -1272px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Shade {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1680px -1378px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Skeleton {
-  background-image: url(spritesmith-main-8.png);
-  background-position: 0px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-White {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -106px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Parrot-Zombie {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -212px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Base {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -318px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-CottonCandyBlue {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -424px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-CottonCandyPink {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -530px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Desert {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -636px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Golden {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -742px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Red {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -848px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Shade {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -954px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Skeleton {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1060px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-White {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1166px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Penguin-Zombie {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1272px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Phoenix-Base {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1378px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Rat-Base {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1484px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Rat-CottonCandyBlue {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1590px -1580px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Rat-CottonCandyPink {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1468px -212px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Rat-Desert {
-  background-image: url(spritesmith-main-8.png);
-  background-position: -1786px 0px;
+  background-position: -742px -1601px;
   width: 105px;
   height: 105px;
 }
diff --git a/common/dist/sprites/spritesmith-main-8.png b/common/dist/sprites/spritesmith-main-8.png
index b78b98aec8..7e83aeeb66 100644
Binary files a/common/dist/sprites/spritesmith-main-8.png and b/common/dist/sprites/spritesmith-main-8.png differ
diff --git a/common/dist/sprites/spritesmith-main-9.css b/common/dist/sprites/spritesmith-main-9.css
index 24e7a89bbe..ca622a8fd0 100644
--- a/common/dist/sprites/spritesmith-main-9.css
+++ b/common/dist/sprites/spritesmith-main-9.css
@@ -1,156 +1,288 @@
-.Mount_Head_Rat-Golden {
+.Mount_Head_Parrot-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1346px;
+  background-position: -424px -816px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rat-Red {
+.Mount_Head_Parrot-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -1240px;
+  background-position: -318px -1240px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rat-Shade {
+.Mount_Head_Parrot-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -1346px;
+  background-position: -530px -816px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rat-Skeleton {
+.Mount_Head_Parrot-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1346px;
+  background-position: -636px -816px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rat-White {
+.Mount_Head_Parrot-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1346px;
+  background-position: -742px -816px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rat-Zombie {
+.Mount_Head_Parrot-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -1346px;
+  background-position: -922px 0px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Base {
+.Mount_Head_Parrot-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -1346px;
+  background-position: -922px -106px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-CottonCandyBlue {
+.Mount_Head_Penguin-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -1346px;
+  background-position: -922px -212px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-CottonCandyPink {
+.Mount_Head_Penguin-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -378px -680px;
+  background-position: -922px -318px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Desert {
+.Mount_Head_Penguin-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -484px -680px;
+  background-position: -922px -424px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Golden {
+.Mount_Head_Penguin-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -590px -680px;
+  background-position: -922px -530px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Red {
+.Mount_Head_Penguin-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1060px -1134px;
+  background-position: -1060px -1240px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Shade {
+.Mount_Head_Penguin-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px 0px;
+  background-position: -1166px -1240px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Skeleton {
+.Mount_Head_Penguin-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -106px;
+  background-position: -1346px 0px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-White {
+.Mount_Head_Penguin-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -212px;
+  background-position: -1346px -106px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rock-Zombie {
+.Mount_Head_Penguin-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -318px;
+  background-position: -1346px -212px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rooster-Base {
+.Mount_Head_Penguin-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -424px;
+  background-position: -1346px -318px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rooster-CottonCandyBlue {
+.Mount_Head_Phoenix-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -530px;
+  background-position: -1346px -424px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rooster-CottonCandyPink {
+.Mount_Head_Rat-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -636px;
+  background-position: -1346px -530px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rooster-Desert {
+.Mount_Head_Rat-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -742px;
+  background-position: -1346px -636px;
   width: 105px;
   height: 105px;
 }
-.Mount_Head_Rooster-Golden {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -848px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Head_Rooster-Red {
+.Mount_Head_Rat-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
   background-position: -1346px -742px;
   width: 105px;
   height: 105px;
 }
+.Mount_Head_Rat-Desert {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -424px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-Golden {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -530px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-Red {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -636px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-Shade {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -742px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-Skeleton {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -848px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-White {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -954px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rat-Zombie {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -1060px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Base {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -1166px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-CottonCandyBlue {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -1452px -1272px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-CottonCandyPink {
+  background-image: url(spritesmith-main-9.png);
+  background-position: 0px -1452px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Desert {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -106px -1452px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Golden {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -212px -1452px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Red {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -378px -680px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Shade {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -484px -680px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Skeleton {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -590px -680px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-White {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -696px -680px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rock-Zombie {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px 0px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-Base {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -106px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-CottonCandyBlue {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -212px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-CottonCandyPink {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -318px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-Desert {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -424px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-Golden {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -530px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Head_Rooster-Red {
+  background-image: url(spritesmith-main-9.png);
+  background-position: -816px -636px;
+  width: 105px;
+  height: 105px;
+}
 .Mount_Head_Rooster-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -848px;
+  background-position: 0px -816px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Rooster-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -954px;
+  background-position: -106px -816px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Rooster-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -1060px;
+  background-position: -212px -816px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Rooster-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -1166px;
+  background-position: -318px -816px;
   width: 105px;
   height: 105px;
 }
@@ -216,361 +348,361 @@
 }
 .Mount_Head_Seahorse-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -696px -680px;
+  background-position: -922px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px 0px;
+  background-position: -922px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -106px;
+  background-position: 0px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -212px;
+  background-position: -106px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -318px;
+  background-position: -212px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -424px;
+  background-position: -318px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -530px;
+  background-position: -424px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -816px -636px;
+  background-position: -530px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -816px;
+  background-position: -636px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Seahorse-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -816px;
+  background-position: -742px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -816px;
+  background-position: -848px -922px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -816px;
+  background-position: -1028px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -816px;
+  background-position: -1028px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -816px;
+  background-position: -1028px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -816px;
+  background-position: -1028px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -816px;
+  background-position: -1028px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px 0px;
+  background-position: -1028px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -106px;
+  background-position: -1028px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -212px;
+  background-position: -1028px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Sheep-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -318px;
+  background-position: -1028px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -424px;
+  background-position: 0px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -530px;
+  background-position: -106px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -636px;
+  background-position: -212px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -922px -742px;
+  background-position: -318px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -922px;
+  background-position: -424px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -922px;
+  background-position: -530px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -922px;
+  background-position: -636px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -922px;
+  background-position: -742px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -922px;
+  background-position: -848px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Slime-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -922px;
+  background-position: -954px -1028px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -922px;
+  background-position: -1134px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -922px;
+  background-position: -1134px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -922px;
+  background-position: -1134px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px 0px;
+  background-position: -1134px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -106px;
+  background-position: -1134px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -212px;
+  background-position: -1134px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -318px;
+  background-position: -1134px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -424px;
+  background-position: -1134px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -530px;
+  background-position: -1134px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snail-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -636px;
+  background-position: -1134px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -742px;
+  background-position: 0px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1028px -848px;
+  background-position: -106px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1028px;
+  background-position: -212px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -1028px;
+  background-position: -318px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1028px;
+  background-position: -424px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1028px;
+  background-position: -530px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -1028px;
+  background-position: -636px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -1028px;
+  background-position: -742px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -1028px;
+  background-position: -848px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Snake-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -1028px;
+  background-position: -954px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -1028px;
+  background-position: -1060px -1134px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -954px -1028px;
+  background-position: -1240px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px 0px;
+  background-position: -1240px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -106px;
+  background-position: -1240px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -212px;
+  background-position: -1240px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -318px;
+  background-position: -1240px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -424px;
+  background-position: -1240px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -530px;
+  background-position: -1240px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -636px;
+  background-position: -1240px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Spider-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -742px;
+  background-position: -1240px -848px;
   width: 105px;
   height: 105px;
 }
@@ -636,199 +768,199 @@
 }
 .Mount_Head_TigerCub-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -848px;
+  background-position: -1240px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1134px -954px;
+  background-position: -1240px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1134px;
+  background-position: 0px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -1134px;
+  background-position: -106px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1134px;
+  background-position: -212px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1134px;
+  background-position: -272px -680px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -1134px;
+  background-position: -424px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -1134px;
+  background-position: -530px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -1134px;
+  background-position: -636px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Spooky {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -1134px;
+  background-position: -742px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -1134px;
+  background-position: -848px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_TigerCub-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -954px -1134px;
+  background-position: -954px -1240px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Turkey-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -954px;
+  background-position: -1346px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1240px -1060px;
+  background-position: -1346px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1240px;
+  background-position: -1346px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -106px -1240px;
+  background-position: -1346px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -212px -1240px;
+  background-position: 0px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -318px -1240px;
+  background-position: -106px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -424px -1240px;
+  background-position: -212px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -530px -1240px;
+  background-position: -318px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -636px -1240px;
+  background-position: -424px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -272px -680px;
+  background-position: -530px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Unicorn-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -848px -1240px;
+  background-position: -636px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -954px -1240px;
+  background-position: -742px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1060px -1240px;
+  background-position: -848px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1166px -1240px;
+  background-position: -954px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px 0px;
+  background-position: -1060px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -106px;
+  background-position: -1166px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -212px;
+  background-position: -1272px -1346px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -318px;
+  background-position: -1452px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -424px;
+  background-position: -1452px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -530px;
+  background-position: -1452px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Head_Whale-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1346px -636px;
+  background-position: -1452px -318px;
   width: 105px;
   height: 105px;
 }
@@ -906,625 +1038,445 @@
 }
 .Mount_Icon_BearCub-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -824px -1346px;
+  background-position: -400px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1312px -1452px;
+  background-position: -1640px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -906px -1346px;
+  background-position: -482px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -988px -1346px;
+  background-position: -564px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1070px -1346px;
+  background-position: -646px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1152px -1346px;
+  background-position: -728px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Polar {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1234px -1346px;
+  background-position: -810px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1316px -1346px;
+  background-position: -892px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px 0px;
+  background-position: -974px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -100px;
+  background-position: -1056px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Spooky {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -200px;
+  background-position: -1138px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -300px;
+  background-position: -1220px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_BearCub-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -400px;
+  background-position: -1302px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -500px;
+  background-position: -1384px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -600px;
+  background-position: -1466px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -700px;
+  background-position: -1558px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -800px;
+  background-position: -1558px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -900px;
+  background-position: -1558px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -1000px;
+  background-position: -1558px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -1100px;
+  background-position: -1558px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -1200px;
+  background-position: -1558px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1452px -1300px;
+  background-position: -1558px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Bunny-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px 0px;
+  background-position: -1558px -700px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -100px;
+  background-position: -1558px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -200px;
+  background-position: -1558px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -300px;
+  background-position: -1558px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -400px;
+  background-position: -1558px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -500px;
+  background-position: -1558px -1200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -600px;
+  background-position: -1558px -1300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -700px;
+  background-position: -1558px -1400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -800px;
+  background-position: -1640px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -900px;
+  background-position: -1640px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Spooky {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -1000px;
+  background-position: -1640px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -1100px;
+  background-position: -1640px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cactus-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -1200px;
+  background-position: -1640px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1534px -1300px;
+  background-position: -1640px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1452px;
+  background-position: -1640px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -82px -1452px;
+  background-position: -318px -1452px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -164px -1452px;
+  background-position: -1640px -800px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -246px -1452px;
+  background-position: -1640px -900px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -328px -1452px;
+  background-position: -1640px -1000px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -410px -1452px;
+  background-position: -1640px -1100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -492px -1452px;
+  background-position: -1640px -1200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -574px -1452px;
+  background-position: -1640px -1300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cheetah-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -656px -1452px;
+  background-position: -1640px -1400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -738px -1452px;
+  background-position: 0px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -820px -1452px;
+  background-position: -82px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -902px -1452px;
+  background-position: -164px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -984px -1452px;
+  background-position: -246px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1066px -1452px;
+  background-position: -328px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1148px -1452px;
+  background-position: -410px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1230px -1452px;
+  background-position: -492px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -742px -1346px;
+  background-position: -574px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1394px -1452px;
+  background-position: -656px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Cuttlefish-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1476px -1452px;
+  background-position: -738px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px 0px;
+  background-position: -820px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -100px;
+  background-position: -902px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -200px;
+  background-position: -984px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -300px;
+  background-position: -1066px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -400px;
+  background-position: -1148px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -500px;
+  background-position: -1230px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -600px;
+  background-position: -1312px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -700px;
+  background-position: -1394px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-White {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -800px;
+  background-position: -1476px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Deer-Zombie {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -900px;
+  background-position: -1558px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Base {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -1000px;
+  background-position: -1640px -1558px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-CottonCandyBlue {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -1100px;
+  background-position: -1722px 0px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-CottonCandyPink {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -1200px;
+  background-position: -1722px -100px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Desert {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -1300px;
+  background-position: -1722px -200px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Golden {
   background-image: url(spritesmith-main-9.png);
-  background-position: -1616px -1400px;
+  background-position: -1722px -300px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Peppermint {
   background-image: url(spritesmith-main-9.png);
-  background-position: 0px -1552px;
+  background-position: -1722px -400px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Red {
   background-image: url(spritesmith-main-9.png);
-  background-position: -82px -1552px;
+  background-position: -1722px -500px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Shade {
   background-image: url(spritesmith-main-9.png);
-  background-position: -164px -1552px;
+  background-position: -1722px -600px;
   width: 81px;
   height: 99px;
 }
 .Mount_Icon_Dragon-Skeleton {
   background-image: url(spritesmith-main-9.png);
-  background-position: -246px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Dragon-Spooky {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -328px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Dragon-White {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -410px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Dragon-Zombie {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -492px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Base {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -574px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-CottonCandyBlue {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -656px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-CottonCandyPink {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -738px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Desert {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -820px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Golden {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -902px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Red {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -984px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Shade {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1066px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Skeleton {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1148px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-White {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1230px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Egg-Zombie {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1312px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Base {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1394px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-CottonCandyBlue {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1476px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-CottonCandyPink {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1558px -1552px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Desert {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Golden {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Peppermint {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Red {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Shade {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Skeleton {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Spooky {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -600px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-White {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -700px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_FlyingPig-Zombie {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -800px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Fox-Base {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -900px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Fox-CottonCandyBlue {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -1000px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Fox-CottonCandyPink {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -1100px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Fox-Desert {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -1200px;
-  width: 81px;
-  height: 99px;
-}
-.Mount_Icon_Fox-Golden {
-  background-image: url(spritesmith-main-9.png);
-  background-position: -1698px -1300px;
+  background-position: -1722px -700px;
   width: 81px;
   height: 99px;
 }
diff --git a/common/dist/sprites/spritesmith-main-9.png b/common/dist/sprites/spritesmith-main-9.png
index 718d501985..e55b76601c 100644
Binary files a/common/dist/sprites/spritesmith-main-9.png and b/common/dist/sprites/spritesmith-main-9.png differ
diff --git a/common/img/sprites/spritesmith/achievements/achievement-partyOn.png b/common/img/sprites/spritesmith/achievements/achievement-partyOn.png
new file mode 100644
index 0000000000..d3362c6fcd
Binary files /dev/null and b/common/img/sprites/spritesmith/achievements/achievement-partyOn.png differ
diff --git a/common/img/sprites/spritesmith/achievements/achievement-partyOn2x.png b/common/img/sprites/spritesmith/achievements/achievement-partyOn2x.png
new file mode 100644
index 0000000000..ca224b2e7e
Binary files /dev/null and b/common/img/sprites/spritesmith/achievements/achievement-partyOn2x.png differ
diff --git a/common/img/sprites/spritesmith/achievements/achievement-partyUp.png b/common/img/sprites/spritesmith/achievements/achievement-partyUp.png
new file mode 100644
index 0000000000..7918337362
Binary files /dev/null and b/common/img/sprites/spritesmith/achievements/achievement-partyUp.png differ
diff --git a/common/img/sprites/spritesmith/achievements/achievement-partyUp2x.png b/common/img/sprites/spritesmith/achievements/achievement-partyUp2x.png
new file mode 100644
index 0000000000..799764a565
Binary files /dev/null and b/common/img/sprites/spritesmith/achievements/achievement-partyUp2x.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Healer.png
new file mode 100644
index 0000000000..2a406cf8de
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Mage.png
new file mode 100644
index 0000000000..907b3dcdc3
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Rogue.png
new file mode 100644
index 0000000000..4f0e5c57a8
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Warrior.png
new file mode 100644
index 0000000000..93b89f2ba2
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/broad_armor_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Healer.png
new file mode 100644
index 0000000000..9234ebcc1f
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Mage.png
new file mode 100644
index 0000000000..ef764e2302
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Rogue.png
new file mode 100644
index 0000000000..80e047c35d
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Warrior.png
new file mode 100644
index 0000000000..f46b92ada1
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/headAccessory_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Healer.png
new file mode 100644
index 0000000000..9caaaf84df
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Mage.png
new file mode 100644
index 0000000000..77b617977a
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Rogue.png
new file mode 100644
index 0000000000..ca6c35c8ca
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Warrior.png
new file mode 100644
index 0000000000..3bb9b02517
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/head_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Healer.png
new file mode 100644
index 0000000000..0004b8a840
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Rogue.png
new file mode 100644
index 0000000000..088bac77b5
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Warrior.png
new file mode 100644
index 0000000000..2220d2456b
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shield_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Healer.png
new file mode 100644
index 0000000000..f9b344c4cb
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Mage.png
new file mode 100644
index 0000000000..5c121d34af
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Rogue.png
new file mode 100644
index 0000000000..0dd4b64a46
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Warrior.png
new file mode 100644
index 0000000000..88900901a4
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_armor_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Healer.png
new file mode 100644
index 0000000000..be7e60f7a9
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Mage.png
new file mode 100644
index 0000000000..5eb67f884e
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Rogue.png
new file mode 100644
index 0000000000..64b3e8022f
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Warrior.png
new file mode 100644
index 0000000000..bcc95bfd32
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_headAccessory_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Healer.png
new file mode 100644
index 0000000000..9e83074181
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Mage.png
new file mode 100644
index 0000000000..fb5e474290
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Rogue.png
new file mode 100644
index 0000000000..ef4a2c5d20
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Warrior.png
new file mode 100644
index 0000000000..6d7fa58fc0
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_head_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Healer.png
new file mode 100644
index 0000000000..8929e46787
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Rogue.png
new file mode 100644
index 0000000000..d9119cfc51
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Warrior.png
new file mode 100644
index 0000000000..640cf5b420
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_shield_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Healer.png
new file mode 100644
index 0000000000..b2d95372c5
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Mage.png
new file mode 100644
index 0000000000..2255e86079
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Rogue.png
new file mode 100644
index 0000000000..8dc95951b5
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Warrior.png
new file mode 100644
index 0000000000..56fc507379
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/shop/shop_weapon_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Healer.png
new file mode 100644
index 0000000000..503a33ed1c
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Mage.png
new file mode 100644
index 0000000000..c9e4e17bb5
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Rogue.png
new file mode 100644
index 0000000000..73f97ba166
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Warrior.png
new file mode 100644
index 0000000000..e3a78f818e
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/slim_armor_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Healer.png b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Healer.png
new file mode 100644
index 0000000000..385a260d7b
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Healer.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Mage.png b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Mage.png
new file mode 100644
index 0000000000..b03d07b50c
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Mage.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Rogue.png b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Rogue.png
new file mode 100644
index 0000000000..b8212d9846
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Rogue.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Warrior.png b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Warrior.png
new file mode 100644
index 0000000000..5035fc9af4
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/spring/weapon_special_spring2016Warrior.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_alex.png b/common/img/sprites/spritesmith/npcs/npc_alex.png
index e904970937..8982854041 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_alex.png and b/common/img/sprites/spritesmith/npcs/npc_alex.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_aprilFool.png b/common/img/sprites/spritesmith/npcs/npc_aprilFool.png
new file mode 100644
index 0000000000..32f1094469
Binary files /dev/null and b/common/img/sprites/spritesmith/npcs/npc_aprilFool.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png
index f6e58617a8..419496bdd0 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_bailey.png and b/common/img/sprites/spritesmith/npcs/npc_bailey.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_daniel.png b/common/img/sprites/spritesmith/npcs/npc_daniel.png
index b12dd9e254..471f751e72 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_daniel.png and b/common/img/sprites/spritesmith/npcs/npc_daniel.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_ian.png b/common/img/sprites/spritesmith/npcs/npc_ian.png
new file mode 100644
index 0000000000..86860dfa1b
Binary files /dev/null and b/common/img/sprites/spritesmith/npcs/npc_ian.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_justin.png b/common/img/sprites/spritesmith/npcs/npc_justin.png
index 08cb56f206..9365bc12c9 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_justin.png and b/common/img/sprites/spritesmith/npcs/npc_justin.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_matt.png b/common/img/sprites/spritesmith/npcs/npc_matt.png
index b643153c46..e129d6e43e 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_matt.png and b/common/img/sprites/spritesmith/npcs/npc_matt.png differ
diff --git a/common/img/sprites/spritesmith/npcs/seasonalshop_open.png b/common/img/sprites/spritesmith/npcs/seasonalshop_open.png
index 5e0ab92cb1..e1f811893e 100644
Binary files a/common/img/sprites/spritesmith/npcs/seasonalshop_open.png and b/common/img/sprites/spritesmith/npcs/seasonalshop_open.png differ
diff --git a/common/img/sprites/spritesmith_large/promo/promo_egg_mounts.png b/common/img/sprites/spritesmith_large/promo/promo_egg_mounts.png
new file mode 100644
index 0000000000..53dbb74179
Binary files /dev/null and b/common/img/sprites/spritesmith_large/promo/promo_egg_mounts.png differ
diff --git a/common/img/sprites/spritesmith_large/promo/promo_spring_classes_2016.png b/common/img/sprites/spritesmith_large/promo/promo_spring_classes_2016.png
new file mode 100644
index 0000000000..47bc52d56d
Binary files /dev/null and b/common/img/sprites/spritesmith_large/promo/promo_spring_classes_2016.png differ
diff --git a/common/locales/cs/communityguidelines.json b/common/locales/cs/communityguidelines.json
index e0ce4e9ffd..89c5147c73 100644
--- a/common/locales/cs/communityguidelines.json
+++ b/common/locales/cs/communityguidelines.json
@@ -1,19 +1,19 @@
 {
     "iAcceptCommunityGuidelines": "Souhlasím s dodržováním Zásad komunity",
     "tavernCommunityGuidelinesPlaceholder": "Přátelské upozornění: tento chat je přístupný všem věkovým kategoriím, takže prosíme, abyste tomu své chování zde přizpůsobili! Pokud máte dotazy, podívejte se Zásady komunity dole.",
-    "commGuideHeadingWelcome": "Vítej v Habitice!",
-    "commGuidePara001": "Buď zdráv dobrodruhu! Vítej v Habitice, zemi produktivity, zdravého životního stylu a sem tam řádících příšer. Jsme veselá komunita plná lidí, kteří si navzájem pomáhají a navzájem se podporují na své cestě ke zlepšení sama sebe.",
+    "commGuideHeadingWelcome": "Vítej v zemi Habitica!",
+    "commGuidePara001": "Buď zdráv dobrodruhu! Vítej ve světě Habitica, zemi produktivity, zdravého životního stylu a sem tam řádících příšer. Jsme veselá komunita plná lidí, kteří si navzájem pomáhají a navzájem se podporují na své cestě ke zlepšení sama sebe.",
     "commGuidePara002": "Aby byli všichni v komunitě šťastní, v bezpečí a produktivní, máme tu nějaké zásady. Připravili jsme je pečlivě tak, aby byly co nejpřátelštější a jednoduché na čtení. Prosím, čtěte je se stejnou pečlivou s jakou jsme je napsali.",
     "commGuidePara003": "Tato pravidla platí pro všechny naše sociální stránky včetně (ale nejen) Trello, GitHub, Transifex, a Wikia (neboli wiki). Někdy nastanou nečekané situace jako nějaký konflikt nebo zákeřný nekromancr. Když taková situace nastane, moderátoři moou změnit tyto zásady, aby ochránili komunity před novými hrozbami. Avšak neboj se: vždy tě na změny upozorníme prostřednictvím Baileyho.",
     "commGuidePara004": "Připrav si svitek a brk na poznámky a začněme!",
     "commGuideHeadingBeing": "Být Habiťanem",
-    "commGuidePara005": "Habitika je stránka věnována především zlepšování. Díky tomu se na nás usmálo štěstí a přitáhli jsme ty nejmilejší, nejsrdečnější, nejzdvořilejší a podporující komunity na internetu. Je spousta vlastností, kterými Habiťané disponují. Některé nejčastější a nejzajímavější jsou:",
+    "commGuidePara005": "Program Habitica je stránka věnována především zlepšování. Díky tomu se na nás usmálo štěstí a přitáhli jsme ty nejmilejší, nejsrdečnější, nejzdvořilejší a podporující komunity na internetu. Je spousta vlastností, kterými Habiťané disponují. Některé nejčastější a nejzajímavější jsou:",
     "commGuideList01A": "<strong>Ochotný duch.</strong> Spousta lidí obětuje čas a energii na pomoc novým členům komunity a učit je. Například Cech nováčků je cech zaměřený pouze na poskytování odpovědí. Pokud si myslíš, že bys mohl být nápomocen, nestyď se a pomož!",
     "commGuideList01B": "<strong>Svědomitý přístup..</strong> Habiťané tvrdě dřou na zlepšení svých životů, ale také pomáhají stavět tuhle stránku a zlepšovat jí. Jsem open-source projekt a tak neustále pracujeme na vylepšení stránky, aby byla tím nejlepším místem.",
     "commGuideList01C": "<strong>Podporující chování.</strong> Habiťané si navzájem fandí, radují se z úspěchů svých i z úspěchů druhých a navzájem si pomáhají v těžkých chvílích. Sdílíme sílu, spoléháme na sebe a učíme se od sebe navzájem. V družinách se podporujeme kouzly, na chatech se podporujeme laskavými slovy a slovy podpory.",
     "commGuideList01D": "<strong>Respekt.</strong> Každý pocházíme odjinud, máme jiné schopnosti a jiné názory. A díky tomu je naše komunita ak skvělá! Habiťané respektují tyto rozdíly a oslavují je. Chvilku se zdrž a za brzo budeš mít spoustu přátel z různých koutů světa.",
     "commGuideHeadingMeet": "Poznejte moderátory!",
-    "commGuidePara006": "Habitika má několik neúnavných rytířů, kteří spojili své síly se zaměstnanci aby udrželi tuto komunitu v klidu, spokojenou a bez trolů. Každý z nich má specifickou doménu, ale mohou být povoláni do služby v jiných sociálních sférách. Zaměstnanci a Moderátoři obvykle začnou oficiální oznámení slovy \"Mod hovoří\" nebo \"S Mod kloboukem\".",
+    "commGuidePara006": "Země Habitica má několik neúnavných rytířů, kteří spojili své síly se zaměstnanci aby udrželi tuto komunitu v klidu, spokojenou a bez trollů. Každý z nich má specifickou doménu, ale mohou být povoláni do služby v jiných sociálních sférách. Zaměstnanci a Moderátoři obvykle začnou oficiální oznámení slovy \"Mod hovoří\" nebo \"S Mod kloboukem\".",
     "commGuidePara007": "Zaměstanci mají fialové štítky s korunami. Jejich titul je \"hrdinný\".",
     "commGuidePara008": "Moderátoři mají tmavě modré štítky s hvězdičkami. jejich titul je \"Ochránce\". jedinou výjimkou je Bailey, který jako NPC má černý a zelený štítek s hvězdou.",
     "commGuidePara009": "Současní zaměstnanci jsou (zleva doprava):",
@@ -26,12 +26,12 @@
     "commGuidePara011c": "na Wikia",
     "commGuidePara011d": "na GitHub",
     "commGuidePara012": "Pokud máte problém s nějakým konkrétním moderátorem, prosíme, pošlete email Lemoness(<a href=\"mailto:leslie@habitica.com\">leslie@habitica</a>)",
-    "commGuidePara013": "V komunitě, jakou je Habitika, uživatelé přicházejí a odcházejí a někdy si i moderátor potřebuje odpočinout. Následující moderátoři jsou již vysloužilí moderátoři, kteří tu již aktivně nepůsobí, přesto bychom ale chtěli uctít jejich práci!",
+    "commGuidePara013": "V komunitě, jakou je země Habitica, uživatelé přicházejí a odcházejí a někdy si i moderátor potřebuje odpočinout. Následující moderátoři jsou již vysloužilí moderátoři, kteří tu již aktivně nepůsobí, přesto bychom ale chtěli uctít jejich práci!",
     "commGuidePara014": "Vysloužilí moderátoři:",
-    "commGuideHeadingPublicSpaces": "Veřejné prostory v Habitice:",
-    "commGuidePara015": "Habitika má dva druhy sociálního prostoru: veřejný a soukromý. Veřejný prostor zahrnuje Krčmu, veřejné cechy, GitHub, Trello a Wiki. Soukromý prostor jsou soukromé cechy. chat v družině a soukromé zprávy.",
-    "commGuidePara016": "Při pohybu ve veřejných prostorách v Habitice platí některá obecná pravidla, díky kterým jsou všichni v bezpečí a šťastní. Tato pravidla by měla pro dobrodruhy, jako jsi ty, snadná!",
-    "commGuidePara017": "<strong>Respektujte se navzájem.</strong> Buď ohleduplný, laskavý, přátelský a nápomocný. Pamatuj: Habiťané pochází z různých koutů světa a mají velice odlišné zkušenosti. To dělá Habitiku tak skvělou! Budování komunity znamená respektovat a oslavovat rozdíly stejně jako podobnosti. Zde jsou snadné způsoby jak se navzájem respektovat:",
+    "commGuideHeadingPublicSpaces": "Veřejné prostory v zemi Habitica:",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
+    "commGuidePara016": "Při pohybu ve veřejných prostorách země Habitica platí některá obecná pravidla, díky kterým jsou všichni v bezpečí a šťastní. Tato pravidla by měla pro dobrodruhy, jako jsi ty, snadná!",
+    "commGuidePara017": "<strong>Respektujte se navzájem.</strong> Buď ohleduplný, laskavý, přátelský a nápomocný. Pamatuj: Habiťané pochází z různých koutů světa a mají velice odlišné zkušenosti. To dělá zemi Habitica tak skvělou! Budování komunity znamená respektovat a oslavovat rozdíly stejně jako podobnosti. Zde jsou snadné způsoby jak se navzájem respektovat:",
     "commGuideList02A": "<strong>Řiď se všemi pravidly a podmínkami.</strong>",
     "commGuideList02B": "<strong> Neuveřejňuj obrázky či text, který je násilnický, výhružný, sexuálně explicitní/vyzývavý, nebo který podporuje diskriminaci, předsudky, rasismus, sexismus, nenávist, obtěžování nebo nabádá k napadání skupiny či jedince.</strong> A to ani jen ze srandy. To znamená žádné urážky a tvrzení. Ne každý má stejný smysl pro humor jako ty, a tak něco, co může být vtipem pro jedny, může být urážlivé pro jiné. Zaútoč na své úkoly, ne na ostatní uživatele.",
     "commGuideList02C": "<strong>Zachovej diskuze přístupné pro všechny věkové kategorie.</strong> Máme tu spoustu mladých Habiťanů! Nechceme přeci zkazit žádné nevinné Habiťany a odradit je od dosažení jejich cílů.",
@@ -40,27 +40,27 @@
     "commGuideList02F": "<strong>Okamžitě se podřiď jakémukoliv požadavku moderátorů</strong> na přerušení konverzace nebo její přesunutí do Zadního koutku. Poslední slova, rozdílné názory a odpálkování by se měla odehrát (zdvořile) u vašeho \"stolu\" v Zadním koutku, pokud to bude dovoleno.",
     "commGuideList02G": "<strong>Raději si nech chvilku na vychladnutí než odpovídat v afektu</strong> pokud ti někdo řekne, že něco, co jsi řekl, či udělal, jim bylo nepříjemné. V umění upřímně se někomu omluvit je velká síla. Pokud si myslíš, že způsob, kterým ti někdo odpověděl, byl nepřiměřený, kontaktuj moderátora než abys toho dotyčného veřejně konfrontoval.",
     "commGuideList02H": "<strong>Rozporuplné či kontroverzní diskuze by měly být hlášeny moderátorům.</strong> Pokud si myslíš, že konverzace začíná být napjatá, příliš emocionální, nebo může někomu ublížit, přestaň se v ní angažovat. Místo toho pošli email na <a href=\"mailto:leslie@habitica.com\">leslie@habitica</a> a nahlaš nám to. Je naší prací tě ochránit.",
-    "commGuideList02I": "<strong>Nespamujte.</strong> Spam může obsahovat: postování stejného komentáře na několik míst, postování linků bez vysvětlení nebo kontextu, postování nesmyslných zpráv, nebo postování mnoha zpráv za sebou. Opakované žadonění o drahokamy nebo předplatné také bude považováno za spam.",
-    "commGuidePara019": "<strong>V soukromých prostorách,</strong> mají uživatelé více svobody povídat si o čem chtějí, ale i tak mohou porušovat Pravidla a podmínky, včetně uveřejňování jakéhokoliv diskriminujícího, násilného nebo urážlivého obsahu.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Soukromé zprávy (SZ) mají další zásady. Pokud tě někdo zablokoval, nekontaktuj je jinak aby tě odblokoval. Dále, neměl bys posílat soukromé zprávy někomu, kdo žádá o pomoc (veřejné odpovědi na žádosti o pomoc mohou pomoc i jiným v komunitě). Nakonec, neposílej nikomu soukromé zprávy, ve kterých žadoníš o drahokamy nebo předplatné, jelikož by to mohlo být považováno za spam.",
-    "commGuidePara021": "Navíc některé veřejné prostory v Habitice mají další pravidla.",
+    "commGuidePara021": "Navíc některé veřejné prostory v zemi Habitica mají další pravidla.",
     "commGuideHeadingTavern": "Krčma",
-    "commGuidePara022": "Krčma je hlavním bodem v Habitice, kde se lidé socializují. Barman Daniel udržuje tohle místo čisté jako klícka a Lemoness vám ráda namíchá nějakou limču zatímco si vesele povídáte. Musíš si však pamatovat, že...",
+    "commGuidePara022": "Krčma je hlavním bodem v zemi Habitica, kde se lidé socializují. Barman Daniel udržuje tohle místo čisté jako klícka a Lemoness vám ráda namíchá nějakou limču zatímco si vesele povídáte. Musíš si však pamatovat, že...",
     "commGuidePara023": "Konverzace se většinou točí kolem tipů na zlepšení a jen tak povídání.",
     "commGuidePara024": "Protože se v krčme zobrazuje pouze 200 vzkazů,<strong> není dobrý místem na zdlouhavé diskuze, převážně na citlivá témata</strong> (např. politika, náboženství, deprese, zda-li by měl být hon na gobliny zakázán, atd) Tyto konverzace by měly probíhat v přislušných ceších v Zadním koutku (více informací najdeš níže).",
-    "commGuidePara027": "<strong>Nerozebírej v krčmě nic návykového. </strong>Spousta lidí používá Habitiku aby se svých špatných návyků zbavila. Slyšet, jak jsi o tom lidé povídají by pro ně mohlo být těžké. Respektuj své spoluhabiťany v krčmě a vezmi tohle v úvahu. To zahrnuje kouření, alkohol,  pornografii, karban, nebo užívání zakázaných látek.",
+    "commGuidePara027": "<strong>Nerozebírej v krčmě nic návykového. </strong>V zemi Habitica je spousta lidí proto, aby se svých špatných návyků zbavila. Slyšet, jak jsi o tom lidé povídají by pro ně mohlo být těžké. Respektuj své spoluhabiťany v krčmě a vezmi tohle v úvahu. To zahrnuje kouření, alkohol,  pornografii, karban, nebo užívání zakázaných látek.",
     "commGuideHeadingPublicGuilds": "Veřejné cechy",
     "commGuidePara029": "<strong>Veřejné cechy jsou hodně jako krčma, akorát místo obecných diskuzí se v nich mluví na specifické téma.</strong> Chat ve veřejném cechu by se měl soustředit na téma. Například, členové cechu řečníků se asi nebudou bavit o zahradničení, a cech přemožitelů draků asi nebude mít zájem o luštění starých run. Některé cechy jsou laxnější než jiné, ale i tak, <strong>drž se tématu!</strong>",
     "commGuidePara031": "<strong>Některé veřejné cechy budou obsahovat citlivá témata jako je deprese, náboženství, politika, atd.</strong> To je v pořádku pokud konverzace neporušují Pravidla a podmínky nebo Pravidla veřejných prostor a pokud budou k tématu.",
-    "commGuidePara033": "<strong>Veřejné cechy by NEMĚLY obsahovat obsah pro starší 18 let. Pokud mají v úmyslu často diskutovat o citlivých tématech, musí to být uvedeno v názvu cechu.</strong> Toto opatření existuje aby byli všichni v Habitice v bezpečí a aby se tu všichni cítili dobře. Pokud by takový cech obsahoval jiné druhy citlivých témat, bylo by slušné ostatní Habiťany varovat (např. \"Varování: diskuze je o sebepoškozování\"). Navíc by mělo být citlivé téma relevantní k cechu - začít mluvit o sebepoškozování v cechu o depresi se může zdát jako dobrý nápad, ale už nemusí být správných rozhodnutí v cechu o muzice. Pokud uvidíš, jak tohle pravidlo někdo neustále poškozuje, prosím, pošli nám email na <a href=\"mailto:leslie@habitica.com\">leslie@habitica</a> i se screenshoty.",
+    "commGuidePara033": "<strong>Veřejné cechy by NEMĚLY obsahovat obsah pro starší 18 let. Pokud mají v úmyslu často diskutovat o citlivých tématech, musí to být uvedeno v názvu cechu.</strong> Toto opatření existuje aby byli všichni v zemi Habitica v bezpečí a aby se tu všichni cítili dobře. Pokud by takový cech obsahoval jiné druhy citlivých témat, bylo by slušné ostatní Habiťany varovat (např. \"Varování: diskuze je o sebepoškozování\"). Navíc by mělo být citlivé téma relevantní k cechu - začít mluvit o sebepoškozování v cechu o depresi se může zdát jako dobrý nápad, ale už nemusí být správných rozhodnutí v cechu o muzice. Pokud uvidíš, jak tohle pravidlo někdo neustále poškozuje, prosím, pošli nám email na <a href=\"mailto:leslie@habitica.com\">leslie@habitica</a> i se screenshoty.",
     "commGuidePara035": "<strong>Žádný cech, ať už veřejný nebo soukromý by neměl být založen za účelem útoku na skupinu nebo jednotlivce. Vytvoření takového cechu je důvodem k okamžitému banu.</strong> Bojuj proti špatným návykům, nebo proti dalším dobrodruhům!",
     "commGuidePara037": "Všechny výzvy v krčmě a výzvy veřejných cechů se musí těmito pravidly řídit také.",
     "commGuideHeadingBackCorner": "Zadní koutek",
     "commGuidePara038": "<strong>Někdy se konverzace může táhnou, může být mimo téma, citlivá natolik, aby se v ní už nemohlo pokračovat ve veřejném prostoru aniž by nebyla někomu nepříjemná. V takovém případě by se měla konverzace přesunout do cechu Zadního koutku. Přemístění do Zadního koutku není v žádném případě trest!</strong> Naopak, Habiťané tam rádi chodí vést dlouhé diskuze.",
     "commGuidePara039": "Cech Zadního koutku je bezplatný veřejný prostor pro diskuzi citlivých témat, či pro dlouhé konverzace, a je pečlivě moderována. <strong>Stále tu platí pravidla pro veřejné prostory a Pravidla a podmínky.</strong> Jen protože máme dlouhé kabáty a držíme se v koutě neznamená, že pravidla neplatí! A teď mi podej tu doutnající svíčku, prosím.",
     "commGuideHeadingTrello": "Trello fóra",
-    "commGuidePara040": "<strong>Trello je otevřené fórum pro návrhy a pro diskuze funkcí stránky.</strong> Habitice vládnou lidé ve formě udatných přispěvatelů - my všichni budujeme tuto stránku společně. Trello je systém, který nám dává řád v chaosu. Tak tedy prosíme <strong>snaž se sepsat všechny své myšlenky do jednoho komentáře místo několik komentářů na jedné kartě. Pokud vymyslíš něco nového, můžeš svůj komentář kdykoliv upravit.</strong> Prosím, slituj se nad námi. S každým komentářem dostaneme upozornění a naše inboxy praskají ve švech.",
-    "commGuidePara041": "Habitika používá pět různých Trello fór:",
+    "commGuidePara040": "<strong>Trello je otevřené fórum pro návrhy a pro diskuze funkcí stránky.</strong> Zemi Habitica vládnou lidé ve formě udatných přispěvatelů - my všichni budujeme tuto stránku společně. Trello je systém, který nám dává řád v chaosu. Tak tedy prosíme <strong>snaž se sepsat všechny své myšlenky do jednoho komentáře místo několik komentářů na jedné kartě. Pokud vymyslíš něco nového, můžeš svůj komentář kdykoliv upravit.</strong> Prosím, slituj se nad námi. S každým komentářem dostaneme upozornění a naše inboxy praskají ve švech.",
+    "commGuidePara041": "Program Habitica používá pět různých Trello fór:",
     "commGuideList03A": "<strong>Hlavní fórum</strong> je místo pro požadavky  a kde se hlasuje o nových funkcích.",
     "commGuideList03B": "<strong>Mobilní fórum</strong> je místo pro požadavky a kde se hlasuje o nových funkcích pro aplikace pro mobily.",
     "commGuideList03C": "<strong>Pixel Art fórum</strong> je místo, kde se diskutuje o pixel obrázcích a kam je můžeš posílat.",
@@ -68,12 +68,12 @@
     "commGuideList03E": "<strong>Wiki fórum</strong> je místo pro zlepšení, požadavky a diskuzi o novém obsahu wiki.",
     "commGuidePara042": "<strong>Všechny mají svá vlastní pravidla a platí v nich i pravidla pro veřejné prostory.</strong> Uživatelé by se měli vyvarovat konverzací mimo téma ve všech fórech a na všech kartách. Věř nám, že fóra jsou už takhle hodně plná! Zdlouhavé konverzace by měly být přesunuty to cechu Zadního koutku.",
     "commGuideHeadingGitHub": "GitHub",
-    "commGuidePara043": "<strong>Habitika používá ke sledování chyb a ke zlepšování kódu GitHub.</strong> Je to kovárna, kde neúnavní kováři kují vylepšení! <strong>Platí zde všechna pravidla pro veřejný prostor.</strong> Buď ke kovářům zdvořilý - dá to hodně práce starta se o tuhle stránku! Hurá kovářům!",
-    "commGuidePara044": "Následující uživatelé jsou členy Habitika repo:",
+    "commGuidePara043": "<strong>Program Habitica používá ke sledování chyb a ke zlepšování kódu GitHub.</strong> Je to kovárna, kde neúnavní kováři kují vylepšení! <strong>Platí zde všechna pravidla pro veřejný prostor.</strong> Buď ke kovářům zdvořilý - dá to hodně práce starta se o tuhle stránku! Hurá kovářům!",
+    "commGuidePara044": "Následující uživatelé jsou členy Habitica repo:",
     "commGuideHeadingWiki": "Wiki",
-    "commGuidePara045": "<strong>Wiki Habitiky shromažďuje informace o stránce.</strong> Také obsahuje několik fór podobných cechům na Habitica. A proto tam platí pravidla pro veřejné prostory.",
-    "commGuidePara046": "Wiki Habitiky může být považována za databázi všeho na Habitica. Poskytuje informace o vlastnostech stránky, návody na hru, tipy jak můžeš Habitica přispět a také poskytuje místo pro zviditelnění tvých cechů či družin a pro hlasování o tématech.",
-    "commGuidePara047": "Protože wiki se nachází na Wikii, platí zde nejen pravidla Habitiky, ale i pravidla Wikie.",
+    "commGuidePara045": "<strong>Wiki země Habitica shromažďuje informace o stránce.</strong> Také obsahuje několik fór podobných cechům v zemi Habitica. A proto tam platí pravidla pro veřejné prostory.",
+    "commGuidePara046": "Wiki země Habitica může být považována za databázi všeho v zemi Habitica. Poskytuje informace o vlastnostech stránky, návody na hru, tipy jak můžeš Habitica přispět a také poskytuje místo pro zviditelnění tvých cechů či družin a pro hlasování o tématech.",
+    "commGuidePara047": "Protože wiki se nachází na Wikii, platí zde nejen pravidla země Habitica, ale i pravidla Wikie.",
     "commGuidePara048": "Wiki je výhradně kolaborací mezi všemi editory, tak mohou platit další pravidla:",
     "commGuideList04A": "Požadavky na nové stránky nebo velké změny na Wiki Trello fóru",
     "commGuideList04B": "Být otevřený o svém návrhu na změnu",
@@ -87,7 +87,7 @@
     "commGuidePara018": "Vysloužilí administrátoři wiki jsou",
     "commGuideHeadingInfractionsEtc": "Porušení, důsledky a náprava",
     "commGuideHeadingInfractions": "Porušení",
-    "commGuidePara050": "Habiťané si pomáhají, respektují se a udržují komunitu zábavnou a přátelskou. Avšak, jednou za čas, něco, co některý Habiťan udělá, může porušovat jedno z uvedených pravidel. Když se to stane, moderátoři zakročí jak uznají za vhodné aby Habitiku ochránili.",
+    "commGuidePara050": "Habiťané si pomáhají, respektují se a udržují komunitu zábavnou a přátelskou. Avšak, jednou za čas, něco, co některý Habiťan udělá, může porušovat jedno z uvedených pravidel. Když se to stane, moderátoři zakročí jak uznají za vhodné aby zemi Habitica ochránili.",
     "commGuidePara051": "<strong>Je několik druhů porušení a je proti nim zakročeno v závislosti na jejich závažnosti.</strong> Toto nejsou úplné seznamy a moderátoři mají omezené pravomoci. Moderátoři vezmou v úvahu kontext při zvažování porušení.",
     "commGuideHeadingSevereInfractions": "Závažná porušení",
     "commGuidePara052": "Závažná porušení závažně narušují bezpečí komunity Habiťánů a uživatelů a proto mají závažné důsledky.",
@@ -111,7 +111,7 @@
     "commGuideList07A": "První porušení pravidel veřejného prostoru",
     "commGuideList07B": "Jakékoliv tvrzení, na které se reaguje slovy \"Prosím, ne\". Pokud moderátor musí uživateli říct \"Prosím, nedělej to\", může se to počítat jako lehčí porušení pro toho uživatele. Příkladem může být \"Moderátor hovoří: Prosím, nepodporujte tenhle nápad na zlepšovák poté, co jsme ti řekli, že to není proveditelné.\" V mnoha případech bude to Prosím, ne tím lehčím důsledkem, ale pokud moderátoři musí říct \"Prosím, ne\" stejnému uživateli několikrát, začne se to počítat jako závažnější porušení.",
     "commGuideHeadingConsequences": "Důsledky",
-    "commGuidePara058": "V Habitice - stejně jako v reálném životě - každý čin má svůj důsledek, ať je to lepší forma po cvičení, kazy po jezení hodně cukru, nebo dobrá známka z testu, protože jsi studoval.",
+    "commGuidePara058": "V zemi Habitica - stejně jako v reálném životě - každý čin má svůj důsledek, ať je to lepší forma po cvičení, kazy po jezení hodně cukru, nebo dobrá známka z testu, protože jsi studoval.",
     "commGuidePara059": "<strong>Stejně tak každé porušení má přímé důsledky.</strong> Některé důsledky jsou uvedeny dole.",
     "commGuidePara060": "Pokud tvé porušení je závažnějšího charakteru, obdržíš email, ve kterém bude vysvětleno:",
     "commGuideList08A": "jaké bylo tvé porušení",
@@ -135,10 +135,10 @@
     "commGuideList11D": "Vymazání (moderátoři/zaměstnanci mohou mazat problémový obsah)",
     "commGuideList11E": "Změny (moderátoři/zaměstnanci mohou měnit problémový obsah)",
     "commGuideHeadingRestoration": "Obnovení",
-    "commGuidePara061": "Habitika je země zasvěcená sebezlepšování a věříme ve druhé šance. <strong>Pokud spácháš přestupek a bude to pro tebe mít důsledky, dívej se na to jako na šanci zhodnotit své činy a šanci stát se lepším členem komunity.</strong>",
+    "commGuidePara061": "Habitica je země zasvěcená sebezlepšování a věříme ve druhé šance. <strong>Pokud spácháš přestupek a bude to pro tebe mít důsledky, dívej se na to jako na šanci zhodnotit své činy a šanci stát se lepším členem komunity.</strong>",
     "commGuidePara062": "Email, který ti byl zaslán, ve kterém vysvětlujeme důsledky tvých činů (nebo, v případě lehčích přestupků, oznámení moderátora/zaměstnance) je dobrým zdrojem informací. <strong>Spolupracuj s omezeními, které na tebe byli uvaleny a snaž se dosáhnout podmínek, abys jich byl zbaven.</strong>",
     "commGuidePara063": "<strong>Pokud nerozumíš důsledkům nebo svému přestupku, požádej zaměstnance/moderátory</strong> o rady, aby ses mohl přestupkům v budoucnosti vyhnout.",
-    "commGuideHeadingContributing": "Přispět Habitice",
+    "commGuideHeadingContributing": "Přispět programu Habitica",
     "commGuidePara064": "Habitica je open-source  projekt, což znamená že kterýkoliv z Habiťanů může přispět! Ti, kteří přispějí, budou odměněni následujícími stupni přispěvatelů:",
     "commGuideList12A": "Odznak přispěvatele Habit RPG, plus 3 drahokamy",
     "commGuideList12B": "Přispěvatelské brnění, plus 3 drahokamy",
diff --git a/common/locales/cs/content.json b/common/locales/cs/content.json
index 495fc2c21b..e27d9e1cbe 100644
--- a/common/locales/cs/content.json
+++ b/common/locales/cs/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "pichlavý",
     "dropEggBearCubText": "medvídek",
     "dropEggBearCubMountText": "medvěd",
-    "dropEggBearCubAdjective": "mazlivý",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "gryf",
     "questEggGryphonMountText": "gryf",
     "questEggGryphonAdjective": "hrdý",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "pestrý",
     "questEggRatText": "myšák",
     "questEggRatMountText": "myšák",
-    "questEggRatAdjective": "špinavý",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "chobotničák",
     "questEggOctopusMountText": "chobotničák",
     "questEggOctopusAdjective": "kluzký",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Najdi líhnoucí lektvar, nalij ho na vejce a to se vylíhne v <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Základní",
     "hatchingPotionWhite": "Bílý",
diff --git a/common/locales/cs/gear.json b/common/locales/cs/gear.json
index 3fbb2cd685..c28461bd60 100644
--- a/common/locales/cs/gear.json
+++ b/common/locales/cs/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "zbraň",
     "weaponBase0Text": "Žádná zbraň",
     "weaponBase0Notes": "Žádná zbraň",
@@ -360,7 +361,7 @@
     "armorArmoireShepherdRobesText": "Oděv pastýře",
     "armorArmoireShepherdRobesNotes": "Látka je chladivá a prodyšná, perfektní pro horký den pasení gryfů v poušti. Zvyšuje Sílu a Vnímání o <%= attrs %> každé. Začarovaná almara: Set pastýře (předmět 2 ze 3).",
     "armorArmoireRoyalRobesText": "Královský oděv",
-    "armorArmoireRoyalRobesNotes": "Skvělý vládce, vládni celý den! Zvyšuje Obranu, Inteligenci a Vnímání o <%= aatrs %> každé. Začarovaná almara: Královský set (předmět 3 ze 3)",
+    "armorArmoireRoyalRobesNotes": "Skvělý vládce, vládni celý den! Zvyšuje Obranu, Inteligenci a Vnímání o <%= attrs %> každé. Začarovaná almara: Královský set (předmět 3 ze 3)",
     "armorArmoireCrystalCrescentRobesText": "Oděv křišťálového půlměsíce",
     "armorArmoireCrystalCrescentRobesNotes": "Tento magický oděv světélkuje ve tmě. Zvyšuje Obranu a Vnímání o <%= attrs %> každé. Začarovaná almara: Set křišťálového půlměsíce (předmět 2 ze 3).",
     "armorArmoireDragonTamerArmorText": "Zbroj krotitele draků",
diff --git a/common/locales/cs/generic.json b/common/locales/cs/generic.json
index f5ccfd1eef..f4d309c2c6 100644
--- a/common/locales/cs/generic.json
+++ b/common/locales/cs/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Díky plnění úkolů se mi vylíhl nový mazlíček!",
     "raisePetShare": "Mazlíček mi vyrostl v silné zvíře, protože jsem svědomitě plnil úkoly!",
     "wonChallengeShare": "V Habitica jsem vyhrál výzvu!",
-    "achievementShare": "Získal jsem v zemi Habitica nové ocenění!"
+    "achievementShare": "Získal jsem v zemi Habitica nové ocenění!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/cs/groups.json b/common/locales/cs/groups.json
index bb74fcf980..d68cf6e504 100644
--- a/common/locales/cs/groups.json
+++ b/common/locales/cs/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Chat tvé družiny je prázdný! Napiš zprávu do okna nahoře a začni si povídat.",
     "guildChatEmpty": "Chat této družiny je prázdný! Napiš zprávu do okna nahoře a začni si povídat.",
     "possessiveParty": "Družina <%= name %>",
-    "requestAcceptGuidelines": "Pokud chceš přidávat zprávy v Krčmě nebo v chatu v  jakékoliv družině nebo cechu, prosíme, nejprve si přečti <%= linkStart %>Zásady komunity<%= linkEnd %> a poté klikni na tlačítko níže na znamení, že jim rozumíš."
+    "requestAcceptGuidelines": "Pokud chceš přidávat zprávy v Krčmě nebo v chatu v  jakékoliv družině nebo cechu, prosíme, nejprve si přečti <%= linkStart %>Zásady komunity<%= linkEnd %> a poté klikni na tlačítko níže na znamení, že jim rozumíš.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/cs/questscontent.json b/common/locales/cs/questscontent.json
index 030f4d0a88..7bb64b126b 100644
--- a/common/locales/cs/questscontent.json
+++ b/common/locales/cs/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/da/backgrounds.json b/common/locales/da/backgrounds.json
index bcff8c09a0..bd492e7ad9 100644
--- a/common/locales/da/backgrounds.json
+++ b/common/locales/da/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Læs i det hyggelige bibliotek.",
     "backgroundGrandStaircaseText": "Hovedtrappen",
     "backgroundGrandStaircaseNotes": "Bevæg dig ned af hovedtrappen.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "SÆT 22: Udgivet marts 2016",
+    "backgroundDeepMineText": "Dyb mine",
+    "backgroundDeepMineNotes": "Find dyrebare metaller i en dyb mine",
+    "backgroundRainforestText": "Regnskov",
+    "backgroundRainforestNotes": "Vov dig ind i en regnskov.",
+    "backgroundStoneCircleText": "Cirkel af sten",
+    "backgroundStoneCircleNotes": "Kast magi i en cirkel af sten."
 }
\ No newline at end of file
diff --git a/common/locales/da/communityguidelines.json b/common/locales/da/communityguidelines.json
index c34f0e2cfc..7c4aae9440 100644
--- a/common/locales/da/communityguidelines.json
+++ b/common/locales/da/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Brugere vil komme og gå i et så stort fællesskab som Habitica, og nogen gange har en moderator brug for at lægge deres noble kappe fra sig og slappe af. De følgende er Moderatorer Emeritus. De har ikke længere moderatorrettigheder, men vi vil stadig gerne ære deres arbejde!",
     "commGuidePara014": "Moderatorer Emeritus:",
     "commGuideHeadingPublicSpaces": "Offentlige Steder i Habitica",
-    "commGuidePara015": "Habitica har to slags sociale områder: offentlige og private. Offentlige steder inkluderer Værtshuset, åbne Klaner, GitHub, Trello og Wikien. Private områder er private Klaner, Gruppechatten og Privatbeskeder.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Når du navigerer rundt i de offentlige steder af Habitica, er der nogle generelle regler for at sørge for, at alle er sikre og glade. De burde være lette for eventyrere som dig!",
     "commGuidePara017": "<strong>Respektér hinanden.</strong> Vær høflig, venlig og hjælpsom. Husk: Habitikanere kommer alle fra forskellige baggrunde og har haft meget forskellige oplevelser. Dette er en del det, der gør Habitica så cool! Et fællesskab bygger på respekt for og fejring af både vores forskelligheder og ligheder. Her er nogle lette måder at vise respekt for andre:",
     "commGuideList02A": "<strong>Overhold alle betingelser og vilkår.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Adlyd enhver Moderator-henstilling med det samme</strong> - enten at stoppe diskussionen eller flytte den til Det Bagerste Hjørne. Sidste ord, afskedskommentarer o.l. skal alle gives (høfligt) ved jeres \"bord\" i 'The Back Corner', hvis tilladt.",
     "commGuideList02G": "<strong>Brug tid på at reflektere i stedet for at svare i vrede</strong> hvis nogen fortæller dig, at noget du sagde eller gjorde, gjorde dem utilpas. Det er stærkere at kunne undskylde oprigtigt. Hvis du føler, at den måde de svarede dig var upassende, så kontakt en Moderator i stedet for selv at pointere det offentligt.",
     "commGuideList02H": "<strong>Kontroversielle/omstridte samtaler skal rapporteres til Moderatorer.</strong> Hvis du føler at en samtale bliver ophedet, meget følelsesladet eller sårende, stop med at deltage. I stedet send en email til <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> og fortæl os om det. Det er vores job at sørge for, at Habitica er et sikkert sted.",
-    "commGuideList02I": "<strong>Lad være med at spamme.</strong> Spam inkluderer bl.a. at sende den samme kommentar eller spørgsmål flere steder, at poste links uden forklaring eller kontekst, at poste volapyk, eller at poste mange beskeder i træk - men denne liste er ikke endelig! Gentagne gange at tigge om ædelsten eller et abonnement kan også anses som spamming.",
-    "commGuidePara019": "<strong>I private områder</strong> har brugere større frihed til at diskutere hvad end man vil, men man må stadig ikke bryde vores Betingelser og Vilkår, hvilket inkluderer diskriminerende, voldeligt eller truende indhold.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Privatbeskeder (PMs) har nogle ekstra retningslinjer. Hvis nogen har blokeret dig må du ikke kontakte dem på andre måder for at bede dem om at fjerne blokeringen. Derudover må du ikke sende PMs til andre for at bede om hjælp (fordi offentlige svar til spørgsmål om hjælp også kan hjælpe resten af fællesskabet). Sidst men ikke mindst må du ikke sende PMs til nogen for at tigge om ædelsten eller et abonnement, da dette kan anses som spamming.",
     "commGuidePara021": "Herudover har nogen offentlige steder i Habitica ekstra retningslinjer.",
     "commGuideHeadingTavern": "Værtshuset",
diff --git a/common/locales/da/content.json b/common/locales/da/content.json
index 42155dd23a..b2442460ac 100644
--- a/common/locales/da/content.json
+++ b/common/locales/da/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "en stikkende",
     "dropEggBearCubText": "Bjørneunge",
     "dropEggBearCubMountText": "Bjørn",
-    "dropEggBearCubAdjective": "en nuttet",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Grif",
     "questEggGryphonMountText": "Grif",
     "questEggGryphonAdjective": "en stolt",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "et farverigt",
     "questEggRatText": "Rotte",
     "questEggRatMountText": "Rotte",
-    "questEggRatAdjective": "en beskidt",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Blæksprutte",
     "questEggOctopusMountText": "Blæksprutte",
     "questEggOctopusAdjective": "en glat",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Abe",
     "questEggMonkeyMountText": "Abe",
     "questEggMonkeyAdjective": "en fræk",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find en udrugningseliksir til at hælde på dit æg, og det vil udklække  <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Almindelig",
     "hatchingPotionWhite": "Hvid",
diff --git a/common/locales/da/front.json b/common/locales/da/front.json
index 974c48f97c..d15c12e7e0 100644
--- a/common/locales/da/front.json
+++ b/common/locales/da/front.json
@@ -165,7 +165,7 @@
     "teams": "Teams",
     "terms": "Betingelser og Vilkår",
     "testimonialHeading": "Hvad siger andre...",
-    "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.",
+    "localStorageTryFirst": "Hvis du oplever problemer med Habitica, kan du trykker på nedenstående knap for at fjerne cookies og lokalt lager for dette websted (andre websteder vil ikke blive berørt). Du skal logge ind igen efter at have gjort dette, så vær sikker på at du kender dine loginoplysninger. Disse kan findes ved Instillinger -> <%= linkStart %>Side<%= linkEnd %>.",
     "localStorageTryNext": "Hvis problemet vedbliver, <%= linkStart %>rapporter da fejlen<%= linkEnd %>, hvis du ikke allerede har gjort det.",
     "localStorageClearing": "Rydder lokalt lager",
     "localStorageClearingExplanation": "Din browsers lokale lager bliver ryddet. Du vil blive logget ud og omdirigeret til startsiden. Vent venligst.",
diff --git a/common/locales/da/gear.json b/common/locales/da/gear.json
index b23df5d506..0dacf6f6ac 100644
--- a/common/locales/da/gear.json
+++ b/common/locales/da/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "våben",
     "weaponBase0Text": "Intet våben",
     "weaponBase0Notes": "Intet våben.",
@@ -176,7 +177,7 @@
     "weaponArmoireBarristerGavelNotes": "Order! Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Barrister Set (Item 3 of 3).",
     "weaponArmoireJesterBatonText": "Jester Baton",
     "weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
+    "weaponArmoireMiningPickaxText": "Minedrifts hakke",
     "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
     "armor": "rustning",
     "armorBase0Text": "Almindeligt tøj",
@@ -241,7 +242,7 @@
     "armorSpecialBirthdayNotes": "Tillykke med Fødselsdagen, Habitica! Brug dette Absurde Festkostume til at fejre denne skønne dag! Giver ingen bonusser.",
     "armorSpecialBirthday2015Text": "Fjollet Festkostume",
     "armorSpecialBirthday2015Notes": "Tillykke med Fødselsdagen, Habitica! Brug dette Fjollede Festkostume til at fejre denne skønne dag! Giver ingen bonusser.",
-    "armorSpecialBirthday2016Text": "Ridiculous Party Robes",
+    "armorSpecialBirthday2016Text": "Absurd festkåbe",
     "armorSpecialBirthday2016Notes": "Happy Birthday, Habitica! Wear these Ridiculous Party Robes to celebrate this wonderful day. Confers no benefit.",
     "armorSpecialGaymerxText": "Regnbuekrigers Rustning",
     "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
@@ -369,7 +370,7 @@
     "armorArmoireBarristerRobesNotes": "Very serious and stately. Increases Constitution by <%= con %>. Enchanted Armoire: Barrister Set (Item 2 of 3).",
     "armorArmoireJesterCostumeText": "Jester Costume",
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Despite the look of this costume, you are no fool. Increases Intelligence by <%= int %>. Enchanted Armoire: Jester Set (Item 2 of 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
+    "armorArmoireMinerOverallsText": "Minedrift overalls",
     "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
     "headgear": "hovedbeklædning",
     "headBase0Text": "Ingen Hjelm",
@@ -530,7 +531,7 @@
     "headMystery201512Notes": "Disse flammer brænder med ren intellekt. Giver ingen bonusser. December 2015 abonnentting.",
     "headMystery201601Text": "Helm of True Resolve",
     "headMystery201601Notes": "Stay resolute, brave champion! Confers no benefit. January 2016 Subscriber Item.",
-    "headMystery201602Text": "Heartbreaker Hood",
+    "headMystery201602Text": "Hjerteknuserhætte",
     "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
     "headMystery301404Text": "Smart Tophat",
     "headMystery301404Notes": "En smart tophat for de fineste folk! Giver ingen bonusser. Januar 3015 Abonnentting.",
@@ -576,7 +577,7 @@
     "headArmoireBarristerWigNotes": "This bouncy wig is enough to frighten away even the fiercest foe. Increases Strength by <%= str %>. Enchanted Armoire: Barrister Set (Item 1 of 3).",
     "headArmoireJesterCapText": "Jester Cap",
     "headArmoireJesterCapNotes": "The bells on this hat might distract your opponents, but they just help you focus. Increases Perception by <%= per %>. Enchanted Armoire: Jester Set (Item 1 of 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
+    "headArmoireMinerHelmetText": "Minedriftshjælm",
     "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
     "offhand": "skjoldhånds-udstyr",
     "shieldBase0Text": "Intet Skjoldhånds-udstyr",
@@ -690,7 +691,7 @@
     "backMystery201507Notes": "Surf fra Forhalingens Kaj og rid på bølgerne i Ufærdighedsbugten! Giver ingen bonusser. Juli 2015 Abonnentting.",
     "backMystery201510Text": "Goblinhale",
     "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
-    "backMystery201602Text": "Heartbreaker Cape",
+    "backMystery201602Text": "Hjerteknuserkappe",
     "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
     "backSpecialWonderconRedText": "Mægtig Kappe",
     "backSpecialWonderconRedNotes": "Rasler af styrke og skønhed. Giver ingen bonusser. Specielt Messeudstyr.",
diff --git a/common/locales/da/generic.json b/common/locales/da/generic.json
index 0dfc194ae3..b1618ef6ec 100644
--- a/common/locales/da/generic.json
+++ b/common/locales/da/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Jeg har udklækket et nyt kæledyr ved at færdiggøre opgaver i mit virkelige liv!",
     "raisePetShare": "Jeg opdrættede et kæledyr til et ridedyr ved at færdiggøre opgaver i mit virkelige liv!",
     "wonChallengeShare": "Jeg har vundet en udfordring i Habitica!",
-    "achievementShare": "Jeg har opnået en ny præstation i Habitica!"
+    "achievementShare": "Jeg har opnået en ny præstation i Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/da/groups.json b/common/locales/da/groups.json
index e8bc9b1e18..6a325656ea 100644
--- a/common/locales/da/groups.json
+++ b/common/locales/da/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Din gruppechat er tom! Skriv en besked i boksen ovenover for at begynde at chatte.",
     "guildChatEmpty": "Denne klanchat er tom! Skriv en besked i boksen ovenover for at begynde at chatte.",
     "possessiveParty": "<%= name %>s Gruppe",
-    "requestAcceptGuidelines": "Hvis du gerne vil skrive beskeder i Værtshuset, din gruppe eller en klan, skal du først læse vores <%= linkStart %>Retningslinjer for Fællesskabet<%= linkEnd %> og så klikke på knappen under for at indikere at du accepterer dem."
+    "requestAcceptGuidelines": "Hvis du gerne vil skrive beskeder i Værtshuset, din gruppe eller en klan, skal du først læse vores <%= linkStart %>Retningslinjer for Fællesskabet<%= linkEnd %> og så klikke på knappen under for at indikere at du accepterer dem.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/da/questscontent.json b/common/locales/da/questscontent.json
index ce9e28a182..2a1908c680 100644
--- a/common/locales/da/questscontent.json
+++ b/common/locales/da/questscontent.json
@@ -286,10 +286,16 @@
     "questSabretoothBoss": "Zombie Sabletandskat",
     "questSabretoothDropSabretoothEgg": "Sabeltand (Æg)",
     "questSabretoothUnlockText": "Åbner for køb af sabeltandsæg på Markedet",
-    "questMonkeyText": "Monstrous Mandrill and the Mischief Monkeys",
+    "questMonkeyText": "Uhyrlig mandrill and ballademager aberne",
     "questMonkeyNotes": "The Sloensteadi Savannah is being torn apart by the Monstrous Mandrill and his Mischief Monkeys! They shriek loudly enough to drown out the sound of approaching deadlines, encouraging everyone to avoid their duties and keep monkeying around. Alas, plenty of people ape this bad behavior. If no one stops these primates, soon everyone's tasks will be as red as the Monstrous Mandrill's face!<br><br>\"It will take a dedicated adventurer to resist them,\" says @yamato.<br><br>\"Quick, let's get this monkey off everyone's backs!\" @Oneironaut yells, and you charge into battle.",
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstermandril",
     "questMonkeyDropMonkeyEgg": "Abe (Æg)",
-    "questMonkeyUnlockText": "Åbner for køb af abeæg på Markedet"
+    "questMonkeyUnlockText": "Åbner for køb af abeæg på Markedet",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/de/backgrounds.json b/common/locales/de/backgrounds.json
index 7aded8e0c7..488c566973 100644
--- a/common/locales/de/backgrounds.json
+++ b/common/locales/de/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Lies in der gemütlichen Bibliothek.",
     "backgroundGrandStaircaseText": "Stattliche Treppe",
     "backgroundGrandStaircaseNotes": "Schreite die stattliche Treppe hinab.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "SET 22: Veröffentlicht im März 2016",
+    "backgroundDeepMineText": "Tiefe Mine",
+    "backgroundDeepMineNotes": "Finde wertvolle Metalle in einer tiefen Mine.",
+    "backgroundRainforestText": "Regenwald",
+    "backgroundRainforestNotes": "Wage dich in einen Regenwald.",
+    "backgroundStoneCircleText": "Steinkreis",
+    "backgroundStoneCircleNotes": "Wirke Zauber in einem Steinkreis."
 }
\ No newline at end of file
diff --git a/common/locales/de/character.json b/common/locales/de/character.json
index 8145015985..782bd7c9e9 100644
--- a/common/locales/de/character.json
+++ b/common/locales/de/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Werte & Erfolge",
     "profile": "Profil",
-    "avatar": "Customize Avatar",
+    "avatar": "Avatar gestalten",
     "other": "Anderes",
     "fullName": "Name",
     "displayName": "Angezeigter Name",
@@ -83,7 +83,7 @@
     "allocateInt": "Intelligenzpunkte:",
     "allocateIntPop": "Füge einen Punkt zu Intelligenz hinzu",
     "noMoreAllocate": "Jetzt, da Du Level 100 erreicht hast, wirst Du keine weiteren Attributpunkte erhalten.   Du kannst weiterspielen, oder ein neues Abenteuer auf Level 1 anfangen, indem du die <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Sphäre der Wiedergeburt </a> benutzt.  Sie ist jetzt kostenlos auf dem Marktplatz erhältich.",
-    "stats": "Avatar Stats",
+    "stats": "Statuswerte des Avatars",
     "strength": "Stärke",
     "strengthText": "Stärke erhöht die Wahrscheinlichkeit zufälliger kritischer Treffer und die Rate mit der durch sie Gold, Beute und Erfahrung gewonnen wird. Weiterhin erhöht sich der Schaden an Bossen.",
     "constitution": "Ausdauer",
@@ -136,7 +136,7 @@
     "respawn": "Auferstehen!",
     "youDied": "Du bist gestorben!",
     "dieText": "Du hast ein Level, Dein gesamtes Gold und einen zufälliges Teil Deiner Ausrüstung verloren. Erhebe Dich, Habiteer, und versuche es erneut! Gebiete diesen schlechten Gewohnheiten Einhalt, sei gewissenhaft bei der Erfüllung Deiner täglichen Aufgaben und halte Dir den Tod mit Heiltränken vom Leib, wenn Du einmal straucheln solltest!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Bist Du sicher? Das wird Deine Klasse und Attributpunkte zurücksetzen (Du erhältst alle Punkte zurück, um sie wieder zuzuweisen). Es kostet 3 Edelsteine.",
     "purchaseFor": "Für <%= cost %> Edelsteine erwerben?",
     "notEnoughMana": "Nicht genug Mana.",
     "invalidTarget": "Ungültiges Ziel",
diff --git a/common/locales/de/communityguidelines.json b/common/locales/de/communityguidelines.json
index 391f2131e7..10e512fad9 100644
--- a/common/locales/de/communityguidelines.json
+++ b/common/locales/de/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In einer so großen Gemeinschaft wie Habitica ist es so, dass die Menschen kommen und gehen. So kommt es vor, dass ein Moderator seinen noblen Umhang ablegt, um sich zu entspannen. Diese Nutzer sind emeritierte Moderatoren. Sie handeln nicht mehr mit der Befugnis eines Moderators, aber wir würdigen ihre Arbeit weiterhin!",
     "commGuidePara014": "Eremetierte Moderatoren:",
     "commGuideHeadingPublicSpaces": "Öffentliche Orte in Habitica",
-    "commGuidePara015": "Habitica hat zwei Arten von sozialen Bereichen: öffentlich und privat. Öffentliche Bereiche umfassen das Gasthaus, öffentliche Gilden, GitHub, Trello und das Wiki. Private Bereiche sind private Gilden, der Chat von Gruppen und private Nachrichten.",
+    "commGuidePara015": "Habitica hat zwei Sorten sozialer Orte: Öffentliche und private. Öffentliche Orte umfassen die Taverne, öffentliche Gilden, GitHub, Trello und die Wiki. Private Orte sind private Gilden, der Gruppenchat und private Nachrichten. Alle Anzeigenamen müssen den Community-Richtlinien für öffentliche Orte entsprechen. Um deinen Anzeigenamen zu ändern, gehe auf der Webseite zu Benutzer > Profil und klicke auf den \"Bearbeiten\"-Button. ",
     "commGuidePara016": "Wenn du dich durch die öffentlichen Orte in Habitica bewegst, gibt es ein paar allgemeine Regeln, damit jeder sicher und glücklich ist. Diese sollten für einen Abenteurer wie dich einfach sein!",
     "commGuidePara017": "<strong>Respektiert einander.</strong> Seit höflich, nett und hilfsbereit. Vergesst nicht: Habiticaner haben die verschiedensten Hintergründe und haben sehr unterschiedliche Erfahrungen gemacht. Das macht Habitica so besonders! Eine Gemeinschaft aufzubauen bedeutet, sich gegenseitig zu respektieren und unsere Unterschiede genauso zu feiern wie unsere Gemeinsamkeiten. Hier sind ein paar einfache Möglichkeiten, Respekt zu zeigen:",
     "commGuideList02A": "<strong>Befolge alle allgemeinen Geschäftsbedingungen.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Befolge unmittelbar jegliche Anliegen der Moderatoren</strong>  um eine Diskussion zu beenden oder um es zur Back Corner zu verschieben. Letzte Bemerkungen, Abschiedsworte und endgültige Fazite sollten dann abschließend an eurem \"Tisch\" in der Back Corner (höflich) abgegeben werden, falls erlaubt.",
     "commGuideList02G": "<strong>Denk erst mal gründlich nach bevor du wütend reagierst</strong> wenn dir jemand sagt, dass etwas was du getan oder gesagt hast ihm/ihr nicht gefallen hat. Es zeigt große Stärke, sich ehrlich bei jemandem zu entschuldigen. Wenn du findest, dass die Art, wie er/sie dir geantwortet hat unangemessen war, kontaktiere einen Mod statt ihn/sie öffentlich damit zu konfrontieren.",
     "commGuideList02H": "<strong>Heftig umstrittene Konversationen sollten den Moderatoren gemeldet werden.</strong> Wenn ihr der Meinung seit, dass eine Diskussion anfängt auszuarten und überaus emotional, oder sogar verletzend wird, verwickelt euch nicht noch weiter in das Gespräch. Schreibt stattdessen eine E-Mail an <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a>, um es uns wissen zu lassen. Es ist unsere Aufgabe euch sicher zu halten.",
-    "commGuideList02I": "<strong>Poste keinen Spam.</strong> Spamming ist unter anderem, aber nicht ausschließlich: das gleiche Kommentar/die gleiche Anfrage mehrmals an verschiedenen Orten posten, Links ohne Erklärung oder Kontext posten, Nachrichten ohne Sinn posten, die gleiche Nachricht mehrmals hintereinander posten. Wiederholt nach Edelsteinen oder einem Abonnement zu betteln, kann ebenfalls als Spamming betrachtet werden.",
-    "commGuidePara019": "<strong>In privaten Orten</strong> haben Nutzer mehr Freiheiten, über alle Themen zu sprechen, die sie interessieren, aber sie dürfen trotzdem nicht die allgemeinen Geschäftsbedingungen verletzen und unter anderem auch dort keine diskriminierenden, gewalttätigen oder bedrohlichen Inhalte posten.",
+    "commGuideList02I": "<strong>Poste keinen Spam.</strong> Spamming umfasst unter anderem: Den gleichen Kommentar oder die gleiche Frage an unterschiedlichen Orten posten, Links ohne Erklärung oder Kontext posten, sinnlose Nachrichten posten, oder viele Nachrichten hintereinander posten. Das Betteln nach Edelsteinen oder einem Abonnement wird ebenfalls als Spamming betrachtet. ",
+    "commGuidePara019": "<strong>An privaten Orten</strong> haben Benutzer die Freiheit, alle möglichen Themen zu besprechen, solange diese nicht den AGB widersprechen. Dies umfasst das Posten von diskriminierenden, gewalttätigen oder einschüchternden Inhalten. Beachte dass Wettbewerbsnamen im öffentlichen Profil des Gewinners anzeigt werden, daher müssen ALLE Wettbewerbsnamen den Community-Richtlinien für öffentliche Orte entsprechen, auch wenn sie an privaten Orten genutzt werden. ",
     "commGuidePara020": "Für private Nachrichten (PNs/PMs) gibt es einige zusätzliche Richtlinien. Falls Dich jemand geblockt hat, kontaktiere ihn nicht über andere Wege, um ihn oder sie zu bitten dich nicht mehr zu blocken. Außerdem solltest Du keine PNs schicken, wenn Du Hilfe mit der Seite, also \"Support\" brauchst (allgemein zugängliche Antworten auf diese Fragen im Gasthaus oder Forum kommen der Gemeinschaft zu gute). Schließlich schicke bitte keine PNs in denen Du um Edelsteine oder ein Abonnement bettelst, dies kann als Spamming betrachtet werden.",
     "commGuidePara021": "Manche öffentliche Orte in Habitica haben außerdem noch weitere Regeln.",
     "commGuideHeadingTavern": "Das Gasthaus",
diff --git a/common/locales/de/content.json b/common/locales/de/content.json
index 08fe605f88..b584e59974 100644
--- a/common/locales/de/content.json
+++ b/common/locales/de/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "ein stacheliger",
     "dropEggBearCubText": "Jungbär",
     "dropEggBearCubMountText": "Bär",
-    "dropEggBearCubAdjective": "ein knuddeliger",
+    "dropEggBearCubAdjective": "ein tapferer",
     "questEggGryphonText": "Greif",
     "questEggGryphonMountText": "Greif",
     "questEggGryphonAdjective": "ein stolzer",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "ein farbiger",
     "questEggRatText": "Ratterich",
     "questEggRatMountText": "Ratterich",
-    "questEggRatAdjective": "ein dreckiger",
+    "questEggRatAdjective": "ein geselliger",
     "questEggOctopusText": "Tintenfisch",
     "questEggOctopusMountText": "Krake",
     "questEggOctopusAdjective": "ein glitschiger",
@@ -101,8 +101,8 @@
     "questEggSnakeText": "Taipan",
     "questEggSnakeMountText": "Taipan",
     "questEggSnakeAdjective": "ein schlängelnder",
-    "questEggUnicornText": "Einhorn",
-    "questEggUnicornMountText": "Geflügeltes Einhorn",
+    "questEggUnicornText": "Einhorn-Hengst",
+    "questEggUnicornMountText": "Geflügelter Einhorn-Hengst",
     "questEggUnicornAdjective": "ein magischer",
     "questEggSabretoothText": "Säbelzahntiger",
     "questEggSabretoothMountText": "Säbelzahntiger",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Affe",
     "questEggMonkeyMountText": "Affe",
     "questEggMonkeyAdjective": "ein schelmischer",
+    "questEggSnailText": "Schneckerich",
+    "questEggSnailMountText": "Schneckerich",
+    "questEggSnailAdjective": "ein langsamer, aber beständiger",
     "eggNotes": "Finde einen Schlüpftrank, den Du über dieses Ei gießen kannst, damit <%= eggAdjective(locale) %> <%= eggText(locale) %> schlüpfen kann.",
     "hatchingPotionBase": "Normaler",
     "hatchingPotionWhite": "Weißer",
diff --git a/common/locales/de/contrib.json b/common/locales/de/contrib.json
index b5cd7f302a..dc18652b92 100644
--- a/common/locales/de/contrib.json
+++ b/common/locales/de/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Hat Habitica geholfen zu wachsen",
     "helpedText1": "Hat Habitica geholfen zu wachsen durch Teilnahme an",
     "helpedText2": "dieser Befragung.",
-    "hall": "Hall of Heroes",
+    "hall": "Halle der Helden",
     "contribTitle": "Mitwirkender Titel (z.B., \"Schmied\")",
     "contribLevel": "Mitwirkender Level",
     "contribHallText": "1-7 für normale Mitwirkende, 8 für Moderatoren, 9 für Mitarbeiter. Diese Stufe entscheidet, welche Gegenstände, Haustiere und Reittiere verfügbar sind und welche Farbe das Namensschild hat. Stufe 8 und 9 erhalten automatisch den Administratorstatus.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Halle der Mitwirkenden",
     "hallPatrons": "Halle der Schirmherren",
     "rewardUser": "Spieler belohnen",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Gilden sind Chatgruppen mit einem gemeinsamen Interesse. Sie sind von Spielern für Spieler erstellt worden. Durchblättere die Liste und tritt den Gilden bei, die dich interessieren.",
     "blurbChallenges": "Wettbewerbe werden von anderen Spielern erstellt. Wenn Du einem Wettbewerb beitrittst, werden seine Aufgaben deinem Aufgabenmenü hinzugefügt, und wenn Du einen Wettbewerb gewinnst erhältst Du einen Erfolg und oft auch einen Edelstein-Preis!",
     "blurbHallPatrons": "Dies ist die Halle der Unterstützer, in der wir die edlen Abenteurer ehren, die Habitica's ursprüngliche Kickstarter-Kampagne unterstützt haben. Wir danken ihnen für die Hilfe Habitica zum Leben zu erwecken!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Dies ist die Halle der Helden, in der Open-Source Unterstützter von Habitica geehrt werden. Durch Code, Kunst, Musik, schreiben, oder auch nur Hilfsbereitschaft haben sie <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> Edelsteine, exklusive Ausstattung</a> verdient und <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>angesehene Titel</a> erlangt. Auch du kannst Habitica unterstützen! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Hier erfährst Du mehr dazu.</a>"
 }
\ No newline at end of file
diff --git a/common/locales/de/faq.json b/common/locales/de/faq.json
index 4e97efa403..bee4b84712 100644
--- a/common/locales/de/faq.json
+++ b/common/locales/de/faq.json
@@ -16,7 +16,7 @@
     "iosFaqAnswer4": "Es gibt verschiedene Dinge, die verursachen, dass du Schaden erleidest. Als erstes, wenn du tägliche Aufgaben über Nacht unerledigt, sie werden dir Schaden zufügen. Zweitens, wenn du eine schlechte Gewohnheit anklickst, fügt es dir auch Schaden zu. Zuletzt, wenn du in einem Bosskampf mit deiner Gruppe bist und einer deiner Gruppenmitglieder hat seine täglichen Aufgaben nicht erledigt, dann wird dich der Boss angreifen.\n\nDer gewöhnliche Weg, um Leben zu gewinnen, ist im Level aufzusteigen, was deine komplette Gesundheit wieder herstellt. Du kannst auch Heiltränke mit Gold in Shop kaufen. Dazu kommt, ab Level 10 oder höher, kannst du wählen, ob du ein Heiler werden möchtest, dann lernst du Heilfähigkeiten. Wenn du in einer Gruppe mit einem Heiler bist, kann dieser dich genauso heilen. ",
     "webFaqAnswer4": "Es gibt verschiedene Dinge, die verursachen, dass du Schaden erleidest. Als erstes fügen dir tägliche Aufgaben, die über Nacht unerledigt bleiben, Schaden zu. Zweitens fügt es dir auch Schaden zu, wenn du eine schlechte Gewohnheit anklickst. Drittens wird dich in einem Bosskampf mit deiner Gruppe der Boss angreifen, wenn eines deiner Gruppenmitglieder seine täglichen Aufgaben nicht erledigt hat.\n<br><br>\nDer gewöhnliche Weg um Leben zu gewinnen ist im Level aufzusteigen, was deine komplette Gesundheit wiederherstellt. Du kannst auch Heiltränke mit Gold in Shop kaufen. Dazu kommt, dass du ab Level 10 oder höher wählen kannst, ob du ein Heiler werden möchtest, dann lernst du Heilfähigkeiten. Wenn du in einer Gruppe (under Social > Party) mit einem Heiler bist, kann dieser dich genauso heilen. ",
     "faqQuestion5": "Wie spiele ich Habitica mit meinen Freunden?",
-    "iosFaqAnswer5": "Am Besten lädst du sie in eine Party mit dir ein! Parties können zusammen Quest beschreiten, Monster bekämpfen und einender mit zaubern unterstützen. Geh ins Menü < Party und klicke \"Neue Party erstellen\" wenn du noch keine Party hast. Dann tippst du auf die Mitglieder liste und tippst du oben rechts auf einladen. Um deine Freunde einzuladen brauchst du ihre User ID(welche aus einer langen zahlen, Buchstaben Kombination besteht).",
+    "iosFaqAnswer5": "Am Besten lädst du sie in eine Gruppe mit dir ein! Gruppen können zusammen Quests bestreiten, Monster bekämpfen und sich gegenseitig mit Zaubern unterstützen. Geh auf Menü > Gruppe und klicke auf \"Neue Gruppe erstellen\" wenn du noch keine Gruppe hast. Dann klicke auf die Mitgliederliste und lade sie ein indem du oben rechts auf einladen klickst und ihre Benutzer ID (die aus einer langen Zahlen-, Buchstabenkombination besteht, welche sie unter Einstellungen > Konto Details bei der App und unter Einstellungen > API auf der Webseite finden können) eingibst. Außerdem kannst du auf der Webseite Freunde auch per E-Mail einladen, was für die App auch noch folgen wird.\n\nAuf der Webseite können Du und Deine Freunde auch Gilden beitreten, welche öffentliche Chat-Räume sind. Gilden werden der App auch noch hinzugefügt werden.",
     "webFaqAnswer5": "Am besten lädst du sie ein eine Gruppe mit dir ein (unter Social > Party)! Gruppen können zusammen Quests antreten, Monster bekämpfen und Fähigkeiten benutzen um einander zu helfen. Ihr könnt außerdem gemeinsam einer Gilde beitreten (unter Social > Guilds). Gilden sind Chat-Räume, deren Mitglieder gemeinsame Ziele verfolgen, und können privat oder öffentlich sein. Du kannst in sovielen Gilden sein, wie du möchtest, aber nur in einer Gruppe.\n<br><br>\nGenauere Informationen findest du auf den Wiki Seiten für [Parties](http://habitrpg.wikia.com/wiki/Party) und [Guilds](http://habitrpg.wikia.com/wiki/Guilds).",
     "faqQuestion6": "Woher bekomme ich Haustiere oder Reittiere?",
     "iosFaqAnswer6": "Wenn du Level 3 erreichst, wirst du das Beutesystem freischalten. Jedes Mal wenn du eine Aufgabe erledigst, hast du eine zufällige Chance ein Ei, einen Schlüpftrank oder Futter zu erhalten. Diese werden unter Inventar > Marktplatz gespeichert. \n\nUm ein Haustier auszubrüten benötigst du ein Ei und einen Schlüpftrank. Klicke auf das Ei, um die Spezies auszuwählen, welche du schlüpfen lassen möchtest, und klicke anschließend auf den Schlüpftrank, um die Farbe zu bestimmen! Um es deinem Avatar hinzuzufügen, gehe zu Inventar > Haustiere und klicke auf das gewünschte Tier.\n\nDu kannst deine Haustiere unter Inventar > Haustiere auch füttern, sodass sie zu Reittieren heranwachsen. Klicke auf ein Haustier und dann auf das Futter aus dem Menü auf der rechten Seite, um es zu füttern! Damit es zu einem Reittier heranwächst, musst du dein Haustier mehrmals füttern, wenn du jedoch sein bevorzugtes Futter herausfindest, wächst es schneller. Dies kannst du entweder durch ausprobieren selbst herausfinden oder [im Wiki nachschauen - Vorsicht: Spoiler!](http://de.habitica.wikia.com/wiki/Futter#Bevorzugtes_Futter). Wenn du ein Reittier erhalten hast, gehe zu Inventar > Reittiere und klicke das Tier an, um es deinem Avatar hinzuzufügen.\n\nDu kannst auch Eier für Quest-Haustiere erhalten, indem du bestimmte Quests abschließt. (Siehe weiter unten, um mehr über Quests zu erfahren.)",
diff --git a/common/locales/de/front.json b/common/locales/de/front.json
index 2b3cebe3c4..3c16717be9 100644
--- a/common/locales/de/front.json
+++ b/common/locales/de/front.json
@@ -2,7 +2,7 @@
     "FAQ": "FAQ",
     "accept1Terms": "Durch Klicken auf diesen Knopf, stimme ich den",
     "accept2Terms": "zu, sowie der",
-    "alexandraQuote": "Ich konnte während meiner Rede in Madrid nicht NICHT über [Habitica] reden. Ein absolutes must-have Hilfsmittel für Freiberufler, die trotzdem einen Chef brauchen.",
+    "alexandraQuote": "Ich konnte während meiner Rede in Madrid nicht NICHT über [Habitica] reden. Ein absolutes Muss für Freiberufler, die trotzdem einen Chef brauchen.",
     "althaireQuote": "Kontinuierlich eine Quest zu haben, motiviert mich dazu alle meine täglichen und einmaligen Aufgaben zu erledigen. Meine größte Motivation ist, meine Gruppe nicht im Stich zu lassen.",
     "andeeliaoQuote": "Großartiges Produkt, ich habe gerade erst vor einigen Tagen angefangen und gehe jetzt schon bewusster und produktiver mit meiner Zeit um!",
     "autumnesquirrelQuote": "Ich schiebe bei der Arbeit und im Haushalt weniger auf und zahle meine Rechnungen rechtzeitig. ",
@@ -33,14 +33,14 @@
     "companyPrivacy": "Datenschutz",
     "companyTerms": "AGB",
     "companyVideos": "Videos",
-    "contribUse": "Habitica Mitwirkende nutzen",
-    "dragonsilverQuote": "Ich habe unzählige Zeit- und Aufgabenerfassungssysteme ausprobiert… [Habitica] ist das Einzige, das mir wirklich hilft Dinge zu erledigen, anstatt sie nur aufzuschreiben.",
-    "dreimQuote": "Bevor ich [Habitica] letzten Sommer entdeckt habe, war ich bereits durch die Hälfte meiner Prüfungen gefallen. Dank den täglichen Aufgaben war ich fähig, mich zu organisieren und zu disziplinieren und ich habe letzten Monat wirklich alle meine Prüfungen mit sehr guten Noten bestanden.",
+    "contribUse": "Habitica-Mitwirkende nutzen",
+    "dragonsilverQuote": "Ich habe unzählige Zeit- und Aufgabenerfassungssysteme ausprobiert… [Habitica] ist das Einzige, das mir wirklich hilft, Dinge zu erledigen, anstatt sie nur aufzuschreiben.",
+    "dreimQuote": "Bevor ich [Habitica] letzten Sommer entdeckt habe, war ich bereits durch die Hälfte meiner Prüfungen gefallen. Dank der täglichen Aufgaben war ich dazu in der Lage, mich zu organisieren und zu disziplinieren und ich habe letzten Monat wirklich alle meine Prüfungen mit sehr guten Noten bestanden.",
     "elmiQuote": "Jeden Morgen freue ich mich aufzustehen und etwas Gold zu verdienen!",
     "email": "E-Mail",
     "emailNewPass": "E-Mail neues Passwort",
     "evagantzQuote": "Mein erster Zahnarztbesuch, bei dem die Assistentin tatsächlich begeistert über meine Zahnseide-Gewohnheiten war. Danke [Habitica]!",
-    "examplesHeading": "Spieler benutzen Habitica, um folgendes zu organisieren...",
+    "examplesHeading": "Spieler benutzen Habitica, um Folgendes zu organisieren...",
     "featureAchievementByline": "Etwas total großartiges gemacht? Erhalte ein Abzeichen und prahle damit!",
     "featureAchievementHeading": "Erfolgsabzeichen",
     "featureEquipByline": "Kaufe Gegenstände in limitierter Auflage, Zaubertränke und andere virtuelle Leckerbissen auf unserem Marktplatz mit den Belohnungen für abgeschlossene Aufgaben!",
@@ -72,7 +72,7 @@
     "healthSample4": "Esse gesund/Junkfood",
     "healthSample5": "Für 1 Stunde ins Schwitzen kommen",
     "history": "Verlauf",
-    "infhQuote": "[Habitica] hat mir geholfen Struktur in mein Leben an der Universität zu bringen.",
+    "infhQuote": "[Habitica] hat mir geholfen, Struktur in mein Leben an der Universität zu bringen.",
     "invalidEmail": "Um das Passwort zurückzusetzen, ist eine gültige Email-Adresse notwendig.",
     "irishfeet123Quote": "Ich hatte die schrecklichen Angewohnheiten, nach Mahlzeiten nicht aufzuräumen und Tassen in der ganzen Wohnung stehen zu lassen. [Habitica] hat mich davon geheilt!",
     "joinOthers": "Schließe dich <%= userCount %> Leuten an, die Spaß dabei haben, ihre Ziele zu erreichen!",
@@ -83,36 +83,36 @@
     "landingend3": ". Sucht Ihr eine nichtöffentliche Variante? Versucht unsere",
     "landingend4": "die ideal sind für Familien, Lehrer, Selbsthilfegruppen und Gewerbe.",
     "landingfeatureslink": "unserer Features",
-    "landingp1": "Das Problem der meisten Produktivitätsapps auf dem Markt ist, dass sie keinen Anreiz bieten, sie dauerhaft zu benutzen. Habitica löst dieses Problem, indem es das Aufbauen von Gewohnheiten zum Spiel macht. Indem es Erfolge belohnt und Misserfolge bestarft, bietet Habitica eine Motivation für Ihre täglichen Aktivitäten.",
-    "landingp2": "Jedes Mal wenn Ihr eine gute Angewohnheit trainiert, eine tägliche Aufgabe erfüllt oder eine andere Aufgabe erfüllt, belohnt Euch Habitica sofort mit Erfahrungspunkten und Gold. Durch Erfahrungspunkte steigt Ihr im Level auf, verbessert Eure Charakterwerte und schaltet weitere Features frei wie Klassen und Haustiere. Gold kann für Spielgegenstände, die Eurem Charakter nützen ausgegeben werden, oder für persönliche Belohnungen, die Ihr zur Motivation erstellen könnt. Wenn auch der kleinste Erfolg Euch eine sofortige Belohnung verspricht, werdet Ihr Eure Aufgaben immer weniger aufschieben.",
+    "landingp1": "Das Problem der meisten Produktivitätsapps auf dem Markt ist, dass sie keinen Anreiz bieten, sie dauerhaft zu benutzen. Habitica löst dieses Problem, indem es das Aufbauen von Gewohnheiten zum Spiel macht. Indem es Erfolge belohnt und Misserfolge bestraft, bietet Habitica eine Motivation für Ihre täglichen Aktivitäten.",
+    "landingp2": "Jedes Mal, wenn du eine gute Angewohnheit trainierst, eine tägliche Aufgabe erfüllst oder dich um eine alte Aufgabe kümmerst, belohnt dich Habitica sofort mit Erfahrungspunkten und Gold. Durch Erfahrungspunkte steigst du im Level auf, verbesserst deine Charakterwerte und schaltest weitere Features wie Klassen und Haustiere frei. Gold kann für Spielgegenstände, die deinem Charakter nützen, ausgegeben werden oder für persönliche Belohnungen, die du zur Motivation erstellen kannst. Wenn dir sogar der kleinste Erfolg eine sofortige Belohnung verspricht, wirst du deine Aufgaben immer weniger aufschieben.",
     "landingp2header": "Sofortige Belohnung",
-    "landingp3": "Jedes Mal, wenn ihr einer schlechten Angewohnheit nachgebt oder eure täglichen Aufgaben vernachlässigt, verliert Ihr Lebenspunkte. Wenn Eure Lebenspunkte zu weit sinken, sterbt Ihr und verliert einen Teil Eures Fortschritts. Indem es Konsequenzen setzt, kann Habitica dabei helfen, schlechte Angewohnheiten und ständiges Hinausschieben zu beenden, bevor sie zu Problemen in eurem Leben werden.",
+    "landingp3": "Jedes Mal, wenn du einer schlechten Angewohnheit nachgibst oder deine täglichen Aufgaben vernachlässigst, verlierst du Lebenspunkte. Wenn deine Lebenspunkte zu weit sinken, stirbst du und verlierst einen Teil deine Fortschritts. Indem es Konsequenzen setzt, kann Habitica dabei helfen, schlechte Angewohnheiten und ständiges Hinausschieben zu beenden, bevor sie zu Problemen in deinem Leben werden.",
     "landingp3header": "Konsequenzen",
-    "landingp4": "Mit einer lebendigen Community bietet Habitica die Verbindlichkeit, die ihr braucht, um auf eure Aufgaben konzentriert zu bleiben. Mit dem Gruppensystem könnt ihr eine Gruppe eurer besten Freunde zur Unterstützung rufen. Das Gildensystem erlaubt euch Spieler mit ähnlichen Interessen oder Hindernissen zu finden, damit ihr eure Ziele gemeinsam erreichen könnt, und Tipps, um eure Probleme anzugehen, austauschen könnt. Auf Habitica steht die Community für die Unterstützung und die Verbindlichkeit die ihr braucht um Erfolg zu haben.",
+    "landingp4": "Mit einer lebendigen Community bietet Habitica die Verbindlichkeit, die du brauchst, um auf deine Aufgaben konzentriert zu bleiben. Mit dem Gruppensystem kannst du eine Gruppe deiner besten Freunde zur Unterstützung rufen. Das Gildensystem erlaubt es dir, Spieler mit ähnlichen Interessen oder Hindernissen zu finden, damit ihr eure Ziele gemeinsam erreichen und Tipps, um eure Probleme anzugehen, austauschen könnt. Auf Habitica steht die Community für die Unterstützung und die Verbindlichkeit, die du brauchst, um Erfolg zu haben.",
     "landingp4header": "Verantwortung",
-    "leadText": "Habitica ist eine kostenlose Anwendung zur Gewohnheitsbildung und Steigerung der Produktivität, die dein Leben wie ein Spiel betrachtet. Mit Belohnungen und Bestafungen als Motivation und einem starken sozialen Netzwerk als Inspiration kann Habitica dir helfen deine Ziele zu erreichen und gesund, fleißig und glücklich zu werden.",
+    "leadText": "Habitica ist eine kostenlose Anwendung zur Gewohnheitsbildung und Steigerung der Produktivität, die dein Leben wie ein Spiel behandelt. Mit Belohnungen und Bestrafungen als Motivation und einem starken sozialen Netzwerk als Inspiration kann Habitica dir helfen, deine Ziele zu erreichen und gesund, fleißig und glücklich zu werden.",
     "login": "Einloggen",
     "loginAndReg": "Einloggen / Registrieren",
     "loginFacebookAlt": "Einloggen / Registrieren mit Facebook",
     "logout": "Ausloggen",
     "marketing1Header": "Verbessern Sie Ihre Lebensführung Durch Ein Spiel",
-    "marketing1Lead1": "Habitica ist ein Videospiel, welches Dir dabei hilft Deine Gewohnheiten im realen Leben zu verbessern. Es \"gamifiziert\" Dein Leben indem es all Deine Aufgaben (Gewohnheiten, tägliche Aufgaben und einmalige Aufgaben) in kleine Monster verwandelt, die Du besiegen musst. Je besser Du Dich dabei anstellst, umso weiter kommst Du im Spiel. Wenn Du in Deinem realen Leben nachlässt, beginnt Dein Charakter im Spiel zurückzufallen.",
+    "marketing1Lead1": "Habitica ist ein Videospiel, welches dir dabei hilft. deine Gewohnheiten im realen Leben zu verbessern. Es \"gamifiziert\" dein Leben, indem es all deine Aufgaben (Gewohnheiten, tägliche Aufgaben und einmalige Aufgaben) in kleine Monster verwandelt, die du besiegen musst. Je besser du dich dabei anstellst, umso weiter kommst du im Spiel. Wenn du in deinem realen Leben nachlässt, beginnt dein Charakter im Spiel zurückzufallen.",
     "marketing1Lead2": "<strong>Bekomme coole Ausrüstung</strong>. Verbessere deine Gewohnheiten um Deinen Avatar auszustatten. Zeige Deine coole Ausrüstung die Du verdient hast.",
     "marketing1Lead2Title": "Bekomme coole Ausrüstung",
     "marketing1Lead3": "<strong>Finde zufällige Preise</strong>. Für einige ist es das Glücksspiel bzw. das System der \"zufälligen Belohnung\", welches sie motiviert. Habitica beinhaltet alle Verstärkungstypen: positive, negative, vorhersehbare und zufällige.",
     "marketing1Lead3Title": "Finde zufällige Preise",
     "marketing2Header": "Messe Dich mit Freunden, schließe Dich Interessensgruppen an",
-    "marketing2Lead1": "Obwohl Du Habitica im Alleingang spielen kannst, wird es erst richtig spaßig, wenn Du anfängst mit anderen zusammenzuarbeiten, zu wetteifern und sich gegenseitig zur Verantwortung zu ziehen. Der effektivste Teil von allen Persönlichkeitsentwicklungsprogrammen ist die soziale Verantwortlichkeit - und wo gibt es eine bessere Umgebung für Verantwortung und Wettkampf als in einem Videospiel?",
+    "marketing2Lead1": "Obwohl du Habitica im Alleingang spielen kannst, wird es erst richtig spaßig, wenn du anfängst, mit anderen zusammenzuarbeiten, zu wetteifern und sich gegenseitig zur Verantwortung zu ziehen. Der effektivste Teil von allen Persönlichkeitsentwicklungsprogrammen ist die soziale Verantwortlichkeit - und wo gibt es eine bessere Umgebung für Verantwortung und Wettkampf, als in einem Videospiel?",
     "marketing2Lead2": "<strong>Bekämpfe Bosse</strong>. Was ist ein Rollenspiel ohne Kämpfe? Bekämpfe Bosse mit Deiner Gruppe. Bosse sind \"super Verantwortlichkeitsmodi\": ein Tag ohne Fitnessstudio ist ein Tag, an dem der Boss <em>alle</em> verletzt.",
     "marketing2Lead2Title": "Bosse",
     "marketing2Lead3": "In <strong>Wettbewerben</strong> kannst Du gegen Freunde und Unbekannte antreten. Wer am besten ist, gewinnt am Ende eines Wettbewerbs spezielle Preise.",
     "marketing3Header": "Apps",
     "marketing3Lead1": "Die <strong>iPhone & Android</strong> Apps erlauben Dir Aufgaben unterwegs abzuhaken. Es ist uns klar, dass es lästig sein kann, sich immer auf der Seite einloggen zu müssen.",
-    "marketing3Lead2": "Andere <strong>Werkzeuge von Drittanbietern</strong> binden Habitica an verschiedene Aspekte deines Lebens. Unsere API stellt eine einfache Integrierung mit Sachen wie der <a href='https://chrome.google.com/webstore/detail/habiticahabitrpg/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US' target='_blank'>Chrome Erweiterung</a> zur Verfügung, die dir Punkte abzieht, wenn du auf unproduktiven Websites surfst und dir welche einbringt, wenn du auf produktiven Seiten unterwegs bist. <a href='http://habitrpg.wikia.com/wiki/App_and_Extension_Integrations' target='_blank'>Mehr dazu hier</a>",
+    "marketing3Lead2": "Andere <strong>Werkzeuge von Drittanbietern</strong> binden Habitica an verschiedene Aspekte deines Lebens an. Unsere API stellt eine einfache Integration mit Sachen wie der <a href='https://chrome.google.com/webstore/detail/habitica/pidkmpibnnnhneohdgjclfdjpijggmjj?hl=en-US' target='_blank'>Chrome-Erweiterung</a> zur Verfügung, die dir Punkte abzieht, wenn du auf unproduktiven Websites surfst und dir welche einbringt, wenn du auf produktiven Seiten unterwegs bist. <a href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations' target='_blank'>Mehr dazu hier</a>",
     "marketing4Header": "Verwendung zur Organisation",
-    "marketing4Lead1": "Bildung ist einer der besten Bereiche für Gamifizierung. Wir wissen alle wie sehr Schüler heutzutage an ihren Handys und Spielen hängen. Nutze diese Macht! Lass deine Schüler in freundlichen Wettbewerben gegeneinander antreten und belohne gutes Verhalten mit seltenen Preisen. Beobachte wie sich ihre Noten und ihr Verhalten verbessern.",
+    "marketing4Lead1": "Bildung ist einer der besten Bereiche für Gamifizierung. Wir wissen alle, wie sehr Schüler heutzutage an ihren Handys und Spielen hängen. Nutze diese Macht! Lass deine Schüler in freundlichen Wettbewerben gegeneinander antreten und belohne gutes Verhalten mit seltenen Preisen. Beobachte, wie sich ihre Noten und ihr Verhalten verbessern.",
     "marketing4Lead1Title": "Betrachtungwinkel Ausbildung",
-    "marketing4Lead2": "Die Kosten für medizinische Versorgung steigen und irgendjemand muss sie tragen. Zahlreiche Pläne wurden entwickelt um Kosten zu reduzieren und das Wohlbefinden zu verbessern. Wir glauben, dass Habitica einen wesentlichen Beitrag zu gesünderen Lebensstilen leisten kann.",
+    "marketing4Lead2": "Die Kosten für medizinische Versorgung steigen und irgendjemand muss sie tragen. Zahlreiche Pläne wurden entwickelt, um Kosten zu reduzieren und das Wohlbefinden zu verbessern. Wir glauben, dass Habitica einen wesentlichen Beitrag zu gesünderen Lebensstilen leisten kann.",
     "marketing4Lead2Title": "Betrachtungswinkel Gesundheit und Erholung",
     "marketing4Lead3-1": "Wollen Sie ihr Leben einmal als Spiel betrachten?",
     "marketing4Lead3-2": "Wollen Sie eine Gruppe für Ausbildung, Erholung etc. leiten?",
@@ -124,13 +124,13 @@
     "motivate1": "Motiviere dich, alles Mögliche zu tun.",
     "motivate2": "Werde organisiert. Motiviere dich. Verdiene Gold.",
     "passConfirm": "Passwort bestätigen",
-    "passMan": "Falls Du einen Passwortmanager (wie 1Password) verwendest und Probleme beim einloggen hast, versuche deinen Benutzername und Passwort manuell einzugeben.",
+    "passMan": "Falls du einen Passwortmanager (wie 1Password) verwendest und Probleme beim Einloggen hast, versuche, deinen Benutzername und dein Passwort manuell einzugeben.",
     "password": "Passwort",
     "playButton": "Spielen",
     "playButtonFull": "Spiele Habitica",
     "presskit": "Pressemappe",
     "presskitDownload": "Alle Bilder herunterladen:",
-    "presskitText": "Danke für Ihr Interesse an Habitica! Die folgenden Bilder dürfen für Artikel und Videos über Habitica benutzt werden. Für weitere Informationen, wenden Sie sich bitte an Siena Leslie via leslie@habitica.com.",
+    "presskitText": "Danke für Ihr Interesse an Habitica! Die folgenden Bilder dürfen für Artikel und Videos über Habitica benutzt werden. Für weitere Informationen wenden Sie sich bitte an Siena Leslie via leslie@habitica.com.",
     "privacy": "Datenschutzrichtlinie",
     "psst": "Psst",
     "punishByline": "Überwinde schlechte Gewohnheiten und das Aufschieben von Aufgaben durch direkte Konsequenzen.",
@@ -153,7 +153,7 @@
     "schoolSample3": "Treffen mit der Lerngruppe",
     "schoolSample4": "Notizen für 1 Kapitel machen",
     "schoolSample5": "1 Kapitel lesen",
-    "sixteenBitFilQuote": "Dank [Habitica] erledige ich meine Aufgaben in Rekordzeit. Ich bin einfach so begierig mein nächstes Level zu erreichen!",
+    "sixteenBitFilQuote": "Dank [Habitica] erledige ich meine Aufgaben in Rekordzeit. Ich bin einfach so begierig, mein nächstes Level zu erreichen!",
     "skysailorQuote": "Meine Gruppe und unsere Quests halten mich im Spiel, was mich motiviert Dinge zu erledigen und mein Leben auf eine positive Art zu verändern.",
     "socialTitle": "Habitica - Mach dein Leben zum Spiel",
     "supermouse35Quote": "Ich trainiere mehr und habe meine Medikamente seit Monaten nicht vergessen. Danke Habit. :D",
@@ -165,8 +165,8 @@
     "teams": "Teams",
     "terms": "AGB",
     "testimonialHeading": "Was andere sagen…",
-    "localStorageTryFirst": "Wenn Du Probleme mit Habitica hast, drücke den Knopf unter \"Lokale Browserdateien löschen\" (Andere Internetseiten sind davon nicht betroffen). Du wirst dich einmal neu einloggen müssen, damit das funktioniert, also habe deine Log-in Daten bereit. Du kannst sie unter Einstellungen -> <%= linkStart %>Seite<%= linkEnd %> nachgucken.",
-    "localStorageTryNext": "Falls das Problem weiterhin besteht, bitte  <%= linkStart %>Melde einen Fehler<%= linkEnd %> , falls du das noch nicht getan hast.",
+    "localStorageTryFirst": "Wenn du Probleme mit Habitica hast, drücke den Knopf unter \"Lokale Daten löschen\" (andere Internetseiten sind davon nicht betroffen). Du wirst dich einmal neu einloggen müssen, damit das funktioniert, also halte deine Logindaten bereit. Du kannst sie unter Einstellungen -> <%= linkStart %>Seite<%= linkEnd %> einsehen.",
+    "localStorageTryNext": "Falls das Problem weiterhin besteht, <%= linkStart %>melde bitte einen Fehler<%= linkEnd %>, falls du das noch nicht getan hast.",
     "localStorageClearing": "Lokale Daten werden gelöscht",
     "localStorageClearingExplanation": "Die lokalen Daten deines Browsers wurden gelöscht. Du wirst nun ausgeloggt und zur Startseite weitergeleitet. Bitte warten.",
     "localStorageClear": "Lokale Daten löschen",
@@ -179,7 +179,7 @@
     "username": "Benutzername",
     "watchVideos": "Sehen Sie sich die Videos an",
     "work": "Arbeit",
-    "zelahQuote": "Mit [Habitica] kann ich mich überzeugen, rechtzeitig ins Bett zu gehen, dank dem Gedanken daran, Punkte zu verdienen, wenn ich früh ins Bett gehe und Leben zu verlieren, wenn ich lange aufbleibe.",
+    "zelahQuote": "Mit [Habitica] kann ich mich davon überzeugen, rechtzeitig ins Bett zu gehen, denn wenn ich früh ins Bett gehe, verdiene ich Punkte und wenn ich zu lange aufbleibe, verliere ich Leben.",
     "reportAccountProblems": "Melde Probleme mit deinem Konto",
     "reportCommunityIssues": "Melde Community-Probleme",
     "generalQuestionsSite": "Generelle Fragen über die Webseite.",
@@ -189,21 +189,21 @@
     "tweet": "Tweet",
     "apps": "Apps",
     "checkOutMobileApps": "Schau dir unsere Apps an!",
-    "imagine1": "Stell dir vor dein Leben zu verbessern wäre so unterhaltsam wie ein Spiel zu spielen.",
+    "imagine1": "Stell dir vor, dein Leben zu verbessern wäre so unterhaltsam, wie ein Spiel zu spielen.",
     "landingCopy1": "Mache Fortschritte im Spiel, indem du deine Aufgaben im echten Leben erledigst.",
     "landingCopy2": "Wenn du mit Freunden Monster bekämpfst, bleibst du für das Erreichen deiner Ziele verantwortlich.",
     "landingCopy3": "Schließe dich <%= userCount %> Leuten an, die Spaß dabei haben, ihr Leben zu verbessern.",
     "alreadyHaveAccount": "Ich habe bereits ein Konto!",
     "getStartedNow": "Jetzt loslegen!",
-    "altAttrNavLogo": "Habitica Startseite",
+    "altAttrNavLogo": "Habitica-Startseite",
     "altAttrLifehacker": "Lifehacker",
-    "altAttrNewYorkTimes": "Die New York Times Tageszeitung",
-    "altAttrMakeUseOf": "Benutze",
+    "altAttrNewYorkTimes": "The New York Times",
+    "altAttrMakeUseOf": "MakeUseOf",
     "altAttrForbes": "Forbes",
     "altAttrCnet": "CNet",
     "altAttrFastCompany": "Fast Company",
     "altAttrKickstarter": "Kickstarter",
-    "altAttrDiscover": "Discover Magazin",
+    "altAttrDiscover": "Discover Magazine",
     "altAttrFrabjabulous": "Frabjabulous:",
     "altAttrAlexandraSo": "_AlexandraSo_:",
     "altAttrEvaGantz": "EvaGantz:",
diff --git a/common/locales/de/gear.json b/common/locales/de/gear.json
index d1579ad97c..1478c3c552 100644
--- a/common/locales/de/gear.json
+++ b/common/locales/de/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "Waffe",
     "weaponBase0Text": "Keine Waffe",
     "weaponBase0Notes": "Keine Waffe.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "Beschlossen! Erhöht Stärke und Ausdauer um je <%= attrs %>. Verzauberter Schrank: Richterset (Gegenstand 3 von 3).",
     "weaponArmoireJesterBatonText": "Narrenstab",
     "weaponArmoireJesterBatonNotes": "Durch ein Fuchteln mit deinem Stab und einigen schlagfertigen Antworten, klären sich sogar die kompliziertesten Situationen. Erhöht Intelligenz und Wahrnehmung um je <%= attrs %>. Verzauberter Schrank: Narrenset (Gegenstand 3 von 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Spitzhacke",
+    "weaponArmoireMiningPickaxNotes": "Grabe das Maximum an Gold aus Deinen Aufgaben heraus! Erhöht Wahrnehmung um <%= per %>. Verzauberter Schrank: Bergmannsset (Gegenstand 3 von 3)",
     "armor": "Rüstung",
     "armorBase0Text": "Schlichte Kleidung",
     "armorBase0Notes": "Gewöhnliches Kleidungsstück. Gewährt keinen Bonus zu Attributen.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Äußerst seriös und stattlich. Erhöht Ausdauer um <%= con %>. Verzauberter Schrank: Richterset (Gegenstand 2 von 3).",
     "armorArmoireJesterCostumeText": "Narrenkostüm",
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Trotz des Aussehens dieses Kostüms, bist du kein Narr. Erhöht Intelligenz um  <%= int %>. Verzauberter Schrank: Narrenset (Gegenstand 2 von 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Arbeitsanzug des Bergmanns",
+    "armorArmoireMinerOverallsNotes": "Er sieht vielleicht abgetragen aus, aber er wurde Schmutz abweisend verzaubert. Erhöht Ausdauer um <&=con %>. Verzauberter Schrank: Bergmannsset (Gegenstand 2 von 3).",
     "headgear": "Kopfschutz",
     "headBase0Text": "Kein Helm.",
     "headBase0Notes": "Keine Kopfbedeckung.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Diese Flammen brennen kalt mit purem Verstand. Gewährt keinen Attributbonus. Dezember 2015 Abonnentengegenstand.",
     "headMystery201601Text": "Helm der wahren Entschlossenheit",
     "headMystery201601Notes": "Bleibe entschlossen, tapferer Held! Gewährt keinen Attributbonus. Januar 2016 Abonnenten-Gegenstand.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Herzensbrecher-Haube",
+    "headMystery201602Notes": "Halte Deine Identität vor all Deinen Verehrern geheim. Gewährt keinen Attributbonus. Februar 2016 Abonnentengegenstand.",
     "headMystery301404Text": "Schicker Zylinder",
     "headMystery301404Notes": "Ein schicker Zylinder für die feinsten Gentlemänner und -frauen! Januar 3015 Abonennten-Gegenstand. Kein Attributbonus.",
     "headMystery301405Text": "Einfacher Zylinder",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Schon allein diese gelockte Perücke reicht, um dem wildesten Feind Angst einzujagen. Erhöht Stärke um <%= str %>. Verzauberter Schrank: Richterset (Gegenstand 1 von 3).",
     "headArmoireJesterCapText": "Narrenkappe",
     "headArmoireJesterCapNotes": "Die Glöckchen an dieser Kappe könnten dein Gegenüber ablenken, doch dir helfen sie einfach dich zu konzentrieren. Erhöht Wahrnehmung um  <%= per %>. Verzauberter Schrank: Narrenset (Gegenstand 1 von 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Bergmannshelm",
+    "headArmoireMinerHelmetNotes": "Schütze Deinen Kopf vor herunterfallenden Aufgaben! Erhöht Intelligenz um <&=int %>. Verzauberter Schrank: Bergmannsset (Gegenstand 1 von 3).",
     "offhand": "Schildhand-Gegenstand",
     "shieldBase0Text": "Keine Schildhand-Ausrüstung",
     "shieldBase0Notes": "Kein Schild oder keine zweite Waffe.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "Ein Hoch auf den besungenen Herrscher! Erhöht Ausdauer, intelligenz und Wahrnehmung um je <%= attrs %>. Verzauberter Schrank: Königsset (Gegenstand 2 von 3).",
     "shieldArmoireDragonTamerShieldText": "Drachenzähmer Schild",
     "shieldArmoireDragonTamerShieldNotes": "Lenke deine Feinde mit diesem Schild in Drachenform ab. Erhöht Wahrnehmung um <%= per %>.  Drachenzähmer Set (Gegenstand 2 von 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Wunderlampe",
+    "shieldArmoireMysticLampNotes": "Erleuchte die dunkelsten Höhlen mit dieser Wunderlampe! Erhöht Wahrnehmung um <%= per %>. unabhängigen Item.",
     "back": "Rückenschmuck",
     "backBase0Text": "Kein Rückenschmuck",
     "backBase0Notes": "Kein Rückenschmuck.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Brande vor den Fleißigen Docks und reite die Wellen der Unvollständigkeitsbucht! gewährt keinen Attributbonus. Abonnentengegenstand Juli 2015",
     "backMystery201510Text": "Koboldschwanz",
     "backMystery201510Notes": "Zum Greifen geeignet und mächtig! Gewährt keinen Attributbonus. Oktober 2015 Abonenntengegenstand.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Herzensbrecher-Umhang",
+    "backMystery201602Notes": "Beim Rascheln Deines Umhangs liegen Deine Feinde Dir zu Füßen! Gewährt keinen Attributbonus. Februar 2016 Abonnentengegenstand.",
     "backSpecialWonderconRedText": "Mächtiger Umhang",
     "backSpecialWonderconRedNotes": "Strotzt vor Stärke und Schönheit. Kein Attributbonus. Special Edition Convention-Gegenstand.",
     "backSpecialWonderconBlackText": "Tückischer Umhang",
diff --git a/common/locales/de/generic.json b/common/locales/de/generic.json
index ef52f39ba7..188b90383f 100644
--- a/common/locales/de/generic.json
+++ b/common/locales/de/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Ich habe ein neues Haustier ausgebrütet, indem ich meine Aufgaben im echten Leben erledigt habe!",
     "raisePetShare": "Ich habe ein Haustier zu einem Reittier großgezogen, indem ich meine Aufgaben im echten Leben erledigt habe!",
     "wonChallengeShare": "Ich habe in Habitica einen Wettbewerb gewonnen!",
-    "achievementShare": "Ich habe in Habitica einen neuen Erfolg verdient!"
+    "achievementShare": "Ich habe in Habitica einen neuen Erfolg verdient!",
+    "orderBy": "Sortieren nach <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/de/groups.json b/common/locales/de/groups.json
index 8ab1ea05e4..81c58d6ed6 100644
--- a/common/locales/de/groups.json
+++ b/common/locales/de/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Gasthaus-Chat",
     "innCheckOut": "Das Gasthaus verlassen",
     "innCheckIn": "Im Gasthaus erholen",
     "innText": "Du erholst dich im Gasthaus! Während du dort verweilst, werden dir deine täglichen Aufgaben keinen Schaden zufügen, aber trotzdem täglich aktualisiert werden. Vorsicht: Wenn du an einem Bosskampf teilnimmst, erhältst du weiterhin Schaden für die verpassten Aufgaben deiner Gruppenmitglieder, sofern sich diese nicht auch im Gasthaus befinden! Außerdem wird der Schaden, den Du dem Boss zufügst, (und gefundene Gegenstände) erst angewendet, wenn du das Gasthaus verlässt.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Dein Gruppenchat ist leer. Tippe eine Nachricht in der Box und beginne mit dem Chat.",
     "guildChatEmpty": "Dieser Gildenchat ist leer. Gib eine Nachricht ein und beginne mit dem Chat.",
     "possessiveParty": "<%= name %>s Gruppe",
-    "requestAcceptGuidelines": "Wenn du Nachrichten in der Schenke oder in irgendeinem Gruppen- oder Gilden-Chat posten willst, bitte lies zuerst unsere <%= linkStart %>Community-Richtlinien<%= linkEnd %>. Klicke danach unten auf den Button, um sie zu akzeptieren."
+    "requestAcceptGuidelines": "Wenn du Nachrichten in der Schenke oder in irgendeinem Gruppen- oder Gilden-Chat posten willst, bitte lies zuerst unsere <%= linkStart %>Community-Richtlinien<%= linkEnd %>. Klicke danach unten auf den Button, um sie zu akzeptieren.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Du bist einer Gruppe mit einer anderen Person beigetreten! Viel Spaß beim Kampf gegen Monster und gegenseitigen Unterstützen.",
+    "partyOnAchievement": "Du bist einer Gruppe mit mindestens vier Personen beigetreten! Genieße die gestiegene Zurechenbarkeit, wenn du dich mit deinen Freunden vereinst, um eure Feinde zu bezwingen!"
 }
\ No newline at end of file
diff --git a/common/locales/de/messages.json b/common/locales/de/messages.json
index 07b38fd946..2db5db75f9 100644
--- a/common/locales/de/messages.json
+++ b/common/locales/de/messages.json
@@ -15,18 +15,18 @@
     "messageEquipped": "<%= itemText %> angelegt.",
     "messageUnEquipped": "<%= itemText %> abgelegt.",
     "messageMissingEggPotion": "Dir fehlt entweder dieses Ei oder dieser Trank",
-    "messageInvalidEggPotionCombo": "Du kannst Quest Haustier-Eier nicht mit magischen Schlüftränken schlüpfen lassen! Versuche es mir einem anderen Ei. ",
+    "messageInvalidEggPotionCombo": "Du kannst Quest Haustier-Eier nicht mit magischen Schlüpftränken schlüpfen lassen! Versuche es mit einem anderen Ei.",
     "messageAlreadyPet": "Du hast dieses Haustier bereits. Versuche doch eine andere Kombination.",
     "messageHatched": "Ein Ei ist ausgeschlüpft! Besichtige die Ställe um Dein Haustier auszuwählen.",
     "messageNotEnoughGold": "Nicht genug Gold",
     "messageTwoHandedEquip": "Um <%= twoHandedText %> zu führen brauchst Du beide Hände, daher wurde  <%= offHandedText %> zurück in das Inventar gelegt.",
-    "messageTwoHandedUnequip": "Um <%= twoHandedText %> zu führen brauchst Du beide Hände, daher wurde es zurück in das Inventar gelegt als Du dich mit  <%= offHandedText %> bewaffnetest. ",
+    "messageTwoHandedUnequip": "Um <%= twoHandedText %> zu führen brauchst Du beide Hände, daher wurde es zurück in das Inventar gelegt als Du dich mit  <%= offHandedText %> bewaffnet hast. ",
     "messageDropFood": "<%= dropArticle %><%= dropText %> gefunden! <%= dropNotes %>",
     "messageDropEgg": "Du hast ein <%= dropText %> Ei gefunden! <%= dropNotes %>",
     "messageDropPotion": "Du hast einen <%= dropText %>  Schlüpftrank gefunden! <%= dropNotes %>",
-    "messageDropQuest": "Du hast ein Quest gefunden!",
+    "messageDropQuest": "Du hast eine Quest gefunden!",
     "messageDropMysteryItem": "Du öffnest die Kiste und findest <%= dropText %>!",
-    "messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!",
+    "messageFoundQuest": "Du hast die Quest \"<%= questText %>\" gefunden!",
     "messageAlreadyPurchasedGear": "Du hast dieses Item in der Vergangenheit bereits gekauft, besitzt es aktuell aber nicht mehr. Du kannst es in der Belohnungen Spalte deiner Aufgaben Seite erneut kaufen.",
     "messageAlreadyOwnGear": "Du besitzt den Gegenstand schon. Gehe zur Ausrüstungsseite, um ihn anzulegen.",
     "armoireEquipment": "<%= image %> Du hast ein Stück seltener Ausrüstung im verzauberten Schrank gefunden: <%= dropText %>! Wow!",
@@ -41,7 +41,7 @@
     "messageAuthMustBeLoggedIn": "Du musst angemeldet sein.",
     "messageAuthMustIncludeTokens": "Deine Anfrage muss ein Token und eine UID (Benutzer-Kennung) beinhalten",
     "messageGroupNotFound": "Gruppe nicht gefunden, oder du hast keine Zugriffsrechte.",
-    "messageGroupAlreadyInParty": "Eine Gruppe bereits beigetreten, versuche die Seite neu zu laden.",
+    "messageGroupAlreadyInParty": "Einer Gruppe bereits beigetreten, versuche die Seite neu zu laden.",
     "messageGroupOnlyLeaderCanUpdate": "Nur der Gruppenleiter kann die Gruppe aktualisieren!",
     "messageGroupRequiresInvite": "Du kannst keiner Gruppe beitreten, zu der du nicht eingeladen wurdest.",
     "messageGroupCannotRemoveSelf": "Du kannst dich nicht selbst entfernen!",
diff --git a/common/locales/de/npc.json b/common/locales/de/npc.json
index 204b1a6bd0..dc82f36f67 100644
--- a/common/locales/de/npc.json
+++ b/common/locales/de/npc.json
@@ -21,7 +21,7 @@
     "ian": "Jan",
     "ianText": "Willkommen beim Quest Shop! Hier kannst du Questschriftrollen besorgen, um mit deinen Freunden Monster zu bekämpfen. Durchstöbere unsere große Anzahl an Schriftrollen und investiere in die Richtige!",
     "ianBrokenText": "Willkommen beim Quest Shop... Hier kannst du Questschriftrollen besorgen, um mit deinen Freunden Monster zu bekämpfen... Durchstöbere unsere große Anzahl an Schriftrollen und investiere in die Richtige...",
-    "USD": "(EUR)",
+    "USD": "(USD)",
     "newStuff": "Neuigkeiten",
     "cool": "Erzähl es mir später",
     "dismissAlert": "Als gelesen markieren",
diff --git a/common/locales/de/quests.json b/common/locales/de/quests.json
index 80038272bf..30bd8cfeec 100644
--- a/common/locales/de/quests.json
+++ b/common/locales/de/quests.json
@@ -25,7 +25,7 @@
     "rejected": "Abgelehnt",
     "pending": "Überlegt noch",
     "questStart": "Sobald alle Mitglieder die Einladung entweder angenommen oder abgelehnt haben beginnt die Quest. Nur diejenigen, die die Einladung \"angenommen\" haben können an der Quest teilnehmen und die Belohnungen kassieren. Wenn Mitglieder zu lange überlegen (inaktiv?), kannst Du die Quest ohne sie starten indem Du auf \"Beginnen\" klickst. Der Quest-Besitzer kann die Quest auch abbrechen und die Questrolle zurückerhalten indem er \"Abbrechen\" klickt.",
-    "questStartBroken": "Sobald alle Mitglieder die Einladung entweder angenommen oder abgelehnt haben beginnt das Quest... Nur diejenigen, die die Einladung \"angenommen\" haben können an dem Quest teilnehmen und die Belohnungen kassieren... Wenn Mitglieder zu lange überlegen (inaktiv?), kannst Du das Quest ohne sie starten indem Du auf \"Beginnen\" klickst... Der Quest-Besitzer kann die Quest auch abbrechen und die Questrolle zurückerhalten indem er \"Abbrechen\" klickt...",
+    "questStartBroken": "Sobald alle Mitglieder die Einladung entweder angenommen oder abgelehnt haben beginnt die Quest… Nur diejenigen, die die Einladung \"angenommen\" haben können an der Quest teilnehmen und die Belohnungen kassieren… Wenn Mitglieder zu lange überlegen (inaktiv?), kann der Quest-Besitzer die Quest ohne sie starten indem er auf \"Beginnen\" klickt… Der Quest-Besitzer kann die Quest auch abbrechen und die Questschriftrolle zurückerhalten indem er auf \"Abbrechen\" klickt...",
     "begin": "Beginnen",
     "bossHP": "Boss Lebenspunkte",
     "bossStrength": "Boss Stärke",
diff --git a/common/locales/de/questscontent.json b/common/locales/de/questscontent.json
index 7e8b30a8c3..ee581b27db 100644
--- a/common/locales/de/questscontent.json
+++ b/common/locales/de/questscontent.json
@@ -274,14 +274,14 @@
     "questSnakeBoss": "Schlange der Ablenkung",
     "questSnakeDropSnakeEgg": "Schlange (Ei)",
     "questSnakeUnlockText": "Ermöglicht den Kauf von Schlangeneiern auf dem Marktplatz",
-    "questUnicornText": "Überzeuge die Königin der Einhörner",
-    "questUnicornNotes": "Conquest Creek ist völlig verschlammt und zerstört so Habit City's Frischwasser Vorräte! Glücklicherweise kennt @Lukreja eine alte Legende, laut dieser ein Einhorn-Horn in der Lage ist das fauleste aller Wasser zu reinigen. Gemeinsam mit deinem unerschrockenen Führer @UncommonCriminal machst du dich auf die Reise durch die, im ewigen Eis verborgenen, Gipfel der Mäandergebirge.\nLetztendlich, auf der eisigen Spitze vom Mount Habitica erblickst du inmitten des funkelnden Schneetreiben die Einhorn-Königing höchstselbst.\n\"Dein Gesuch ist überzeugend\", spricht sie. \"Aber zuerst musst du dich meiner Hilfe als würdig erweisen!\"",
-    "questUnicornCompletion": "Von deiner Aufrichtigkeit und Stärke beeindruckt stimmt die Einhorn-Königin deinem Anliegen zu. Auf Ihrem Rücken reitend fliegt ihr zum Ursprung des Conquest Creek. In dem Moment wo das güldene Horn der Königing das faulige Wasser berührt beginnt ein grell-blaues List aus dem Wasser zu steigen. Es blendet so sehr das du nicht anders kannst als deine Augen zu verschließen. Als du sie einen Moment später wieder öffnest ist die Königing verschwundend. Ehe du darüber nachdenken kannst hörst du @rosiesully´s Freudenschrei: Das Wasser ist nun klar und am Ufer des Flusses erblickst du drei glänzende Eier.",
-    "questUnicornBoss": "Die Königin der Einhörner",
+    "questUnicornText": "Überzeuge die Einhornkönigin",
+    "questUnicornNotes": "Conquest Creek ist völlig verschlammt und zerstört so Habit Citys Frischwasser-Vorräte! Glücklicherweise kennt @Lukreja eine alte Legende, laut welcher das Horn eines Einhorns in der Lage ist selbst das fauleste aller Wasser zu reinigen. Gemeinsam mit deinem unerschrockenen Führer @UncommonCriminal machst du dich auf die Reise durch die, im ewigen Eis verborgenen, Gipfel der Mäandergebirge.\nLetztendlich, auf der eisigen Spitze von Mount Habitica erblickst du inmitten des funkelnden Schneetreibens die Einhorn-Königin höchstselbst.\n\"Dein Gesuch ist überzeugend\", spricht sie. \"Aber zuerst musst du dich meiner Hilfe als würdig erweisen!\"",
+    "questUnicornCompletion": "Von deiner Aufrichtigkeit und Stärke beeindruckt stimmt die Einhorn-Königin schließlich deinem Anliegen zu. Auf Ihrem Rücken reitend fliegt ihr zum Ursprung des Conquest Creek. In dem Moment, als das güldene Horn der Königin das faulige Wasser berührt beginnt ein grell-blaues Licht aus dem Wasser zu steigen. Es blendet so sehr, dass du nicht anders kannst als deine Augen zu schließen. Als du sie einen Augenblick später wieder öffnest ist die Königin verschwunden. Ehe du darüber nachdenken kannst hörst du @rosiesullys Freudenschrei: Das Wasser ist nun klar und am Ufer des Flusses erblickst du drei glänzende Eier.",
+    "questUnicornBoss": "Die Einhornkönigin",
     "questUnicornDropUnicornEgg": "Einhorn (Ei)",
     "questUnicornUnlockText": "Ermöglicht den Kauf von Einhorneier auf dem Marktplatz",
     "questSabretoothText": "Der Säbelzahntiger",
-    "questSabretoothNotes": "Ein brüllendes Monster terrorisiert Habitica! Die Kreatur pirscht sich durch Wildnis und Wälder an, greift blitzschnell an und verschwindet so schnell sie gekommen ist wieder. Es hat unschuldige Pandas angegriffen und die Flugkeiler erschreckt, sodass sie geflohen sind und sich in den Bäumen verstecken. @Inventrix und @icefelis erklären, dass der Zombie-Säbelzahntiger freigelassen wurde, während sie in den alten, verlassenen Eisfeldern der Stoischen Steppe gruben. \"Es war zuerst sehr freundlich - Ich weiß nicht, was passiert ist. Bitte hilf uns es wieder einzufangen! Nur ein Meister von Habitica kann dieses prähistorische Biest bändigen!\"",
+    "questSabretoothNotes": "Ein brüllendes Monster terrorisiert Habitica! Die Kreatur pirscht durch Wildnis und Wälder, greift blitzschnell an und verschwindet so schnell es gekommen ist wieder. Es hat unschuldige Pandas angegriffen und die Flugkeiler erschreckt, sodass sie geflohen sind und sich in den Wäldern verstecken. @Inventrix und @icefelis erklären, dass der Zombie-Säbelzahntiger freigelassen wurde, während sie in den alten, verlassenen Eisfeldern der Stoischen Steppe gruben. \"Es war zuerst sehr freundlich - Ich weiß nicht, was passiert ist. Bitte hilf uns es wieder einzufangen! Nur ein Meister von Habitica kann dieses prähistorische Biest bändigen!\"",
     "questSabretoothCompletion": "Nach einem langen und ermüdenden Kampf, ringst Du den Zombie-Säbelzahntiger zu Boden. Als Du endlich in der Lage bist heranzutreten, bemerkst Du ein scheußliches Loch in einem seiner Zähne. Nun erkennst Du den wahren Grund für den Zorn des Tigers, füllst das Loch mit @Fandekasp und rätst allen, ihre Freunde in Zukunft nicht länger mit Süßigkeiten zu füttern. Der Säbelzahntiger blüht auf und aus Dankbarkeit senden Dir seine Dompteure eine großzügige Belohnung - einen Haufen Säbelzahntigereier!",
     "questSabretoothBoss": "Zombie Säbelzahntiger",
     "questSabretoothDropSabretoothEgg": "Säbelzahntiger (Ei)",
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Du hast es geschafft! Keine Bananen für diese Übeltäter, heute. Überwältigt von deinem Eifer fliehen die Affen in heller Panik. \"Guck mal\", sagt @Misceo. \"Sie haben ein paar Eier zurückgelassen.\" <br><br>@Leephon grinst. \"Vielleicht werden Dir ein paar gut trainierte Haustieraffen so gut helfen, wie die wilden ein Hindernis waren!\"",
     "questMonkeyBoss": "Monströser Mandrill",
     "questMonkeyDropMonkeyEgg": "Affe (Ei)",
-    "questMonkeyUnlockText": "Ermöglicht den Kauf von Affeneiern auf dem Marktplatz"
+    "questMonkeyUnlockText": "Ermöglicht den Kauf von Affeneiern auf dem Marktplatz",
+    "questSnailText": "Der Schneckerich der schlammigen Schinderei",
+    "questSnailNotes": "Du freust dich, deinen Quest in den verlassenen Schinderverliesen zu beginnen, aber kaum, dass du die Verliese betrittst, fühlst du wie der Grund unter dir an deinen Stiefeln zu saugen beginnt. Du betrachtest den Pfad vor dir und siehst in Schleim versunkene Habiticaner.  @Overomega brüllt, \"Sie haben zu viele unwichtige Aufgaben, und sie bleiben an Dingen hängen, die nicht wichtig sind! Zieh sie raus! <br><br>\"Du musst die Quelle des Schlamms finden,\" stimmt @Pfeffernusse zu, \"oder die nicht erfüllbaren Aufgaben ziehen sie ewig hinunter!\"<br><br>Deine Waffe ziehend watest du durch den zählen Schlamm... und triffst auf den fürchterlichen Schneckerich der schlammigen Schinderei.",
+    "questSnailCompletion": "Du lässt deine Waffe auf den Schneckenpanzer niederfahren, wobei dieser in zwei Teile zerbricht und eine Flutwelle Wasser freigibt. Der Schleim wird weggespült und die Habiticaner um dich herum  jubeln.  \"Sieh!\" sagt @Misceo. \"Dort liegt einige Schneckerich-Eier in den Überresten des Unrats.\" ",
+    "questSnailBoss": "Schneckerich der schlammigen Schinderei",
+    "questSnailDropSnailEgg": "Schneckerich (Ei)",
+    "questSnailUnlockText": "Schaltet Schneckerich-Eier im Marktplatz frei."
 }
\ No newline at end of file
diff --git a/common/locales/de/subscriber.json b/common/locales/de/subscriber.json
index 5f8034c611..288aaf76c6 100644
--- a/common/locales/de/subscriber.json
+++ b/common/locales/de/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "Holzkrieger-Set",
     "mysterySet201512": "Winterflammen-Set",
     "mysterySet201601": "Entschlossener-Held-Set",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Herzensbrecher-Set",
     "mysterySet301404": "Steampunk-Standard-Set",
     "mysterySet301405": "Steampunk-Zubehör-Set",
     "mysterySetwondercon": "Wondercon",
diff --git a/common/locales/de/tasks.json b/common/locales/de/tasks.json
index 610015c69b..4f54922e10 100644
--- a/common/locales/de/tasks.json
+++ b/common/locales/de/tasks.json
@@ -39,7 +39,7 @@
     "streakCounter": "Strähnenzähler",
     "repeat": "Wiederholen",
     "repeatEvery": "Wiederhole alle",
-    "repeatHelpTitle": "Wie oft sollte diese Aufgabe wiederholt werden?",
+    "repeatHelpTitle": "Wie oft soll diese Aufgabe wiederholt werden?",
     "dailyRepeatHelpContent": "Diese Aufgabe wird alle X Tage fällig werden. Du kannst diesen Wert unten bestimmen. ",
     "weeklyRepeatHelpContent": "Diese Aufgabe wird an den unten hervorgehobenen Tagen fällig werden. Klicke auf einen Tag um ihn zu aktivieren / deaktivieren. ",
     "repeatDays": "Alle X Tage",
diff --git a/common/locales/en/character.json b/common/locales/en/character.json
index 4f4bacc0bb..e1548be916 100644
--- a/common/locales/en/character.json
+++ b/common/locales/en/character.json
@@ -160,5 +160,8 @@
     "str": "STR",
     "con": "CON",
     "per": "PER",
-    "int": "INT"
+    "int": "INT",
+    "showQuickAllocation": "Show stat allocation",
+    "hideQuickAllocation": "Hide stat allocation",
+    "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats."
 }
diff --git a/common/locales/en/gear.json b/common/locales/en/gear.json
index 37ca45998a..7806d910f5 100644
--- a/common/locales/en/gear.json
+++ b/common/locales/en/gear.json
@@ -1,4 +1,6 @@
 {
+  "set": "Set",
+
   "weapon": "weapon",
 
   "weaponBase0Text": "No Weapon",
@@ -158,6 +160,15 @@
   "weaponSpecialWinter2016HealerText": "Confetti Cannon",
   "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.",
 
+  "weaponSpecialSpring2016RogueText": "Fire Bolas",
+  "weaponSpecialSpring2016RogueNotes": "You've mastered the ball, the club, and the knife. Now you advance to juggling fire! Awoo! Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.",
+  "weaponSpecialSpring2016WarriorText": "Cheese Mallet",
+  "weaponSpecialSpring2016WarriorNotes": "No one has as many friends as the mouse with tender cheeses. Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.",
+  "weaponSpecialSpring2016MageText": "Staff of Bells",
+  "weaponSpecialSpring2016MageNotes": "Abra-cat-abra! So dazzling, you might mesmerize yourself! Ooh... it jingles... Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016 Spring Gear.",
+  "weaponSpecialSpring2016HealerText": "Spring Flower Wand",
+  "weaponSpecialSpring2016HealerNotes": "With a wave and a wink, you bring the fields and forests into bloom! Or bop troublesome mice on the head. Increases Intelligence by <%= int %>. Limited Edition 2016 Spring Gear.",
+
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -344,6 +355,15 @@
   "armorSpecialWinter2016HealerText": "Festive Fairy Cloak",
   "armorSpecialWinter2016HealerNotes": "Festive Fairies wrap their body wings around themselves for protection as they use their head wings to catch headwinds and fly around Habitica at speeds of up to 100 mph, delivering gifts and spraying everyone with confetti. How droll. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",
 
+  "armorSpecialSpring2016RogueText": "Canine Camo Suit",
+  "armorSpecialSpring2016RogueNotes": "A clever pup knows to choose a brighter guise for concealment when everything is green and vibrant. Increases Perception by <%= per %>. Limited Edition 2016 Spring Gear.",
+  "armorSpecialSpring2016WarriorText": "Mighty Mail",
+  "armorSpecialSpring2016WarriorNotes": "Though you be but little, you are fierce! Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",
+  "armorSpecialSpring2016MageText": "Grand Malkin Robes",
+  "armorSpecialSpring2016MageNotes": "Brightly colored, so you won't be mistaken for a necromouser. Increases Intelligence by <%= int %>. Limited Edition 2016 Spring Gear.",
+  "armorSpecialSpring2016HealerText": "Fluffy Bunny Breeches",
+  "armorSpecialSpring2016HealerNotes": "Hippity hop! Bound from hill to hill, healing those in need. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",
+
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -553,6 +573,15 @@
   "headSpecialWinter2016HealerText": "Fairy Wing Helm",
   "headSpecialWinter2016HealerNotes": "Thesewingsfluttersoquicklythattheyblur! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.",
 
+  "headSpecialSpring2016RogueText": "Good Doggy Mask",
+  "headSpecialSpring2016RogueNotes": "Aww, what a cute puppy! Come here and let me pet your head. ...Hey, where did all my Gold go? Increases Perception by <%= per %>. Limited Edition 2016 Spring Gear.",
+  "headSpecialSpring2016WarriorText": "Mouse Guard Helm",
+  "headSpecialSpring2016WarriorNotes": "Never again shall you be bopped on the head! Let them try! Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.",
+  "headSpecialSpring2016MageText": "Grand Malkin Hat",
+  "headSpecialSpring2016MageNotes": "Apparel to set you above the mere alley-mages of the world. Increases Perception by <%= per %>. Limited Edition 2016 Spring Gear.",
+  "headSpecialSpring2016HealerText": "Blossom Diadem",
+  "headSpecialSpring2016HealerNotes": "It glints with the potential of new life ready to burst forth. Increases Intelligence by <%= int %>. Limited Edition 2016 Spring Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
 
@@ -732,6 +761,13 @@
   "shieldSpecialWinter2016HealerText": "Pixie Present",
   "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",
 
+  "shieldSpecialSpring2016RogueText": "Fire Bolas",
+  "shieldSpecialSpring2016RogueNotes": "You've mastered the ball, the club, and the knife. Now you advance to juggling fire! Awoo! Increases Strength <%= str %>. Limited Edition 2016 Spring Gear.",
+  "shieldSpecialSpring2016WarriorText": "Cheese Wheel",
+  "shieldSpecialSpring2016WarriorNotes": "You braved fiendish traps to procure this defense-boosting food. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",
+  "shieldSpecialSpring2016HealerText": "Floral Buckler",
+  "shieldSpecialSpring2016HealerNotes": "The April Fool claims this little shield will block Shiny Seeds. Don't believe him. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.",
+
   "shieldMystery201601Text": "Resolution Slayer",
   "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
   "shieldMystery301405Text": "Clock Shield",
@@ -822,8 +858,17 @@
   "headAccessorySpecialSpring2015HealerText": "Green Kitty Ears",
   "headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
 
+  "headAccessorySpecialSpring2016RogueText": "Green Dog Ears",
+  "headAccessorySpecialSpring2016RogueNotes": "With these, you can keep track of tricky Mages even if they turn invisible! Confers no benefit. Limited Edition 2016 Spring Gear.",
+  "headAccessorySpecialSpring2016WarriorText": "Red Mouse Ears",
+  "headAccessorySpecialSpring2016WarriorNotes": "To better hear your theme song across clamorous battlefields. Confers no benefit. Limited Edition 2016 Spring Gear.",
+  "headAccessorySpecialSpring2016MageText": "Yellow Cat Ears",
+  "headAccessorySpecialSpring2016MageNotes": "These sharp ears can detect the minute hum of ambient Mana, or the muted footfalls of a Rogue. Confers no benefit. Limited Edition 2016 Spring Gear.",
+  "headAccessorySpecialSpring2016HealerText": "Purple Bunny Ears",
+  "headAccessorySpecialSpring2016HealerNotes": "They stand like flags above the fray, letting others know where to run for help. Confers no benefit. Limited Edition 2016 Spring Gear.",
+
   "headAccessoryBearEarsText": "Bear Ears",
-  "headAccessoryBearEarsNotes": "These ears make you look like a cuddly bear! Confers no benefit.",
+  "headAccessoryBearEarsNotes": "These ears make you look like a brave bear! Confers no benefit.",
   "headAccessoryCactusEarsText": "Cactus Ears",
   "headAccessoryCactusEarsNotes": "These ears make you look like a prickly cactus! Confers no benefit.",
   "headAccessoryFoxEarsText": "Fox Ears",
diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json
index 409e48e1f0..3c1e1bfb21 100644
--- a/common/locales/en/generic.json
+++ b/common/locales/en/generic.json
@@ -177,5 +177,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index fc3a7c6d1e..ecae985923 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -147,6 +147,10 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
 
diff --git a/common/locales/en/limited.json b/common/locales/en/limited.json
index 449d2ff26d..687d0e607e 100644
--- a/common/locales/en/limited.json
+++ b/common/locales/en/limited.json
@@ -67,6 +67,10 @@
     "witchyWizardSet": "Witchy Wizard (Mage)",
     "mummyMedicSet": "Mummy Medic (Healer)",
     "vampireSmiterSet": "Vampire Smiter (Rogue)",
+    "bewareDogSet": "Beware Dog (Warrior)",
+    "magicianBunnySet": "Magician's Bunny (Mage)",
+    "comfortingKittySet": "Comforting Kitty (Healer)",
+    "sneakySqueakerSet": "Sneaky Squeaker (Rogue)",
     "fallEventAvailability": "Available until October 31",
     "winterEventAvailability": "Available until December 31"
 }
diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index b48b7ddd1e..a5ea38a2d6 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -102,7 +102,7 @@
     "invitedParty": "Invited To Party",
     "invitedGuild": "Invited To Guild",
     "importantAnnouncements": "Your account is inactive",
-    "weeklyRecaps": "Summaries of your account activity in the past week",
+    "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)",
     "questStarted": "Your Quest has Begun",
     "invitedQuest": "Invited to Quest",
     "kickedGroup": "Kicked from group",
diff --git a/common/locales/en@pirate/communityguidelines.json b/common/locales/en@pirate/communityguidelines.json
index 8646b9acf9..45c3f9aab1 100644
--- a/common/locales/en@pirate/communityguidelines.json
+++ b/common/locales/en@pirate/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In an ocean as wide as Habitica, Pirates come and go, sometimes the Privateers be needin' a break.  These here be Privateers Emeritus.  They have swabbed the deck and walked the plank and no longer have yer special powers, but they still be honorable.",
     "commGuidePara014": "Privateers Emeritus:",
     "commGuideHeadingPublicSpaces": "Gatherin' Places in Habitica",
-    "commGuidePara015": "There be two kinds of gatherin' places in Habitica: public 'n private. The Pub, Public Guilds, GitHub, Trello, 'n the Wiki be public. Private Guilds, party chat, 'n Messages in a Bottle be private.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "When navigating ther' rough seas in Habitica, some landlubber guidelines to seek out ye shold abide by so yer don't go gettin' sea sick on me boat. These be adventures ye will fancy.",
     "commGuidePara017": "<strong>Respect each other.</strong> Be courteous, kind, friendly, an' helpful. Remember: Habiticans come from all backgrounds an' have had wildly divergent experiences. This be part o' what makes Habitica so cool! Buildin' a community means respectin' an' celebratin' our differences as well as our similarities. Here be some easy ways t' respect each other:",
     "commGuideList02A": "<strong>Obey all o' th' Terms an' Conditions.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Comply immediately with any Mod request</strong> t' cease a discussion or move it t' th' Back Corner. Last words, partin' shots an' conclusive zingers should all be delivered (courteously) at yer \"table\" in th' Back Corner, if allowed.",
     "commGuideList02G": "<strong>Take time t' reflect instead o' respondin' in anger</strong> if someone tells ye that somethin' ye said or did made 'em uncomfortable. There be great strength in bein' able t' sincerely apologize t' someone. If ye feel that th' way they responded t' ye was inappropriate, contact a mod rather than callin' 'em out on it publicly.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported t' mods.</strong> If ye feel tha' a conversation be gettin' heated, overly emotional, or hurtful, cease t' engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> t' let us know about it. It be our job t' keep ye safe.",
-    "commGuideList02I": "<strong>Do not spam.</strong> Spammin' may include, but be not limited t': postin' th' same comment or query in multiple places, postin' links without explanation or context, postin' nonsensical messages, or postin' many messages in a row. Repeatedly beggin' fer sapphires or a subscription may also be considered spammin'.",
-    "commGuidePara019": "<strong>In private spaces,</strong> users be havin' more freedom t' discuss whatever topics they would like, but they still may not violate th' Terms an' Conditions, includin' postin' any discriminatory, violent, or threatenin' content.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Private Messages (PMs) have some additional guidelines. If someone has blocked ye, do not be contactin' 'em elsewhere t' ask 'em t' unblock ye. Additionally, ye should not be sendin' PMs t' someone askin' fer support (since public answers t' support questions be helpful t' th' community). Finally, do not be sendin' anyone PMs beggin' for a gift o' sapphires or a subscription, as this can be considered spammin'.",
     "commGuidePara021": "Some gatherin' places in Habitica abide by more guideline scrolls.",
     "commGuideHeadingTavern": "The Tavern",
diff --git a/common/locales/en@pirate/content.json b/common/locales/en@pirate/content.json
index c05a05e1ff..0cf306ced2 100644
--- a/common/locales/en@pirate/content.json
+++ b/common/locales/en@pirate/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "a prickly",
     "dropEggBearCubText": "Bear Cub",
     "dropEggBearCubMountText": "Bear",
-    "dropEggBearCubAdjective": "a cuddly",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Gryphon",
     "questEggGryphonMountText": "Gryphon",
     "questEggGryphonAdjective": "a proud",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "a colourful",
     "questEggRatText": "Rat",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "a dirty",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Octopus",
     "questEggOctopusMountText": "Kraken",
     "questEggOctopusAdjective": "a slippery",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find ye hatchin' potion to pourrrr on this egg, an' it'll hatch into  <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Base",
     "hatchingPotionWhite": "White",
diff --git a/common/locales/en@pirate/gear.json b/common/locales/en@pirate/gear.json
index 106968898c..3ce00fccd7 100644
--- a/common/locales/en@pirate/gear.json
+++ b/common/locales/en@pirate/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "Weapon",
     "weaponBase0Text": "No Weapon",
     "weaponBase0Notes": "No Weapon.",
diff --git a/common/locales/en@pirate/generic.json b/common/locales/en@pirate/generic.json
index a2ac21a5cf..44c7cfda43 100644
--- a/common/locales/en@pirate/generic.json
+++ b/common/locales/en@pirate/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched meself a new pet by completin' me real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completin' me real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned meself a new achievement in Habitica!"
+    "achievementShare": "I earned meself a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/en@pirate/groups.json b/common/locales/en@pirate/groups.json
index 378489274f..6c00c249fd 100644
--- a/common/locales/en@pirate/groups.json
+++ b/common/locales/en@pirate/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Pub Chat",
     "innCheckOut": "Check Out o' th' Quarters",
     "innCheckIn": "Rest in th' Quarters",
     "innText": "Ye be restin' in th' Inn! While checked-in, yer Dailies won't hurt ye at th' day's end, but they will still refresh every day. Be warned: If ye be participatin' in a Boss Quest, the Boss will still damage ye for ye crew mates' missed Dailies unless they be also in th' Inn! Also, yer own damage to th' Boss (or items collected) will not be applied until ye check out of th' Inn.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Yer crew chat be empty! Type a message in th' box above t' start chatting.",
     "guildChatEmpty": "This Alliance's chat be empty! Type a message in th' box above t' start chattin'.",
     "possessiveParty": "<%= name %>'s Crew",
-    "requestAcceptGuidelines": "If ye would like t' post messages in th' Pub or any crew or alliance chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> an' then click th' button below t' indicate that ye accept them."
+    "requestAcceptGuidelines": "If ye would like t' post messages in th' Pub or any crew or alliance chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> an' then click th' button below t' indicate that ye accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/en@pirate/questscontent.json b/common/locales/en@pirate/questscontent.json
index e038dd3394..197cd43d4e 100644
--- a/common/locales/en@pirate/questscontent.json
+++ b/common/locales/en@pirate/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/en_GB/character.json b/common/locales/en_GB/character.json
index 19fb711578..304a1c786a 100644
--- a/common/locales/en_GB/character.json
+++ b/common/locales/en_GB/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Stats & Achievements",
     "profile": "Profile",
-    "avatar": "Customize Avatar",
+    "avatar": "Customise Avatar",
     "other": "Other",
     "fullName": "Full Name",
     "displayName": "Display Name",
diff --git a/common/locales/en_GB/communityguidelines.json b/common/locales/en_GB/communityguidelines.json
index d0948aef97..6b1b22d31d 100644
--- a/common/locales/en_GB/communityguidelines.json
+++ b/common/locales/en_GB/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a moderator needs to lay down their noble mantle and relax. The following are Moderators Emeritus. They no longer act with the power of a Moderator, but we would still like to honour their work!",
     "commGuidePara014": "Moderators Emeritus:",
     "commGuideHeadingPublicSpaces": "Public Spaces In Habitica",
-    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "When navigating the public spaces in Habitica, there are some general rules to keep everyone safe and happy. These should be easy for adventurers like you!",
     "commGuidePara017": "<strong>Respect each other.</strong> Be courteous, kind, friendly, and helpful. Remember: Habiticans come from all backgrounds and have had wildly divergent experiences. This is part of what makes Habitica so cool! Building a community means respecting and celebrating our differences as well as our similarities. Here are some easy ways to respect each other:",
     "commGuideList02A": "<strong>Obey all of the Terms and Conditions.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Comply immediately with any Mod request</strong> to cease a discussion or move it to the Back Corner. Last words, parting shots and conclusive zingers should all be delivered (courteously) at your \"table\" in the Back Corner, if allowed.",
     "commGuideList02G": "<strong>Take time to reflect instead of responding in anger</strong> if someone tells you that something you said or did made them uncomfortable. There is great strength in being able to sincerely apologise to someone. If you feel that the way they responded to you was inappropriate, contact a mod rather than calling them out on it publicly.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Repeatedly begging for gems or a subscription may also be considered spamming.",
-    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Private Messages (PMs) have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
     "commGuidePara021": "Furthermore, some public spaces in Habitica have additional guidelines.",
     "commGuideHeadingTavern": "The Tavern",
diff --git a/common/locales/en_GB/content.json b/common/locales/en_GB/content.json
index 6bdcd6ff54..366ee70abb 100644
--- a/common/locales/en_GB/content.json
+++ b/common/locales/en_GB/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "a prickly",
     "dropEggBearCubText": "Bear Cub",
     "dropEggBearCubMountText": "Bear",
-    "dropEggBearCubAdjective": "a cuddly",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Gryphon",
     "questEggGryphonMountText": "Gryphon",
     "questEggGryphonAdjective": "a proud",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "a colourful",
     "questEggRatText": "Rat",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "a dirty",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Octopus",
     "questEggOctopusMountText": "Octopus",
     "questEggOctopusAdjective": "a slippery",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Base",
     "hatchingPotionWhite": "White",
diff --git a/common/locales/en_GB/gear.json b/common/locales/en_GB/gear.json
index 7cbdd7d4c2..d710428060 100644
--- a/common/locales/en_GB/gear.json
+++ b/common/locales/en_GB/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "weapon",
     "weaponBase0Text": "No Weapon",
     "weaponBase0Notes": "No Weapon.",
@@ -176,7 +177,7 @@
     "weaponArmoireBarristerGavelNotes": "Order! Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Barrister Set (Item 3 of 3).",
     "weaponArmoireJesterBatonText": "Jester Baton",
     "weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
+    "weaponArmoireMiningPickaxText": "Mining Pickaxe",
     "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
     "armor": "armour",
     "armorBase0Text": "Plain Clothing",
diff --git a/common/locales/en_GB/generic.json b/common/locales/en_GB/generic.json
index bbef52262b..d37ec56b73 100644
--- a/common/locales/en_GB/generic.json
+++ b/common/locales/en_GB/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/en_GB/groups.json b/common/locales/en_GB/groups.json
index df1cec1d3d..7048a3b802 100644
--- a/common/locales/en_GB/groups.json
+++ b/common/locales/en_GB/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Communit Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Communit Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/en_GB/questscontent.json b/common/locales/en_GB/questscontent.json
index 2c381011e6..0e36686d1a 100644
--- a/common/locales/en_GB/questscontent.json
+++ b/common/locales/en_GB/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/es/backgrounds.json b/common/locales/es/backgrounds.json
index 8dc4757a8b..892a4c1e09 100644
--- a/common/locales/es/backgrounds.json
+++ b/common/locales/es/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Lee en esta acogedora biblioteca.",
     "backgroundGrandStaircaseText": "Gran escalinata",
     "backgroundGrandStaircaseNotes": "Desciende por la gran escalinata.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "SET 22: lanzado en marzo del 2016",
+    "backgroundDeepMineText": "Mina profunda",
+    "backgroundDeepMineNotes": "Encuentra metales preciosos en esta mina profunda.",
+    "backgroundRainforestText": "Selva tropical",
+    "backgroundRainforestNotes": "Adéntrate en la selva tropical.",
+    "backgroundStoneCircleText": "Crómlech",
+    "backgroundStoneCircleNotes": "Lanza hechizos en este crómlech."
 }
\ No newline at end of file
diff --git a/common/locales/es/character.json b/common/locales/es/character.json
index 1e72fbfbd4..3d2256ff54 100644
--- a/common/locales/es/character.json
+++ b/common/locales/es/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Estadísticas y Logros",
     "profile": "Perfil",
-    "avatar": "Customize Avatar",
+    "avatar": "Personalizar avatar",
     "other": "Otro",
     "fullName": "Nombre Completo",
     "displayName": "Nombre de Usuario",
@@ -83,7 +83,7 @@
     "allocateInt": "Puntos asignados a Inteligencia:",
     "allocateIntPop": "Añadir un punto a Inteligencia",
     "noMoreAllocate": "Ahora que has alcanzado el nivel 100, no ganarás más puntos de atributo. Puedes seguir subiendo de nivel o empezar una nueva aventura desde el nivel 1 con la <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orbe de renacimiento</a>, ya disponible gratis en el Mercado.",
-    "stats": "Avatar Stats",
+    "stats": "Atributos del avatar",
     "strength": "Fuerza",
     "strengthText": "La fuerza aumenta la probabilidad de conseguir «golpes críticos» aleatorios y el Oro, la Experiencia y la probabilidad de conseguir botín al asestarlos. También ayuda a hacer daño a los monstruos jefe.",
     "constitution": "Constitución",
@@ -136,7 +136,7 @@
     "respawn": "¡Reaparecer!",
     "youDied": "¡Has muerto!",
     "dieText": "Has perdido un Nivel, todo tu Oro y una pieza de equipamiento al azar. ¡Levántate Habiteer e inténtalo otra vez! ¡Ataca esos Hábitos negativos, mantente atento para cumplir las tareas Diarias y mantén a la muerte a raya con una Poción de Salud cuando falles!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "¿Seguro? Se restablecerán la clase y los puntos asignados a tu personaje (que recuperarás y podrás volver a asignar), y te costará 3 gemas.",
     "purchaseFor": "¿Comprar por  <%= cost %> Gemas?",
     "notEnoughMana": "No hay suficiente Maná.",
     "invalidTarget": "Objetivo inválido",
diff --git a/common/locales/es/communityguidelines.json b/common/locales/es/communityguidelines.json
index 823a7211a3..05de778e57 100644
--- a/common/locales/es/communityguidelines.json
+++ b/common/locales/es/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "En una comunidad tan grande como Habitica los usuarios vienen y van, a veces un moderador necesita bajar su manto de noble y relajarse. Los siguientes son los Moderadores emérito. Ellos ya no actúan con el poder de un Moderador, ¡pero nos gustaría seguir honrando su trabajo!",
     "commGuidePara014": "Moderadores emérito:",
     "commGuideHeadingPublicSpaces": "Espacios Públicos en Habítica",
-    "commGuidePara015": "Habitica tiene dos tipos de espacios sociales: publicos, y privados.  Espacios publicos incluyen la Taberna, los Gremios Publicos, el GitHub, el Trello, y la Wiki. Los espacios privados tiene los Gremios Privados, el chat de grupo, y mensajes privados.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Al recorrer los espacios públicos de Habitica, hay algunas reglas generales para mantener a todo el mundo seguro y feliz. ¡Deberían ser sencillas para aventureros como tú!",
     "commGuidePara017": "<strong> Respetaros los unos a los otros. </strong> Se cortés,  amable, amigable, y útil. Recuerda: Los Habititante son de muchos antecedentes diferentes y han tenido experiencias diferentes. ¡Eso es parte de lo que haze Habitica tan guay! Formar una comunidad  significa respetar y celebrar nuestras diferencias y nuestras similitudes.  Aqui hay algunas formas faciles de ser respertar a otros:",
     "commGuideList02A": "<strong>Obedece todos los Términos y Condiciones.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Cumple de inmediato con cualquier petición del Moderador</strong> de cesar un discurso o moverlo al Rincón del Fondo. Palabras últimas, quejas finales, y puntadas conclusivas deben ser dichos (con cortesía) a su \"mesa\" en el Rincón del Fondo, si está permitido.",
     "commGuideList02G": "<strong>Tome tiempo para reflexionar en vez de responder con enojo</strong> si alguien te avise que algo que dijiste o hiciste le hizo incomodo.  Hay mucha fuerza en poder disculparse sinceramente con alguien.  Si te sentís que fue inapropriada la forma en que te respondieron, póngate en contacto con un moderador en vez de públicamente llamarlo al cabo.",
     "commGuideList02H": "<strong>Las conversaciones polémicas o que causan divisiones deben ser comunicadas a los moderadores.</strong> Si notas que una conversación se calienta, se vuelve excesivamente emocional o hiriente, deja de involucrarte. En vez de ello, envía un e-mail a <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> para hacérnoslo saber. Es nuestro trabajo mantenerte a salvo.",
-    "commGuideList02I": "<strong>No hagas spam.</strong> Spamear puede incluir, pero no está limitado a ello: publicar el mismo comentario o pregunta en multiples lugares, publicar enlaces sin explicación o contexto, publicar mensajes sin sentido, o publicar muchos mensajes a la vez. Pedir gemas o una suscripción repetidamente puede considerarse también como spam.",
-    "commGuidePara019": "<strong>En lugares privados,</strong> usuarios tienen más libertad para conversar sobre cualquier tema, sin embargo no pueden violar los Términos y Condiciones, incluyendo publicar contenidos discriminatorios, violentos, o amenazantes.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "los Mensajes Privados (MPs) tienen algunas reglas adicionales. Si alguien te ha bloqueado, no lo contactes por otro lugar para pedir que te desbloquee. Adicionalmente, no debes mandar MPs a alguien para pedirle ayuda (porque las respuestas públicas en cuestiones de soporte son útiles para la comunidad). Finalmente, no mandes a nadie MPs pidiendo un regalo de gemas o una suscripción, puesto que puede ser considerado spam.",
     "commGuidePara021": "Aunque, algunos espacios públicos de habitica tienen sus normas adicionales.",
     "commGuideHeadingTavern": "La Taberna",
diff --git a/common/locales/es/content.json b/common/locales/es/content.json
index 93a3a2b303..0d7aee5b08 100644
--- a/common/locales/es/content.json
+++ b/common/locales/es/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "un Espinoso",
     "dropEggBearCubText": "Cachorro de oso",
     "dropEggBearCubMountText": "Oso",
-    "dropEggBearCubAdjective": "un Mimoso",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Grifo",
     "questEggGryphonMountText": "Grifo",
     "questEggGryphonAdjective": "digno",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "un colorido",
     "questEggRatText": "Rata",
     "questEggRatMountText": "Rata",
-    "questEggRatAdjective": "una sucia",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Pulpo",
     "questEggOctopusMountText": "Pulpo",
     "questEggOctopusAdjective": "un Resbaloso",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Mono",
     "questEggMonkeyMountText": "Mono",
     "questEggMonkeyAdjective": "un travieso",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Encuentra una poción de eclosión para verter en este huevo y eclosionará en <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Base",
     "hatchingPotionWhite": "Blanco",
diff --git a/common/locales/es/contrib.json b/common/locales/es/contrib.json
index 524dd985fb..15f1dc317d 100644
--- a/common/locales/es/contrib.json
+++ b/common/locales/es/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Ayudó al Crecimiento de Habit",
     "helpedText1": "Ayudó a que Habitica creciera completando",
     "helpedText2": "esta encuesta.",
-    "hall": "Hall of Heroes",
+    "hall": "Salón de los Héroes",
     "contribTitle": "Título de Colaborador (por ejemplo: «Herrero»)",
     "contribLevel": "Nivel Contribuidor",
     "contribHallText": "1-7 es para los contribuidores normales, 8 para los moderadores y 9 para el Staff. Esto determina que objetos, mascotas y monturas están disponibles. También determina el color de la etiqueta del nombre. Los niveles 8 y 9 tienen automáticamente el estatus de administrador.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Salón de los Colaboradores",
     "hallPatrons": "Salón de Patrocinadores",
     "rewardUser": "Recompensar Usuario",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Los gremios son grupos de conversación centrados en intereses comunes y creados por y para los jugadores. Echa un vistazo a la lista y únete a los gremios que te interesen.",
     "blurbChallenges": "Los jugadores pueden crear desafíos. Si te unes a un desafío, las tareas que contiene se añadirán a tu panel de tareas. Y si ganas el desafío, obtendrás un logro y, muchas veces, ¡gemas de premio!",
     "blurbHallPatrons": "Este es el Salón de Patrocinadores, donde honramos a los nobles aventureros que colaboraron en el primer Kickstarter de Habitica. ¡Les damos las gracias por haber hecho posible Habitica!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Este es el Salón de los Colaboradores, donde se honra a quienes han colaborado en el código libre de Habitica. Con su labor de programación, arte, música, escritura o, simplemente, su ayuda, han obtenido <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'>gemas, objetos exclusivos</a> y <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigiosos títulos</a>. ¡Tú también puedes colaborar con Habitica! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>Más información, aquí</a>."
 }
\ No newline at end of file
diff --git a/common/locales/es/gear.json b/common/locales/es/gear.json
index a1dcbdfa69..7305ab10ef 100644
--- a/common/locales/es/gear.json
+++ b/common/locales/es/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "arma",
     "weaponBase0Text": "Sin arma",
     "weaponBase0Notes": "Sin arma.",
@@ -115,7 +116,7 @@
     "weaponSpecialSpring2015WarriorText": "Porra de Hueso",
     "weaponSpecialSpring2015WarriorNotes": "Es una auténtica Porra de Hueso para auténticos y fieros cahorritos, no es para nada uno de esos mordedores que te podrían dar los Hechiceros Estacionales porque, ¿quién es un buen chico? ¿Quiéeen es un buen chico? ¡¡Tú!! ¡¡Tú eres un buen chico!! Aumenta la fuerza en <%= str %>. Equipamiento de Primavera 2015 Edición Limitada",
     "weaponSpecialSpring2015MageText": "Varita de Mago",
-    "weaponSpecialSpring2015MageNotes": "Conjure up a carrot for yourself with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
+    "weaponSpecialSpring2015MageNotes": "Conjúrate una zanahoria con esta sofisticada varita. Incrementa la Inteligencia por <%= int %> y Percepción por <%= per %>. Equipamiento de Edición Limitada de Primavera 2015.",
     "weaponSpecialSpring2015HealerText": "Cascabel de Gato",
     "weaponSpecialSpring2015HealerNotes": "Cuando lo ondeas, hace un click tan fascinante que mantendría a CUALQUIERA entretenido por horas. Aumenta la Inteligencia en <%= int %>. Equipamiento de Primavera 2015, Edición Limitada",
     "weaponSpecialSummer2015RogueText": "Coral de Fuego",
@@ -171,13 +172,13 @@
     "weaponArmoireBlueLongbowText": "Arco largo azul",
     "weaponArmoireBlueLongbowNotes": "Prepara... Apunta... ¡Fuego! Este arco tiene un gran alcance. Incrementa la Percepción por <%= per %>, la Constitución por <%= con %> y la Fuerza por <%= str %>. Armario Encantado: Artículo Independiente.",
     "weaponArmoireGlowingSpearText": "Lanza Resplandeciente",
-    "weaponArmoireGlowingSpearNotes": "This spear hypnotizes wild tasks so you can attack them. Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.",
-    "weaponArmoireBarristerGavelText": "Barrister Gavel",
-    "weaponArmoireBarristerGavelNotes": "Order! Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Barrister Set (Item 3 of 3).",
-    "weaponArmoireJesterBatonText": "Jester Baton",
-    "weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireGlowingSpearNotes": "Esta lanza hipnotiza a las tareas salvajes para que puedas atacarlas. Incrementa la Fuerza por <%= str %>. Armario Encantado: Artículo Independiente.",
+    "weaponArmoireBarristerGavelText": "Martillo de Juez",
+    "weaponArmoireBarristerGavelNotes": "¡Orden! Incrementa la Fuerza y la Constitución por <%= attrs %> cada una. Armario Encantado: Conjunto de Juez (Artículo 3 de 3).",
+    "weaponArmoireJesterBatonText": "Bastón de Bufón",
+    "weaponArmoireJesterBatonNotes": "Con una sacudida de tu bastón y una conversación ingeniosa, hasta las situaciones más complicadas se pueden calmar. Incrementa la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto de Bufón (Artículo 3 de 3).",
+    "weaponArmoireMiningPickaxText": "Pico de Minero",
+    "weaponArmoireMiningPickaxNotes": "Obtén la cantidad máxima de oro que puedas de tus tareas! Aumenta Percepción <%= per %>. Armario Encantado: Kit del Minero (Objeto 3 de 3).",
     "armor": "armadura",
     "armorBase0Text": "Ropa normal",
     "armorBase0Notes": "Ropa normal. No otorga ningún beneficio.",
@@ -214,7 +215,7 @@
     "armorHealer1Text": "Túnica de acólito",
     "armorHealer1Notes": "Prenda que muestra humildad y propósito. Aumenta constitución en <%= con %>",
     "armorHealer2Text": "Túnica de médico",
-    "armorHealer2Notes": "Llevada por aquellos dedicados a atender a los heridos en batalla. Aumenta la constitución en <%= int %>",
+    "armorHealer2Notes": "Llevada por aquellos dedicados a atender a los heridos en batalla. Aumenta la constitución en <%= con %>.",
     "armorHealer3Text": "Manto del defensor",
     "armorHealer3Notes": "Concentra la magia del sanador en si mismo para evadir el daño. Aumenta la constitución en <%= con %>",
     "armorHealer4Text": "Manto del médico",
@@ -241,10 +242,10 @@
     "armorSpecialBirthdayNotes": "¡Feliz Cumpleaños, Habitica! Vístete con esta Ropa Absurda de Fiesta para celebrar este maravilloso día. No confiere ningún beneficio.",
     "armorSpecialBirthday2015Text": "Ropa Ridícula de Fiesta",
     "armorSpecialBirthday2015Notes": "¡Feliz Cumpleaños, Habitica! Vístete con esta Ropa Ridícula de Fiesta para celebrar este maravilloso día. No confiere ningún beneficio.",
-    "armorSpecialBirthday2016Text": "Ridiculous Party Robes",
-    "armorSpecialBirthday2016Notes": "Happy Birthday, Habitica! Wear these Ridiculous Party Robes to celebrate this wonderful day. Confers no benefit.",
+    "armorSpecialBirthday2016Text": "Túnica Ridícula de Fiesta",
+    "armorSpecialBirthday2016Notes": "¡Feliz Cumpleaños, Habitica! Usa esta Túnica Ridícula de Fiesta para celebrar este maravilloso día. No otorga ningún beneficio.",
     "armorSpecialGaymerxText": "Armadura de Guerrero del Arco Iris",
-    "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
+    "armorSpecialGaymerxNotes": "Con motivo de la celebración por la Conferencia GaymerX, ¡esta armadura especial está decorada con un radiante y colorido estampado arco iris! GaymerX es una convención de juegos que celebra a la gente LGBTQ y a los videojuegos, y está abierta a todo el público.",
     "armorSpecialSpringRogueText": "Traje Elegante de Gato",
     "armorSpecialSpringRogueNotes": "Impecablemente cuidado. Aumenta la percepción en <%= per %>. Equipo de Primavera Edición Limitada 2014.",
     "armorSpecialSpringWarriorText": "Armadura de Acero de Trébol.",
@@ -361,16 +362,16 @@
     "armorArmoireShepherdRobesNotes": "Tejido con una tela fresca y transpirable, perfecta para una jornada de calor arreando grifos en el desierto. Suma <%= attrs %> de fuerza y <%= attrs %> de percepción. Ropero Encantado: conjunto de pastor (artículo 2 de 3).",
     "armorArmoireRoyalRobesText": "Ropa real",
     "armorArmoireRoyalRobesNotes": "Qué buen gobernante, que gobierna de la mañana a la noche. Suma <%= attrs %> de constitución, de inteligencia y de percepción. Ropero Encantado: conjunto real (artículo 3 de 3).",
-    "armorArmoireCrystalCrescentRobesText": "Crystal Crescent Robes",
-    "armorArmoireCrystalCrescentRobesNotes": "These magical robes are luminescent at night. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 2 of 3).",
+    "armorArmoireCrystalCrescentRobesText": "Túnica de Cristal Creciente",
+    "armorArmoireCrystalCrescentRobesNotes": "Esta túnica mágica es luminiscente durante la noche. Incrementa la Constitución y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto de Cristal Creciente (Artículo 2 de 3).",
     "armorArmoireDragonTamerArmorText": "Armadura del Domador del Dragón",
-    "armorArmoireDragonTamerArmorNotes": "This tough armor is impenetrable to flame. Increases Constitution by <%= con %>. Enchanted Armoire: Dragon Tamer Set (Item 3 of 3).",
-    "armorArmoireBarristerRobesText": "Barrister Robes",
-    "armorArmoireBarristerRobesNotes": "Very serious and stately. Increases Constitution by <%= con %>. Enchanted Armoire: Barrister Set (Item 2 of 3).",
+    "armorArmoireDragonTamerArmorNotes": "Esta armadura resistente es impenetrable a las llamas. Incrementa la Constitución por <%= con %>. Armario Encantado: Conjunto de Domador de Dragones (Artículo 3 de 3).",
+    "armorArmoireBarristerRobesText": "Túnica de Juez",
+    "armorArmoireBarristerRobesNotes": "Muy seria y majestuosa. Incrementa la Constitución por <%= con %>. Armario Encantado: Conjunto de Juez (Artículo 2 de 3).",
     "armorArmoireJesterCostumeText": "Disfraz de bufón",
-    "armorArmoireJesterCostumeNotes": "Tra-la-la! Despite the look of this costume, you are no fool. Increases Intelligence by <%= int %>. Enchanted Armoire: Jester Set (Item 2 of 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireJesterCostumeNotes": "¡Tra-la-la! A pesar del aspecto de este disfraz, no eres un bufón. Incrementa la Inteligencia por <%= int %>. Armario Encantado: Conjunto de Bufón (Artículo 2 de 3).",
+    "armorArmoireMinerOverallsText": "Overoles de Minero",
+    "armorArmoireMinerOverallsNotes": "Pueden parecer usados, pero han sido hechizados para repeler la suciedad. Aumenta la Constitución <%= con %>. Armario encantado: Kit del Minero (Objeto 2 de 3).",
     "headgear": "cubrecabeza",
     "headBase0Text": "Sin casco",
     "headBase0Notes": "Sin equipo de cabeza.",
@@ -482,26 +483,26 @@
     "headSpecialSummer2015MageNotes": "Entre los hilos de este pañuelo, brilla un poder oculto. Suma <%= per %> de percepción. Equipo de edición limitada, verano de 2015.",
     "headSpecialSummer2015HealerText": "Gorro de marinero",
     "headSpecialSummer2015HealerNotes": "Con tu gorro de marinero bien ajustado a la cabeza, puedes navegar hasta los mares más tempestuosos. Suma <%= int %> de inteligencia. Equipo de edición limitada, verano de 2015.",
-    "headSpecialFall2015RogueText": "Bat-tle Wings",
-    "headSpecialFall2015RogueNotes": "Echolocate your enemies with this powerful helm! Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.",
+    "headSpecialFall2015RogueText": "Alas de Bati-Batalla",
+    "headSpecialFall2015RogueNotes": "¡Utiliza la ecolocación para ubicar a tus enemigos con este poderoso yelmo! Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Otoño 2015.",
     "headSpecialFall2015WarriorText": "Sombrero de Espantapájaros",
-    "headSpecialFall2015WarriorNotes": "Everyone would want this hat--if they only had a brain. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.",
-    "headSpecialFall2015MageText": "Stitched Hat",
-    "headSpecialFall2015MageNotes": "Every stitch in this hat augments its power. Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.",
+    "headSpecialFall2015WarriorNotes": "Todos querrían este sombrero--si tan sólo tuvieran un cerebro. Incrementa la Fuerza por <%= str %>. Equipamiento de Edición Limitada de Otoño 2015.",
+    "headSpecialFall2015MageText": "Sombrero Cosido",
+    "headSpecialFall2015MageNotes": "Cada puntada en este sombrero aumenta su poder. Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Otoño 2015.",
     "headSpecialFall2015HealerText": "Sombrero de Rana",
-    "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.",
-    "headSpecialNye2015Text": "Ridiculous Party Hat",
-    "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
+    "headSpecialFall2015HealerNotes": "Este es un sombrero extremadamente serio que sólo es digno de los más avanzados fabricantes de pociones. Incrementa la Inteligencia por <%= int %>. Equipamiento de Edición Limitada de Otoño 2015.",
+    "headSpecialNye2015Text": "Sombrero Ridículo de Fiesta",
+    "headSpecialNye2015Notes": "¡Has recibido un Sombrero Ridículo de Fiesta! ¡Lúcelo con orgullo mientras festejas el Año Nuevo! No otorga ningún beneficio.",
     "headSpecialWinter2016RogueText": "Casco de cacao",
-    "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.",
+    "headSpecialWinter2016RogueNotes": "La bufanda protectora de este cómodo yelmo sólo se puede sacar para beber calentitas bebidas invernales. Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
     "headSpecialWinter2016WarriorText": "Gorra de muñeco de nieve",
-    "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.",
-    "headSpecialWinter2016MageText": "Snowboarder Hood",
-    "headSpecialWinter2016MageNotes": "Keeps the snow out of your eyes while you're casting spells. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.",
-    "headSpecialWinter2016HealerText": "Fairy Wing Helm",
+    "headSpecialWinter2016WarriorNotes": "¡Brr! Este fuerte yelmo es realmente poderoso... hasta que se derrite. Incrementa la Fuerza por <%= str %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
+    "headSpecialWinter2016MageText": "Capucha de Esquiador de Snowboard",
+    "headSpecialWinter2016MageNotes": "Mantiene la nieve fuera de tus ojos mientras conjuras hechizos. Incrementa la Percepción por <%= per %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
+    "headSpecialWinter2016HealerText": "Yelmo con Alas de Hada",
     "headSpecialWinter2016HealerNotes": "¡Estasalasbatentanrápidoqueniseven! Aumenta la Inteligencia en <%= int %>. Equipo de Invierno Edición Limitada 2015-2016.",
     "headSpecialGaymerxText": "Casco de Guerrero de Arco Iris",
-    "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
+    "headSpecialGaymerxNotes": "Con motivo de la celebración por la Conferencia GaymerX, ¡este casco especial está decorado con un radiante y colorido estampado arco iris! GaymerX es una convención de juegos que celebra a la gente LGBTQ y a los videojuegos, y está abierta a todo el público.",
     "headMystery201402Text": "Casco alado",
     "headMystery201402Notes": "¡Esta diadema alada imbuye a su portador con la velocidad del viento! No confiere ningún beneficio. Equipo de suscriptor Febrero 2014.",
     "headMystery201405Text": "Llama de Mente",
@@ -524,14 +525,14 @@
     "headMystery201508Notes": "¡Mira qué rizado y calentito es este gorro de guepardo! No aporta ningún beneficio. Artículo de suscriptor de agosto del 2015.",
     "headMystery201509Text": "Máscara de Hombre lobo",
     "headMystery201509Notes": "Esto ES una máscara, ¿no? No aporta ningún beneficio. Artículo de suscriptor de septiembre del 2015.",
-    "headMystery201511Text": "Log Crown",
-    "headMystery201511Notes": "Count the number of rings to learn how old this crown is. Confers no benefit. November 2015 Subscriber Item.",
+    "headMystery201511Text": "Corona de Troncos",
+    "headMystery201511Notes": "Cuenta el número de anillos para saber qué edad tiene esta corona. No otorga ningún beneficio. Artículo de Suscriptor de Noviembre 2015.",
     "headMystery201512Text": "Llama invernal",
     "headMystery201512Notes": "Estas llamas queman con la frialdad del intelecto puro. No aporta ningún beneficio. Artículo del suscriptor de diciembre del 2015.",
     "headMystery201601Text": "Yelmo de Resolución Verdadera",
-    "headMystery201601Notes": "Stay resolute, brave champion! Confers no benefit. January 2016 Subscriber Item.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201601Notes": "¡No abandones tu determinación, valiente campeón! No otorga ningún beneficio. Artículo de Suscriptor de Enero 2016.",
+    "headMystery201602Text": "Capucha de Rompecorazones",
+    "headMystery201602Notes": "Esconde tu identidad de todos tus admiradores. No otorga ningún beneficio. Artículo de suscriptor de febrero de 2016.",
     "headMystery301404Text": "Sombrero de copa sofisticado",
     "headMystery301404Notes": "¡Un sofisticado sombrero de copa solo para los más refinados caballeros! No otorga ningún beneficio. Artículo de Suscriptor de Enero del 3015",
     "headMystery301405Text": "Sombrero de copa básico",
@@ -549,7 +550,7 @@
     "headArmoireBlueHairbowText": "Lazo azul",
     "headArmoireBlueHairbowNotes": "Este bonito lazo rojo te hará perspicaz, fuerte e inteligente. Suma <%= per %> de percepción, <%= con %> de constitución y <%= int %> de inteligencia. Ropero Encantado: artículo independiente.",
     "headArmoireRoyalCrownText": "Corona real",
-    "headArmoireRoyalCrownNotes": "Hooray for the ruler, mighty and strong! Increases Strength by <%= str %>. Enchanted Armoire: Royal Set (Item 1 of 3).",
+    "headArmoireRoyalCrownNotes": "¡Viva el líder, poderoso y fuerte! Incrementa la Fuerza por <%= str %>. Armario Encantado: Conjunto Real (Artículo 1 de 3).",
     "headArmoireGoldenLaurelsText": "Corona de laurel dorado",
     "headArmoireGoldenLaurelsNotes": "Esta corona de laurel dorado recompensa a quienes han logrado vencer a sus malos hábitos. Suma <%= attrs %> de percepción y <%= attrs %> de constitución. Ropero Encantado: conjunto de toga dorada (artículo 2 de 3).",
     "headArmoireHornedIronHelmText": "Casco de hierro enastado",
@@ -561,23 +562,23 @@
     "headArmoirePlagueDoctorHatText": "Sombrero de médico de la peste negra",
     "headArmoirePlagueDoctorHatNotes": "El auténtico sombrero de los médicos que combatieron la peste negra de la procrastinación. Suma <%= str %> de fuerza, <%= int %> de inteligencia y <%= con %> de constitución. Ropero Encantado: conjunto de médico de la peste negra (artículo 1 de 3).",
     "headArmoireBlackCatText": "Sombrero de Gato Negro",
-    "headArmoireBlackCatNotes": "This black hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+    "headArmoireBlackCatNotes": "Este sombrero negro está... ronroneando. Y agitando su cola. Y ¿respirando? Sí, es sólo un gato durmiendo sobre tu cabeza. Incrementa la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Artículo Independiente.",
     "headArmoireOrangeCatText": "Sombrero de Gato Naranja",
-    "headArmoireOrangeCatNotes": "This orange hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+    "headArmoireOrangeCatNotes": "Este sombrero naranja está... ronroneando. Y agitando su cola. Y ¿respirando? Sí, es sólo un gato durmiendo sobre tu cabeza. Incrementa la Fuerza y la Constitución por <%= attrs %> cada una. Armario Encantado: Artículo Independiente.",
     "headArmoireBlueFloppyHatText": "Azul sombrero flojo",
-    "headArmoireBlueFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a brilliant blue color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
-    "headArmoireShepherdHeaddressText": "Shepherd Headdress",
-    "headArmoireShepherdHeaddressNotes": "Sometimes the gryphons that you herd like to chew on this headdress, but it makes you seem more intelligent nonetheless. Increases Intelligence by <%= int %>. Enchanted Armoire: Shepherd Set (Item 3 of 3).",
-    "headArmoireCrystalCrescentHatText": "Crystal Crescent Hat",
-    "headArmoireCrystalCrescentHatNotes": "The design on this hat waxes and wanes with the phases of the moon. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 1 of 3).",
+    "headArmoireBlueFloppyHatNotes": "Se han cosido muchos hechizos en este sombrero simple, dándole un brillante color azul. Incrementa la Constitución, la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Artículo Independiente.",
+    "headArmoireShepherdHeaddressText": "Tocado de Pastor",
+    "headArmoireShepherdHeaddressNotes": "A veces a los grifos que arreas les gusta masticar este tocado, pero de todas formas te hace parecer más inteligente. Incrementa la Inteligencia por <%= int %>. Armario Encantado: Conjunto de Pastor (Artículo 3 de 3).",
+    "headArmoireCrystalCrescentHatText": "Sombrero de Cristal Creciente",
+    "headArmoireCrystalCrescentHatNotes": "El diseño de este sombrero crece y mengua con las fases de la luna. Incrementa la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto de Cristal Creciente (Artículo 1 de 3).",
     "headArmoireDragonTamerHelmText": "Yelmo del Domador del Dragón",
-    "headArmoireDragonTamerHelmNotes": "You look exactly like a dragon. The perfect camouflage... Increases Intelligence by <%= int %>. Enchanted Armoire: Dragon Tamer Set (Item 1 of 3).",
-    "headArmoireBarristerWigText": "Barrister Wig",
-    "headArmoireBarristerWigNotes": "This bouncy wig is enough to frighten away even the fiercest foe. Increases Strength by <%= str %>. Enchanted Armoire: Barrister Set (Item 1 of 3).",
+    "headArmoireDragonTamerHelmNotes": "Te ves exactamente igual que un dragón. El camuflaje perfecto... Incrementa la Inteligencia por <%= int %>. Armario Encantado: Conjunto de Domador de Dragones (Artículo 1 de 3).",
+    "headArmoireBarristerWigText": "Peluca de Juez",
+    "headArmoireBarristerWigNotes": "Esta peluca que rebota es suficiente para ahuyentar incluso al enemigo más feroz. Incrementa la Fuerza por <%= str %>. Armario Encantado: Conjunto de Juez (Artículo 1 de 3).",
     "headArmoireJesterCapText": "Gorro de bufón",
-    "headArmoireJesterCapNotes": "The bells on this hat might distract your opponents, but they just help you focus. Increases Perception by <%= per %>. Enchanted Armoire: Jester Set (Item 1 of 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireJesterCapNotes": "Los cascabeles de este gorro pueden distraer a tus oponentes, pero a ti sólo te ayudan a concentrarte. Incrementa la Percepción por <%= per %>. Armario Encantado: Conjunto de Bufón (Artículo 1 de 3).",
+    "headArmoireMinerHelmetText": "Casco de Minero",
+    "headArmoireMinerHelmetNotes": "Protege tu cabeza de las tareas que te están cayendo! Aumenta la Inteligencia <%= int %>. Armario Encantado: Kit del Minero (Objeto 1 de 3).",
     "offhand": "objeto para la mano del escudo",
     "shieldBase0Text": "Sin equipamiento en la mano del escudo",
     "shieldBase0Notes": "Sin escudo o arma secundaria.",
@@ -651,30 +652,30 @@
     "shieldSpecialSummer2015HealerNotes": "Con este escudo, puedes aporrear a las ratas de las cloacas. Suma <%= con %> de constitución. Artículo de Edición Limitada, verano del 2015.",
     "shieldSpecialFall2015RogueText": "Hacha de Bati-Batalla",
     "shieldSpecialFall2015RogueNotes": "Las Pendientes aterradoras se encogen de miedo ante el batido de este hacha. Incrementa la Fuerza por <%= str %>. Equipamiento de Edición Limitada de Otoño 2015.",
-    "shieldSpecialFall2015WarriorText": "Birdseed Bag",
-    "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
-    "shieldSpecialFall2015HealerText": "Stirring Stick",
-    "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.",
+    "shieldSpecialFall2015WarriorText": "Bolsa de Alpiste",
+    "shieldSpecialFall2015WarriorNotes": "Es cierto que deberías ESPANTAR a los pájaros, ¡pero hacer amigos no tiene nada de malo! Incrementa la Constitución por <%= con %>. Equipamiento de Edición Limitada de Otoño 2015.",
+    "shieldSpecialFall2015HealerText": "Palo para Revolver",
+    "shieldSpecialFall2015HealerNotes": "¡Este palo puede revolver cualquier cosa sin derretirse, disolverse o prenderse fuego! También puede usarse para hincárselo ferozmente a las tareas enemigas. Incrementa la Constitución por <%= con %>. Equipamiento de Edición Limitada de Otoño 2015.",
     "shieldSpecialWinter2016RogueText": "Taza de chocolate",
     "shieldSpecialWinter2016RogueNotes": "¿Bebida caliente, o proyectil ardiente? Tú decides... Incrementa la Fuerza por <%= str %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
-    "shieldSpecialWinter2016WarriorText": "Sled Shield",
-    "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",
-    "shieldSpecialWinter2016HealerText": "Pixie Present",
-    "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.",
-    "shieldMystery201601Text": "Resolution Slayer",
-    "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
+    "shieldSpecialWinter2016WarriorText": "Escudo de Trineo",
+    "shieldSpecialWinter2016WarriorNotes": "Utiliza este trineo para bloquear ataques, ¡o deslízate con él hacia la batalla! Incrementa la Constitución por <%= con %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
+    "shieldSpecialWinter2016HealerText": "Regalo de Hada",
+    "shieldSpecialWinter2016HealerNotes": "¡¡¡¡¡¡¡¡¡Ábrelo ábrelo ábrelo ábrelo ábrelo ábrelo!!!!!!!!! Incrementa la Constitución por <%= con %>. Equipamiento de Edición Limitada de Invierno 2015-2016.",
+    "shieldMystery201601Text": "Destructora de Resoluciones",
+    "shieldMystery201601Notes": "Esta espada se puede usar para desviar a todas las distracciones. No otorga ningún beneficio. Artículo de Suscriptor de Enero 2016.",
     "shieldMystery301405Text": "Escudo Reloj",
     "shieldMystery301405Notes": "¡El tiempo está de tu parte con este imponente escudo reloj! No confiere ningún beneficio. Equipo de suscriptor Junio 3015.",
     "shieldArmoireGladiatorShieldText": "Escudo de gladiador",
     "shieldArmoireGladiatorShieldNotes": "Para ser gladiador... bueno, eso, que basta con que aporrees al enemigo con tu escudo. Suma <%= con %> de constitución y <%= str %> de fuerza. Ropero Encantado: conjunto de gladiador (artículo 3 de 3).",
     "shieldArmoireMidnightShieldText": "Escudo de Medianoche",
-    "shieldArmoireMidnightShieldNotes": "This shield is most powerful at the stroke of midnight! Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.",
-    "shieldArmoireRoyalCaneText": "Royal Cane",
-    "shieldArmoireRoyalCaneNotes": "Hooray for the ruler, worthy of song! Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Royal Set (Item 2 of 3).",
-    "shieldArmoireDragonTamerShieldText": "Dragon Tamer Shield",
-    "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMidnightShieldNotes": "¡Este escudo se vuelve más poderoso justo a la medianoche! Incrementa la Constitución por <%= con %> y la Fuerza por <%= str %>. Armario Encantado: Artículo Independiente.",
+    "shieldArmoireRoyalCaneText": "Bastón Real",
+    "shieldArmoireRoyalCaneNotes": "¡Viva el líder, digno de ser mencionado en canciones! Incrementa la Constitución, la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto Real (Artículo 2 de 3).",
+    "shieldArmoireDragonTamerShieldText": "Escudo de Domador de Dragones",
+    "shieldArmoireDragonTamerShieldNotes": "Distrae a tus enemigos con este escudo con forma de dragón. Incrementa la Percepción por <%= per %>. Armario Encantado: Conjunto de Domador de Dragones (Artículo 2 de 3).",
+    "shieldArmoireMysticLampText": "Lámpara Mística",
+    "shieldArmoireMysticLampNotes": "Ilumina las cuevas más oscuras con esta lámpara mística! Aumenta Percepción <%= per %>. Armario Encantado: Objeto Independiente.",
     "back": "Accesorio en la Espalda",
     "backBase0Text": "Sin Accesorio en la Espalda",
     "backBase0Notes": "Sin Accesorio en la Espalda",
@@ -689,9 +690,9 @@
     "backMystery201507Text": "Tabla de surf guay",
     "backMystery201507Notes": "¡Surfea sobre las Mareas del Esmero y domina las olas de la Bahía Vagancia! No aporta ningún beneficio. Artículo del suscriptor de julio del 2015.",
     "backMystery201510Text": "Cola de Trasgo",
-    "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201510Notes": "¡Prensil y poderosa! No otorga ningún beneficio. Artículo de Suscriptor de Octubre 2015.",
+    "backMystery201602Text": "Capa de Rompecorazones",
+    "backMystery201602Notes": "Con un movimiento de tu capa, ¡tus enemigos caen a tus pies! No otorga ningún beneficio. Artículo de suscriptor de febrero de 2016.",
     "backSpecialWonderconRedText": "Capa del poder",
     "backSpecialWonderconRedNotes": "Castañea con fuerza y belleza. No confiere beneficio. Artículo Edición Especial Convención.",
     "backSpecialWonderconBlackText": "Capa Sigilosa",
@@ -763,7 +764,7 @@
     "headAccessoryMystery201502Text": "Alas del Pensamiento",
     "headAccessoryMystery201502Notes": "¡Deja volar tu imaginación! No otorga ningún beneficio. Artículo de suscriptor de febrero 2015.",
     "headAccessoryMystery201510Text": "Cuernos de Trasgo",
-    "headAccessoryMystery201510Notes": "These fearsome horns are slightly slimy. Confers no benefit. October 2015 Subscriber Item.",
+    "headAccessoryMystery201510Notes": "Estos cuernos aterradores son ligeramente babosos. No otorgan ningún beneficio. Artículo de Suscriptor de Octubre 2015.",
     "headAccessoryMystery301405Text": "Gafas para la Cabeza",
     "headAccessoryMystery301405Notes": "\"Las gafas son para los ojos\" dijeron, \"Nadie quiere gafas que solo se puedan llevar en la cabeza\" dijeron. ¡Ja! ¡Demuéstrales que eso no es así! No confiere ningún beneficio. Artículo de suscriptor de agosto de 3015.",
     "eyewear": "Gafas",
diff --git a/common/locales/es/generic.json b/common/locales/es/generic.json
index af442938b1..a56a353e30 100644
--- a/common/locales/es/generic.json
+++ b/common/locales/es/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "¡He conseguido una nueva mascota cumpliendo tareas en el mundo real!",
     "raisePetShare": "¡He convertido a una mascota en montura cumpliendo tareas en el mundo real!",
     "wonChallengeShare": "¡He ganado un desafío en Habitica!",
-    "achievementShare": "¡He obtenido un nuevo logro en Habitica!"
+    "achievementShare": "¡He obtenido un nuevo logro en Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/es/groups.json b/common/locales/es/groups.json
index 830bfd48e5..2825fefdc7 100644
--- a/common/locales/es/groups.json
+++ b/common/locales/es/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Chat de la Taberna",
     "innCheckOut": "Dejar la Posada",
     "innCheckIn": "Descansar en la Posada",
     "innText": "¡Estás descansando en la Posada! Mientras sigas en ella, tus tareas diarias no te causarán daños al final del día, pero seguirán restableciéndose cada día. Por otra parte, ten cuidado: si estás participando en alguna misión contra un jefe, el jefe seguirá haciéndote daño cuando tus compañeros de grupo no cumplan sus tareas diarias, a menos que ellos también estén en la Posada. Además, el daño que provoques al jefe (o los objetos que recopiles) no tendrá efecto hasta que salgas de la Posada.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "El chat de este grupo está vacío. Escribe un mensaje en el cuadro de arriba para romper el hielo.",
     "guildChatEmpty": "El chat de este gremio está vacío. Escribe un mensaje en el cuadro de arriba para empezar una conversación.",
     "possessiveParty": "Grupo de <%= name %>",
-    "requestAcceptGuidelines": "Si quieres publicar mensajes en la Taberna o en el chat de algún grupo o gremio, lee primero las <%= linkStart %>Normas de la Comunidad<%= linkEnd %> y, a continuación, haz clic en el botón de abajo para indicar que las aceptas."
+    "requestAcceptGuidelines": "Si quieres publicar mensajes en la Taberna o en el chat de algún grupo o gremio, lee primero las <%= linkStart %>Normas de la Comunidad<%= linkEnd %> y, a continuación, haz clic en el botón de abajo para indicar que las aceptas.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/es/questscontent.json b/common/locales/es/questscontent.json
index a4cb284db5..0c36754707 100644
--- a/common/locales/es/questscontent.json
+++ b/common/locales/es/questscontent.json
@@ -252,44 +252,50 @@
     "questHorseUnlockText": "Desbloquear la compra de huevos de caballo en el Mercado",
     "questBurnoutText": "Burnout y los Espíritus Consumidos",
     "questBurnoutNotes": "Es ya bien pasada la medianoche, tranquila y sofocante, cuando Redphoenix y el capitán scout Kiwibot aparecen súbitamente cruzando las puertas de la ciudad. \"¡Tenemos que evacuar todos los edificios de madera!\" grita Redphoenix. \"¡Rápido!\"<br><br>Kiwibot se sujeta de la pared mientras recobra el aliento. \"¡Está drenando a la gente y conviertiéndola en Espíritus Consumidos! Por eso todo estaba demorado. Allí es adonde la gente desaparecida ha ido. ¡Es él quien ha estado robando su energía!\"<br><br>\"¿'Él'?\" pregunta Lemoness.<br><br>Y en ese momento el calor toma forma.<br><br>Se alza desde la tierra en una masa nebulosa y serpenteante, y el aire se satura de olor a humo y azufre. Llamas reptan a través del suelo fundido y se contorsionan formando extremidades, retorciéndose hacia alturas espeluznantes. Ojos ardientes se abren repentinamente, y la criatura deja escapar una carcajada profunda y chispeante.<br><br> Kiwibot murmura una única palabra.<br><br><em>\"Burnout.\"</em>",
-    "questBurnoutCompletion": "<strong>Burnout is DEFEATED!</strong><br><br>With a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.<br><br>Ian, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!<br><br>\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!<br><br>One of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"<br><br>Her tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"<br><br>She claps her hands. \"Now - let's celebrate!\"",
-    "questBurnoutCompletionChat": "`Burnout is DEFEATED!`\n\nWith a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.\n\nIan, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!\n\n\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!\n\nOne of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"\n\nHer tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"\n\nShe claps her hands. \"Now - let's celebrate!\"\n\nAll Habiticans receive:\n\nPhoenix Pet\nPhoenix Mount\nAchievement: Savior of the Flourishing Fields\nBasic Candy\nVanilla Candy\nSand Candy\nCinnamon Candy\nChocolate Candy\nRotten Candy\nSour Pink Candy\nSour Blue Candy\nHoney Candy",
-    "questBurnoutBoss": "Agotamiento",
-    "questBurnoutBossRageTitle": "Exhaust Strike",
-    "questBurnoutBossRageDescription": "When this gauge fills, Burnout will unleash its Exhaust Strike on Habitica!",
+    "questBurnoutCompletion": "<strong>¡Burnout es DERROTADO!</strong><br><br>Con un gran, suave suspiro, Burnout gradualmente libera la energía ardiente que alimentaba su fuego. Mientras el monstruo silenciosamente se convierte en cenizas, su energía robada centellea en el aire, rejuveneciendo a los Espíritus Consumidos y devolviéndolos a sus formas originales.<br><br>Ian, Daniel y la Hechicera Estacional festejan mientras los Habiticanos se apuran a recibirlos, y todos los ciudadanos desaparecidos de los Campos Florecientes abrazan a sus amigos y a sus familias. ¡El último Espíritu Consumido se transforma en la mismísima Parca Alegre!<br><br>\"¡Miren!\" murmura @Baconsaur, al tiempo que las cenizas comienzan a brillar. ¡Lentamente, se convierten en cientos de fénix resplandecientes!<br><br>Una de las aves radiantes se posa sobre el brazo esquelético de la Parca Alegre, y ella le sonríe. \"Ha pasado ya bastante tiempo desde que tuve el privilegio exquisito de ver un fénix en los Campos Florecientes,\" dice. \"Aunque dados los hechos recientes, debo decir, ¡esto es extremadamente apropiado!\"<br><br>Su tono se vuelve serio, aunque (naturalmente) su sonrisa persiste. \"Somos conocidos por ser muy trabajadores aquí, pero también lo somos por nuestros banquetes y festividades. Es bastante irónico, supongo, que mientras nos esforzábamos para planear una fiesta espectacular, nos rehusamos a permitirnos un tiempo de ocio. ¡Desde luego no volveremos a cometer el mismo error dos veces!\"<br><br>La Parca Alegre aplaude. \"Ahora - ¡a celebrar!\"",
+    "questBurnoutCompletionChat": "`¡Burnout es DERROTADO!`\n\nCon un gran, suave suspiro, Burnout gradualmente libera la energía ardiente que alimentaba su fuego. Mientras el monstruo silenciosamente se convierte en cenizas, su energía robada centellea en el aire, rejuveneciendo a los Espíritus Consumidos y devolviéndolos a sus formas originales.\n\nIan, Daniel y la Hechicera Estacional festejan mientras los Habiticanos se apuran a recibirlos, y todos los ciudadanos desaparecidos de los Campos Florecientes abrazan a sus amigos y a sus familias. ¡El último Espíritu Consumido se transforma en la mismísima Parca Alegre!\n\n\"¡Miren!\" murmura @Baconsaur, al tiempo que las cenizas comienzan a brillar. ¡Lentamente, se convierten en cientos de fénix resplandecientes!\n\nUna de las aves radiantes se posa sobre el brazo esquelético de la Parca Alegre, y ella le sonríe. \"Ha pasado ya bastante tiempo desde que tuve el privilegio exquisito de ver un fénix en los Campos Florecientes,\" dice. \"Aunque dados los hechos recientes, debo decir, ¡esto es extremadamente apropiado!\"\n\nSu tono se vuelve serio, aunque (naturalmente) su sonrisa persiste. \"Somos conocidos por ser muy trabajadores aquí, pero también lo somos por nuestros banquetes y festividades. Es bastante irónico, supongo, que mientras nos esforzábamos para planear una fiesta espectacular, nos rehusamos a permitirnos un tiempo de ocio. ¡Desde luego no volveremos a cometer el mismo error dos veces!\"\n\nLa Parca Alegre aplaude. \"Ahora - ¡a celebrar!\"\n\nTodos los Habiticanos reciben:\n\nFénix (Mascota)\nFénix (Montura)\nLogro: Salvador de los Campos Florecientes\nCaramelo Básico\nCaramelo de Vainilla\nCaramelo de Arena\nCaramelo de Canela\nCaramelo de Chocolate\nCaramelo Podrido\nCaramelo Rosa Agrio\nCaramelo Azul Agrio\nCaramelo de Miel",
+    "questBurnoutBoss": "Burnout",
+    "questBurnoutBossRageTitle": "Ataque Consumidor",
+    "questBurnoutBossRageDescription": "¡Cuando esta barra se llene, Burnout desatará su Ataque Consumidor sobre Habitica!",
     "questBurnoutDropPhoenixPet": "Fénix (Mascota)",
     "questBurnoutDropPhoenixMount": "Fénix (Montura)",
-    "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!",
-    "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!",
-    "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!",
+    "questBurnoutBossRageQuests": "`¡Burnout usa ATAQUE CONSUMIDOR!`\n\n¡Oh, no! A pesar de nuestros mejores esfuerzos, hemos dejado que algunas Diarias se nos escaparan, ¡y ahora Burnout está hinchado de energía! Con un rugido chispeante, envuelve a Ian, el Maestro de las Misiones, en una explosión de fuego espectral. Mientras pergaminos de misión caídos arden, el humo se disipa, ¡y puedes ver que Ian ha sido drenado de energía y convertido en un Espíritu Consumido a la deriva!\n\nSolamente vencer a Burnout puede romper el hechizo y devolver a nuestro querido Maestro de las Misiones. ¡Mantengamos a nuestras Diarias bajo control y derrotemos a este monstruo antes de que ataque de nuevo!",
+    "questBurnoutBossRageSeasonalShop": "`¡Burnout usa ATAQUE CONSUMIDOR!`\n\n¡¡¡Ahh!!! ¡Nuestras Diarias incompletas han alimentado las llamas de Burnout, y ahora tiene suficiente energía para atacar de nuevo! El monstruo deja escapar un chorro de llamas espectrales que chamuscan la Tienda Estacional. Te horrorizas al ver que la alegre Hechicera Estacional ha sido transformada en un triste Espíritu Consumido.\n\n¡Tenemos que rescatar a nuestros PNJs! ¡Rápido, Habiticanos, completen sus tareas y derroten a Burnout antes de que ataque una tercera vez!",
+    "questBurnoutBossRageTavern": "`¡Burnout usa ATAQUE CONSUMIDOR!`\n\nMuchos Habiticanos han estado escondiéndose de Burnout en la Taberna, ¡pero ya no más! Con un aullido chirriante, Burnout rastrilla la Taberna con sus manos blancas y ardientes. Mientras los clientes de la Taberna huyen, ¡Daniel es atrapado por Burnout, y se transforma en un Espíritu Consumido justo delante de ti!\n \nEste impetuoso horror se ha extendido demasiado tiempo. No se rindan... ¡estamos tan cerca de vencer a Burnout de una vez por todas! ",
     "questFrogText": "Pantano de la Rana de Desorden",
-    "questFrogNotes": "As you and your friends are slogging through the Swamps of Stagnation, @starsystemic points at a large sign. \"Stay on the path -- if you can.\"<br><br>\"Surely that isn't hard!\" @RosemonkeyCT says. \"It's broad and clear.\"<br><br>But as you continue, you notice that path is gradually overtaken by the muck of the swamp, laced with bits of strange blue debris and clutter, until it's impossible to proceed.<br><br>As you look around, wondering how it got this messy, @Jon Arjinborn shouts, \"Look out!\" An angry frog leaps from the sludge, clad in dirty laundry and lit by blue fire. You will have to overcome this poisonous Clutter Frog to progress!",
-    "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.<br><br>Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"",
+    "questFrogNotes": "Mientras tú y tus amigos se esfuerzan para atravesar las Ciénagas del Estancamiento, @starsystemic señala un gran cartel. \"No te desvíes del camino -- si puedes.\"<br><br>\"¡Seguramente no es difícil!\" dice @RosemonkeyCT. \"Es ancho y está despejado.\"<br><br>Pero al continuar, notan que el camino es gradualmente invadido por el lodo de la ciénaga, entremezclado desordenadamente con pedazos azules de desechos, hasta que seguir avanzando se vuelve imposible.<br><br>Mientras miras alrededor, preguntándote cómo se transformó en un desastre, @Jon Arjinborn grita, \"¡Cuidado!\" Una rana furiosa salta desde el lodo, cubierta con ropa sucia y encendida por un fuego azul. ¡Van a tener que derrotar a esta venenosa Rana Desastrosa para continuar!",
+    "questFrogCompletion": "La rana se hunde en el lodo, derrotada. Mientras se escabulle, el cieno azul se disipa, despejando el camino.<br><br>Posados en el medio del sendero se encuentran tres huevos inmaculados. \"¡Se pueden ver incluso los pequeños renacuajos a través de la cubierta transparente!\" dice @Breadstrings. \"Tomen, deberían quedárselos.\"",
     "questFrogBoss": "Rana de Desorden",
     "questFrogDropFrogEgg": "Rana (Huevo)",
     "questFrogUnlockText": "Desbloquear la compra de huevos de rana en el Mercado",
     "questSnakeText": "La Serpiente de Distracción",
-    "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?",
-    "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.",
+    "questSnakeNotes": "Para vivir en las Dunas de la Distracción hay que tener un alma resistente. El árido desierto es difícilmente un lugar productivo, y las dunas centelleantes han hecho que muchos viajeros se perdieran. Sin embargo, algo está asustando incluso a los lugareños. La arena ha estado desplazándose y dando vuelta pueblos enteros. Los residentes dicen que un monstruo con un cuerpo enorme y serpentino se encuentra al acecho debajo de la arena, y ofrecen una recompensa para quienquiera que los ayude a encontrarlo y detenerlo. Los aclamados encantadores de serpientes @EmeraldOx y @PainterProphet han accedido a ayudarte a atraer a la bestia. ¿Puedes detener a la Serpiente de la Distracción?",
+    "questSnakeCompletion": "Con ayuda de los encantadores destierras a la Serpiente de la Distracción. Aunque te alegra haber asistido a los habitantes de las Dunas, no puedes evitar sentirte un poco triste por tu enemigo caído. Mientras contemplas la vista, @LordDarkly se dirige a ti. \"¡Gracias! No es mucho, pero espero que esto pueda expresar nuestra gratitud.\" Te da un poco de Oro y... ¡algunos huevos de Serpiente! Volverás a ver a ese animal majestuoso, después de todo.",
     "questSnakeBoss": "Serpiente de Distracción",
     "questSnakeDropSnakeEgg": "Serpiente (Huevo)",
     "questSnakeUnlockText": "Desbloquear la compra de huevos de serpiente en el Mercado",
     "questUnicornText": "Persuadiendo a la Reina Unicornio",
-    "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"",
-    "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.",
+    "questUnicornNotes": "¡El Arroyo de la Conquista se ha vuelto turbio, destruyendo el suministro de agua potable de Ciudad Hábito! Afortunadamente, @Lukreja conoce una leyenda antigua que asegura que el cuerno de un unicornio puede purificar hasta las aguas más sucias. Acompañado por tu intrépido guía @UncommonCriminal, caminas entre las cumbres heladas de las Montañas Serpenteantes. Finalmente, en la cima congelada del mismísimo Monte Habitica, encuentras a la Reina Unicornio en medio de la nieve brillante. \"Tus súplicas son convincentes,\" te dice. \"¡Pero antes debes probar que eres digno de mi ayuda!\"",
+    "questUnicornCompletion": "Impresionada por tu diligencia y tu fuerza, la Reina Unicornio finalmente coincide en que tu causa es noble. Te deja montar sobre su lomo al tiempo que despega hacia la fuente del Arroyo de la Conquista. Mientras baja su cuerno dorado hacia las sucias aguas, una luz azul brillante se eleva desde la superficie de las mismas. Es tan enceguecedora que te obliga a cerrar los ojos. Cuando los abres un momento después, la unicornio se ha ido. Sin embargo, @rosiesully deja escapar un grito de alegría: el agua se ha vuelto clara, y tres huevos relucientes se posan sobre la orilla del arroyo.",
     "questUnicornBoss": "La Reina de Unicornio",
     "questUnicornDropUnicornEgg": "Unicornio (Huevo)",
     "questUnicornUnlockText": "Desbloquear la compra de huevos de unicornio en el Mercado",
     "questSabretoothText": "El Dientes de sable",
-    "questSabretoothNotes": "A roaring monster is terrorizing Habitica! The creature stalks through the wilds and woods, then bursts forth to attack before vanishing again. It's been hunting innocent pandas and frightening the flying pigs into fleeing their pens to roost in the trees. @Inventrix and @icefelis explain that the Zombie Sabre Cat was set free while they were excavating in the ancient, untouched ice-fields of the Stoikalm Steppes. \"It was perfectly friendly at first – I don't know what happened. Please, you have to help us recapture it! Only a champion of Habitica can subdue this prehistoric beast!\"",
-    "questSabretoothCompletion": "After a long and tiring battle, you wrestle the Zombie Sabre Cat to the ground. As you are finally able to approach, you notice a nasty cavity in one of its sabre teeth. Realising the true cause of the cat's wrath, you're able to get the cavity filled by @Fandekasp, and advise everyone to avoid feeding their friend sweets in future. The Sabre Cat flourishes, and in gratitude, its tamers send you a generous reward – a clutch of sabretooth eggs!",
+    "questSabretoothNotes": "¡Un monstruo está aterrorizando a Habitica con sus rugidos! La criatura acecha en los bosques, y luego se abalanza para atacar antes de desvanecerse nuevamente. Ha estado cazando pandas inocentes y asustando a los cerdos voladores, los cuales huyen de sus corrales y se posan en los árboles. @Inventrix y @icefelis explican que el Dientes de Sable Zombi fue liberado mientras excavaban en los antiguos, intactos campos de hielo de las Estepas de Stoïkalm. \"Al principio era perfectamente amistoso – no sé qué pasó. Por favor, ¡debes ayudarnos a capturarlo de vuelta! ¡Sólo un campeón de Habitica puede dominar a esta bestia prehistórica!\"",
+    "questSabretoothCompletion": "Luego de una larga y agotadora batalla, logras inmovilizar al Dientes de Sable Zombi. Cuando por fin te puedes acercar, notas una fea caries en uno de sus dientes de sable. Dándote cuenta de la verdadera causa de su furia, consigues que @Fandekasp arregle la caries, y les aconsejas a todos que no le den muchos dulces a su amigo en el futuro. El Dientes de Sable se alza fortalecido, y en agradecimiento, sus domadores te envían una generosa recompensa – ¡algunos huevos de Dientes de Sable!",
     "questSabretoothBoss": "Dientes de sable zombie",
     "questSabretoothDropSabretoothEgg": "El Tigre Dientes de Sable (Huevo)",
     "questSabretoothUnlockText": "Desbloquear la compra de huevos de tigres dientes de sable en el Mercado",
     "questMonkeyText": "El Mandril Monstruoso y los Monos Traviesos",
-    "questMonkeyNotes": "The Sloensteadi Savannah is being torn apart by the Monstrous Mandrill and his Mischief Monkeys! They shriek loudly enough to drown out the sound of approaching deadlines, encouraging everyone to avoid their duties and keep monkeying around. Alas, plenty of people ape this bad behavior. If no one stops these primates, soon everyone's tasks will be as red as the Monstrous Mandrill's face!<br><br>\"It will take a dedicated adventurer to resist them,\" says @yamato.<br><br>\"Quick, let's get this monkey off everyone's backs!\" @Oneironaut yells, and you charge into battle.",
-    "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
+    "questMonkeyNotes": "¡La Sabana Sloensteadi está siendo destruida por el Mandril Monstruoso y sus Monos Maliciosos! Aúllan lo suficientemente fuerte como para ahogar el sonido de las fechas límites que se aproximan, alentando a todos a evadir sus obligaciones y seguir procrastinando. Cielos, mucha gente está imitando esta mala conducta. ¡Si nadie detiene a estos primates, muy pronto las tareas de todo el mundo se volverán tan rojas como la cara del Mandril Monstruoso!<br><br>\"Sólo un aventurero dedicado podrá resistirse a ellos,\" dice @yamato.<br><br>\"¡Rápido, hagamos que este mono deje de molestar a todos!\" grita @Oneironaut, y tú te preparas para la batalla.",
+    "questMonkeyCompletion": "¡Lo lograste! Esos diablillos no conseguirán bananas hoy. Agobiados por tu diligencia, los monos huyen llenos de pánico. \"Miren,\" dice @Misceo. \"Han dejado algunos huevos.\"<br><br>@Leephon sonríe. \"¡Quizás un mono mascota bien entrenado pueda ayudarte tanto como los salvajes te estorban!\"",
     "questMonkeyBoss": "Mandril Monstruoso",
     "questMonkeyDropMonkeyEgg": "Mono (Huevo)",
-    "questMonkeyUnlockText": "Desbloquea la compra de huevos de mono en el Mercado"
+    "questMonkeyUnlockText": "Desbloquea la compra de huevos de mono en el Mercado",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/es/subscriber.json b/common/locales/es/subscriber.json
index 7d932cfbb9..007f833c25 100644
--- a/common/locales/es/subscriber.json
+++ b/common/locales/es/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "Conjunto del Guerrero de Madera",
     "mysterySet201512": "Conjunto de la Llama Invernal",
     "mysterySet201601": "Juego de Campeón de Resoluciones",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Conjunto de Rompecorazones",
     "mysterySet301404": "El Conjunto Steampunk",
     "mysterySet301405": "Accesorios Steampunk",
     "mysterySetwondercon": "Wondercon",
diff --git a/common/locales/es_419/backgrounds.json b/common/locales/es_419/backgrounds.json
index 23ef39046f..ebb582ea73 100644
--- a/common/locales/es_419/backgrounds.json
+++ b/common/locales/es_419/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Lee en la biblioteca acogedora.",
     "backgroundGrandStaircaseText": "Gran Escalera",
     "backgroundGrandStaircaseNotes": "Baja a zancadas por la gran escalera.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "CONJUNTO 22: Lanzado en Marzo 2016",
+    "backgroundDeepMineText": "Mina Profunda ",
+    "backgroundDeepMineNotes": "Encuentra metales preciosos en una Mina Profunda ",
+    "backgroundRainforestText": "Selva ",
+    "backgroundRainforestNotes": "Aventurarse en una Selva",
+    "backgroundStoneCircleText": "Círculo de Piedra ",
+    "backgroundStoneCircleNotes": "Lanzar encantamiento en un Círculo de Piedra "
 }
\ No newline at end of file
diff --git a/common/locales/es_419/character.json b/common/locales/es_419/character.json
index 8282038a50..c684828d3f 100644
--- a/common/locales/es_419/character.json
+++ b/common/locales/es_419/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Estadísticas y Logros",
     "profile": "Perfil",
-    "avatar": "Customize Avatar",
+    "avatar": "Personalizar Avatar",
     "other": "Otro",
     "fullName": "Nombre completo",
     "displayName": "Nombre de usuario",
@@ -83,7 +83,7 @@
     "allocateInt": "Puntos asignados a Inteligencia:",
     "allocateIntPop": "Añadir un punto a Inteligencia",
     "noMoreAllocate": "Ahora que has alcanzado el nivel 100, ya no ganarás más Puntos de Atributo. Puedes seguir subiendo de nivel, o empezar una nueva aventura desde el nivel 1 utilizando la <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Esfera de Renacimiento</a>, que ahora se encuentra disponible gratuitamente en el Mercado.",
-    "stats": "Avatar Stats",
+    "stats": "Estadísticas del Avatar",
     "strength": "Fuerza",
     "strengthText": "La Fuerza aumenta la probabilidad de conseguir \"golpes críticos\" aleatorios y el Oro, la Experiencia y la probabilidad de conseguir botín al asestarlos. También ayuda a hacer daño a los monstruos jefe.",
     "constitution": "Constitución",
@@ -136,7 +136,7 @@
     "respawn": "¡Reaparecer!",
     "youDied": "¡Has muerto!",
     "dieText": "Has perdido un Nivel, todo tu Oro, y una pieza de Equipamiento al azar. ¡Levántate Habitero e inténtalo otra vez! ¡Domina esos Hábitos negativos, mantente atento para cumplir las Diarias y mantén a la muerte a raya con una Poción de Salud cuando flaqueas!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Estás seguro? Esto restablecerá la clase de tu personaje y los puntos asignados (Los recuperaras para poder re-asignarlos), y cuesta 3 gemas.",
     "purchaseFor": "¿Comprar por <%= cost %> Gemas?",
     "notEnoughMana": "No tienes maná suficiente.",
     "invalidTarget": "Objetivo inválido",
diff --git a/common/locales/es_419/communityguidelines.json b/common/locales/es_419/communityguidelines.json
index fcb7848493..b0a486b722 100644
--- a/common/locales/es_419/communityguidelines.json
+++ b/common/locales/es_419/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "En una comunidad tan grande como Habitica los usuarios vienen y van, a veces un moderador necesita bajar su manto de noble y relajarse. Los siguientes son los Moderadores emérito. Ellos ya no actúan con el poder de un Moderador, ¡pero nos gustaría seguir honrando su trabajo!",
     "commGuidePara014": "Moderadores emérito:",
     "commGuideHeadingPublicSpaces": "Espacios públicos en Habitica",
-    "commGuidePara015": "Habitica tiene dos tipos de espacios sociales: públicos, y privados. Los espacios públicos incluyen la Taberna, Gremios públicos, GitHub, Trello y la Wiki. Los espacios privados son los Gremios Privados, el chat del Grupo y los Mensajes Privados.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Cuando navegues los espacios públicos en Habitica, existen algunas reglas generales para mantener la seguridad de todos. ¡Estas deberían ser sencillas para aventureros como tu!",
     "commGuidePara017": "<strong>Respétense mutuamente.</strong> Sé cortés, amable, amigable y servicial. Recuerda: los Habiticanos vienen de toda clase de entornos y han tenido experiencias extremadamente diversas. ¡Esto es parte de lo que hace a Habitica tan genial! Construir una comunidad significa respetar y celebrar nuestras diferencias así como también nuestras similitudes. Éstas son algunas formas fáciles de respetarnos los unos a los otros:",
     "commGuideList02A": "<strong>Obedece todos los Términos y condiciones</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Obedece inmediatamente cualquier solicitud de un Mod</strong> para terminar con una discusión o moverla a la Trastienda. Últimas palabras, réplicas finales y ocurrencias concluyentes deberían ser intercambiadas (de forma educada) en tu \"mesa\" en la Trastienda, si te lo permiten.",
     "commGuideList02G": "<strong>Tóma el tiempo de reflexionar en lugar de responder con enojo</strong> si alguien te indica que algo que dijiste o hiciste lo hizo sentirse incómodo. El poder disculparse sinceramente demuestra una gran fortaleza. Si sientes que la manera en la que te respondió fue inapropiada, contacta a un Mod en vez de confrontarlo públicamente.",
     "commGuideList02H": "<strong>Conversaciones divisivas y/o conflictivas deberán ser denunciadas a los mods.</strong> Si sientes que una conversación se está volviendo intensa, demasiado emocional o hiriente, deja de dialogar. En vez de eso, manda un email a <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> para informarnos del asunto. Protegerte es nuestro trabajo.",
-    "commGuideList02I": "<strong>No hagas Spam.</strong> Spamear puede incluir, pero no está limitado a: publicar el mismo contenido o pregunta en múltiples sitios, publicar links sin explicación o contexto, publicar mensajes sin sentido, o publicar muchos mensajes seguidos. El rogar repetidamente por gemas o una suscripción tambien puede ser considerarse spam.",
-    "commGuidePara019": "<strong>En espacios privados,</strong> los usuarios tienen mayor libertad para discutir sobre cualquier tema que gusten, pero aún así no deben violar los Términos y condiciones, incluyendo publicar cualquier contenido discriminatorio, violento o amenazador.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Los Mensajes Privados (MPs) tienen algunas normas adicionales. Si alguien te ha bloqueado, no lo contactes en otro lugar para pedirle que te desbloquee. Además, no debes enviar MPs a alguien para solicitar soporte (dado que las respuestas públicas de soporte son útiles para la comunidad). Finalmente, no envíes a MPs a nadie rogando por un regalo de gemas o una suscripción, ya que puede ser considerado como spam.",
     "commGuidePara021": "Más aún, algunos espacios públicos en Habitica tienen sus normas adicionales",
     "commGuideHeadingTavern": "La Taberna",
diff --git a/common/locales/es_419/content.json b/common/locales/es_419/content.json
index 1aa795d905..cdb83249ab 100644
--- a/common/locales/es_419/content.json
+++ b/common/locales/es_419/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "un espinoso",
     "dropEggBearCubText": "Cachorro de Oso",
     "dropEggBearCubMountText": "Oso",
-    "dropEggBearCubAdjective": "un adorable",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Grifo",
     "questEggGryphonMountText": "Grifo",
     "questEggGryphonAdjective": "un orgulloso",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "un colorido",
     "questEggRatText": "Rata",
     "questEggRatMountText": "Rata",
-    "questEggRatAdjective": "una sucia",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Pulpo",
     "questEggOctopusMountText": "Pulpo",
     "questEggOctopusAdjective": "un resbaladizo",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Mono",
     "questEggMonkeyMountText": "Mono",
     "questEggMonkeyAdjective": "un travieso",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Encuentra una poción de eclosión para verter sobre este huevo y se convertirá en <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Básic@",
     "hatchingPotionWhite": "Blanc@",
diff --git a/common/locales/es_419/contrib.json b/common/locales/es_419/contrib.json
index 8a538cdac4..4417657c4b 100644
--- a/common/locales/es_419/contrib.json
+++ b/common/locales/es_419/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Ayudó con el crecimiento de Habit",
     "helpedText1": "Ayudó a mejorar Habitica completando",
     "helpedText2": "esta encuesta.",
-    "hall": "Hall of Heroes",
+    "hall": "Salón de Héroes",
     "contribTitle": "Título de colaborador (p ej, \"Herrero\")",
     "contribLevel": "Nivel de colaborador",
     "contribHallText": "1-7 para los colaboradores normales, 8 para moderadores, 9 para el personal. Esto determina cuáles artículos, mascotas y monturas están disponibles. También determina el color de la etiqueta de nombre. A los de nivel 8 y 9 se les da estatus de administrador automáticamente.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Salón de Colaboradores",
     "hallPatrons": "Salón de Patrocinadores",
     "rewardUser": "Recompensar usuario",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Los Gremios son salas de chat con temas de interés común creados por jugadores para jugadores. ¡Echa un vistazo a la lista y únete a los Gremios que te interesen!",
     "blurbChallenges": "Los Desafíos son creados por los usuarios. Al unirte a un Desafío éste añadirá tareas a tu cuenta, ¡y si ganas el Desafío obtendrás un logro y algunas veces gemas!",
     "blurbHallPatrons": "Éste es el Salón de Patrocinadores, donde honramos a los nobles aventureros que apoyaron al Kickstarter original de Habitica. ¡Les agradecemos por ayudarnos a dar vida a Habitica!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Este es el Salón de Colaboradores, donde los colaboradores del código abierto de Habitica son honrados. Ya sea a través de códigos, arte, música, escritura o simplemente ayudando, ellos han ganado <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gemas, equipamento exclusivo</a>, y <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'> títulos prestigiosos</a>. Tu puedes contribuir a Habitica tambien! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Encuentra más información aqui. </a>"
 }
\ No newline at end of file
diff --git a/common/locales/es_419/gear.json b/common/locales/es_419/gear.json
index 9d5bd25e37..8bd39eb2cf 100644
--- a/common/locales/es_419/gear.json
+++ b/common/locales/es_419/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "arma",
     "weaponBase0Text": "Sin arma",
     "weaponBase0Notes": "Sin arma.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "¡Orden! Incrementa la Fuerza y la Constitución por <%= attrs %> cada una. Armario Encantado: Conjunto de Juez (Artículo 3 de 3).",
     "weaponArmoireJesterBatonText": "Bastón de Bufón",
     "weaponArmoireJesterBatonNotes": "Con una sacudida de tu bastón y una conversación ingeniosa, hasta las situaciones más complicadas se pueden calmar. Incrementa la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto de Bufón (Artículo 3 de 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Pico de Minero",
+    "weaponArmoireMiningPickaxNotes": "Extrae la máxima cantidad de oro de tus tareas! Incrementa la Percepción por <%= per %>. Armario Encantado: Set de Minero (Item 3 de 3).",
     "armor": "armadura",
     "armorBase0Text": "Ropa Simple",
     "armorBase0Notes": "Ropa común. No otorga ningún beneficio.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Muy seria y majestuosa. Incrementa la Constitución por <%= con %>. Armario Encantado: Conjunto de Juez (Artículo 2 de 3).",
     "armorArmoireJesterCostumeText": "Disfraz de Bufón",
     "armorArmoireJesterCostumeNotes": "¡Tra-la-la! A pesar del aspecto de este disfraz, no eres un bufón. Incrementa la Inteligencia por <%= int %>. Armario Encantado: Conjunto de Bufón (Artículo 2 de 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Overoles de Minero",
+    "armorArmoireMinerOverallsNotes": "Parecen gastadas, pero están encantadas para repeler mugre. Incrementa la Constitución por <%= con %>. Armario Encantado: Conjunto de Minero (Item 2 de 3)",
     "headgear": "equipamiento para la cabeza",
     "headBase0Text": "Sin yelmo",
     "headBase0Notes": "Sin equipamiento para la cabeza.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Estas frías llamas arden llenas de puro intelecto. No otorgan ningún beneficio. Artículo de Suscriptor de Diciembre 2015.",
     "headMystery201601Text": "Yelmo de la Verdadera Determinación",
     "headMystery201601Notes": "¡No abandones tu determinación, valiente campeón! No otorga ningún beneficio. Artículo de Suscriptor de Enero 2016.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Capucha Rompe Corazones ",
+    "headMystery201602Notes": "Protege tu identidad de tus admiradores. No otorga ningún beneficio. Artículo de Suscriptor de Febrero 2016. ",
     "headMystery301404Text": "Galera Elegante",
     "headMystery301404Notes": "¡Una galera elegante para los señores más sofisticados! Artículo de Suscriptor de Enero 3015. No otorga ningún beneficio.",
     "headMystery301405Text": "Galera Básica",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Esta peluca que rebota es suficiente para ahuyentar incluso al enemigo más feroz. Incrementa la Fuerza por <%= str %>. Armario Encantado: Conjunto de Juez (Artículo 1 de 3).",
     "headArmoireJesterCapText": "Gorro de Bufón",
     "headArmoireJesterCapNotes": "Los cascabeles de este gorro pueden distraer a tus oponentes, pero a ti sólo te ayudan a concentrarte. Incrementa la Percepción por <%= per %>. Armario Encantado: Conjunto de Bufón (Artículo 1 de 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Casco de Minero",
+    "headArmoireMinerHelmetNotes": "Protege tu cabeza de tareas que caen! Incrementa inteligencia por <%= int %>. Armario Encantado: Conjunto de Minero (Item 1 de 3)",
     "offhand": "artículo adicional",
     "shieldBase0Text": "Sin equipamiento adicional",
     "shieldBase0Notes": "Sin escudo o arma secundaria.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "¡Viva el líder, digno de ser mencionado en canciones! Incrementa la Constitución, la Inteligencia y la Percepción por <%= attrs %> cada una. Armario Encantado: Conjunto Real (Artículo 2 de 3).",
     "shieldArmoireDragonTamerShieldText": "Escudo de Domador de Dragones",
     "shieldArmoireDragonTamerShieldNotes": "Distrae a tus enemigos con este escudo con forma de dragón. Incrementa la Percepción por <%= per %>. Armario Encantado: Conjunto de Domador de Dragones (Artículo 2 de 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Lámpara Mística",
+    "shieldArmoireMysticLampNotes": "Ilumina las cuevas más oscuras con esta lámpara mística! Incrementa la Percepción por  <%= per %>. Armario encantado: Item independiente. ",
     "back": "Accesorio para espalda",
     "backBase0Text": "Sin accesorio para espalda",
     "backBase0Notes": "Sin accesorio para espalda.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "¡Surfea desde los Muelles Diligentes y remonta las olas en Bahía Inkompleta! No otorga ningún beneficio. Artículo de Suscriptor de Julio 2015.",
     "backMystery201510Text": "Cola de Duende",
     "backMystery201510Notes": "¡Prensil y poderosa! No otorga ningún beneficio. Artículo de Suscriptor de Octubre 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Capa Rompe Corazones",
+    "backMystery201602Notes": "Con un silbido de tu capa, tus enemigos caen ante ti! No otorga ningún beneficio. Artículo de Suscriptor de Febrero 2016. ",
     "backSpecialWonderconRedText": "Capa Poderosa",
     "backSpecialWonderconRedNotes": "Ondea sibilante con fuerza y ​belleza. No otorga ningún beneficio. Artículo de Convención de Edición Especial.",
     "backSpecialWonderconBlackText": "Capa Furtiva",
diff --git a/common/locales/es_419/generic.json b/common/locales/es_419/generic.json
index 19e1bbbbd4..b0227f50f6 100644
--- a/common/locales/es_419/generic.json
+++ b/common/locales/es_419/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "¡Eclosioné una nueva mascota completando mis tareas de la vida real!",
     "raisePetShare": "¡Convertí una mascota en montura completando mis tareas de la vida real!",
     "wonChallengeShare": "¡Gané un desafío en Habitica!",
-    "achievementShare": "¡Gané un nuevo logro en Habitica!"
+    "achievementShare": "¡Gané un nuevo logro en Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/es_419/groups.json b/common/locales/es_419/groups.json
index 706bbe9a59..492a274c15 100644
--- a/common/locales/es_419/groups.json
+++ b/common/locales/es_419/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Chat de Taberna",
     "innCheckOut": "Dejar la posada",
     "innCheckIn": "Descansar en la posada",
     "innText": "¡Has entrado a descansar en la Posada! Mientras permanezcas aquí tus Diarias no te dañarán al finalizar el día, pero sí se renovarán cada día. Ten cuidado: si estás participando en una Misión contra un Jefe ¡las Diarias incompletas de tus compañeros de equipo te seguirán haciendo daño! Además, tú no dañarás al jefe (ni obtendrás los objetos recolectados) hasta que no hayas salido de la Posada.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "¡El chat de tu equipo está vacío! Escribe un mensaje en el recuadro de arriba para empezar a conversar.",
     "guildChatEmpty": "¡El chat de este gremio está vacío! Escribe un mensaje en el recuadro de arriba para empezar a conversar.",
     "possessiveParty": "El Equipo de <%= name %>",
-    "requestAcceptGuidelines": "Si quieres publicar mensajes en la Taberna o en el chat de un equipo o de un gremio, por favor lee nuestras <%= linkStart %>Normas de la Comunidad<%= linkEnd %> primero y después haz clic en el botón de abajo para indicar que las aceptas."
+    "requestAcceptGuidelines": "Si quieres publicar mensajes en la Taberna o en el chat de un equipo o de un gremio, por favor lee nuestras <%= linkStart %>Normas de la Comunidad<%= linkEnd %> primero y después haz clic en el botón de abajo para indicar que las aceptas.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/es_419/questscontent.json b/common/locales/es_419/questscontent.json
index 5bba8e6d0d..0f6eb66add 100644
--- a/common/locales/es_419/questscontent.json
+++ b/common/locales/es_419/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "¡Lo lograste! Esos diablillos no conseguirán bananas hoy. Agobiados por tu diligencia, los monos huyen llenos de pánico. \"Miren,\" dice @Misceo. \"Han dejado algunos huevos.\"<br><br>@Leephon sonríe. \"¡Quizás un mono mascota bien entrenado pueda ayudarte tanto como los salvajes te estorban!\"",
     "questMonkeyBoss": "Mandril Monstruoso",
     "questMonkeyDropMonkeyEgg": "Mono (Huevo)",
-    "questMonkeyUnlockText": "Desbloquea huevos de Mono adquiribles en el Mercado"
+    "questMonkeyUnlockText": "Desbloquea huevos de Mono adquiribles en el Mercado",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/es_419/subscriber.json b/common/locales/es_419/subscriber.json
index 054f67a605..7329b4bdd2 100644
--- a/common/locales/es_419/subscriber.json
+++ b/common/locales/es_419/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "Conjunto de Guerrero de Madera",
     "mysterySet201512": "Conjunto de Llama Invernal",
     "mysterySet201601": "Conjunto de Campeón de Resoluciones",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Conjunto Rompe Corazones ",
     "mysterySet301404": "Conjunto Steampunk Estándar ",
     "mysterySet301405": "Conjunto de Accesorios Steampunk",
     "mysterySetwondercon": "WonderCon",
diff --git a/common/locales/fr/backgrounds.json b/common/locales/fr/backgrounds.json
index bc468b0ef6..788ac5c2e8 100644
--- a/common/locales/fr/backgrounds.json
+++ b/common/locales/fr/backgrounds.json
@@ -1,76 +1,76 @@
 {
     "backgrounds": "Arrière-plans",
-    "backgrounds062014": "Ensemble 1 : Sorti en Juin 2014",
+    "backgrounds062014": "Ensemble 1 : Sorti en juin 2014",
     "backgroundBeachText": "Plage",
     "backgroundBeachNotes": "Prélassez-vous sur le sable chaud.",
     "backgroundFairyRingText": "Cercle des Fées",
     "backgroundFairyRingNotes": "Dansez dans un Cercle des Fées.",
     "backgroundForestText": "Forêt",
     "backgroundForestNotes": "Flânez dans une Forêt d'Eté.",
-    "backgrounds072014": "Ensemble 2 : Sorti en Juillet 2014",
+    "backgrounds072014": "Ensemble 2 : Sorti en juillet 2014",
     "backgroundCoralReefText": "Récif de Corail",
     "backgroundCoralReefNotes": "Nagez au milieu d'un Récif Corallien.",
     "backgroundOpenWatersText": "Eaux Profondes",
     "backgroundOpenWatersNotes": "Savourez les Eaux Profondes.",
     "backgroundSeafarerShipText": "Galion",
     "backgroundSeafarerShipNotes": "Embarquez à bord d'un Galion.",
-    "backgrounds082014": "Ensemble 3 : Sorti en Août 2014",
+    "backgrounds082014": "Ensemble 3 : Sorti en août 2014",
     "backgroundCloudsText": "Nuages",
     "backgroundCloudsNotes": "Planez au milieu des Nuages.",
     "backgroundDustyCanyonsText": "Canyon Poussiéreux",
     "backgroundDustyCanyonsNotes": "Errez au fond d'un Canyon Poussiéreux.",
     "backgroundVolcanoText": "Volcan",
     "backgroundVolcanoNotes": "Réchauffez-vous au cœur d'un Volcan.",
-    "backgrounds092014": "Ensemble 4 : Sorti en Septembre 2014",
+    "backgrounds092014": "Ensemble 4 : Sorti en septembre 2014",
     "backgroundThunderstormText": "Orage",
     "backgroundThunderstormNotes": "Canalisez la foudre d'un Orage.",
     "backgroundAutumnForestText": "Forêt d'Automne",
     "backgroundAutumnForestNotes": "Flânez dans une Forêt d'Automne.",
     "backgroundHarvestFieldsText": "Champs",
     "backgroundHarvestFieldsNotes": "Moissonnez vos Champs",
-    "backgrounds102014": "Ensemble 5 : Sorti en Octobre 2014",
+    "backgrounds102014": "Ensemble 5 : Sorti en octobre 2014",
     "backgroundGraveyardText": "Cimetière",
     "backgroundGraveyardNotes": "Visitez un Cimetière Effrayant",
     "backgroundHauntedHouseText": "Maison Hantée",
     "backgroundHauntedHouseNotes": "Faufilez-vous dans une Maison Hantée",
     "backgroundPumpkinPatchText": "Potager à Citrouilles",
     "backgroundPumpkinPatchNotes": "Taillez des Lanternes d'Halloween dans un Potager à Citrouilles.",
-    "backgrounds112014": "Ensemble 6 : Sorti en Novembre 2014",
+    "backgrounds112014": "Ensemble 6 : Sorti en novembre 2014",
     "backgroundHarvestFeastText": "Fête de la Moisson",
     "backgroundHarvestFeastNotes": "Savourez une Fête de la Moisson.",
     "backgroundStarrySkiesText": "Ciel Étoilé",
     "backgroundStarrySkiesNotes": "Contemplez le Ciel Étoilé.",
     "backgroundSunsetMeadowText": "Coucher de Soleil",
     "backgroundSunsetMeadowNotes": "Admirez le Coucher de Soleil sur une Prairie.",
-    "backgrounds122014": "Ensemble 7 : Sorti en Décembre 2014",
+    "backgrounds122014": "Ensemble 7 : Sorti en décembre 2014",
     "backgroundIcebergText": "Iceberg",
     "backgroundIcebergNotes": "Dérivez sur un Iceberg.",
     "backgroundTwinklyLightsText": "Guirlandes Scintillantes Hivernales",
     "backgroundTwinklyLightsNotes": "Promenez-vous au milieu d'arbres parés de lumières festives.",
     "backgroundSouthPoleText": "Pôle Sud",
     "backgroundSouthPoleNotes": "Visitez le Pôle Sud glacial.",
-    "backgrounds012015": "Ensemble 8 : Sorti en Janvier 2015",
+    "backgrounds012015": "Ensemble 8 : Sorti en janvier 2015",
     "backgroundIceCaveText": "Caverne de Glace",
     "backgroundIceCaveNotes": "Descendez dans une Caverne de Glace.",
     "backgroundFrigidPeakText": "Pic Glacé",
     "backgroundFrigidPeakNotes": "Atteignez le sommet d'un Pic Glacé.",
     "backgroundSnowyPinesText": "Pins Enneigés",
     "backgroundSnowyPinesNotes": "Réfugiez-vous sous des Pins Enneigés.",
-    "backgrounds022015": "Ensemble 9 : Sorti en Février 2015",
+    "backgrounds022015": "Ensemble 9 : Sorti en février 2015",
     "backgroundBlacksmithyText": "Forge",
     "backgroundBlacksmithyNotes": "Travaillez dans une Forge.",
     "backgroundCrystalCaveText": "Grotte de Cristal",
     "backgroundCrystalCaveNotes": "Explorer une Grotte de Cristal",
     "backgroundDistantCastleText": "Fort Lointain",
     "backgroundDistantCastleNotes": "Défendez un Fort Lointain.",
-    "backgrounds032015": "Ensemble 10 : Sorti en Mars 2015",
+    "backgrounds032015": "Ensemble 10 : Sorti en mars 2015",
     "backgroundSpringRainText": "Averse Printanière",
     "backgroundSpringRainNotes": "Dansez sous une Averse Printanière.",
     "backgroundStainedGlassText": "Vitraux",
     "backgroundStainedGlassNotes": "Admirez des Vitraux.",
     "backgroundRollingHillsText": "Collines",
     "backgroundRollingHillsNotes": "Gambadez dans les Collines.",
-    "backgrounds042015": "Ensemble 11 : Sorti en Avril 2015",
+    "backgrounds042015": "Ensemble 11 : Sorti en avril 2015",
     "backgroundCherryTreesText": "Cerisiers",
     "backgroundCherryTreesNotes": "Admirez les Cerisiers en fleurs.",
     "backgroundFloralMeadowText": "Prairie Fleurie",
@@ -84,74 +84,74 @@
     "backgroundMountainLakeNotes": "Trempez vos orteils dans un Lac d'Altitude.",
     "backgroundPagodasText": "Pagodes",
     "backgroundPagodasNotes": "Grimpez au sommet de Pagodes.",
-    "backgrounds062015": "Ensemble 13 : Sorti en Juin 2015",
+    "backgrounds062015": "Ensemble 13 : Sorti en juin 2015",
     "backgroundDriftingRaftText": "Radeau à la Dérive",
     "backgroundDriftingRaftNotes": "Pagayez sur un Radeau à la Dérive",
     "backgroundShimmeryBubblesText": "Bulles Chatoyantes",
     "backgroundShimmeryBubblesNotes": "Flottez au milieu d'une mer de Bulles Chatoyantes",
     "backgroundIslandWaterfallsText": "Chutes d'eau Insulaires",
     "backgroundIslandWaterfallsNotes": "Pique-niquez près des Chutes d'eau Insulaires",
-    "backgrounds072015": "Ensemble 14 : Sorti en Juillet 2015",
+    "backgrounds072015": "Ensemble 14 : Sorti en juillet 2015",
     "backgroundDilatoryRuinsText": "Les Ruines de Dilatoire",
     "backgroundDilatoryRuinsNotes": "Plongez vers les ruines de Dilatoire.",
     "backgroundGiantWaveText": "Vague Géante",
     "backgroundGiantWaveNotes": "Surfez sur une Vague Géante !",
     "backgroundSunkenShipText": "Épave",
     "backgroundSunkenShipNotes": "Explorez une Épave.",
-    "backgrounds082015": "Ensemble 15 : Sorti en Juillet 2015",
+    "backgrounds082015": "Ensemble 15 : Sorti en juillet 2015",
     "backgroundPyramidsText": "Pyramides",
     "backgroundPyramidsNotes": "Admirez les pyramides.",
     "backgroundSunsetSavannahText": "Coucher de soleil dans la savanne",
     "backgroundSunsetSavannahNotes": "Épiez le coucher de soleil dans la savanne",
     "backgroundTwinklyPartyLightsText": "Éclairage Festif Scintillant",
     "backgroundTwinklyPartyLightsNotes": "Dansez sous un Éclairage Festif Scintillant !",
-    "backgrounds092015": "Ensemble 16 : Sorti en Septembre 2015",
+    "backgrounds092015": "Ensemble 16 : Sorti en septembre 2015",
     "backgroundMarketText": "Marché d'Habitica",
     "backgroundMarketNotes": "Faites vos courses dans le Marché d'Habitica",
     "backgroundStableText": "Étable d'Habitica",
     "backgroundStableNotes": "Prenez soin de vos montures dans l'Etable d'Habitica",
     "backgroundTavernText": "Taverne d'Habitica",
     "backgroundTavernNotes": "Visitez la Taverne d'Habitica",
-    "backgrounds102015": "Ensemble 17 : Sorti en Octobre 2015",
+    "backgrounds102015": "Ensemble 17 : Sorti en octobre 2015",
     "backgroundHarvestMoonText": "Lune des Moissons",
     "backgroundHarvestMoonNotes": "Gloussez sous la Lune des Moissons",
     "backgroundSlimySwampText": "Marécage Vaseux",
     "backgroundSlimySwampNotes": "Échinez-vous à traverser un Marais Visqueux",
     "backgroundSwarmingDarknessText": "Ténèbres Grouillantes",
     "backgroundSwarmingDarknessNotes": "Frissonnez dans les Ténèbres Grouillantes",
-    "backgrounds112015": "Ensemble 18: Sorti en Novembre 2015",
+    "backgrounds112015": "Ensemble 18: Sorti en novembre 2015",
     "backgroundFloatingIslandsText": "Les Îles Flottantes",
     "backgroundFloatingIslandsNotes": "Parcourez les Îles Flottantes.",
     "backgroundNightDunesText": "Les Dunes Nocturnes",
     "backgroundNightDunesNotes": "Promenez-vous tranquillement dans les Dunes Nocturnes.",
     "backgroundSunsetOasisText": "L'Oasis du Coucher de Soleil",
     "backgroundSunsetOasisNotes": "Prélassez-vous à l'Oasis du Coucher de Soleil.",
-    "backgrounds122015": "Ensemble 19 : Sorti en Décembre 2015",
+    "backgrounds122015": "Ensemble 19 : Sorti en décembre 2015",
     "backgroundAlpineSlopesText": "Pentes Alpines",
     "backgroundAlpineSlopesNotes": "Skiez sur les Pentes Alpines.",
     "backgroundSnowySunriseText": "Lever de Soleil Enneigé",
     "backgroundSnowySunriseNotes": "Contemplez le Lever de Soleil Enneigé.",
     "backgroundWinterTownText": "Ville Hivernale",
     "backgroundWinterTownNotes": "Affairez-vous dans une Ville Hivernale. ",
-    "backgrounds012016": "Ensemble 20 : Sorti en Janvier 2016",
+    "backgrounds012016": "Ensemble 20 : Sorti en janvier 2016",
     "backgroundFrozenLakeText": "Lac Gelé",
     "backgroundFrozenLakeNotes": "Patinez sur un Lac Gelé.",
     "backgroundSnowmanArmyText": "Armée de Bonhommes de Neige",
     "backgroundSnowmanArmyNotes": "Dirigez une Armée de Bonhommes de Neige",
     "backgroundWinterNightText": "Nuit d'Hiver",
     "backgroundWinterNightNotes": "Regardez les étoiles durant une Nuit d'Hiver.",
-    "backgrounds022016": "Ensemble 21 : Sorti en Février 2016",
+    "backgrounds022016": "Ensemble 21 : Sorti en février 2016",
     "backgroundBambooForestText": "Forêt de Bambous",
     "backgroundBambooForestNotes": "Flânez dans la Forêt de Bambous.",
     "backgroundCozyLibraryText": "Bibliothèque Douillette",
     "backgroundCozyLibraryNotes": "Lisez dans la Bibliothèque Douillette.",
     "backgroundGrandStaircaseText": "Grand Escalier",
     "backgroundGrandStaircaseNotes": "Descendez à grands pas le Grand Escalier.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "Ensemble 22 : Sorti en mars 2016",
+    "backgroundDeepMineText": "Mine Profonde",
+    "backgroundDeepMineNotes": "Trouvez des métaux précieux dans une Mine Profonde.",
+    "backgroundRainforestText": "Forêt Tropicale",
+    "backgroundRainforestNotes": "Aventurez-vous dans une Forêt Tropicale.",
+    "backgroundStoneCircleText": "Cercle de Pierres",
+    "backgroundStoneCircleNotes": "Jetez des sorts dans un Cercle de Pierres."
 }
\ No newline at end of file
diff --git a/common/locales/fr/character.json b/common/locales/fr/character.json
index 1affbeaaa1..fe68dd5ab2 100644
--- a/common/locales/fr/character.json
+++ b/common/locales/fr/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Caractéristiques & Succès",
     "profile": "Profil",
-    "avatar": "Customize Avatar",
+    "avatar": "Personnalisez votre avatar",
     "other": "Autres",
     "fullName": "Nom complet",
     "displayName": "Pseudonyme",
@@ -83,7 +83,7 @@
     "allocateInt": "Points alloués en Intelligence :",
     "allocateIntPop": "Ajouter un point en Intelligence",
     "noMoreAllocate": "Maintenant que vous avez atteint le niveau 100, vous ne gagnerez plus de Points d'Attribut. Vous pouvez continuer à passer des niveaux ou commencer une nouvelle aventure depuis le niveau 1 en utilisant l'<a href='http://fr.habitica.wikia.com/wiki/Orbe_de_Renaissance'>Orbe de Renaissance</a>, disponible gratuitement au Marché dès maintenant.",
-    "stats": "Avatar Stats",
+    "stats": "Caractéristiques de l'avatar",
     "strength": "Force",
     "strengthText": "La Force augmente les chances de \"coups critiques\" aléatoires et donc les bonus d'or, d'expérience et de gain de butin qui en découlent. Elle aide aussi à infliger des dommages aux boss.",
     "constitution": "Constitution",
@@ -136,7 +136,7 @@
     "respawn": "Résurrection !",
     "youDied": "Vous êtes mort !",
     "dieText": "Vous avez perdu un Niveau, tout votre Or et une pièce d'Équipement aléatoire. Relevez-vous, Habiticien·ne, et essayez encore ! Mettez un frein à ces Habitudes négatives, complétez vos tâches Quotidiennes avec vigilance et tenez la mort à distance avec une Potion de Santé si vous fléchissez !",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Êtes-vous sûr·e ? Ceci réinitialisera la classe de votre personnage ainsi que vos points alloués (vous les récupérerez tous pour les ré-allouer), et vous coûtera 3 gemmes.",
     "purchaseFor": "Acheter pour <%= cost %> Gemmes ?",
     "notEnoughMana": "Pas assez de mana.",
     "invalidTarget": "Cible invalide",
diff --git a/common/locales/fr/communityguidelines.json b/common/locales/fr/communityguidelines.json
index ae56102d50..1af81bf66f 100644
--- a/common/locales/fr/communityguidelines.json
+++ b/common/locales/fr/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Dans une communauté aussi large que celle d’Habitica, les gens vont et viennent et il arrive parfois qu’un·e Mod doive reposer sa noble charge et se détendre. Les personnes suivantes sont Modérateurs et Modératrices Émérites. Elles n’ont plus en charge la modération, mais nous souhaitons tout de même honorer leur travail !",
     "commGuidePara014": "Modérateurs et Modératrices Émérites :",
     "commGuideHeadingPublicSpaces": "Espaces Publics sur Habitica",
-    "commGuidePara015": "Habitica compte deux sortes d’espaces sociaux : publics et privés. Les espaces publics comprennent la Taverne, les Guildes Publiques, GitHub, Trello et le Wiki. Les espaces privés sont les Guildes Privées, la messagerie d’équipe et les Messages Privés.",
+    "commGuidePara015": "Habitica compte deux sortes d’espaces sociaux : publics et privés. Les espaces publics comprennent la Taverne, les Guildes Publiques, GitHub, Trello et le Wiki. Les espaces privés sont les Guildes Privées, la messagerie d’équipe et les Messages Privés. Tous les noms affichés doivent se conformer avec les règles des espaces publics. Pour changer votre nom affiché, allez sur le site dans Utilisateur > Profil et cliquez sur le bouton \"Modifier\".",
     "commGuidePara016": "Lorsque vous naviguez dans les sphères publiques d’Habitica, il y a quelques règles générales à suivre afin que tout le monde se sente bien et heureux. Cela devrait être facile pour des aventuriers comme vous !",
     "commGuidePara017": "<strong>Respectez-vous les uns les autres.</strong> Soyez courtois·e, agréable, sympathique, et serviable. Souvenez-vous : les Habiticien·ne·s viennent de tous horizons et ont eu des expériences drastiquement différentes. C’est ce qui rend Habitica si génial !  Construire une communauté implique de respecter et de fêter nos différences tout comme nos points communs. Voici quelques méthodes simples pour se respecter mutuellement :",
     "commGuideList02A": "<strong>Respectez l’ensemble des Conditions d'Utilisation.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Obtempérez immédiatement si un Modérateur vous demande</strong> de cesser une conversation ou de la déplacer dans l'Arrière-Boutique. Les derniers mots et tirades finales devraient être lancés (courtoisement) à votre \"table\" dans l'Arrière-Boutique, si vous en avez la permission.",
     "commGuideList02G": "<strong>Prenez le temps de la réflexion plutôt que de répondre de manière impulsive</strong> si quelqu'un vous dit qu'une de vos propos ou actions l'ont gêné. Il faut une une grande force pour être capable de présenter des excuses sincères. Si vous trouvez qu'une personne vous a répondu de manière inappropriée, contactez un·e Mod plutôt que de l'interpeller en public.",
     "commGuideList02H": "<strong>Les discordes et les contentieux doivent être remontés aux modérateurs.</strong> Si vous sentez qu'une conversion s'échauffe, devient trop émotionnelle ou blessante, arrêtez-vous là. A la place, envoyer un courriel à <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> pour porter cela à notre attention. C'est notre travail que de faire de cet endroit un lieu sûr.",
-    "commGuideList02I": "<strong>Ne spammez pas</strong> Le spam peut inclure, sans être limité à : poster le même commentaire ou la même demande dans de multiples endroits, poster des liens sans explication ou contexte, poster des messages incohérents, ou poster le même message à la chaîne. Les demandes répétées de gemmes ou d'abonnements peuvent aussi être considérées comme du spam.",
-    "commGuidePara019": "<strong>Dans les espaces privés,</strong> une plus grande liberté est accordée pour discuter de ce dont vous avez envie, mais vous êtes toujours soumis aux Conditions d'Utilisation et ne devez pas les enfreindre : pas de contenu discriminatoire, violent ou menaçant.",
+    "commGuideList02I": "<strong>Ne spammez pas</strong> Le spam peut inclure, sans être limité à : poster le même commentaire ou la même demande dans de multiples endroits, poster des liens sans explication ou contexte, poster des messages incohérents, ou poster le même message à la chaîne. Les demandes répétées de gemmes ou d'abonnements dans une discussion privée ou publique peuvent aussi être considérées comme du spam.",
+    "commGuidePara019": "<strong>Dans les espaces privés,</strong> une plus grande liberté est accordée pour discuter de ce dont vous avez envie, mais vous êtes toujours soumis aux Conditions d'Utilisation, notamment pour le contenu discriminatoire, violent ou menaçant. Notez que, parce que les noms de Défis apparaissent dans le profil public du vainqueur, TOUS les noms de Défis doivent obéir aux règles régissant les espaces publics, même s'ils sont privés.",
     "commGuidePara020": "Les Message Privés (MP) ont quelques règles additionnelles. Si une personne vous a bloqué, ne la contactez pas par un autre biais pour lui demander de vous débloquer. Vous ne devriez également pas envoyer des MPs à quelqu'un en lui demandant de l'aide (dans la mesure où les réponses publiques aux questions sont utiles à la communauté). Enfin, n'envoyez à personne de messages les priant de vous offrir des gemmes ou un abonnement, ce qui peut être considéré comme du spam.",
     "commGuidePara021": "De plus, certains lieux publics d’Habitica ont des règles supplémentaires.",
     "commGuideHeadingTavern": "La Taverne",
diff --git a/common/locales/fr/content.json b/common/locales/fr/content.json
index cffc9758c4..3c65cfcbb5 100644
--- a/common/locales/fr/content.json
+++ b/common/locales/fr/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "un piquant",
     "dropEggBearCubText": "Ourson",
     "dropEggBearCubMountText": "Ours",
-    "dropEggBearCubAdjective": "un câlin",
+    "dropEggBearCubAdjective": "un courageux",
     "questEggGryphonText": "Griffon",
     "questEggGryphonMountText": "Griffon",
     "questEggGryphonAdjective": "un fier",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "un coloré",
     "questEggRatText": "Rat",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "un poussiéreux",
+    "questEggRatAdjective": "un sociable",
     "questEggOctopusText": "Pieuvre",
     "questEggOctopusMountText": "Pieuvre",
     "questEggOctopusAdjective": "une visqueuse",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Singe",
     "questEggMonkeyMountText": "Singe",
     "questEggMonkeyAdjective": "un malicieux",
+    "questEggSnailText": "Escargot",
+    "questEggSnailMountText": "Escargot",
+    "questEggSnailAdjective": "Un lent mais régulier",
     "eggNotes": "Trouvez une potion d’éclosion à verser sur cet œuf et il en sortira <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "de Base",
     "hatchingPotionWhite": "Blanc",
diff --git a/common/locales/fr/contrib.json b/common/locales/fr/contrib.json
index 4bda03219f..f28b96f770 100644
--- a/common/locales/fr/contrib.json
+++ b/common/locales/fr/contrib.json
@@ -28,11 +28,11 @@
     "helped": "A aidé Habit à s'agrandir",
     "helpedText1": "A aidé Habitica à s'agrandir en remplissant",
     "helpedText2": "cette enquête.",
-    "hall": "Hall of Heroes",
+    "hall": "Panthéon des héros",
     "contribTitle": "Titre de Contributeur (par exemple, \"Forgeron\")",
     "contribLevel": "Palier de Contributeur",
     "contribHallText": "1 à 7 pour les contributeurs normaux, 8 pour les modérateurs, 9 pour l'équipe. Détermine quels objets, familiers et montures sont accessibles. Définit également la couleur de l'étiquette du nom. Les paliers 8 et 9 se voient automatiquement attribuer un statut d'admin.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Panthéon des contributeurs",
     "hallPatrons": "Panthéon des Sponsors",
     "rewardUser": "Récompenser l'Utilisateur",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Les Guildes sont des groupes de discussion créés par les joueurs pour les joueurs pour regrouper les personnes autour de leurs centres d'intérêt. Jetez un œil à la liste et rejoignez les Guildes qui vous intéressent !",
     "blurbChallenges": "Les Défis sont des listes de tâches créées par des membres ! Rejoindre un défi ajoutera ses tâches aux vôtres dans la page des tâches ; gagner un Défi vous fera gagner un succès ainsi que, souvent, des gemmes !",
     "blurbHallPatrons": "Voici le Panthéon des Sponsors, où nous rendons hommage aux nobles aventuriers qui ont soutenu le Kickstarter original de Habitica. Nous les remercions de nous avoir aidés à donner la vie à Habitica !",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Voici le Panthéon des Contributeurs, où sont honorés tous les contributeurs \"open-source\" d'Habitica. Que ce soit grâce à du code, de l'art, de la musique, de l'écriture ou même simplement de l'aide, ils ont gagné <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'>des gemmes, de l'équipement exclusif</a>, et <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>des titres prestigieux</a>. Vous pouvez,  vous aussi, contribuer à Habitica ! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>Apprenez-en plus ici.</a>"
 }
\ No newline at end of file
diff --git a/common/locales/fr/gear.json b/common/locales/fr/gear.json
index ebb8cc4701..a3e3bc4a67 100644
--- a/common/locales/fr/gear.json
+++ b/common/locales/fr/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Ensemble",
     "weapon": "arme",
     "weaponBase0Text": "Pas d'arme",
     "weaponBase0Notes": "Pas d'arme.",
@@ -143,13 +144,13 @@
     "weaponSpecialWinter2016HealerText": "Canon à conffetis",
     "weaponSpecialWinter2016HealerNotes": "YOUPI !!!!!!! C'EST LE TEMPS DES MERVEILLES D'HIVER !!!!!!!! Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "weaponMystery201411Text": "Fourche Festive",
-    "weaponMystery201411Notes": "Embrochez vos ennemis ou plantez-la dans votre nourriture préférée : cette fourche multi-fonctions peut tout faire ! N'apporte aucun bonus. Équipement d'Abonné de Novembre 2014.",
+    "weaponMystery201411Notes": "Embrochez vos ennemis ou plantez-la dans votre nourriture préférée : cette fourche multi-fonctions peut tout faire ! N'apporte aucun bonus. Équipement d'abonné·e de novembre 2014.",
     "weaponMystery201502Text": "Bâton Chatoyant Ailé d'Amour et Aussi de Vérité",
-    "weaponMystery201502Notes": "Pour les AILES ! Pour l'AMOUR ! Et AUSSI pour la VÉRITÉ ! N'apporte aucun bonus. Équipement d'Abonné de Février 2015.",
+    "weaponMystery201502Notes": "Pour les AILES ! Pour l'AMOUR ! Et AUSSI pour la VÉRITÉ ! N'apporte aucun bonus. Équipement d'abonné·e de février 2015.",
     "weaponMystery201505Text": "Lance du Chevalier Vert",
-    "weaponMystery201505Notes": "Cette lance verte et argent a désarçonné de nombreux adversaires ! N'apporte aucun bonus. Équipement d'Abonné de Mai 2015.",
+    "weaponMystery201505Notes": "Cette lance verte et argent a désarçonné de nombreux adversaires ! N'apporte aucun bonus. Équipement d'abonné·e de mai 2015.",
     "weaponMystery301404Text": "Canne Steampunk",
-    "weaponMystery301404Notes": "Parfaite pour faire un tour en ville. N'apporte aucun bonus. Équipement d'Abonné de Mars 3015.",
+    "weaponMystery301404Notes": "Parfaite pour faire un tour en ville. N'apporte aucun bonus. Équipement d'abonné·e de mars 3015.",
     "weaponArmoireBasicCrossbowText": "Arbalète Basique",
     "weaponArmoireBasicCrossbowNotes": "Cette arbalète peut percer l'armure d'une tâche de très loin ! Augmente la Force de <%= str %> points, la Perception de <%= per %> points et la Constitution de <%= con %>points. Armoire Enchantée : Objet Indépendant.",
     "weaponArmoireLunarSceptreText": "Sceptre Lunaire Apaisant",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "De l'ordre ! Augmente la Force et la Constitution de <%= attrs %> points chacune. Armoire Enchantée : Ensemble de l'Avocat (Objet 3 sur 3).",
     "weaponArmoireJesterBatonText": "Bâton de Bouffon",
     "weaponArmoireJesterBatonNotes": "Avec un geste de votre bâton et une répartie saillante, même les situations les plus compliquées deviennent simples. Augmente l'Intelligence et la Perception de <%= attrs %> points chacune. Armoire Enchantée : Ensemble du Bouffon (Objet 3 sur 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Pioche de Minage",
+    "weaponArmoireMiningPickaxNotes": "Minez la quantité maximale d'or de vos tâches ! Augmente la Perception de <%= per %> points. Armoire Enchantée : Ensemble du Mineur (Objet 3 sur 3).",
     "armor": "armure",
     "armorBase0Text": "Habit simple",
     "armorBase0Notes": "Un vêtement ordinaire. N'apporte aucun avantage.",
@@ -308,43 +309,43 @@
     "armorSpecialWinter2016MageText": "Anorak de Snowboardeur",
     "armorSpecialWinter2016MageNotes": "Un Sorcier avisé reste bien couvert pour affronter le vent d'hiver. Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "armorSpecialWinter2016HealerText": "Cape Festive Féerique",
-    "armorSpecialWinter2016HealerNotes": "Les Fées Festives se protègent en s'enveloppant des ailes de leur corps, utilisent celles de leur tête pour se laisser porter par les vents et volent tout autour d'Habitica à des vitesses montant jusqu'à 100 mph, livrant leurs présents et recouvrant tout le monde de confettis. C'est tellement drôle. Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
+    "armorSpecialWinter2016HealerNotes": "Les Fées Festives se protègent en s'enveloppant des ailes de leur corps, utilisent celles de leur tête pour se laisser porter par les vents et volent tout autour d'Habitica à des vitesses montant jusqu'à 150 km/h, livrant leurs présents et recouvrant tout le monde de confettis. C'est tellement drôle. Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "armorMystery201402Text": "Robe du Messager",
-    "armorMystery201402Notes": "Chatoyante et solide, cette robe possède de nombreuses poches dans lesquelles transporter des lettres. N'apporte aucun bonus. Équipement d'Abonné de Février 2014.",
+    "armorMystery201402Notes": "Chatoyante et solide, cette robe possède de nombreuses poches dans lesquelles transporter des lettres. N'apporte aucun bonus. Équipement d'abonné·e de février 2014.",
     "armorMystery201403Text": "Armure du Marcheur Sylvain",
-    "armorMystery201403Notes": "Cette armure mousseuse tissée de bois se plie au gré des mouvements de son porteur. N'apporte aucun bonus. Équipement d'Abonné de Mars 2014.",
+    "armorMystery201403Notes": "Cette armure mousseuse tissée de bois se plie au gré des mouvements de son porteur. N'apporte aucun bonus. Équipement d'abonné·e de mars 2014.",
     "armorMystery201405Text": "Flamme du Cœur",
-    "armorMystery201405Notes": "Rien ne peut vous atteindre lorsque les flammes vous enveloppent ! N'apporte aucun bonus. Équipement d'Abonné de Mai 2014.",
+    "armorMystery201405Notes": "Rien ne peut vous atteindre lorsque les flammes vous enveloppent ! N'apporte aucun bonus. Équipement d'abonné·e de mai 2014.",
     "armorMystery201406Text": "Robe de Pieuvre",
-    "armorMystery201406Notes": "Cette robe souple permet à son porteur de se glisser même dans les fissures les plus étroites. N'apporte aucun bonus. Équipement d'Abonné de Juin 2014.",
+    "armorMystery201406Notes": "Cette robe souple permet à son porteur de se glisser même dans les fissures les plus étroites. N'apporte aucun bonus. Équipement d'abonné·e de juin 2014.",
     "armorMystery201407Text": "Tenue de l'Explorateur Sous-marin",
-    "armorMystery201407Notes": "Alternativement décrite comme \"splooshy\", \"bien trop épaisse\" et \"franchement, un peu encombrante\", cette tenue est le meilleur compagnon de tout explorateur intrépide des bas-fonds. N'apporte aucun bonus. Équipement d'Abonné de Juillet 2014.",
+    "armorMystery201407Notes": "Alternativement décrite comme \"splooshy\", \"bien trop épaisse\" et \"franchement, un peu encombrante\", cette tenue est le meilleur compagnon de tout explorateur intrépide des bas-fonds. N'apporte aucun bonus. Équipement d'abonné·e de juillet 2014.",
     "armorMystery201408Text": "Robe Solaire",
-    "armorMystery201408Notes": "Cette robe est tissée à partir de rayons solaires et d'or. N'apporte aucun bonus. Équipement d'Abonné d'Août 2014.",
+    "armorMystery201408Notes": "Cette robe est tissée à partir de rayons solaires et d'or. N'apporte aucun bonus. Équipement d'abonné·e d'août 2014.",
     "armorMystery201409Text": "Veste du Marcheur Sylvain",
-    "armorMystery201409Notes": "Une veste recouverte de feuilles qui camoufle son porteur. N'apporte aucun bonus. Équipement d'Abonné de Septembre 2014.",
+    "armorMystery201409Notes": "Une veste recouverte de feuilles qui camoufle son porteur. N'apporte aucun bonus. Équipement d'abonné·e de septembre 2014.",
     "armorMystery201410Text": "Tenue de Gobelin",
-    "armorMystery201410Notes": "Écaillé, visqueux et puissant ! N'apporte aucun bonus. Équipement d'Abonné d'Octobre 2014.",
+    "armorMystery201410Notes": "Écaillé, visqueux et puissant ! N'apporte aucun bonus. Équipement d'abonné·e d'octobre 2014.",
     "armorMystery201412Text": "Costume de Pingouin",
-    "armorMystery201412Notes": "Vous êtes un pingouin ! N'apporte aucun bonus. Équipement d'Abonné de Décembre 2014.",
+    "armorMystery201412Notes": "Vous êtes un pingouin ! N'apporte aucun bonus. Équipement d'abonné·e de décembre 2014.",
     "armorMystery201501Text": "Armure Stellaire",
-    "armorMystery201501Notes": "Des galaxies scintillent dans le métal de cette armure, renforçant la force de volonté de son porteur. N'apporte aucun bonus. Équipement d'Abonné de Janvier 2015.",
+    "armorMystery201501Notes": "Des galaxies scintillent dans le métal de cette armure, renforçant la force de volonté de son porteur. N'apporte aucun bonus. Équipement d'abonné·e de janvier 2015.",
     "armorMystery201503Text": "Armure d'Aigue-Marine",
-    "armorMystery201503Notes": "Ce minerai bleu symbolise la bonne fortune, la joie et la productivité éternelle. N'apporte aucun bonus. Équipement d'Abonné de Mars 2015.",
+    "armorMystery201503Notes": "Ce minerai bleu symbolise la bonne fortune, la joie et la productivité éternelle. N'apporte aucun bonus. Équipement d'abonné·e de mars 2015.",
     "armorMystery201504Text": "Robe d'Abeille",
-    "armorMystery201504Notes": "Vous serez aussi productif qu'une abeille dans cette robe attirante ! N'apporte aucun bonus. Équipement d'Abonné d'Avril 2015",
+    "armorMystery201504Notes": "Vous serez aussi productif qu'une abeille dans cette robe attirante ! N'apporte aucun bonus. Équipement d'abonné·e d'avril 2015",
     "armorMystery201506Text": "Tenue de plongée",
-    "armorMystery201506Notes": "Plongez à travers un récif corallien dans cette tenue de bain aux couleurs vives ! N'apporte aucun bonus. Équipement d'Abonné de Juin 2015.",
+    "armorMystery201506Notes": "Plongez à travers un récif corallien dans cette tenue de bain aux couleurs vives ! N'apporte aucun bonus. Équipement d'abonné·e de juin 2015.",
     "armorMystery201508Text": "Costume de Guépard",
-    "armorMystery201508Notes": "Vous serez aussi rapide qu'un guépard dans ce costume tout doux ! N'apporte aucun bonus. Équipement d'Abonné d'août 2015.",
+    "armorMystery201508Notes": "Vous serez aussi rapide qu'un guépard dans ce costume tout doux ! N'apporte aucun bonus. Équipement d'abonné·e d'août 2015.",
     "armorMystery201509Text": "Costume de Loup-Garou",
-    "armorMystery201509Notes": "C'est bien un costume, hein? N'apporte aucun bonus. Équipement d'Abonné de Septembre 2015.",
+    "armorMystery201509Notes": "C'est bien un costume, hein? N'apporte aucun bonus. Équipement d'abonné·e de septembre 2015.",
     "armorMystery201511Text": "Armure en Bois",
-    "armorMystery201511Notes": "Si l'on considère que cette armure a été creusée à même une bûche magique, elle est étonnament confortable. N'apporte aucun bonus. Équipement d'Abonné(e) de Novembre 2015.",
+    "armorMystery201511Notes": "Si l'on considère que cette armure a été creusée à même une bûche magique, elle est étonnamment confortable. N'apporte aucun bonus. Équipement d'abonné·e de novembre 2015.",
     "armorMystery201512Text": "Armure de Feu Glacial ",
-    "armorMystery201512Notes": "Invoquez la flamme glacée de l'hiver ! N'apporte aucun bonus. Équipement d'Abonné de Décembre 2015.",
+    "armorMystery201512Notes": "Invoquez la flamme glacée de l'hiver ! N'apporte aucun bonus. Équipement d'abonné·e de décembre 2015.",
     "armorMystery301404Text": "Tenue Steampunk",
-    "armorMystery301404Notes": "Pimpant et fringuant ! N'apporte aucun bonus. Équipement d'Abonné de Février 3015.",
+    "armorMystery301404Notes": "Pimpant et fringuant ! N'apporte aucun bonus. Équipement d'abonné·e de février 3015.",
     "armorArmoireLunarArmorText": "Armure Lunaire Apaisante",
     "armorArmoireLunarArmorNotes": "La lumière de la lune vous rendra fort et perspicace. Augmente la Force de <%= str %> points et l'Intelligence de <%= int %> points. Armoire Enchantée: Ensemble Lunaire Apaisant (Objet 2 sur 3).",
     "armorArmoireGladiatorArmorText": "Armure de Gladiateur",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Très solennelle et majestueuse. Augmente la Constitution de <%= con %> points. Armoire Enchantée : Ensemble de l'Avocat (Objet 2 sur 3).",
     "armorArmoireJesterCostumeText": "Costume de Bouffon",
     "armorArmoireJesterCostumeNotes": "Tralala ! Malgré l'apparence de ce costume, vous n'êtes pas un bouffon. Augmente l'Intelligence de <%= int %> points. Armoire Enchantée : Ensemble du Bouffon (Objet 2 sur 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Salopette de Mineur",
+    "armorArmoireMinerOverallsNotes": "Elle semble peut-être usée, mais elle contient un enchantement qui repousse la poussière. Augmente la Constitution de <%= con %> points. Armoire Enchantée : Ensemble du Mineur (Objet 2 sur 3).",
     "headgear": "coiffe",
     "headBase0Text": "Pas de casque",
     "headBase0Notes": "Pas de couvre-chef.",
@@ -495,47 +496,47 @@
     "headSpecialWinter2016RogueText": "Heaume Cacao",
     "headSpecialWinter2016RogueNotes": "Le foulard protecteur de ce confortable heaume s'enlève uniquement pour siroter des boissons chaudes en hiver. Augmente la Perception de <%= per %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "headSpecialWinter2016WarriorText": "Bonnet de bonhomme de neige",
-    "headSpecialWinter2016WarriorNotes": "Brr ! Ce puissant heaume est vraiment puissant... Jusqu'à ce qu'il fonde. Augmente la Force de <%= str %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
+    "headSpecialWinter2016WarriorNotes": "Brr ! Ce majestueux heaume est vraiment puissant... Jusqu'à ce qu'il fonde. Augmente la Force de <%= str %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "headSpecialWinter2016MageText": "Capuche de Snowboardeur",
     "headSpecialWinter2016MageNotes": "Protège vos yeux de la neige pendant que vous jetez vos sort. Augmente la Perception de <%= per %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "headSpecialWinter2016HealerText": "Heaume d'Ailes de Fées",
-    "headSpecialWinter2016HealerNotes": "Cesailesbattentsivitequ'elless'estompent ! Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
+    "headSpecialWinter2016HealerNotes": "Cesailesbattentsivitequ'ellesrendentflou ! Augmente l'Intelligence de <%= int %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "headSpecialGaymerxText": "Heaume de Guerrier Arc-en-Ciel",
     "headSpecialGaymerxNotes": "En l'honneur de la conférence GaymerX, cet casque spécial est décoré avec un motif arc-en-ciel aussi radieux que coloré ! GaymerX est une convention célébrant les LGBTQ et les jeux, et est ouverte à tous.",
     "headMystery201402Text": "Heaume Ailé",
-    "headMystery201402Notes": "Ce bandeau ailé insuffle la vitesse du vent à son porteur ! N'apporte aucun bonus. Équipement d'Abonné de Février 2014.",
+    "headMystery201402Notes": "Ce bandeau ailé insuffle la vitesse du vent à son porteur ! N'apporte aucun bonus. Équipement d'abonné·e de février 2014.",
     "headMystery201405Text": "Flamme de l'Esprit",
-    "headMystery201405Notes": "Faites flamber la procrastination !  N'apporte aucun bonus. Équipement d'Abonné de Mai 2014.",
+    "headMystery201405Notes": "Faites flamber la procrastination !  N'apporte aucun bonus. Équipement d'abonné·e de mai 2014.",
     "headMystery201406Text": "Couronne de Tentacules",
-    "headMystery201406Notes": "Les tentacules de ce casque captent l'énergie magique de l'eau.  N'apporte aucun bonus. Équipement d'Abonné de Juin 2014.",
+    "headMystery201406Notes": "Les tentacules de ce casque captent l'énergie magique de l'eau.  N'apporte aucun bonus. Équipement d'abonné·e de juin 2014.",
     "headMystery201407Text": "Casque de l'Explorateur Sous-marin",
-    "headMystery201407Notes": "Ce casque rend l'exploration sous-marine enfantine ! Il vous fait aussi légèrement ressembler à un poisson aux yeux globuleux. Très rétro ! N'apporte aucun bonus. Équipement d'Abonné de Juillet 2014.",
+    "headMystery201407Notes": "Ce casque rend l'exploration sous-marine enfantine ! Il vous fait aussi légèrement ressembler à un poisson aux yeux globuleux. Très rétro ! N'apporte aucun bonus. Équipement d'abonné·e de juillet 2014.",
     "headMystery201408Text": "Couronne Solaire",
-    "headMystery201408Notes": "Cette couronne flamboyante confère une grande force de volonté à son porteur.  N'apporte aucun bonus. Équipement d'Abonné d'Août 2014.",
+    "headMystery201408Notes": "Cette couronne flamboyante confère une grande force de volonté à son porteur.  N'apporte aucun bonus. Équipement d'abonné·e d'août 2014.",
     "headMystery201411Text": "Heaume d'Acier Sportif",
-    "headMystery201411Notes": "Le heaume traditionnel porté pour le Balance-Ball, le sport Habiticien populaire qui consiste à vous recouvrir d'une lourde tenue de protection puis à vous lancer dans un sain équilibrage travail-vie... TOUT EN ÉTANT POURSUIVI PAR DES HIPPOGRIFFES !  N'apporte aucun bonus. Équipement d'Abonné de Novembre 2014.",
+    "headMystery201411Notes": "Le heaume traditionnel porté pour le Balance-Ball, le sport Habiticien populaire qui consiste à vous recouvrir d'une lourde tenue de protection puis à vous lancer dans un sain équilibrage travail-vie... TOUT EN ÉTANT POURSUIVI PAR DES HIPPOGRIFFES !  N'apporte aucun bonus. Équipement d'abonné·e de novembre 2014.",
     "headMystery201412Text": "Chapeau de Pingouin",
-    "headMystery201412Notes": "Qui est un pingouin ? N'apporte aucun bonus. Équipement d'Abonné de Décembre 2014.",
+    "headMystery201412Notes": "Qui est un pingouin ? N'apporte aucun bonus. Équipement d'abonné·e de décembre 2014.",
     "headMystery201501Text": "Heaume Stellaire",
-    "headMystery201501Notes": "Les constellations de ce casque scintillent et tourbillonnent, canalisant les pensées de son porteur. N'apporte aucun bonus. Équipement d'Abonné de Janvier 2015.",
+    "headMystery201501Notes": "Les constellations de ce casque scintillent et tourbillonnent, canalisant les pensées de son porteur. N'apporte aucun bonus. Équipement d'abonné·e de janvier 2015.",
     "headMystery201505Text": "Heaume du Chevalier Vert",
-    "headMystery201505Notes": "La plume verte au sommet de ce heaume ondule fièrement. N'apport aucun bonus. Équipement d'Abonné de Mai 2015.",
+    "headMystery201505Notes": "La plume verte au sommet de ce heaume ondule fièrement. N'apporte aucun bonus. Équipement d'abonné·e de mai 2015.",
     "headMystery201508Text": "Chapeau de Guépard",
-    "headMystery201508Notes": "Ce confortable chapeau de guépard est vraiment soyeux ! N'apporte aucun bonus. Équipement d'Abonné d'Août 2015.",
+    "headMystery201508Notes": "Ce confortable chapeau de guépard est vraiment soyeux ! N'apporte aucun bonus. Équipement d'abonné·e d'août 2015.",
     "headMystery201509Text": "Masque de Loup-Garou",
-    "headMystery201509Notes": "C'est bien un masque, hein? N'apporte aucun bonus. Équipement d'Abonné de Septembre 2015.",
+    "headMystery201509Notes": "C'est bien un masque, hein? N'apporte aucun bonus. Équipement d'abonné·e de septembre 2015.",
     "headMystery201511Text": "Couronne de Rondin",
-    "headMystery201511Notes": "Comptez le nombre d'anneaux pour déterminer l'âge de la couronne. Ne confère aucun bonus. Équipement d'Abonné de Novembre 2015.",
+    "headMystery201511Notes": "Comptez le nombre d'anneaux pour déterminer l'âge de la couronne. Ne confère aucun bonus. Équipement d'abonné·e de novembre 2015.",
     "headMystery201512Text": "Flammes hivernales",
-    "headMystery201512Notes": "Ces flammes brûlent froidement d'une grande intelligence. N'apporte aucun bonus. Équipement d'Abonné de Décembre 2015.",
+    "headMystery201512Notes": "Ces flammes brûlent froidement d'une grande intelligence. N'apporte aucun bonus. Équipement d'abonné·e de décembre 2015.",
     "headMystery201601Text": "Casque de Vraie Détermination",
-    "headMystery201601Notes": "Restez déterminé, courageux champion ! N'apporte aucun bonus. Equipement d'Abonné de janvier 2016.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201601Notes": "Restez déterminé, courageux champion ! N'apporte aucun bonus. Équipement d'abonné·e de janvier 2016.",
+    "headMystery201602Text": "Capuche de Bourreau des Cœurs ",
+    "headMystery201602Notes": "Protéger votre identité de tous vos admirateurs. N'apporte aucun bonus. Équipement d'abonné·e de février 2016.",
     "headMystery301404Text": "Haut-de-forme Fantaisiste",
-    "headMystery301404Notes": "Un couvre-chef fantaisiste pour les gens de bonne famille les plus élégants ! N'apporte aucun bonus. Équipement d'Abonné de Janvier 3015.",
+    "headMystery301404Notes": "Un couvre-chef fantaisiste pour les gens de bonne famille les plus élégants ! N'apporte aucun bonus. Équipement d'abonné·e de janvier 3015.",
     "headMystery301405Text": "Haut-de-forme Classique",
-    "headMystery301405Notes": "Un haut-de-forme classique ne demandant qu'à être assorti avec des accessoires fantaisistes. N'apporte aucun bonus. Équipement d'Abonné de Mai 3015.",
+    "headMystery301405Notes": "Un haut-de-forme classique ne demandant qu'à être assorti avec des accessoires fantaisistes. N'apporte aucun bonus. Équipement d'abonné·e de mai 3015.",
     "headArmoireLunarCrownText": "Couronne Lunaire Apaisante",
     "headArmoireLunarCrownNotes": "Cette couronne vous fortifie et affûte vos sens, spécialement les nuits de pleine lune. Augmente la Constitution de <%= con %> points et la Perception de <%= per %> points. Armoire Enchantée : Ensemble Lunaire Apaisant (Objet 1 sur 3).",
     "headArmoireRedHairbowText": "Nœud Rouge",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Cette perruque bondissante suffit à effrayer même le plus acharné des ennemis. Augmente la Force de  <%= str %> points. Armoire Enchantée : Ensemble de l'Avocat (Objet 1 sur 3).",
     "headArmoireJesterCapText": "Chapeau de Bouffon",
     "headArmoireJesterCapNotes": "Les cloches de ce chapeau pourraient bien distraire vos adversaires mais elles vous aident juste à vous concentrer. Augmente la Perception de <%= per %> points. Armoire Enchantée : Ensemble du Bouffon (Objet 1 sur 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Casque de Mineur",
+    "headArmoireMinerHelmetNotes": "Protégez votre tête des chutes de tâches ! Augmente l'Intelligence de <%= int %> points. Armoire Enchantée : Ensemble du Mineur (Objet 1 sur 3).",
     "offhand": "objet de main de bouclier",
     "shieldBase0Text": "Pas d'Équipement de Main de Bouclier",
     "shieldBase0Notes": "Pas de bouclier ni de deuxième arme.",
@@ -662,9 +663,9 @@
     "shieldSpecialWinter2016HealerText": "Cadeau Lutin",
     "shieldSpecialWinter2016HealerNotes": "Ouvrez le ouvrez le ouvrez le ouvrez le ouvrez le ouvrez le !!!!!!!!! Augmente la Constitution de <%= con %> points. Équipement en Édition Limitée de l'Hiver 2015-2016.",
     "shieldMystery201601Text": "Tueuse Résolue",
-    "shieldMystery201601Notes": "Cette lame peut être utilisée pour parer toutes les distractions. N'apporte aucun bonus. Equipement d'Abonné de janvier 2016.",
+    "shieldMystery201601Notes": "Cette lame peut être utilisée pour parer toutes les distractions. N'apporte aucun bonus. Équipement d'abonné·e de janvier 2016.",
     "shieldMystery301405Text": "Bouclier Horloge",
-    "shieldMystery301405Notes": "Le temps est de vote côté avec cet imposant bouclier horloge ! N'apporte aucun bonus. Équipement d'Abonné de Juin 3015.",
+    "shieldMystery301405Notes": "Le temps est de vote côté avec cet imposant bouclier horloge ! N'apporte aucun bonus. Équipement d'abonné·e de juin 3015.",
     "shieldArmoireGladiatorShieldText": "Bouclier de Gladiateur",
     "shieldArmoireGladiatorShieldNotes": "Pour être un gladiateur, vous devez ... euh, peu importe, cognez-les simplement avec votre bouclier. Augmente la Constitution de <%= con %> points et la Force de <%= str %> points. Armoire Enchantée : Ensemble de Gladiateur (Objet 3 sur 3).",
     "shieldArmoireMidnightShieldText": "Bouclier de Minuit",
@@ -673,25 +674,25 @@
     "shieldArmoireRoyalCaneNotes": "Hourra pour le souverain, dont on chante les louanges dans le royaume ! Augmente la Constitution, l'Intelligence et la Perception de <%= attrs %> points chacune. Armoire Enchantée : Ensemble Royal ( Objet 2 sur 3).",
     "shieldArmoireDragonTamerShieldText": "Bouclier de Dresseur de Dragon",
     "shieldArmoireDragonTamerShieldNotes": "Distrayez les ennemis grâce à ce bouclier en forme de Dragon. Augmente la Perception de <%= per %> points. Armoire Enchantée : Ensemble de Dresseur de Dragon (Objet 2 sur 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Lampe Mystique",
+    "shieldArmoireMysticLampNotes": "Illuminez les cavernes les plus sombres grâce à cette lampe mystique !  Augmente la Perception de <%= per %> points. Armoire Enchantée : Objet Indépendant.",
     "back": "Accessoire de Dos",
     "backBase0Text": "Pas d’accessoire dorsal",
     "backBase0Notes": "Pas d’accessoire dorsal.",
     "backMystery201402Text": "Ailes d'Or",
-    "backMystery201402Notes": "Ces ailes brillantes ont des plumes qui étincellent au soleil ! N'apporte aucun bonus. Équipement d'Abonné de Février 2014.",
+    "backMystery201402Notes": "Ces ailes brillantes ont des plumes qui étincellent au soleil ! N'apporte aucun bonus. Équipement d'abonné·e de février 2014.",
     "backMystery201404Text": "Ailes du Papillon Crépusculaire",
-    "backMystery201404Notes": "Sois un papillon et bats des ailes !  N'apporte aucun bonus. Équipement d'Abonné d'Avril 2014.",
+    "backMystery201404Notes": "Sois un papillon et bats des ailes !  N'apporte aucun bonus. Équipement d'abonné·e d'avril 2014.",
     "backMystery201410Text": "Ailes de Gobelin",
-    "backMystery201410Notes": "Fendez la nuit sur ces ailes puissantes.  N'apporte aucun bonus. Équipement d'Abonné d'Octobre 2014.",
+    "backMystery201410Notes": "Fendez la nuit sur ces ailes puissantes.  N'apporte aucun bonus. Équipement d'abonné·e d'octobre 2014.",
     "backMystery201504Text": "Ailes d'Abeille",
-    "backMystery201504Notes": "Bzzz bzzz bzzz ! Voltigez de tâche en tâche. Ne confère aucun bonus. Équipement d'Abonné d'Avril 2015",
+    "backMystery201504Notes": "Bzzz bzzz bzzz ! Voltigez de tâche en tâche. Ne confère aucun bonus. Équipement d'abonné·e d'avril 2015",
     "backMystery201507Text": "Planche de surf excellente",
-    "backMystery201507Notes": "Surfez loin du Quai Assidu et domptez les vagues de la Baie d'Inkomplet ! N'apporte aucun bonus. Équipement d'Abonné de Juillet 2015.",
+    "backMystery201507Notes": "Surfez loin du Quai Assidu et domptez les vagues de la Baie d'Inkomplet ! N'apporte aucun bonus. Équipement d'abonné·e de juillet 2015.",
     "backMystery201510Text": "Queue de Goblin",
-    "backMystery201510Notes": "Préhensile et puissante! N'apporte aucun bonus. Équipement d'Abonné d'Octobre 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201510Notes": "Préhensile et puissante! N'apporte aucun bonus. Équipement d'abonné·e d'octobre 2015.",
+    "backMystery201602Text": "Cape de Bourreau des Cœurs ",
+    "backMystery201602Notes": "D'un bruissement de votre cape, vos ennemis tombent à vos pieds. N'apporte aucun bonus. Équipement d'abonné·e de février 2016.",
     "backSpecialWonderconRedText": "Cape de Puissance",
     "backSpecialWonderconRedNotes": "Bruisse avec force et élégance. N'apporte aucun bonus. Équipement de Convention en Édition Spéciale.",
     "backSpecialWonderconBlackText": "Cape de Dissimulation",
@@ -755,17 +756,17 @@
     "headAccessoryWolfEarsText": "Oreilles de Loup",
     "headAccessoryWolfEarsNotes": "Ces oreilles vous font ressembler à un loup loyal ! Ne confère aucun bonus.",
     "headAccessoryMystery201403Text": "Bois du Marcheur Sylvain",
-    "headAccessoryMystery201403Notes": "Mousses et lichens font scintiller ces bois. N'apporte aucun bonus. Équipement d'Abonné de Mars 2014.",
+    "headAccessoryMystery201403Notes": "Mousses et lichens font scintiller ces bois. N'apporte aucun bonus. Équipement d'abonné·e de mars 2014.",
     "headAccessoryMystery201404Text": "Antennes du Papillon Crépusculaire",
-    "headAccessoryMystery201404Notes": "Ces antennes aident leur porteur à pressentir de dangereux égarements !  N'apporte aucun bonus. Équipement d'Abonné d'Avril 2014.",
+    "headAccessoryMystery201404Notes": "Ces antennes aident leur porteur à pressentir de dangereux égarements !  N'apporte aucun bonus. Équipement d'abonné·e d'avril 2014.",
     "headAccessoryMystery201409Text": "Ramure d'Automne",
-    "headAccessoryMystery201409Notes": "Cette puissante ramure change de couleur en harmonie avec celle des feuilles. N'apporte aucun bonus. Équipement d'Abonné de Septembre 2014.",
+    "headAccessoryMystery201409Notes": "Cette puissante ramure change de couleur en harmonie avec celle des feuilles. N'apporte aucun bonus. Équipement d'abonné·e de septembre 2014.",
     "headAccessoryMystery201502Text": "Ailes de la Pensée",
-    "headAccessoryMystery201502Notes": "Laissez votre imagination s'envoler ! N'apporte aucun bonus. Équipement d'Abonné de Février 2015.",
+    "headAccessoryMystery201502Notes": "Laissez votre imagination s'envoler ! N'apporte aucun bonus. Équipement d'abonné·e de février 2015.",
     "headAccessoryMystery201510Text": "Cornes de Goblin",
-    "headAccessoryMystery201510Notes": "Terrifiantes et un peu visqueuses. N'apportent aucun bonus. Equipement d'Abonné d'Octobre 2015.",
+    "headAccessoryMystery201510Notes": "Terrifiantes et un peu visqueuses. N'apportent aucun bonus. Équipement d'abonné·e d'octobre 2015.",
     "headAccessoryMystery301405Text": "Lunettes Frontales",
-    "headAccessoryMystery301405Notes": "\"Les lunettes c'est pour les yeux,\" disaient-ils. \"Personne ne voudrait de lunettes qu'on ne peut porter que sur la tête\" disaient-ils. Ha ! Vous leur avez bien montré ! N'apporte aucun bonus. Équipement d'Abonné d'Août 3015.",
+    "headAccessoryMystery301405Notes": "\"Les lunettes c'est pour les yeux,\" disaient-ils. \"Personne ne voudrait de lunettes qu'on ne peut porter que sur la tête\" disaient-ils. Ha ! Vous leur avez bien montré ! N'apporte aucun bonus. Équipement d'abonné·e d'août 3015.",
     "eyewear": "Lunettes",
     "eyewearBase0Text": "Pas de Lunettes",
     "eyewearBase0Notes": "Pas de Lunettes.",
@@ -778,15 +779,15 @@
     "eyewearSpecialWonderconBlackText": "Masque de Dissimulation",
     "eyewearSpecialWonderconBlackNotes": "Vos raisons sont parfaitement légitimes. N'apporte aucun bonus. Équipement de Convention en Édition Spéciale.",
     "eyewearMystery201503Text": "Lunettes d'Aigue-Marine",
-    "eyewearMystery201503Notes": "Ne laissez pas ces gemmes chatoyantes vous taper dans l’œil ! N'apporte aucun bonus. Équipement d'Abonné de Mars 2015.",
+    "eyewearMystery201503Notes": "Ne laissez pas ces gemmes chatoyantes vous taper dans l’œil ! N'apporte aucun bonus. Équipement d'abonné·e de mars 2015.",
     "eyewearMystery201506Text": "Tuba néon",
-    "eyewearMystery201506Notes": "Ce tuba néon permet à son porteur de voir sous l'eau. N'apporte aucun bonus. Équipement d'Abonné de Juin 2015.",
+    "eyewearMystery201506Notes": "Ce tuba néon permet à son porteur de voir sous l'eau. N'apporte aucun bonus. Équipement d'abonné·e de juin 2015.",
     "eyewearMystery201507Text": "Lunettes de soleil excellentes",
-    "eyewearMystery201507Notes": "Ces lunettes vous permettront de rester cool, même en pleine canicule. N'apporte aucun bonus. Équipement d'Abonné de Juillet 2015.",
+    "eyewearMystery201507Notes": "Ces lunettes vous permettront de rester cool, même en pleine canicule. N'apporte aucun bonus. Équipement d'abonné·e de juillet 2015.",
     "eyewearMystery301404Text": "Lunettes",
-    "eyewearMystery301404Notes": "Il n'y a pas plus raffiné qu'une paire de lunettes - à l'exception, peut-être, d'un monocle. N'apporte aucun bonus. Équipement d'Abonné d'Avril 3015.",
+    "eyewearMystery301404Notes": "Il n'y a pas plus raffiné qu'une paire de lunettes - à l'exception, peut-être, d'un monocle. N'apporte aucun bonus. Équipement d'abonné·e d'avril 3015.",
     "eyewearMystery301405Text": "Monocle",
-    "eyewearMystery301405Notes": "Il n'y a pas plus raffiné qu'un monocle - à l'exception, peut-être, d'une paire de lunettes. N'apporte aucun bonus. Équipement d'Abonné d'Avril 3015.",
+    "eyewearMystery301405Notes": "Il n'y a pas plus raffiné qu'un monocle - à l'exception, peut-être, d'une paire de lunettes. N'apporte aucun bonus. Équipement d'abonné·e de Juillet 3015.",
     "eyewearArmoirePlagueDoctorMaskText": "Masque de Médecin de la Peste",
     "eyewearArmoirePlagueDoctorMaskNotes": "Un authentique masque porté par les médecins qui ont combattu la Peste de Procrastination ! N'apporte aucun bonus. Armoire Enchantée, Ensemble de Médecin de la Peste (Objet 2 sur 3)."
 }
\ No newline at end of file
diff --git a/common/locales/fr/generic.json b/common/locales/fr/generic.json
index a9d2277383..87552b9296 100644
--- a/common/locales/fr/generic.json
+++ b/common/locales/fr/generic.json
@@ -3,7 +3,7 @@
     "stringNotFound": "Chaîne '<%= string %>' non trouvée",
     "titleIndex": "Habitica | Le RPG de votre vie",
     "habitica": "Habitica",
-    "titleTasks": "Devoirs",
+    "titleTasks": "Tâches",
     "titleAvatar": "Avatar",
     "titleBackgrounds": "Arrière-plans",
     "titleStats": "Caractéristiques & Succès",
@@ -20,8 +20,8 @@
     "titlePets": "Familiers",
     "titleMounts": "Montures",
     "titleEquipment": "Équipement",
-    "titleTimeTravelers": "Voyageur du Temps",
-    "titleSeasonalShop": "Marché de Saison",
+    "titleTimeTravelers": "Voyageur Temporels",
+    "titleSeasonalShop": "Boutique Saisonnière",
     "titleSettings": "Paramètres",
     "expandToolbar": "Montrer la barre d'outlis",
     "collapseToolbar": "Cacher la barre d'outils",
@@ -48,7 +48,7 @@
     "market": "Marché",
     "subscriberItem": "Objet mystère",
     "newSubscriberItem": "Nouvel Objet Mystère",
-    "subscriberItemText": "Les Abonnés recevront chaque mois un objet mystère. Celui-ci est généralement dévoilé environ une semaine avant la fin du mois. Consultez la page \"Mystery Item\" du wiki pour avoir plus d'information.",
+    "subscriberItemText": "Les abonné·e·s recevront chaque mois un objet mystère. Celui-ci est généralement dévoilé environ une semaine avant la fin du mois. Consultez la page \"Objet Mystère\" du wiki pour avoir plus d'information.",
     "all": "Tous",
     "none": "Aucun",
     "or": "Ou",
@@ -134,9 +134,9 @@
     "December": "Décembre",
     "dateFormat": "Format de la Date",
     "achievementStressbeast": "Sauveur de Stoïcalme",
-    "achievementStressbeastText": "A contribué à vaincre l'Abominable Homme du Stress pendant le Festival Winter Wonderland 2014!",
+    "achievementStressbeastText": "A contribué à vaincre l'Abominable Homme du Stress pendant l’Événement Pays des Merveilles de l'Hiver 2014 !",
     "achievementBurnout": "Sauveur des Champs Florissants",
-    "achievementBurnoutText": "A contribué à vaincre Burnout et à revivifier les Esprits d'Échappement au cours du \"Fall Festival Event\" 2015!",
+    "achievementBurnoutText": "A contribué à vaincre Burnout et à revivifier les Esprits d'Échappement au cours du l'Événement Festival de l'Automne 2015 !",
     "checkOutProgress": "Regardez mes progrès sur Habitica !",
     "cardReceived": "A reçu une carte !",
     "cardReceivedFrom": "<%= cardType %> de <%= userName %>",
@@ -174,6 +174,7 @@
     "questUnlockShare": "J'ai déverrouillé une nouvelle quête sur Habitica !",
     "hatchPetShare": "J'ai fait éclore un familier en terminant des tâches de ma vie réelle!",
     "raisePetShare": "J'ai transformé un familier en monture en terminant des tâches de ma vie réelle!",
-    "wonChallengeShare": "J'ai gagné un défi en Habitica !",
-    "achievementShare": "J'ai gagné un nouveau succès sur Habitica !"
+    "wonChallengeShare": "J'ai gagné un défi sur Habitica !",
+    "achievementShare": "J'ai gagné un nouveau succès sur Habitica !",
+    "orderBy": "Trier par <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/fr/groups.json b/common/locales/fr/groups.json
index c21626fc36..ac58f5c4d1 100644
--- a/common/locales/fr/groups.json
+++ b/common/locales/fr/groups.json
@@ -1,9 +1,9 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Discussion de la Taverne",
     "innCheckOut": "Quitter l'Auberge",
     "innCheckIn": "Se reposer à l'Auberge",
     "innText": "Vous êtes installé à l'Auberge ! Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours. Attention : si vous êtes en pleine Quête contre un Boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les potes de votre Equipe, sauf s'ils séjournent aussi à l'Auberge ! Et vous ne pourrez vous-même blesser le Boss (ou récolter des objets) que lorsque vous quitterez l'Auberge.",
-    "innTextBroken": "Vous êtes installé à l'Auberge, je suppose... Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours... Si vous êtes en pleine Quête contre un Boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les potes de votre Équipe... sauf s'ils séjournent aussi à l'Auberge... De plus, vous ne pourrez vous-même blesser le Boss (ou récolter des objets) que lorsque vous quitterez l'Auberge... si fatigué...",
+    "innTextBroken": "Vous êtes installé à l'Auberge, je suppose... Tant que vous y séjournez, vous n'êtes pas affecté par vos Quotidiennes à la fin de la journée, mais elles vont tout de même se remettre à zéro tous les jours... Si vous êtes en pleine Quête contre un Boss, il pourra toujours vous blesser pour les Quotidiennes manquées par les membres de votre Équipe... sauf s'ils séjournent aussi à l'Auberge... De plus, vous ne pourrez vous-même blesser le Boss (ou récolter des objets) que lorsque vous quitterez l'Auberge... si fatigué...",
     "lfgPosts": "Sujets de recherche de Groupe (Recherche d'Équipe)",
     "tutorial": "Tutoriel",
     "glossary": "Glossaire",
@@ -101,7 +101,7 @@
     "inbox": "Boîte de Réception",
     "abuseFlag": "Signaler une infraction aux Règles de la Communauté",
     "abuseFlagModalHeading": "Signaler <%= name %> pour infraction ?",
-    "abuseFlagModalBody": "Êtes-vous sûr de vouloir signaler cette publication? Vous devez signaler UNIQUEMENT celles qui enfreignent les <%= firstLinkStart %>Règles de la Communauté<%= linkEnd %> et/ou les<%= secondLinkStart %>Conditions Générales<%= linkEnd %>. Le signalement inapproprié d'une publication est une violation des Règles de la Communauté et peut vous affecter d'une infraction. Les raisons appropriées pour signaler une publication incluent mais ne sont pas limitée à: <p></p></br><ul style='margin-left: 10px;'><li> jurer, serments religieux</li><li>bigoterie, insultes</li><li>sujets adultes</li><li>violence, également en tant que blague</li><li>spam, messages absurdes</li></ul>",
+    "abuseFlagModalBody": "Êtes-vous sûr-e de vouloir signaler cette publication ? Vous devez signaler UNIQUEMENT celles qui enfreignent les <%= firstLinkStart %>Règles de la Communauté<%= linkEnd %> et/ou les <%= secondLinkStart %>Conditions Générales<%= linkEnd %>. Le signalement inapproprié d'une publication est une violation des Règles de la Communauté et est considéré comme une infraction. Les raisons appropriées pour signaler une publication incluent mais ne sont pas limitées aux motifs suivants : <p></p></br><ul style='margin-left: 10px;'><li>jurons, propos à caractère religieux</li><li>intolérance, insultes</li><li>sujets heurtant la sensibilité des plus jeunes</li><li>violence, y compris pour rire</li><li>spam, messages absurdes</li></ul>",
     "abuseFlagModalButton": "Signaler une infraction",
     "abuseReported": "Merci d'avoir signalé cette infraction. Les modérateurs en ont été informé.",
     "abuseAlreadyReported": "Vous avez déjà signalé ce message.",
@@ -131,7 +131,7 @@
     "sendGiftFromBalance": "Offrir vos propres Gemmes",
     "sendGiftPurchase": "Acheter les Gemmes",
     "sendGiftMessagePlaceholder": "Message personnel (facultatif)",
-    "sendGiftSubscription": "<%= months %> Mois : €<%= price %> EUR",
+    "sendGiftSubscription": "<%= months %> Mois : <%= price %>$ USD",
     "battleWithFriends": "Combattez des Monstres aux côtés d'Amis",
     "startPartyWithFriends": "Créez une équipe avec vos amis !",
     "startAParty": "Former une Equipe",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Votre discussion d'équipe est vide ! Écrivez un message dans le champ ci-dessus pour commencer la discussion.",
     "guildChatEmpty": "La discussion de cette guilde est vide ! Écrivez un message dans le champ ci-dessus pour commencer la discussion.",
     "possessiveParty": "Équipe de <%= name %>",
-    "requestAcceptGuidelines": "Si vous souhaitez envoyer des messages dans la Taverne ou dans le chat d'une équipe ou d'une guilde, veuillez d'abord s'il vous plait lire nos <%= linkStart %>Règles de Vie en Communauté<%= linkEnd %> et cliquez sur le bouton ci-dessous pour indiquer que vous les acceptez."
+    "requestAcceptGuidelines": "Si vous souhaitez envoyer des messages dans la Taverne ou dans le chat d'une équipe ou d'une guilde, veuillez d'abord s'il vous plait lire nos <%= linkStart %>Règles de Vie en Communauté<%= linkEnd %> et cliquez sur le bouton ci-dessous pour indiquer que vous les acceptez.",
+    "partyUpName": "Une joyeuse équipe",
+    "partyOnName": "Une équipe festive",
+    "partyUpAchievement": "A rejoint une équipe avec une autre personne ! Amusez vous à combattre des monstres et à vous encourager.",
+    "partyOnAchievement": "A rejoint une équipe d'au moins quatre personnes ! Profitez de votre plus grande responsabilité en vous regroupant avec vos amis pour vaincre vos ennemis !"
 }
\ No newline at end of file
diff --git a/common/locales/fr/limited.json b/common/locales/fr/limited.json
index 79f624425e..c632cfbea9 100644
--- a/common/locales/fr/limited.json
+++ b/common/locales/fr/limited.json
@@ -21,27 +21,27 @@
     "valentineCardAchievementText": "Wow, vous et votre ami devez vraiment compter l'un pour l'autre ! A envoyé ou reçu <%= cards %> cartes de la Saint Valentin.",
     "polarBear": "Ours polaire",
     "turkey": "Dindon",
-    "gildedTurkey": "Dindon doré",
+    "gildedTurkey": "Dinde dorée",
     "polarBearPup": "Ourson polaire",
     "jackolantern": "Citrouille d'Halloween",
     "seasonalShop": "Boutique Saisonnière",
     "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
     "seasonalShopTitle": "<%= linkStart %>Sorcière Saisonnière<%= linkEnd %>",
     "seasonalShopClosedText": "La Boutique Saisonnière est actuellement fermée !! Je ne sais pas où est passé la Sorcière Saisonnière, mais je parie qu'elle sera de retour lors du prochain <a href='http://habitica.wikia.com/wiki/Grand_Galas' target='_blank'>Grand Gala</a> !",
-    "seasonalShopText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> du Printemps. Tout l'équipement est disponible à l'achat pendant la Fête du Printemps chaque année, mais nous ne sommes ouverts que jusqu'au 30 Avril, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
+    "seasonalShopText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> du Printemps. Tout l'équipement est disponible à l'achat pendant la Fête du Printemps chaque année, mais nous ne sommes ouverts que jusqu'au 30 avril, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
     "seasonalShopSummerText": "Bienvenue à la Boutique Saisonnière !! Nous avons reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> de l'Été. Tout l'équipement sera disponible à l'achat pendant la Fête de l'Été chaque année, mais nous ne sommes ouverts que jusqu'au 31 juillet, alors faites un stock dès maintenant ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
     "seasonalShopFallText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> d'automne. Tout l'équipement est disponible à l'achat pendant le Festival d'Automne chaque année, mais nous ne sommes ouverts que jusqu'au 31 octobre, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
-    "seasonalShopWinterText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés de l'<a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> de l'Hiver. Tout l'équipement est disponible à l'achat pendant La Fantaisie Hivernale chaque année, mais nous ne sommes ouverts que jusqu'au 31 Janvier, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
+    "seasonalShopWinterText": "Bienvenue à la Boutique Saisonnière !! Nous avons actuellement reçu les nouveautés de l'<a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Édition Saisonnière</a> de l'Hiver. Tout l'équipement est disponible à l'achat pendant La Fantaisie Hivernale chaque année, mais nous ne sommes ouverts que jusqu'au 31 janvier, alors faites un stock dès maintenant, ou vous devrez attendre un an pour acheter à nouveau cet équipement !",
     "seasonalShopFallTextBroken": "Oh... Bienvenue à la Boutique Saisonnière... Nous avons actuellement reçu les nouveautés Édition Saisonnière d'automne, ou quelque chose du genre... Tout l'équipement est disponible à l'achat pendant le Festival d'Automne chaque année, mais nous ne sommes ouverts que jusqu'au 31 octobre... alors je suppose que vous devriez faire le stock dès maintenant, ou vous devrez attendre... et attendre... et attendre... <strong>*soupir*</strong>",
     "seasonalShopRebirth": "Si vous avez utilisé l'Orbe de Renaissance, vous pouvez racheter cet équipement dans la colonne des Récompenses. Au début, vous pourrez seulement acheter les objets associés à votre classe actuelle (Guerrier par défaut), mais n'ayez crainte, les objets spécifiques à une classe deviendront disponibles si vous choisissez cette classe.",
     "candycaneSet": "Sucre d'Orge (Mage)",
     "skiSet": "Ski-sassin (Voleur)",
     "snowflakeSet": "Flocon de Neige (Guérisseur)",
     "yetiSet": "Dresseur de Yéti (Guerrier)",
-    "northMageSet": "Magicien du Nord (Mage)",
-    "icicleDrakeSet": "Dragon Glaçon (Voleur)",
+    "northMageSet": "Mage du Nord (Mage)",
+    "icicleDrakeSet": "Dragon de Glace (Voleur)",
     "soothingSkaterSet": "Patineur Apaisant (Guérisseur)",
-    "gingerbreadSet": "Guerrier de pain d'épice (Guerrier)",
+    "gingerbreadSet": "Guerrier en pain d'épice (Guerrier)",
     "toAndFromCard": "A : <%= toName %>, De : <%= fromName %>",
     "nyeCard": "Carte de la Nouvelle Année",
     "nyeCardExplanation": "Pour avoir célébré cette nouvelle année ensemble, vous avez tous les deux reçu le badge \"Vieille Connaissance\" !",
diff --git a/common/locales/fr/npc.json b/common/locales/fr/npc.json
index 352dc6cf9b..161a56d925 100644
--- a/common/locales/fr/npc.json
+++ b/common/locales/fr/npc.json
@@ -21,7 +21,7 @@
     "ian": "Ian",
     "ianText": "Bienvenue à la boutique des Quêtes ! Vous pouvez utiliser des parchemins de quête pour battre des monstres avec vos amis. Soyez sûr de vérifier notre ensemble de parchemins de Quêtes à l'achat sur votre droite !",
     "ianBrokenText": "Bienvenue à la boutique des Quêtes... Ici, vous pouvez utiliser des Parchemins de quêtes pour combattre des monstres avec vos amis. Assurez-vous de regarder notre ensemble de Parchemins de quêtes en vente sur votre droite...",
-    "USD": "(EUR)",
+    "USD": "(USD)",
     "newStuff": "Nouveauté",
     "cool": "Rappelez-le moi plus tard",
     "dismissAlert": "Renvoyer la Messagère",
diff --git a/common/locales/fr/pets.json b/common/locales/fr/pets.json
index 23eb344347..06159b8b5d 100644
--- a/common/locales/fr/pets.json
+++ b/common/locales/fr/pets.json
@@ -80,7 +80,7 @@
     "petKeyPets": "Relâcher Mes Familiers",
     "petKeyMounts": "Relâcher Mes Montures",
     "petKeyBoth": "Relâcher les Deux",
-    "confirmPetKey": "Est tu sure?",
+    "confirmPetKey": "Êtes-vous sur·e ?",
     "petKeyNeverMind": "Pas Encore",
     "gemsEach": "gemmes chacun"
 }
\ No newline at end of file
diff --git a/common/locales/fr/quests.json b/common/locales/fr/quests.json
index a619951a9a..f0c625fda2 100644
--- a/common/locales/fr/quests.json
+++ b/common/locales/fr/quests.json
@@ -38,8 +38,8 @@
     "bossDmg2": "Seuls les participants pourront combattre le boss et partager le butin de la quête.",
     "bossDmg1Broken": "Chaque tâche Quotidienne ou À Faire et chaque Habitude positive effectuée inflige des dommages au boss... Frappez plus fort avec des tâches plus rouges ou avec les sorts Frappe Brutale et Explosion de Flammes... Le boss infligera des dommages à chacun des participants de la quête pour chaque Quotidienne manquée (multipliés par la Force du boss) en plus des dommages normaux... Alors protégez votre équipe en effectuant vos Quotidiennes... <strong>Tout dommage causé par vous et par le boss est pris en compte au cron (la réinitialisation de votre journée)...</strong>",
     "bossDmg2Broken": "Seuls les participants pourront combattre le boss et partager le butin de la quête...",
-    "tavernBossInfo": "Complétez les Quotidiennes et les Tâches À faire et maintenez vous bonnes habitudes pour blesser le Boss Mondial !  Les Quotidiennes incomplètes remplissent la jauge d'Harassement. Lorsque la jauge d'Harassement est pleine, le Boss Mondial attaquera un PNJ. Un Boss Mondial ne blessera jamais de joueurs individuels ou leurs comptes d'aucune façon. Seules les tâches des comptes actifs ne reposant pas à l'Auberge seront comptabilisées.",
-    "tavernBossInfoBroken": "Effectuez vos tâches Quotidiennes et À Faire et maintenez vos Habitudes positives pour blesser le Boss Mondial... Chaque Quotidienne non effectuée remplit la barre d'Harassement... Lorsque la barre d'Harassement est pleine, le Boss Mondial attaquera un PNJ... Un Boss Mondial ne blessera jamais des joueurs individuels ou des comptes de quelque façon que ce soit... Seules les tâches des comptes actifs de joueurs qui ne se reposent pas à l'Auberge sont prises en compte...",
+    "tavernBossInfo": "Complétez les Quotidiennes et les Tâches À faire et continuez vos bonnes habitudes pour blesser le Boss Mondial !  Les Quotidiennes incomplètes remplissent la jauge d'Harassement. Lorsque la jauge d'Harassement est pleine, le Boss Mondial attaquera un PNJ. Un Boss Mondial ne blessera jamais de joueurs individuels ou leurs comptes d'aucune façon. Seules les tâches des comptes actifs ne reposant pas à l'Auberge seront comptabilisées.",
+    "tavernBossInfoBroken": "Effectuez vos tâches Quotidiennes et À Faire et continuez vos Habitudes positives pour blesser le Boss Mondial... Chaque Quotidienne non effectuée remplit la barre d'Harassement... Lorsque la barre d'Harassement est pleine, le Boss Mondial attaquera un PNJ... Un Boss Mondial ne blessera jamais des joueurs individuels ou des comptes de quelque façon que ce soit... Seules les tâches des comptes actifs de joueurs qui ne se reposent pas à l'Auberge sont prises en compte...",
     "bossColl1": "Pour obtenir des objets, accomplissez vos tâches positives. Vous trouvez les objets de quêtes de la même façon que vous trouvez les objets normaux mais vous ne les verrez que le jour suivant. À ce moment, tous les objets de quêtes que vous aurez trouvés seront comptabilisés et s'ajouteront à la pile.",
     "bossColl2": "Seuls les participants peuvent collecter des objets et partager le butin de la quête.",
     "bossColl1Broken": "Pour collectionner des objets, accomplissez vos tâches positives... Vous trouverez les objets de quête exactement comme les objets normaux, mais vous ne les verrez que le jour suivant, lorsque tous les objets trouvés seront comptabilisés dans votre collection...",
diff --git a/common/locales/fr/questscontent.json b/common/locales/fr/questscontent.json
index 373bf50fbb..ead15e9bde 100644
--- a/common/locales/fr/questscontent.json
+++ b/common/locales/fr/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Vous avez réussi ! Pas de bananes pour ces démons aujourd'hui. Accablés par votre zèle, les singes s'enfuient, paniqués. \"Regarde\", dit @Misceo. \"Ils ont laissé quelques œufs derrière eux.\"<br><br>@Leephon sourit. \"Peut-être qu'un singe familier bien entraîné peut t'apporter autant d'aide que la gêne causée par les singes sauvages !\"",
     "questMonkeyBoss": "Monstrueux Mandrill",
     "questMonkeyDropMonkeyEgg": "Singe (Œuf)",
-    "questMonkeyUnlockText": "Déverrouille l'achat d’œufs de singe au Marché"
+    "questMonkeyUnlockText": "Déverrouille l'achat d’œufs de singe au Marché",
+    "questSnailText": "L'escargot de la Fange de Pénibilité",
+    "questSnailNotes": "Vous êtes excité à l'idée de faire une quête dans les oubliettes abandonnées de Pénibilité, mais alors que vous y entrez, vous sentez le sol sous votre pied aspirer vos bottes.Vous regardez le chemin devant vous et voyez des Habiticien·ne·s embourbés dans la vase. @Overomega crie \"Ils ont trop de tâches À Faire ou de Quotidiennes inutiles, et ils sont bloqués sur ce qui n'a pas d'importance ! Sortez-les de là !\"<br><br>\"Vous devez trouver la source de cette boue,\" confirme @Pfeffernusse, \"ou les tâches qu'ils ne peuvent accomplir les enliseront à jamais !\"<br><br>Vous dégainez votre arme, pataugez dans la gadoue collante... et rencontrez un terrible Escargot de la Fange de Pénibilité.",
+    "questSnailCompletion": "Vous abattez votre arme sur la grande coquille de l'Escargot, la brisant en deux, et libérant un torrent d'eau. La vase est éliminées et les Habiticien·ne·s autour de vous se réjouissent. \"Regardez !\" dit @Misceo. \"Il y a un petit paquet d’œufs d'escargots dans les dernières flaques de boue.\"",
+    "questSnailBoss": "Escargot de la Fange de Pénibilité",
+    "questSnailDropSnailEgg": "Escargot (Œuf)",
+    "questSnailUnlockText": "Débloque l'achat d’œuf d'Escargot au marché"
 }
\ No newline at end of file
diff --git a/common/locales/fr/rebirth.json b/common/locales/fr/rebirth.json
index f8affe3944..b3a847de58 100644
--- a/common/locales/fr/rebirth.json
+++ b/common/locales/fr/rebirth.json
@@ -12,7 +12,7 @@
     "rebirthInList2": "Les Défis, les Guildes et les appartenances à des Groupes sont conservés.",
     "rebirthInList3": "Les Gemmes, les paliers de soutien et les niveaux de contributeur sont conservés.",
     "rebirthInList4": "Les objets obtenus via des Gemmes ou des butins (tels que les familiers et les montures) sont conservés, bien que vous ne puissiez pas y accéder jusqu'à ce que vous les ayez débloqués de nouveau.",
-    "rebirthInList5": "L'équipement en édition limitée que vous avez acheté peut être de nouveau acheté, même si l’événement y afférant est terminé. Pour acheter de l'équipement spécifique à une classe, vous devez d'abord passer à cette classe.",
+    "rebirthInList5": "L'équipement en édition limitée que vous avez acheté peut être de nouveau acheté, même si l’événement en question est terminé. Pour acheter de l'équipement spécifique à une classe, vous devez d'abord passer à cette classe.",
     "rebirthEarnAchievement": "Vous avez également obtenu un Succès pour avoir commencé une nouvelle aventure !",
     "beReborn": "Renaître",
     "rebirthAchievement": "Vous avez commencé une nouvelle aventure ! C'est votre Renaissance n°<%= number %> et le niveau le plus élevé que vous avez atteint est <%= level %>. Pour cumuler ce Succès, commencez votre nouvelle aventure une fois que vous aurez atteint un niveau encore plus élevé !",
diff --git a/common/locales/fr/settings.json b/common/locales/fr/settings.json
index 1fdb15d42d..ef1b4d329d 100644
--- a/common/locales/fr/settings.json
+++ b/common/locales/fr/settings.json
@@ -62,7 +62,7 @@
     "dangerZone": "Zone de Danger",
     "resetText1": "ATTENTION ! Cette action va réinitialiser une grand partie de votre compte. Ceci est fortement déconseillé, mais certaines personnes y trouvent une utilité dans les premiers temps, après une courte utilisation de l'application.",
     "resetText2": "Vous perdrez tous vos niveaux, or et points d'expérience. Toutes vos tâches seront supprimées de façon permanente et vous perdrez tout l'historique associé aux tâches. Vous perdrez tout votre équipement mais il vous sera possible de l'acheter à nouveau, y compris les équipements en Edition Limitée et les Equipements Mystères d'abonné (vous devrez cependant être de la classe correspondante pour racheter les équipements de classe). Vous conserverez votre classe actuelle, ainsi que vos familiers et montures. Vous préférerez peut-être utiliser un Orbe de Renaissance à la place, une option bien plus sûre qui vous permettra de conserver toutes vos tâches.",
-    "deleteText": "Êtes-vous sûr ? Cela va supprimer votre compte Habitica définitivement et il ne pourra pas être restauré ! Vous serez obligé de créer un nouveau compte pour ré-utiliser Habitica. Les Gemmes sur votre compte ou celles dépensées ne seront pas remboursées. Si vous êtes absolument certain, tapez <strong><%= deleteWord %></strong> dans le champ de texte ci-dessous.",
+    "deleteText": "Êtes-vous sûr•e ? Cela va supprimer votre compte Habitica définitivement et il ne pourra pas être restauré ! Vous serez obligé de créer un nouveau compte pour ré-utiliser Habitica. Les Gemmes sur votre compte ou celles dépensées ne seront pas remboursées. Si vous êtes absolument certain, tapez <strong><%= deleteWord %></strong> dans le champ de texte ci-dessous.",
     "API": "API",
     "APIText": "Copiez ceci pour un usage dans des applications tierces. Considérez toutefois votre Jeton d'API comme l'équivalent d'un mot de passe, et ne le partagez pas publiquement. Votre ID d'utilisateur peut occasionnellement vous être demandé, mais ne publiez jamais votre Jeton d'API là où d'autres peuvent le voir, y compris sur Github.",
     "APIToken": "Jeton d'API (ceci est un mot de passe - voir l'avertissement ci-dessus !)",
@@ -114,7 +114,7 @@
     "unsubscribeAllEmails": "Cocher pour se désabonner des mails",
     "unsubscribeAllEmailsText": "En cochant cette case, je certifie comprendre qu'en me désabonnant de tous les mails, Habitica n'aura jamais la possibilité de m'avertir par e-mail de changements importants au niveau du site ou de mon compte.",
     "correctlyUnsubscribedEmailType": "Correctement désinscrit·e des mails \"<%= emailType %>\".",
-    "subscriptionRateText": "Récurrent €<%= price %> EUR tous les <%= months %> mois",
+    "subscriptionRateText": "Récurrent, <%= price %> USD tous les <%= months %> mois",
     "recurringText": "récurrent",
     "benefits": "Avantages",
     "coupon": "Promo",
@@ -139,7 +139,7 @@
     "buyGemsGoldCap": "Limite augmentée à <%= amount %>",
     "mysticHourglass": "<%= amount %> Sablier Mystique ",
     "mysticHourglassText": "Un Sablier Mystique vous permet d'acheter des Sets d'Objets Mystère d'un mois passé.",
-    "purchasedPlanId": "Récurrent €<%= price %> EUR tous les <%= months %> mois (<%= plan %>)",
+    "purchasedPlanId": "Récurrent, <%= price %> USD tous les <%= months %> mois (<%= plan %>)",
     "purchasedPlanExtraMonths": "Vous avez <%= months %> mois de crédits extra d'abonnement.",
     "consecutiveSubscription": "Abonnement consécutif",
     "consecutiveMonths": "Mois consécutifs",
diff --git a/common/locales/fr/subscriber.json b/common/locales/fr/subscriber.json
index b71879640e..15c1baf55c 100644
--- a/common/locales/fr/subscriber.json
+++ b/common/locales/fr/subscriber.json
@@ -56,9 +56,9 @@
     "sureCancelSub": "Êtes-vous sûr•e de vouloir annuler votre abonnement ?",
     "subCanceled": "Votre abonnement deviendra inactif le",
     "buyGemsGoldTitle": "Pour acheter des Gemmes avec de l'Or",
-    "becomeSubscriber": "Devenir un abonné",
+    "becomeSubscriber": "Devenir un·e abonné·e",
     "subGemPop": "Votre abonnement à Habitica vous permet d'acheter chaque mois un certain nombre de Gemmes avec de l'Or. Vous pouvez voir combien de Gemmes sont disponibles à l'achat dans le coin de l'icone des Gemmes.",
-    "subGemName": "Gemmes d'Abonné",
+    "subGemName": "Gemmes d'abonné·e",
     "freeGemsTitle": "Obtenir des Gemmes gratuitement",
     "maxBuyGems": "Vous avez acheté toutes les gemmes disponibles ce mois-ci. Il y aura un nouvel arrivage le mois prochain, au cours des trois premiers jours. Merci de votre souscription !  ",
     "buyGemsAllow1": "Vous pouvez acheter",
@@ -69,7 +69,7 @@
     "timeTravelers": "Voyageurs Temporels",
     "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> et <%= linkStartVicky %>Vicky<%= linkEnd %>",
     "timeTravelersTitle": "Mystérieux Voyageurs Temporels",
-    "timeTravelersPopoverNoSub": "Vous aurez besoin d'un Sablier Mystique pour invoquer les mystérieux Voyageurs Temporels ! <%= linkStart %>Les Abonnés<%= linkEnd %> reçoivent un Sablier Mystique par tranche de trois mois consécutifs d'abonnement. Revenez lorsque vous aurez un Sablier Mystique, et les Voyageurs Temporels vous fourniront un Familier ou une Monture rare, un Ensemble d'Équipement d'Abonné du passé... ou peut-être même du futur.",
+    "timeTravelersPopoverNoSub": "Vous aurez besoin d'un Sablier Mystique pour invoquer les mystérieux Voyageurs Temporels ! <%= linkStart %>Les abonné·e·s<%= linkEnd %> reçoivent un Sablier Mystique par tranche de trois mois consécutifs d'abonnement. Revenez lorsque vous aurez un Sablier Mystique, et les Voyageurs Temporels vous fourniront un Familier ou une Monture rare, un Ensemble d'Équipement d'abonné·e du passé... ou peut-être même du futur.",
     "timeTravelersPopover": "Vous avez un Sablier Mystique! C'est une joie de voyager dans le temps pour vous! Veuillez choisir le familier, la monture ou Set d'Objets Mystère que vous désirez. Vous trouverez une liste d'objets passés  <a href='http://habitica.wikia.com/wiki/Mystery_Item' target='_blank'> ici</a>! Si ceux-ci ne vous satisfont pas, peut-être seriez vous intéressés par l'un de nos convoités Set d'objets Steampunk?",
     "timeTravelersAlreadyOwned": "Félicitations ! Vous possédez déjà tout ce que les Voyageurs Temporels ont à offrir. Merci de soutenir le site !",
     "mysticHourglassPopover": "Un Sablier Mystique vous permet d'acheter certains objets dont l'achat est limité dans le temps, comme les ensembles d'objets Mystère des mois précédents et des récompenses passées de Boss mondiaux.",
@@ -97,7 +97,7 @@
     "mysterySet201511": "Ensemble du Guerrier de Bois",
     "mysterySet201512": "Ensemble de la Flamme Hivernale",
     "mysterySet201601": "Ensemble du Champion de la Résolution",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Ensemble du Bourreau des Cœurs ",
     "mysterySet301404": "Ensemble Steampunk de Base",
     "mysterySet301405": "Ensemble D'accessoire Steampunk",
     "mysterySetwondercon": "Wondercon",
diff --git a/common/locales/fr/tasks.json b/common/locales/fr/tasks.json
index e67fc5d200..1458576d6d 100644
--- a/common/locales/fr/tasks.json
+++ b/common/locales/fr/tasks.json
@@ -32,7 +32,7 @@
     "mental": "Mental",
     "otherExamples": "Par exemple, suivis professionnels, passe-temps, finances, etc.",
     "progress": "Progrès",
-    "daily": "Quotidien",
+    "daily": "Quotidienne",
     "dailies": "Quotidiennes",
     "newDaily": "Nouvelle Quotidienne",
     "newDailyBulk": "Nouvelles tâches Quotidiennes (une par ligne)",
@@ -89,10 +89,10 @@
     "fortifyPop": "Fait revenir toutes les tâches à une valeur neutre (couleur jaune) et restaure tous les points de santé que vous aviez perdus.",
     "fortify": "Fortification",
     "fortifyText": "La potion de fortification ramènera toutes vos tâches à un niveau neutre (jaune), comme si vous veniez de les ajouter, et remplira votre barre de santé.  C'est utile si vos tâches rouges rendent le jeu trop dur, ou si vos tâches bleues le rendent trop facile. Si cela vous motive de retrouver des bases saines, dépensez vos gemmes et accordez vous un sursis !",
-    "confirmFortify": "Est tu sure?",
-    "sureDelete": "Est tu sure que tu veux  effacer le <%= taskType %> avec le text \"<%= taskText %>\"?",
+    "confirmFortify": "Êtes-vous sûr•e ?",
+    "sureDelete": "Êtes-vous sûr•e de vouloir effacer cette <%= taskType %> avec le texte \"<%= taskText %>\"?",
     "streakCoins": "Bonus de combo !",
-    "pushTaskToTop": "Déplace la tâche en tête de liste. Maintenez ctrl ou cmd enfoncé pour la déplacer en queue de liste. ",
+    "pushTaskToTop": "Déplace la tâche en tête de liste. Maintenez ctrl ou cmd enfoncé pour la déplacer en fin de liste. ",
     "emptyTask": "Indiquez d'abord le titre de la tâche.",
     "dailiesRestingInInn": "Vous vous reposez à l'Auberge ! Vos Quotidiennes ne vous infligeront AUCUN dégâts cette nuit, mais SERONT réinitialisées chaque jour. Si vous participez à une quête, vous n'infligerez aucun dégât / ne récolterez aucun item jusqu'à ce que vous quittiez l'Auberge, mais vous pouvez quand même être blessé par un boss si un de vos équipiers oublie une de ses Quotidiennes.",
     "habitHelp1": "Les Bonnes Habitudes sont les choses que vous faites souvent. Elles octroient de l'Or et de l'Expérience à chaque fois que vous cliquez sur le <%= plusIcon %>.",
diff --git a/common/locales/he/backgrounds.json b/common/locales/he/backgrounds.json
index 5a64040e3f..2c6fdba8b1 100644
--- a/common/locales/he/backgrounds.json
+++ b/common/locales/he/backgrounds.json
@@ -133,7 +133,7 @@
     "backgroundSnowySunriseNotes": "הבט בזריחה המושלגת.",
     "backgroundWinterTownText": "עיירה חורפית",
     "backgroundWinterTownNotes": "התרוצץ בעיירה החורפית.",
-    "backgrounds012016": "סט 20: שוחרר בינואר 2016",
+    "backgrounds012016": "סט 20: פורסם בינואר 2016",
     "backgroundFrozenLakeText": "אגם קפוא",
     "backgroundFrozenLakeNotes": "החלק על אגם קפוא.",
     "backgroundSnowmanArmyText": "צבא איש-שלג",
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "קיראו בספרייה החמימה.",
     "backgroundGrandStaircaseText": "גרם מדרגות מפואר",
     "backgroundGrandStaircaseNotes": "צעדו במורד גרם המדרגות המפואר.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "סט 22: פורסם במרץ 2016",
+    "backgroundDeepMineText": "מיכרה עמוק",
+    "backgroundDeepMineNotes": "מיצאו מתכות יקרות במכרה עמוק.",
+    "backgroundRainforestText": "יער גשם",
+    "backgroundRainforestNotes": "צאו להרפתקאה ביער הגשם.",
+    "backgroundStoneCircleText": "מעגל אבנים",
+    "backgroundStoneCircleNotes": "הטילו כשפים במעגל אבנים."
 }
\ No newline at end of file
diff --git a/common/locales/he/character.json b/common/locales/he/character.json
index 8574ed8dc2..2d739d60ea 100644
--- a/common/locales/he/character.json
+++ b/common/locales/he/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "תכונות והישגים",
     "profile": "פרופיל",
-    "avatar": "Customize Avatar",
+    "avatar": "התאם דמות",
     "other": "אחר",
     "fullName": "שם מלא",
     "displayName": "שם תצוגה",
@@ -83,7 +83,7 @@
     "allocateInt": "נקודות שהוקצו לתבונה",
     "allocateIntPop": "הוסף נקודה לתבונה שלך",
     "noMoreAllocate": "עכשיו כשהגעת לרמה 100, לא ניתן להרוויח עוד נקודות תכונה. אתה תוכל להמשיך ולעלות ברמה, או להתחיל הרפתקאה חדשה ברמה 1 ע״י שימוש ב <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>כדור הלידה מחדש</a>, זמין כעת בחינם בשוק.",
-    "stats": "Avatar Stats",
+    "stats": "תכונות דמות",
     "strength": "כוח",
     "strengthText": "כוח מגביר את הסיכוי ל\"פגיעות חמורות\" ואת הסיכוי לקבלת מהם זהב, ניסיון, וחפצי ערך. הוא גם מסייע לגרום נזק למפלצות האויב.",
     "constitution": "חוסן",
@@ -136,7 +136,7 @@
     "respawn": "היוולד מחדש!",
     "youDied": "אתה מת!",
     "dieText": "איבדת דרגה, את כל הזהב שלך, ופריט ציוד ראנדומאלי. קום, שחקן, ונסה שוב! השתלט על ההרגלים הרעים, היה דרוך בעשיית המטלות היומיות, והתרחק ממוות באמצעות שיקוי בריאות, במידה ותצטרך.",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "האם אתם בטוחים? זה יאפס את מקצוע הדמות שלכם ואת הנקודות שהוקצו (תקבלו את כולן בחזרה - מוקצות מחדש), ויעלה 3 אבני-חן.",
     "purchaseFor": "לרכוש בתמורה ל <%= cost %> אבני חן?",
     "notEnoughMana": "אין לך מספיק מאנה.",
     "invalidTarget": "יעד לא חוקי",
diff --git a/common/locales/he/communityguidelines.json b/common/locales/he/communityguidelines.json
index affc676009..a57fb2bbc3 100644
--- a/common/locales/he/communityguidelines.json
+++ b/common/locales/he/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "בקהילה גדולה כמו האביטיקה, משתמשים באים והולכים. לעיתים עורכים צריכים להניח את אצטלתם האצילה ולנוח. הבאים הם עורכים בדימוס, אשר אינם פעילים יותר כעורכים, אך עדיין ברצוננו לציין את תרומתם!",
     "commGuidePara014": "עורכים בדימוס:",
     "commGuideHeadingPublicSpaces": "מרחבים ציבוריים בהאביטיקה",
-    "commGuidePara015": "בהאביטיקה שני סוגים של אזורים קהילתיים: ציבוריים ופרטיים. איזורים ציבוריים כוללים את הפונדק, גילדות ציבוריות, GitHub, Trello, ואתר הוויקי. איזורים פרטיים כוללים גילדות פרטיות, דיבורי חבורה והודעות אישיות.",
+    "commGuidePara015": "להאביטיקה שני סוגי מרחבים: פומבי, ופרטי. מרחבים פומביים כוללים את הפונדק, גילדות פומביות, גיטהאב, Trello, והוויקי. מרחבים פרטיים כוללים גילדות פרטיות, שיחת חבורה, והודעות פרטיות. כל השמות המוצגים חייבים לתאום את הנחיות המרחבים הפומביים. כדי לשנות את השם המוצג שלגם, לכו באתר למשתמש > פרופיל ולחצו על כפתור העריכה.",
     "commGuidePara016": "בעודך נודד בין המרחבים הציבוריים של האביטיקה, ישנם מספר חוקים שנועדו לשמור את כולם בטוחים ומאושרים. אלו אמורים להיות קלים לשמירה עבור הרפתקן כמוך!",
     "commGuidePara017": "<strong>כבדו זה את זה.</strong> היו אדיבים, רגישים, חברותיים וששים לעזור. זכרו: האביטיקנים באים מכל המסגרות והיו להם חוויות שונות. זהו אחד הגורמים לכך שHabitica מגניב כל כך! בניית קהילה פירושה לכבד ולאהוב את השונה בינינו כמו גם את המשותף. הנה כמה דרכים קלות לכבד זה את זה:",
     "commGuideList02A": "<strong>ציית/י לכל התנאים והסעיפים.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>ציית מיד לכל בקשה של העורכים</strong> להפסיק דיון או להעבירו לגילדת ״הפינה האחורית״. מילים אחרונות, יריות סיכום, ושנינויות מסכמות, כולן יועברו באדיבות ל\"שולחנך\" בגילדת ״הפינה האחורית״, אם הדבר יורשה.",
     "commGuideList02G": "<strong>קח את הזמן להרהר במקום לענות בכעס</strong> אם מישהו אמר לך שאמירה שלך גרמה לו לאי נוחות. ישנו כוח עצום ביכולת להתנצל בכנות בפני מישהו. אם אתם מרגישים שתגובתם לא הייתה הולמת, דברו עם עורך במקום להתעמת איתם בפומבי.",
     "commGuideList02H": "<strong>יש לדווח למנחים לגבי שיחות שנויות במחלוקת.</strong> אם אתם מרגישים ששיחה מתלהטת, מערבת רגשות יתר על המידה, או נעשית פוגענית - נתקו מגע. במקום זאת, שלחו דואר ל<a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> כדי ליידע אותנו על כך. זה התפקיד שלנו לוודא שאתם בטוחים.",
-    "commGuideList02I": "<strong> אין להציף את הרשת בספאם. </strong> ספאם יכול לכלול, בין היתר: פרסום של אותה תגובה או שאלה במקומות רבים, פירסום קישורים ללא הסבר או הקשר, פרסום של תוכן לא הגיוני, או פרסום הודעות רבות ברצף. בקשה חוזרת ונשנית לאבני חן או מנוי מתנה יכולים גם כן להיחשב כספאם.",
-    "commGuidePara019": "<strong>במקומות פרטיים</strong> למשתמשים יש חופש רב יותר לדון בנושאים שעל ליבם, אך גם בהם יש לשמור על תנאי השימוש, כולל המנעות מפרסום תוכן מפלה, אלים, או מאיים.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "ישנן כמה הנחיות נוספות בנוגע להודעות פרטיות (PMs). אם מישהו חסם אותך, אל תיצור איתו קשר באמצעים אחרים בבקשה שיסיר את החסימה. בנוסף, אל תשיב לאדם המבקש תמיכה בהודעה פרטית, אלא שתף את תשובתך עם הקהילה כולה (דבר שתורם הרבה יותר). דבר אחרון, אל תשלח הודעות פרטיות בבקשה לאבני חן או מנוי מתנה, שכן זה עלול להיחשב כספאם.",
     "commGuidePara021": "בנוסף לכך, לאיזורים פרטיים מסויימים בהאביטיקה יש כללים נוספים.",
     "commGuideHeadingTavern": "הפונדק",
diff --git a/common/locales/he/content.json b/common/locales/he/content.json
index 58355bc8d7..4e6f738da1 100644
--- a/common/locales/he/content.json
+++ b/common/locales/he/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "קוצני",
     "dropEggBearCubText": "דובון",
     "dropEggBearCubMountText": "דוב",
-    "dropEggBearCubAdjective": "מתחבק",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "גריפין",
     "questEggGryphonMountText": "גריפין",
     "questEggGryphonAdjective": "גאה",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "צבעונית",
     "questEggRatText": "עכברוש",
     "questEggRatMountText": "עכברוש",
-    "questEggRatAdjective": "מלוכלך",
+    "questEggRatAdjective": "חברותי",
     "questEggOctopusText": "תמנון",
     "questEggOctopusMountText": "תמנון",
     "questEggOctopusAdjective": "חלקלק",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "קוף",
     "questEggMonkeyMountText": "קוף",
     "questEggMonkeyAdjective": "שובב",
+    "questEggSnailText": "חילזון",
+    "questEggSnailMountText": "חילזון",
+    "questEggSnailAdjective": "איטי אבל יציב",
     "eggNotes": "מצא שיקוי הבקעה לשפוך על ביצה זו, והיא תהפוך ל<%= eggText(locale) %> <%= eggAdjective(locale) %>.",
     "hatchingPotionBase": "רגיל",
     "hatchingPotionWhite": "לבן",
diff --git a/common/locales/he/contrib.json b/common/locales/he/contrib.json
index 265a21cbbe..f6ea181fb3 100644
--- a/common/locales/he/contrib.json
+++ b/common/locales/he/contrib.json
@@ -28,11 +28,11 @@
     "helped": "עזר לhabitRPG לגדול",
     "helpedText1": "עזר לHabitica לגדול ע\"י מילוי",
     "helpedText2": "הסקר הזה",
-    "hall": "Hall of Heroes",
+    "hall": "היכל הגיבורים",
     "contribTitle": "תואר תורם (למשל \"נפח\")",
     "contribLevel": "רמת תורם",
     "contribHallText": "1-7 לתורמים רגילים, 8 לעורכים, 9 לחברי צוות. רמה זו קובעת אילו חפצים, חיות מחמד וחיות רכיבה זמינות לכם. בנוסף, רמה זו קובעת גם את צבע תגית השם שלכם. בעלי רמות 8 ו-9 מקבלים מעמד של מנהל באופן אוטומטי.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "היכל התורמים",
     "hallPatrons": "היכל נותני החסות",
     "rewardUser": "הענק פרס למשתמש",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "גילדות הן קבוצות צ׳ט על בסיס תחומי עניין משותפים, אשר נוצרו ע״י שחקנים - עבור שחקנים. דפדף ברשימת הגילדות והצטרף לאלו שמעניינות אותך!",
     "blurbChallenges": "אתגרים נוצרים ע״י עמיתיך השחקנים. הצטרפות לאתגר תוסיף את מטלות האתגר לעמוד המשימות שלך. הניצחון באתגר יתן לך תג הישג ולעיתים רבות גם פרס של אבני חן!",
     "blurbHallPatrons": "זהו היכל התומכים, היכן שאנו מעניקים כבוד לשחקנים האדירים שתמכו ב״Kickstarter״ המקורי של האתר. אנו מודים להם שהביאו את האביטיקה לחיים!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "זהו היכל התורמים, המקום שבו עושים כבוד לתורמים במקור פתוח להאביטיקה. בין אם מדובר בקוד, עיצוב, מנגיה, כתיבה, או אפילו רק עזרה באופן כללי, הם הרוויחו <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'>אבני חן, ציוד אקסקלוסיבי</a>, ו<a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>תארים נחשבים</a>. תוכלו לתרום גם אתם להאביטקיה! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>קיראו על כך עוד כאן.</a>"
 }
\ No newline at end of file
diff --git a/common/locales/he/gear.json b/common/locales/he/gear.json
index 1dc7c6c2d6..3fca040f59 100644
--- a/common/locales/he/gear.json
+++ b/common/locales/he/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "נשק",
     "weaponBase0Text": "אין לך נֶשֶׁק.",
     "weaponBase0Notes": "אין לך נֶשֶׁק.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "סדר! מגביר כוח וחוסן ב <%= attrs %> כל אחד. ארמואר קסום: סט עורך דין (חפץ 3 מתוך 3).",
     "weaponArmoireJesterBatonText": "שרביט לץ",
     "weaponArmoireJesterBatonNotes": "בהינף שרביטכם וכמה תשובות שנונות, גם המצבים הסבוכים ביותר נעשים ברורים. מגביר תבונה ותפיסה ב <%= attrs %> כל אחד. ארמואר קסום: סט לץ (חפץ 3 מתוך 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "מעדר כרייה",
+    "weaponArmoireMiningPickaxNotes": "כרו כמות מקסימלית של זהב ממשימותיכם! מגביר תפיסה ב <%= per %>. ארמואר קסום: סט כורים (חפץ 3 מתוך 3).",
     "armor": "שריון",
     "armorBase0Text": "בגדים פשוטים",
     "armorBase0Notes": "אלה סתם בגדים, הם לא נותנים בונוס.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "מאוד רציני ומרשים. מגביר חוסן ב <%= con %>. ארמואר קסום: סט עורך דין (חפץ 2 מתוך 3).",
     "armorArmoireJesterCostumeText": "תחפושת לץ",
     "armorArmoireJesterCostumeNotes": "טרה-לה-לה! למרות המראה של התחפושת הזו, אינכם שוטים. מגבירה תבונה ב <%= int %>. ארמואר קסום: סט לץ (חפץ 2 מתוך 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "אוברול כורים",
+    "armorArmoireMinerOverallsNotes": "ייתכן והם נראים שחוקים, אך הם מכושפים לדחות עפר. מגבירים חוסן ב <%= con %>. ארמואר קסום: סט כורים (חפץ 2 מתוך 3).",
     "headgear": "ציוד ראש",
     "headBase0Text": "ללא קסדה",
     "headBase0Notes": "בלי שום כיסוי ראש בכלל.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "הלהבות האלו שורפות קור באמצעות חשיבה טהורה. לא מקנה ייתרון. דצמבר 2015, חפץ מנויים.",
     "headMystery201601Text": "קסדת החלטיות אמת",
     "headMystery201601Notes": "השאר החלטי, אלוף אמיץ! לא מקנה ייתרון. ינואר 2016, חפץ מנויים.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "ברדס שוברי לבבות",
+    "headMystery201602Notes": "שמרו על זהותכם מפני מעריצים. לא מקנה ייתרון. פברואר 2016, חפץ מנויים.",
     "headMystery301404Text": "כובע ראש מפואר",
     "headMystery301404Notes": "כובע ראש מפואר למכובד שבג׳נטלמנים! ינואר 3015, חפץ מנויים. לא מקנה ייתרון.",
     "headMystery301405Text": "כובע ראש בסיסי",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "פאה קופצנית זו מספיקה כדי להבריח גם את האוייב העז ביותר. מגבירה כוח ב <%= str %>. ארמואר קסום: סט עורך דין (חפץ 1 מתוך 3).",
     "headArmoireJesterCapText": "כובע לץ",
     "headArmoireJesterCapNotes": "הפעמונים על הכובע הזה עלולים להסיח את דעתם של אויבכם, אך לכם הם עוזרים להתרכז. מגבירים תפיסה ב <%= per %>. ארמואר קסום: סט לץ (חפץ 1 מתוך 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "קסדת כרייה",
+    "headArmoireMinerHelmetNotes": "הגנו על ראשכם ממשימות נופלות! מגביר תבונה ב <%= int %>. ארמואר קסום: סט כורים (חפץ 1 מתוך 3).",
     "offhand": "חפץ יד-מגן",
     "shieldBase0Text": "אין חפץ יד-מגן",
     "shieldBase0Notes": "לא הצטיידת באף מגן או נשק ליד החדשה.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "הידד לשליט, ראוי לשיר! מגביר חוסן, תבונה ותפיסה ב <%= attrs %> כל אחד. ארמואר קסום: סט מלכותי (חפץ 2 מתוך 3). ",
     "shieldArmoireDragonTamerShieldText": "מגן מאלף דרקונים",
     "shieldArmoireDragonTamerShieldNotes": "הסיחו את דעתם של אויבים עם מגן בצורת דרקון זה. מגביר תפיסה ב  <%= per %>. ארמואר קסום: סט מאלף דרקונים (חפץ 2 מתוך 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "מנורה מיסטית",
+    "shieldArmoireMysticLampNotes": "האירו את המערות החשוכות ביותר עם מנורה מיסטית זו! מגביר תפיסה ב <%= per %>. ארמואר קסום: חפץ בלתי תלוי.",
     "back": "אביזר גב",
     "backBase0Text": "אביזר ללא גב",
     "backBase0Notes": "אביזר ללא גב.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "גילשו ממעגני החריצות על גלי מפרץ הלומושלם! לא מקנה ייתרון. יולי 2015, חפץ מנויים.",
     "backMystery201510Text": "זנב גובלין",
     "backMystery201510Notes": "מסוגל לתפוס מראש ועוצמתי! לא מקנה ייתרון. אוקטובר 2015, חפץ מנויים.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "שיכמיית שוברי לבבות",
+    "backMystery201602Notes": "בהינף שיכמייתכם, אוייביכם נופלים בפניכם! לא מקנה ייתרון. פברואר 2016, חפץ מנויים.",
     "backSpecialWonderconRedText": "שכמייה אימתנית",
     "backSpecialWonderconRedNotes": "מצליף בכוח ויופי. לא מקנה ייתרון. מהדורה מיוחדת, חפץ כנסים.",
     "backSpecialWonderconBlackText": "שכמייה חמקנית",
diff --git a/common/locales/he/generic.json b/common/locales/he/generic.json
index dd2c2c78e9..af8b3bf2e3 100644
--- a/common/locales/he/generic.json
+++ b/common/locales/he/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "הבקעתי חיית מחמד חדשה על ידי השלמת משימה מעולם האמיתי!",
     "raisePetShare": "אילפתי חיית מחמד להיות חיית רכיבה על ידי השלמת משימות מהעולם האמיתי!",
     "wonChallengeShare": "סיימתי אתגר בהביטיקה!",
-    "achievementShare": "השגתי הישג חדש בהביטיקה!"
+    "achievementShare": "השגתי הישג חדש בהביטיקה!",
+    "orderBy": "סדר לפי <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/he/groups.json b/common/locales/he/groups.json
index 126d3ea29a..559e23747d 100644
--- a/common/locales/he/groups.json
+++ b/common/locales/he/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "שיחת פונדק",
     "innCheckOut": "צאו מהאכסנייה",
     "innCheckIn": "נוחו באכסנייה",
     "innText": "אתם נחים באכסנייה! בזמן שאתם רשומים באכסניה, המטלות היומיות שלכם לא יפגעו בכם בסוף היום, אך הן עדיין יתחילו מחדש בכל יום. הזהרו: אם אתם משתתפים בהרפתקאת בוס, הבוס עדיין יפגע בכם בגין פספוסי העמיתים שלכם בחבורה - אלא אם גם הם באכסניה! בנוסף, נזק שאתם מסבים לבוס (או חפצים שנאספים) לא ישפיעו עד שתצאו מהאכסנייה.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "שיחת החבורה שלכם ריקה! הקלידו הודעה בתיבה למעלה כדי להתחיל לשוחח.",
     "guildChatEmpty": "השיחה של הגילדה הזו ריקה! רשמו הודעה בקופסה למעלה כדי להתחיל לשוחח.",
     "possessiveParty": "החבורה של <%= name %>",
-    "requestAcceptGuidelines": "אם אתם מעוניינים לרשום הודעה בפונדק או חבורה כלשהי או גילדה, אנא קראו את <%= linkStart %>הנחיות הקהילה<%= linkEnd %> ולחצו על הכפתור למטה כדי לאשר שהן מקובלות עליכם."
+    "requestAcceptGuidelines": "אם אתם מעוניינים לרשום הודעה בפונדק או חבורה כלשהי או גילדה, אנא קראו את <%= linkStart %>הנחיות הקהילה<%= linkEnd %> ולחצו על הכפתור למטה כדי לאשר שהן מקובלות עליכם.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/he/questscontent.json b/common/locales/he/questscontent.json
index 90592d8beb..8e4e642661 100644
--- a/common/locales/he/questscontent.json
+++ b/common/locales/he/questscontent.json
@@ -232,7 +232,7 @@
     "questDilatoryDistress2DropCottonCandyBluePotion": "שיקוי בקיעה שמבלולו כחול",
     "questDilatoryDistress2DropHeadgear": "עיגול אלמוג אש (לראש)",
     "questDilatoryDistress3Text": "מצוקה משתהה, חלק 3: לא עוזרת-ים",
-    "questDilatoryDistress3Notes": "אתם עוקבים אחר חסילון המנטיס עמוק לתוך הנקיק, ומגלים מבצר תת-ימי. הנסיכה אדוה, מלווה בעוד גולגולות מימיות, מחכה לכם באולם המרכזי. \"אבא שלי שלח אתכם, הלא כן? תגידו לו שאני מסרבת לחזור. אני מרוצה מלהישאר כאן ולתרגל את יכולות הכישוף שלי. עיזבו עכשיו, או שתרגישו את זעמה של המלכת האוקיינוס החדשה!\" אדוה נראית מאוד נחושה בדעתה, אבל כשהיא מדברת אתם מבחינים בתליון פנינת אודם מוזר תלוי על צווארה, זוהר בצורה מאיימת... אולי הזיותיה יחדלו ברגע שתשברו אותו?",
+    "questDilatoryDistress3Notes": "אתם עוקבים אחר חסילון המנטיס עמוק לתוך הנקיק, ומגלים מבצר תת-ימי. הנסיכה אדוה, מלווה בעוד גולגולות מימיות, מחכה לכם באולם המרכזי. \"אבא שלי שלח אתכם, הלא כן? תגידו לו שאני מסרבת לחזור. אני מרוצה מלהישאר כאן ולתרגל את יכולות הכישוף שלי. עיזבו עכשיו, או שתרגישו את זעמה של מלכת האוקיינוס החדשה!\" אדוה נראית מאוד נחושה בדעתה, אבל כשהיא מדברת אתם מבחינים בתליון פנינת אודם מוזר תלוי על צווארה, זוהר בצורה מאיימת... אולי הזיותיה יחדלו ברגע שתשברו אותו?",
     "questDilatoryDistress3Completion": "לבסוף, אתם מצליחים למשוך את התליון המכושף מצווארה של אדוה ולהשליך אותו. אדוה לופתת את ראשה. \"איפה אני? מה קרה כאן?\" לאחר ששמעה את הסיפור שלכם, היא מקמטת זועפת. \"שרשרת זו ניתנה לי על ידי שגרירה מוזרה - גברת בשם \"צינה\". אני לא זוכרת שום דבר מאז\"<br><br>חזרה ב״מישתהה״, מנטה מאושרת מהצלחתכם. \"הרשו לי לתגמל אתכם עם קלשון ומגן אלו! הזמנתי אותם מ @aiseant ו @starsystemic במתנה לאדוה, אבל... אני מעדיפה לא לשים נשק בידיה בזמן קרוב.\"",
     "questDilatoryDistress3Boss": "אדוה, בתולת הים המתקוממת",
     "questDilatoryDistress3DropFish": "דג (אוכל)",
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "עשיתם זאת! אין להם יותר בננות היום. מרוב החריצות שלכם, הקופים בורחים בבהלה. \"תראה\", אומר @Misceo. \"הם השאירו כמה ביצים מאחור.\"<br><br>@Leephon מחייך. \"אולי קוף מחמד מאומן היטב יכול לעזור לכם כמו שהפראיים הפריעו!\"",
     "questMonkeyBoss": "קפטן מפלצתי",
     "questMonkeyDropMonkeyEgg": "קוף (ביצה)",
-    "questMonkeyUnlockText": "משחרר ביצי קוף לרכישה בשוק"
+    "questMonkeyUnlockText": "משחרר ביצי קוף לרכישה בשוק",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/he/settings.json b/common/locales/he/settings.json
index 223f36415c..296859f158 100644
--- a/common/locales/he/settings.json
+++ b/common/locales/he/settings.json
@@ -21,7 +21,7 @@
     "suppressRaisePetModal": "אל תציג פופ-אפ כשחיית מחמד הופכת לחיית רכיבה",
     "suppressStreakModal": "אל תציג פופ-אפ בהשגת הישג רצף",
     "showTour": "הראה סיור",
-    "restartTour": "מתחיל מחדש את סיור ההיכרות מהזמן בו הצטרפת לhabitRPG.",
+    "restartTour": "מתחיל מחדש את סיור ההיכרות מהזמן בו הצטרפתם להאביטיקה.",
     "showBailey": "הראה את באילי",
     "showBaileyPop": "הבא את באילי המבשרת של העיירה מחוץ למחבוא, כדי שיבשר לך על חדשות העבר.",
     "fixVal": "תקן ערכי דמות",
@@ -52,15 +52,15 @@
     "misc": "שונות",
     "showHeader": "הראה כותרת",
     "changePass": "שנה סיסמה",
-    "changeUsername": "שנה/י שם כניסה",
-    "changeEmail": "שנה/י כתובת דוא\"ל",
+    "changeUsername": "שנו שם כניסה",
+    "changeEmail": "שנו כתובת דוא\"ל",
     "newEmail": "כתובת דוא\"ל חדשה",
     "oldPass": "סיסמה ישנה",
     "newPass": "סיסמה חדשה",
     "confirmPass": "אשרר סיסמה חדשה",
     "newUsername": "שם כניסה חדש",
     "dangerZone": "אזור מסוכן",
-    "resetText1": "אזהרה! פעולה זו תמחוק חלקים רבים מהמשתמש שלך. זה ממש לא מומלץ כי תאבד/י מידע היסטורי, השימושי למעקב אחר ההתקדמות שלך לאורך זמן, אם כי, ישנם האנשים שזה שימושי עבורם אחרי שהם משחקים עם האתר לזמן מה.",
+    "resetText1": "אזהרה! פעולה זו תמחוק חלקים רבים מהמשתמש שלך. זה ממש לא מומלץ כי תאבד/י מידע היסטורי, השימושי למעקב אחר ההתקדמות שלך לאורך זמן, אם כי, ישנם האנשים שזה שימושי עבורם אחרי שהם משחקים באתר זמן מה.",
     "resetText2": "את/ה תאבד/י את כל הדרגות, הזהב, ונקודות הניסיון שלך. כל המשימות שלך ימחקו לצמיתות יחד עם ההיסטוריה שלהן. את/ה תאבד/י את כל הציוד שלך אך תוכלי לקנות את כולו בחזרה, כולל את כל הציוד ממהדורה מוגבלת או חפצי תורם שכבר בבעלותך (תיאלצ/י להיות במקצוע הנכון בשביל לקנות מחדש ציוד מקצועי מתאים). את/ה תשמור/י על המקצוע שלך, חיות המחמד וחיות הרכיבה. אולי תעדיפ/י להשתמש בכדור הלידה מחדש במקום זאת, שהוא אפשרות הרבה יותר בטוחה שתשמר את המשימות שלך.",
     "deleteText": "האם את/ה בטוח/ה? זה ימחק את המשתמש שלך לנצח, ולעולם לא תוכל/י להחזיר אותו! תיאלצ/י להיאשם בחשבון חדש לhabitRPG. אבני חן שנאגרו או בוזבזו לא יוחזרו לך. אם את/ה בטוח/ה ב100%, הקלד/י <strong><%= deleteWord %></strong> לתיבת הטקסט למטה.",
     "API": "ממשק",
@@ -84,13 +84,13 @@
     "addedLocalAuth": "אימות מקומי נוסף בהצלחה",
     "data": "מידע",
     "exportData": "ייצוא מידע",
-    "emailChange1": "כדי לשנות את כתובת הדוא\"ל שלך, בבקשה שלח מייל ל-",
+    "emailChange1": "כדי לשנות את כתובת הדוא\"ל שלכם, בבקשה שילחו מייל ל-",
     "emailChange2": "admin@habitica.com",
     "emailChange3": "וכלול את כתובות הדוא\"ל הישנה והחדשה שלך כמו גם את מספר זיהוי המשתמש שלך.",
     "usernameOrEmail": "שם משתמש או אימייל",
     "email": "דוא\"ל",
     "registeredWithFb": "רשום עם פייסבוק",
-    "loginNameDescription1": "אלה הפרטים בהם אתה משתמש כדי להכנס ל-Habitica. עבור ל-",
+    "loginNameDescription1": "אלה הפרטים בהם אתה משתמש כדי להכנס להאביטיקה. עבור ל-",
     "loginNameDescription2": "משתמש->פרופיל",
     "loginNameDescription3": "כדי לשנות את השם שמופיע באוואטר שלך ובהודעות הצ'אט.",
     "emailNotifications": "הודעות",
diff --git a/common/locales/he/spells.json b/common/locales/he/spells.json
index 1a65142ce6..2a5d48c7d2 100644
--- a/common/locales/he/spells.json
+++ b/common/locales/he/spells.json
@@ -20,7 +20,7 @@
     "spellRogueBackStabText": "דקירה בגב",
     "spellRogueBackStabNotes": "אתם בוגדים במשימה מטופשת. אתם מרוויחים זהב וניסיון! לחצו על משימה כדי להטיל. (מבוסס על: כוח).",
     "spellRogueToolsOfTradeText": "כלי המקצוע",
-    "spellRogueToolsOfTradeNotes": "אתם חולקים את הכישרון שלכם עם חברים. כל החבורה שלכם מרוויחה תוסף לתפיסה! (מבוסס על: תפס לפני התוסף)",
+    "spellRogueToolsOfTradeNotes": "אתם חולקים את הכישרון שלכם עם חברים. כל החבורה שלכם מרוויחה תוסף לתפיסה! (מבוסס על: תפיסה לפני התוסף)",
     "spellRogueStealthText": "חשאיות",
     "spellRogueStealthNotes": "אתם חמקנים מכדי שיבחינו בכם. חלק מהמטלות היומיות שלכם לא יגרמו הלילה לנזק, והרצף/צבע לא ישתנו. (הטילו כמה פעמים כדי להשפיע על מטלות נוספות)",
     "spellHealerHealText": "אור מרפא",
@@ -30,7 +30,7 @@
     "spellHealerProtectAuraText": "הילה מגוננת",
     "spellHealerProtectAuraNotes": "אתם מגנים על החבורה שלכם מפני נזק. כל החבורה שלכם זוכה בתוסף לחוסן! (מבוסס על: חוסן לפני התוסף)",
     "spellHealerHealAllText": "ברכה",
-    "spellHealerHealAllNotes": "הילה מרגיעה מקיפה אתכם. כל החבורה שלכם מבריאה! (מבוסס על: חסן ותבנ)",
+    "spellHealerHealAllNotes": "הילה מרגיעה מקיפה אתכם. כל החבורה שלכם מבריאה! (מבוסס על: חוסן ותבונה)",
     "spellSpecialSnowballAuraText": "כדור שלג",
     "spellSpecialSnowballAuraNotes": "השליכו כדור שלג על החבר שלכם, מה כבר יקרה? נמשך עד היום הבא של החבר הפגוע.",
     "spellSpecialSaltText": "מלח",
diff --git a/common/locales/he/subscriber.json b/common/locales/he/subscriber.json
index e240b190f9..494bd6ee67 100644
--- a/common/locales/he/subscriber.json
+++ b/common/locales/he/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "סט לוחם העץ",
     "mysterySet201512": "סט להבות חורף",
     "mysterySet201601": "סט אלוף של החלטיות",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "סט שוברי לבבות",
     "mysterySet301404": "סט סטימפאנק רגיל",
     "mysterySet301405": "סט סטימפאנק אקססוריז",
     "mysterySetwondercon": "וונדרקון",
diff --git a/common/locales/hu/backgrounds.json b/common/locales/hu/backgrounds.json
index f215b6f0f6..566c43ef46 100644
--- a/common/locales/hu/backgrounds.json
+++ b/common/locales/hu/backgrounds.json
@@ -127,7 +127,7 @@
     "backgroundSunsetOasisText": "Naplemente Oázis",
     "backgroundSunsetOasisNotes": "Sütkérezz a Naplemente Oázisban.",
     "backgrounds122015": "SET 19: Released December 2015",
-    "backgroundAlpineSlopesText": "Alpine Slopes",
+    "backgroundAlpineSlopesText": "Alpesi lejtők",
     "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.",
     "backgroundSnowySunriseText": "Snowy Sunrise",
     "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.",
@@ -138,7 +138,7 @@
     "backgroundFrozenLakeNotes": "Skate on a Frozen Lake.",
     "backgroundSnowmanArmyText": "Snowman Army",
     "backgroundSnowmanArmyNotes": "Lead a Snowman Army.",
-    "backgroundWinterNightText": "Winter Night",
+    "backgroundWinterNightText": "Téli éjszaka",
     "backgroundWinterNightNotes": "Look at the stars of a Winter Night.",
     "backgrounds022016": "SET 21: Released February 2016",
     "backgroundBambooForestText": "Bamboo Forest",
diff --git a/common/locales/hu/communityguidelines.json b/common/locales/hu/communityguidelines.json
index fa13c7888d..7429cc875b 100644
--- a/common/locales/hu/communityguidelines.json
+++ b/common/locales/hu/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Egy ilyen nagy közösségben mint a Habitica, a felhasználok jönnek mennek, és néha a moderátoroknak is le kell tenniük nemes köpenyüket és pihenniük. Ők a Moderators Emeritus-ok, azaz a Nyugalmazott Moderátorok. Nekik mar nincs meg a Moderátori hatalmuk, de tiszteljük őket továbbra is az elvégzett munkájukért!",
     "commGuidePara014": "Nyugalmazott Moderátorok:",
     "commGuideHeadingPublicSpaces": "Nyilvános helyek Habitica-n",
-    "commGuidePara015": "Habitca-n két féle közösségi hely van: nyilvános és privát. Nyilvános helyek például a Kocsma, a Nyilvános Céhek, GitHub, Trello és a Wiki. A privát helyek a Privát Céhek, csoport chat és a privát üzenetek.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Amikor a Habitica nyilvános helyein mozogsz, akkor be kell tartanod néhány egyszerű szabályt, hogy mindenki biztonságban és boldogan érezhesse magát. Ez könnyű kell, hogy legyen olyan kalandoroknak, mint Neked!",
     "commGuidePara017": "<strong>Tiszteljétek egymást.</strong> Légy udvarias, kedves, barátságos és segítőkész. Ne feledd: Habitica lakói mindenfelől érkeztek és nagyon eltérő tapasztalatokkal rendelkeznek. Ez az a plusz, amitől a Habitica annyira menő. Egy közösséget építeni annyit jelent, hogy tiszteljük és ünnepeljük a különbözőségeinket és hasonlóságunkat. Íme néhány egyszerű tanács, hogy tiszteljük egymást:",
     "commGuideList02A": "<strong>Tartsd be az összes Általános Szerződési Feltételt.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Comply immediately with any Mod request</strong> to cease a discussion or move it to the Back Corner. Last words, parting shots and conclusive zingers should all be delivered (courteously) at your \"table\" in the Back Corner, if allowed.",
     "commGuideList02G": "<strong>Adj magadnak időt gondolkodni, mint sem haragból válaszolni</strong> ha valaki azt mondja neked, rosszul esett neki, amit mondtál neki vagy tettel vele. Nagy bátorság és erő kell ahhoz, hogy őszintén tudjunk bocsánatot kerni valakitől. Ha úgy érzed, hogy nem a megfelelő módon válaszoltak neked, akkor vedd fel a kapcsolatot egy moderátorral, ahelyett hogy a nyilvánosság előtt szidjatok egymást.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Repeatedly begging for gems or a subscription may also be considered spamming.",
-    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Private Messages (PMs) have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
     "commGuidePara021": "Továbbá, néhány nyilvános helynek Habitica-n megvannak a saját szabályai.",
     "commGuideHeadingTavern": "A fogadó",
diff --git a/common/locales/hu/content.json b/common/locales/hu/content.json
index a8f52abf62..bdf692aa35 100644
--- a/common/locales/hu/content.json
+++ b/common/locales/hu/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "tüskés",
     "dropEggBearCubText": "Medvebocs",
     "dropEggBearCubMountText": "Medve",
-    "dropEggBearCubAdjective": "ennivaló",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Griff",
     "questEggGryphonMountText": "Griff",
     "questEggGryphonAdjective": "büszke",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "a colorful",
     "questEggRatText": "Patkány",
     "questEggRatMountText": "Patkány",
-    "questEggRatAdjective": "koszos",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Polip",
     "questEggOctopusMountText": "Polip",
     "questEggOctopusAdjective": "a slippery",
@@ -90,7 +90,7 @@
     "questEggWhaleMountText": "Bálna",
     "questEggWhaleAdjective": "a splashy",
     "questEggCheetahText": "Gepárd",
-    "questEggCheetahMountText": "Cheetah",
+    "questEggCheetahMountText": "Gepárd",
     "questEggCheetahAdjective": "an honest",
     "questEggHorseText": "Ló",
     "questEggHorseMountText": "Ló",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Majom",
     "questEggMonkeyMountText": "Majom",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Alap",
     "hatchingPotionWhite": "Fehér",
diff --git a/common/locales/hu/front.json b/common/locales/hu/front.json
index 1f43223532..6da9f4bb78 100644
--- a/common/locales/hu/front.json
+++ b/common/locales/hu/front.json
@@ -112,74 +112,74 @@
     "marketing4Header": "Céges használat",
     "marketing4Lead1": "Az oktatás a játékosítás egyik legjobb ágazata. Mindnyájan tudjuk, mennyire hozzátapadnak manapság a diákok a mobiljaik képernyőjéhez - használjuk fel ezt az erőt! Biztassuk diákjainkat barátságos versenyzésre. Díjazzuk a jó teljesítményt ritka jutalmakkal. Nézzük, ahogy a jegyeik és a viselkedésük a csúcsra hág.",
     "marketing4Lead1Title": "Játékosítás az Oktatásban",
-    "marketing4Lead2": "Az egészségügyi költségek emelkedenek és ezen valahogy segíteni kell. Többszáz program készült a költségek csökkentésére és az egészség megőrzésére. Úgy hisszük, hogy a Habitica megalapozhatja az utat egy egészségesebb életstílus felé.",
+    "marketing4Lead2": "Az egészségügyi költségek emelkedenek és ezen valahogy segíteni kell. Többszáz program készült a költségek csökkentésére és az egészség megőrzésére. Hisszük, hogy a Habitica segíthet megalapozni az utat egy egészségesebb életstílus felé.",
     "marketing4Lead2Title": "Az egészséges életmód játkossá tétele",
-    "marketing4Lead3-1": "Szeretnéd játékossá tenni az életed?",
+    "marketing4Lead3-1": "Szeretnéd játékká tenni az életed?",
     "marketing4Lead3-2": "Szeretnél egy csoporttot vezetni oktatás, wellness, vagy egyéb témában?",
     "marketing4Lead3-3": "Szeretnél többet tudni?",
     "marketing4Lead3Title": "Játékosíts mindent",
     "mobileAndroid": "Android",
     "mobileIOS": "iOS",
     "motivate": "Motiváld magad és a csapatod!",
-    "motivate1": "Motiváld magad, hogy csinálj valamit.",
-    "motivate2": "Szerezz szervezettséget. Szerezz motivációt. Szerezz aranyat.",
+    "motivate1": "Motiváld magad, hogy bármit véghezvihess!",
+    "motivate2": "Légy szervezett. Légy motivált. Szerezz aranyat.",
     "passConfirm": "Jelszó megerősítése",
-    "passMan": "In case you are using a password manager (like 1Password) and have problems logging in, try typing your username and password manually.",
+    "passMan": "Abban az esetben, hogyha jelszó-megőrző programot használsz (mint a 1Password vagy LastPass) és problémáid akadnak a bejelentkezéssel, próbáld manuálisan bevinni a neved és a jelszavad.",
     "password": "Jelszó",
     "playButton": "Játssz",
-    "playButtonFull": "Játssz",
+    "playButtonFull": "Játssz a Habiticával",
     "presskit": "Sajtókészlet",
     "presskitDownload": "Összes kép letöltése:",
-    "presskitText": "Thanks for your interest in Habitica! The following images can be used for articles or videos about Habitica. For more information, please contact Siena Leslie at leslie@habitica.com.",
+    "presskitText": "Köszönjük a Habiticával kapcsolatos érdeklődésed! A következő képeket felhasználhatod a Habiticáról készített cikkekhez, vagy videókhoz. További információért, kérlek írj Siena Leslienek, a leslie@habitica.com címen.",
     "privacy": "Adatvédelmi nyilatkozat",
     "psst": "Psszt",
     "punishByline": "Szakíts a rossz szokásokkal és halogatással azonnali következményekkel.",
     "punishHeading1": "Kihagytál egy napi feladatot?",
     "punishHeading2": "Veszíts életerőt!",
-    "questByline1": "Ha barátokkal játszol felelős tudsz maradni a feladataidért.",
-    "questByline2": "Készítsetek kihívásokat egymásnak, hogy hamarabb elérjétek a céljaitokat.",
-    "questHeading1": "Harcolj szörnyek ellen a barátaiddal.",
-    "questHeading2": "Ha hanyag vagy, akkor mindenki megsérül.",
+    "questByline1": "A barátaiddal való játék segít feladatid számonkérésében.",
+    "questByline2": "Készítsetek kihívásokat egymásnak, hogy együtt érjétek el céljaitokat.",
+    "questHeading1": "Harcolj szörnyek ellen a barátaiddal!",
+    "questHeading2": "Ha hanyag vagy, akkor mindenki megsérül!",
     "register": "Regisztráció",
-    "rewardByline1": "Költsd el az aranyat virtuális és valós jutalmakra.",
-    "rewardByline2": "Azonnali jutalmak motiválnak folyamatosan.",
+    "rewardByline1": "Költs aranyat virtuális és valós jutalmakra.",
+    "rewardByline2": "Azonnali jutalmak segítenek, hogy folyamatosan motivált maradj!",
     "rewardHeading": "Teljesítsd a feladatod és szerezz aranyat!",
     "sampleDailies": "Minta napi feladatok",
     "sampleHabits": "Minta szokások",
-    "sampleToDo": "Minta Tennivalók",
+    "sampleToDo": "Minta tennivalók",
     "school": "Iskola",
-    "schoolSample1": "Befejezni 1 megbízást",
+    "schoolSample1": "Befejezni 1 feladatot",
     "schoolSample2": "1 óra tanulás",
     "schoolSample3": "Találkozni a tanulócsoporttal",
     "schoolSample4": "1 fejezetet kijegyzetelni",
-    "schoolSample5": "1 fejezet elolvasása",
-    "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to [Habitica]. I'm just always so eager to reach my next level-up!",
-    "skysailorQuote": "A csoportom és a küldetésünk a játékban tartanak, ami motivál a feladataim elvégzésében és jó irányban változtatja meg az életem",
-    "socialTitle": "Habitica | Játszd az életed",
+    "schoolSample5": "1 fejezetet elolvasni",
+    "sixteenBitFilQuote": "A megbízásaimmal és feladataimmal rekordidő alatt végzek, hála a [Habiticának]! Mindig vágyom rá, hogy elérhessem a következő szintet!",
+    "skysailorQuote": "A csapatom és a küldetésünk a játékban tartanak, ami motivál a feladataim elvégzésében és jó irányba tereli az életem",
+    "socialTitle": "Habitica - Játszd az életed",
     "supermouse35Quote": "Többet edzek és már hónapok óta nem felejtettem el bevenni a gyógyszereimet! Köszi, Habit. :D",
     "sync": "Szinkronizálás",
     "tasks": "Feladatok",
     "teamSample1": "Megbeszélés vázlat előkészítése keddre",
-    "teamSample2": "Brainstorm Growth Hacking",
-    "teamSample3": "Discuss this week's KPIs",
+    "teamSample2": "Ötletelés",
+    "teamSample3": "A hét ügyeinek megbeszélése",
     "teams": "Csoportok",
-    "terms": "Általános Szerződési Feltételeket",
+    "terms": "Általános Szerződési Feltételek",
     "testimonialHeading": "Játékosok véleménye...",
-    "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.",
-    "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.",
-    "localStorageClearing": "Clearing Local Storage",
-    "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.",
-    "localStorageClear": "Clear Local Storage",
-    "localStorageClearExplanation": "This button will clear local storage and log you out",
+    "localStorageTryFirst": "Ha problémáid akadnak a Habiticával, kattints az alábbi gombra, hogy a helyi tárhelyet kitisztítsd ehhez a webhelyhez (más webhelyeket nem érint). Ezután újra be kell majd jelentkezned, tehát először bizonyosodj meg arról, hogy tudod a bejelentkezéshez szükséges adataidat, melyet a beállítások közt találhatsz meg.<%= linkStart %>Honlap<%= linkEnd %>.",
+    "localStorageTryNext": "Ha a probléma ezután is fennáll, kérlek <%= linkStart %>jelentsd a hibát<%= linkEnd %> , ha még nem tetted volna meg.",
+    "localStorageClearing": "Helyi tárhely ürítése",
+    "localStorageClearingExplanation": "A böngésződ helyi tárhelye épp tisztítás alatt áll. Ezután az oldal kijelentkezik és visszairányít a kezdőlapra. Kérlek légy türelemmel.",
+    "localStorageClear": "Helyi tárhely ürítése",
+    "localStorageClearExplanation": "Ez a gomb kiüríti a helyi tárhelyet és kijelentkezik.",
     "tutorials": "Oktatóanyagok",
     "unlockByline1": "Érd el a céljaid és lépj szintet.",
-    "unlockByline2": "Oldj fel újabb motivációs eszközöket, mint például állat gyűjtés, véletlenszerű jutalmak, varázslás, és még sok más!",
+    "unlockByline2": "Oldj fel újabb motivációs eszközöket, mint például a kisállat gyűjtés, véletlenszerű jutalmak, varázslás, és még sok más!",
     "unlockHeadline": "Minél tovább maradsz produktív, annál több új tartalmat érhetsz el!",
     "useUUID": "Használj UUID / API Kulcs (Facebook felhasználóknak) párost",
     "username": "Felhasználónév",
     "watchVideos": "Nézz videókat",
     "work": "Munka",
-    "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+    "zelahQuote": "A [Habiticával] elértem, hogy időben feküdjek le, mert jutalmat kapok a korai lefekvésért és bosszant a gondolat, hogy ha későn fekszem le, életet vesztek!",
     "reportAccountProblems": "Fiók problémák jelentése",
     "reportCommunityIssues": "Közösségi problémák jelentése",
     "generalQuestionsSite": "Általános kérdések az oldalról",
@@ -187,15 +187,15 @@
     "merchandiseInquiries": "Termék információk",
     "marketingInquiries": "Marketing/Közösségi média információk",
     "tweet": "Tweet",
-    "apps": "Apps",
-    "checkOutMobileApps": "Check out our mobile apps!",
-    "imagine1": "Imagine if improving your life were as fun as playing a game.",
-    "landingCopy1": "Advance in the game by completing your real-life tasks.",
-    "landingCopy2": "Battle monsters with friends to stay accountable to your goals.",
-    "landingCopy3": "Join over <%= userCount %> people having fun as they improve their lives.",
-    "alreadyHaveAccount": "I already have an account!",
-    "getStartedNow": "Get Started Now!",
-    "altAttrNavLogo": "Habitica home",
+    "apps": "Alkalmazások",
+    "checkOutMobileApps": "Próbáld ki mobilos alkalmazásainkat!",
+    "imagine1": "Képzeld el, ha életet jobbá tétele olyan izgalmas lenne, mint egy játék.",
+    "landingCopy1": "Lépj előre a játékban valós feladataid elvégzésével.",
+    "landingCopy2": "Harcolj szörnyekkel, barátaid segítségével, hogy számonkérhető legyél a céljaidon.",
+    "landingCopy3": "Csatlakozz <%= userCount %> emberhez és érezd magad jól, miközben életed építed.",
+    "alreadyHaveAccount": "Már van fiókom!",
+    "getStartedNow": "Kezdj most!",
+    "altAttrNavLogo": "Habitica kezdőlap",
     "altAttrLifehacker": "Lifehacker",
     "altAttrNewYorkTimes": "The New York Times",
     "altAttrMakeUseOf": "MakeUseOf",
diff --git a/common/locales/hu/gear.json b/common/locales/hu/gear.json
index e29c359815..b5b593aa12 100644
--- a/common/locales/hu/gear.json
+++ b/common/locales/hu/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "Fegyver",
     "weaponBase0Text": "Nincs fegyvered",
     "weaponBase0Notes": "Nincs fegyvered.",
diff --git a/common/locales/hu/generic.json b/common/locales/hu/generic.json
index 6e0afe86f5..cdbc808d8f 100644
--- a/common/locales/hu/generic.json
+++ b/common/locales/hu/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Kikeltettem egy új háziállatot, azzal, hogy való-életbeli feladatim elvégeztem!",
     "raisePetShare": "Hátassá neveltem egy háziállatot, azzal, hogy való-életbeli tennivalóim elvégeztem!",
     "wonChallengeShare": "Megnyertem egy kihívást a Habiticán!",
-    "achievementShare": "Új kitüntetést szereztem a Habiticán!"
+    "achievementShare": "Új kitüntetést szereztem a Habiticán!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/hu/groups.json b/common/locales/hu/groups.json
index 4b526b438c..bcdafc89be 100644
--- a/common/locales/hu/groups.json
+++ b/common/locales/hu/groups.json
@@ -52,7 +52,7 @@
     "groupDescr": "Leírás, amit a nyilvános Céh listában láthatsz (Használhatsz Markdown-t)",
     "logoUrl": "Logo URL",
     "assignLeader": "Jelölj ki Csoportvezetőt",
-    "members": "Members",
+    "members": "Tagok",
     "partyList": "Order for party members in header",
     "banTip": "Tag kirúgása",
     "moreMembers": "továbi tagok",
@@ -112,8 +112,8 @@
     "messageWroteIn": "<%= user %> wrote in <%= group %>",
     "msgPreviewHeading": "Message Preview",
     "leaderOnlyChallenges": "Only group leader can create challenges",
-    "sendGift": "Send Gift",
-    "inviteFriends": "Invite Friends",
+    "sendGift": "Küldj ajándékot",
+    "inviteFriends": "Barátok meghívása",
     "inviteByEmail": "Invite by Email",
     "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
     "inviteFriendsNow": "Invite Friends Now",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/hu/pets.json b/common/locales/hu/pets.json
index 64748b8632..1345732cef 100644
--- a/common/locales/hu/pets.json
+++ b/common/locales/hu/pets.json
@@ -17,8 +17,8 @@
     "mantisShrimp": "Sáskarák",
     "mammoth": "Gyapjas Mamut",
     "orca": "Gyilkos bálna",
-    "royalPurpleGryphon": "Royal Purple Gryphon",
-    "phoenix": "Phoenix",
+    "royalPurpleGryphon": "Fenséges lila griffmadár",
+    "phoenix": "Főnix",
     "rarePetPop1": "Kattintas az arany mancsra, hogy megtudd hogyan tudod megszerezni ezt a ritka háziállatot úgy, hogy közreműködsz a Habitica-nek.",
     "rarePetPop2": "Hogyan szerezheted meg ezt a háziállatot!",
     "potion": "<%= potionType %> főzet",
@@ -27,7 +27,7 @@
     "eggSingular": "Tojás",
     "noEggs": "Nincs egy tojásod se.",
     "hatchingPotions": "Keltetőfőzetek",
-    "magicHatchingPotions": "<strong>Magic Hatching Potions</strong>",
+    "magicHatchingPotions": "<strong>Varázslatos keltetőfőzetek</strong>",
     "hatchingPotion": "keltetőfőzet",
     "noHatchingPotions": "Nincs keltetőfőzeted.",
     "inventoryText": "Kattintsa tojásra, hogy a lásd a használható főzeteket zöldben és kattints egy kijelölt főzetre, hogy kikeltesd a háziállatod. Ha nincs kijelölt főzet, akkor kattints a tojásra újra, hogy megszűntesd a kijelölést és kattints egy főzetre inkább, hogy lásd a tojásokat, amiken használhatod. A nem kívánt tárgyakat eladhatod Alexandernek, a kereskedőnek.",
diff --git a/common/locales/hu/questscontent.json b/common/locales/hu/questscontent.json
index ccdb9275ac..e2eaf0f09b 100644
--- a/common/locales/hu/questscontent.json
+++ b/common/locales/hu/questscontent.json
@@ -5,8 +5,8 @@
     "questEvilSantaBoss": "Prémvadász mikulás",
     "questEvilSantaDropBearCubPolarMount": "Jegesmedve (hátas)",
     "questEvilSanta2Text": "Találd meg a kölyköt",
-    "questEvilSanta2Notes": "Amikor a prémvadász mikulás elfogta a jegesmedve hátast, a kisbocsa elfutott a végtelen jégmezők felé. Az erdő csendjében gallyak és a hó ropogását hallod. Mancsnyomok! Sietve elkezditek követni, merre vezetnek. Találd meg az össze nyomot és törött gallyat, és juss el a kisbocshoz!",
-    "questEvilSanta2Completion": "You've found the cub! It will keep you company forever.",
+    "questEvilSanta2Notes": "Amikor a prémvadász mikulás elfogta a jegesmedve hátast, a kisbocsa elfutott a végtelen jégmezők felé. Az erdő csendjében gallyak és a hó ropogását hallod. Mancsnyomok! Sietve elkezditek követni, merre vezetnek. Találd meg az összes nyomot és törött gallyat, és juss el a kisbocshoz!",
+    "questEvilSanta2Completion": "Megtaláltad a kölyköt ! Mindig is veled fog maradni.",
     "questEvilSanta2CollectTracks": "Nyomok",
     "questEvilSanta2CollectBranches": "Törött gallyak",
     "questEvilSanta2DropBearCubPolarPet": "Jegesmedve (háziállat)",
@@ -39,25 +39,25 @@
     "questOctopusCompletion": "Egy végső csapás után a szörnyet beszippantja az örvény, ahonnan jött. Nem tudod eldönteni, hogy @Urse boldog-e a győzelmetekkel, vagy szomórú, hogy eltűnt a bestia. Szótlanul rámutat három trutymákos, óriási tojásra, melyek egy fészeknyi arany között hevernek a mellettetek lévő dagálytérben. \"Valószínűleg csak polip-tojások\" - mondod idegesen. Az úton hazafele, @Urse viharosan firkál a naplójába, és az az érzésetek támad, hogy nem utoljára láttátok a hatalmas Polipszörnyet.",
     "questOctopusBoss": "Polipszörny",
     "questOctopusDropOctopusEgg": "Polip (tojás)",
-    "questOctopusUnlockText": "Unlocks purchasable octopus eggs in the Market",
+    "questOctopusUnlockText": "Elérhetővé teszi a polip-tojások vásárlását a piacon",
     "questHarpyText": "Segítség! Hárpia!",
     "questHarpyNotes": "A bátor kalandor @UncommonCriminal eltűnt az erdőben, miközben egy pár napja látott szárnyas szörny nyomát követte. Épp a keresését kezdenétek, amikor egy sebesült papagáj száll a karodra, aminek egy csúnya sebhely borítja gyönyörű tollazatát. A lábához rögzítve egy firkált üzenet található, amiben az szerepel, hogy a papagájok védelmezése közben @UncommonCriminal-t fogjul ejtette egy gonosz Hárpia és kétségbeesetten kell segítségetek a szökéséhez. Követitek a madarat, legyőzitek a Hárpiát és megmentitek @UncommonCriminal-t?",
     "questHarpyCompletion": "Egy utolsó csapás leteríti a Hárpiát és tollak repülnek minden irányba. Gyorsan felmásztok a fészkébe és megtaláljátok @UncommonCriminal-t és körülötte a papagáj tojásokat. Csapatmunkában gyorsan visszateszitek a tojásokat a környező fészkekbe. Az ijedt papagáj, amelyik megtalált benneteket hangosan károg, miközben több tojást a karjaitokba ejt. \"A Hárpia támadása miatt néhány tojás védelmezésre szorul,\" magyarázza @UncommonCriminal. \"Úgy tűnik, hogy tiszteletbeli papagájok lettetek.\"",
     "questHarpyBoss": "Hárpia",
     "questHarpyDropParrotEgg": "Papagáj (tojás)",
-    "questHarpyUnlockText": "Unlocks purchasable parrot eggs in the Market",
+    "questHarpyUnlockText": "Elérhetővé teszi a papagáj-tojások vásárlását a piacon",
     "questRoosterText": "A kakas tombolása",
     "questRoosterNotes": "A farmer @extrajordanary éveken át kakasokat használt ébresztőórának. De most egy hatalmas kakas megjelent és hangosabban károg, mint bármelyik más korábban - és felébreszt mindenkit Habiticában! Habitica alváshiányos lakói szenvednek a napi feladataikkal. @Pandoro úgy döntött, hogy itt az ideje véget vetni ennek. \"Kérem, van valaki aki csendesebb kukorékolásra tudná bírni a kakast?\" Önként jelentkezel, megközelíted a kakast egy korai reggelen - de megfordul, hatalmas szárnyaival csapkod, éles karmait megvillantja és egy harci rikoltást hallat.",
     "questRoosterCompletion": "Ravaszsággal és erővel megszelídítetted a vad bestiát. A fülei, amik korábban tollakkal és félig elfeledett teendőkkel voltak tele, már tiszták, mint a vízfolyás. Halkan kukorékol egyet neked és a válladnál átölel a csőrével. A következő nap, amikor már indulnál tovább, @EmeraldOx odarohan hozzád egy letakart kosárral. \"Várj! Amikor bementem a tanyára ma reggel, a kakas odanyomta ezeket az ajtóhoz, ahol aludtál. Szerintem azt szeretné, hogy ez a tied legyen.\" Felfeded a kosár tartalmát és három törékeny tojást látsz benne.",
     "questRoosterBoss": "Kakas",
     "questRoosterDropRoosterEgg": "Kakas (tojás)",
-    "questRoosterUnlockText": "Unlocks purchasable rooster eggs in the Market",
+    "questRoosterUnlockText": "Elérhetővé teszi a kakas-tojások vásárlását a piacon",
     "questSpiderText": "A fagyos pókféle",
     "questSpiderNotes": "Ahogy lehűl az idő, vékony dér kezdi beborítani Habitica lakóinak ablaküvegeit, csipkés hálók formájában...kivéve @Arcosine-nak, akinek az ablakait teljesen befagyasztotta a Zúzmarapók, ami beköltözött a házába. Jaj.",
     "questSpiderCompletion": "A Zúzmarapók összeesik és maga után hagy egy kis halom deret és egy párat az elbűvölt petezsákjából. @Arcosine fölöttébb sietve felajánlja Nektek, mint jutalmat - talán fel tudnátok nevelni néhány fenyegetést nem jelentő pókot, mint háziállatot?",
     "questSpiderBoss": "Pók",
     "questSpiderDropSpiderEgg": "Pók (tojás)",
-    "questSpiderUnlockText": "Unlocks purchasable spider eggs in the Market",
+    "questSpiderUnlockText": "Elérhetővé teszi a pók-tojások vásárlását a piacon",
     "questVice1Text": "Vice, Part 1: Free Yourself of the Dragon's Influence",
     "questVice1Notes": "<p>Azt mondják, hogy egy szörnyű gonosz lakik Mt. Habitica barjangjaiban. Egy szörny, amely jelenléte elvetemíti az ország erős hőseinek akaratát, rossz szokások és lustaság felé fordítva őket! A szörny egy nagy sárkány, hatalmas erővel, és magukból az árnyakból alakult ki: Bűn, az álnok árnysárkány. Habitica bátor lakói, keljetek fel és győzéttek le ezt az aljas bestiát egyszer és mindenkorra, de csak akkor, ha úgy hiszitek, hogy ellen tudtok állni a roppant erejének. </p><h3> Bűn, 1. rész:</h3><p>Hogy várhatjátok, hogy megküzdtök a szörnyeteggel, ha már hatalma van felettetek? Ne essetek áldozatul a lustaságnak és a vétkezésnek! Dolgozzatok keményen, hogy harcoljatok a sárkány sötét befolyása ellen és kiszabaduljatok a markából!</p>",
     "questVice1Boss": "A Bűn Árnyékában",
@@ -127,7 +127,7 @@
     "questSeahorseCompletion": "A most megszelidített tengeri csikó engedelmesen úszik az oldaladon. \"Oh, nézd!\" - mondja Kiwibot. - \"Azt szeretné ha vigyáznál a gyerekeire\". Három tojást ad neked. \"Jól neveld fel őket!\" mondja. \"Várunk sok szeretettel a Halogató Lóverseny bármelyik napján!\"",
     "questSeahorseBoss": "Tengericsikó",
     "questSeahorseDropSeahorseEgg": "Csikóhal (tojás)",
-    "questSeahorseUnlockText": "Unlocks purchasable seahorse eggs in the Market",
+    "questSeahorseUnlockText": "Elérhetővé teszi a csikóhal-tojások vásárlását a piacon",
     "questAtom1Text": "Attack of the Mundane, Part 1: Dish Disaster!",
     "questAtom1Notes": "A jól megérdemelt pihenésedet töltöd a Tisztáramosott tó partján, s amint megérkezel észre veszel valamit..... A tó tele van mosatlan edényekkel! Hogy történhett ez? Ilyen állapotban nem hagyhatod a tavat. Csak egy dolgot tehetsz: elmosogatod az edényeket és megmented a nyaraló helyet. Jobb lesz ha találsz egy szappant és tisztára mosod a piszkot. Jó sok szappan fog kelleni...",
     "questAtom1CollectSoapBars": "Szappanok",
@@ -140,19 +140,19 @@
     "questAtom3Notes": "Fülsiketítő sikoltással és a szájából öt fajta íncsiklandozó sajttal hullva a Zabaszörny darabokra esik. \"HOGY MERÉSZELITEK!\" - hallotok egy vízfelszín alól jövő kiáltást. Egy köpenyes, kék alak jön ki a vízből, kezében egy varázslatos vécékefével. Szennyes ruhák kezdenek felúszni a tó felszínére. \"Én vagyok a Szennyesmágus\" - jelenti be mérgesen. \"Van képetek elmosni az örömtelien mosatlan tányérjaimat, elpusztítani a háziállatomat és belépni a birodalmamba ilyen tiszta ruhákban. Készüljetek a tiszta ruhák elleni mágiam átázott haragját megismerni!\"",
     "questAtom3Completion": "Legyőztétek a kőszívű Mosómágust! Frissen mosott ruhák esnek le körülöttetek halmokban. Minden sokkal szebben néz ki a környéken. Ahogy átgázolsz a frissen sajtolt páncélon, fém csillogására leszel figyelmes és egy ragyogó sisakot veszel észre. Habár nem ismered eme csillogó tárgy eredeti tulajdonosát, de ahogy felveszed, érzed egy nagylelkű lélek melengető jelenlétét. Kár, hogy nem varrták rá a tulajdonosa nevét.",
     "questAtom3Boss": "A Mosómágus",
-    "questAtom3DropPotion": "Base Hatching Potion",
+    "questAtom3DropPotion": "Alap keltetőfőzet",
     "questOwlText": "Az éjjeli bagoly",
     "questOwlNotes": "The Tavern light is lit 'til dawn <br>Until one eve the glow is gone!<br>How can we see for our all-nighters?<br>@Twitching cries, \"I need some fighters!<br>See that Night-Owl, starry foe?<br>Fight with haste and do not slow!<br>We'll drive its shadow from our door,<br>And make the night shine bright once more!\"",
     "questOwlCompletion": "The Night-Owl fades before the dawn,<br>But even so, you feel a yawn.<br>Perhaps it's time to get some rest?<br>Then on your bed, you see a nest!<br>A Night-Owl knows it can be great<br>To finish work and stay up late,<br>But your new pets will softly peep<br>To tell you when it's time to sleep.",
     "questOwlBoss": "Az éjjeli bagoly",
     "questOwlDropOwlEgg": "Bagoly (tojás)",
-    "questOwlUnlockText": "Unlocks purchasable owl eggs in the Market",
+    "questOwlUnlockText": "Elérhetővé teszi a bagoly-tojások vásárlását a piacon",
     "questPenguinText": "A Baromfi Hideg",
     "questPenguinNotes": "Habár egy forró nyári nap van Habitica legdélebbi csücskében, egy természetellenes fagy ereszkedett a Tóra. Erős, hideg szelek tombolnak, ahogy a part elkezd befagyni. Jégcsapok szögellnek ki a talajból, arrébb nyomva a füvet és a földet. @Melynnrose és @Breadstrings odaszalad hozzád.<br><br>\"Segíts!\" mondja @Melynnrose. \"Idehoztunk egy óriási pingvint, hogy befagyassza a tavat, hogy korcsolyázhassunk rajta, de elfogyott a halunk, amivel etethetjük!\"<br><br>\"Mérges lett és fagyos leheletével befagyaszt mindent amit lát!!\" mondja @Breadstrings. \"Kérlek, győzd le ezt a pingvint, mielőtt mindnyájunkat beborít jéggel!\" Úgy néz ki, hogy... <em>le kell hűtened</em> ezt a pingvint.",
     "questPenguinCompletion": "A pingvin legyőzésével elolvadt a jég is. Az óriás pingvin lenyugszik a napsütésben és elszürcsöl egy extra vödör halat, amit találtál. Arrébb korcsolyázik a tavon, finoman maga elé fújva, hogy sima, szikrázó jeget hozzon létre maga előtt. Milyen fura madár! \"Úgy tűnik, hogy egy pár tojást hátrahagyatott\" mondja @Painter de Cluster. <br><br>@Rattify felnevet. \"Talán majd ezek a pingvinek egy kicsit... higgadtabbak lesznek?\"",
     "questPenguinBoss": "Fagypingvin",
     "questPenguinDropPenguinEgg": "Pingvin (tojás)",
-    "questPenguinUnlockText": "Unlocks purchasable penguin eggs in the Market",
+    "questPenguinUnlockText": "Elérhetővé teszi a pingvinalakú-tojások vásárlását a piacon",
     "questStressbeastText": "A Stoïkalm Sztyeppék Utálatos Stresszörnye",
     "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.<br><br>~*~<br><br>The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.<br><br>We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.<br><br>\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"<br><br>\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.<br><br>\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"<br><br>There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...",
     "questStressbeastBoss": "Az Utálatos Stresszörny",
@@ -178,43 +178,43 @@
     "questTRexUndeadRageDescription": "Ez a csík akkor töltődik ha nem csinálod meg a Napi feladataidat. Ha megtelik, a Csontos Tirannoszaur a még meglévő életerejének 30%-ával felgyógyítja magát.",
     "questTRexUndeadRageEffect": "`A Csontos Tirannoszaur a CSONTVÁZ GYÓGYÍTÁST használja!`\n\nA szörny egy földöntúli üvöltést hallat, és néhány sérült, törött csontja újra összeforr!",
     "questTRexDropTRexEgg": "Tirannoszaur (tojás)",
-    "questTRexUnlockText": "Unlocks purchasable tyrannosaur eggs in the Market",
+    "questTRexUnlockText": "Elérhetővé teszi a tyrannosaurus-tojások vásárlását a piacon",
     "questRockText": "Menekülés a barlangszörny elől",
     "questRockNotes": "Néhány barátoddal Habitica Kanyargós Hegyein keresztül utazva tábort vertek egy éjszaka egy gyönyörű barlangban, ami csillogó ásványokkal van csipkézve. De amikor másnap reggel felébredtek, a bejárat eltűnt és talaj a lábatok alatt megmozdul.  <br><br>\"A hegy él!\" kiabálja a társatok @pfeffernusse. \"Ezek nem kristályok - hanem fogak!\"<br><br>@Painter de Cluster elkapja a kezed. \"Találnunk kell egy másik kivezető utat - maradj velem és ne vonja el semmi a figyelmed, mert különben örökké itt ragadhatunk!\"",
     "questRockBoss": "Kristálykolosszus",
     "questRockCompletion": "A gondosságotok lehetővé tette, hogy egy biztonságos utat találjatok ami az élő hegyen keresztülvezet. A napsütésben állva a barátod @intune valami csillogót vesz észre a földön a barlang kijáratánál. Megálltok, hogy felvegyétek és látjátok, hogy ez egy kicsi kő, amin arany fut keresztül. Mellette több más fölöttébb furcsa alakú követ találtok. Majdnem úgy néznek ki, mint... a tojások?",
-    "questRockDropRockEgg": "Rock (Egg)",
-    "questRockUnlockText": "Unlocks purchasable rock eggs in the Market",
-    "questBunnyText": "The Killer Bunny",
+    "questRockDropRockEgg": "Kő (tojás)",
+    "questRockUnlockText": "Elérhetővé teszi a kő-tojások vásárlását a piacon.",
+    "questBunnyText": "A Gyilkos Nyuszi",
     "questBunnyNotes": "After many difficult days, you reach the peak of Mount Procrastination and stand before the imposing doors of the Fortress of Neglect. You read the inscription in the stone. \"Inside resides the creature that embodies your greatest fears, the reason for your inaction. Knock and face your demon!\" You tremble, imagining the horror within and feel the urge to flee as you have done so many times before. @Draayder holds you back. \"Steady, my friend! The time has come at last. You must do this!\"<br><br>You knock and the doors swing inward. From within the gloom you hear a deafening roar, and you draw your weapon.",
-    "questBunnyBoss": "Killer Bunny",
+    "questBunnyBoss": "Gyilkos Nyuszi",
     "questBunnyCompletion": "With one final blow the killer rabbit sinks to the ground. A sparkly mist rises from her body as she shrinks down into a tiny bunny... nothing like the cruel beast you faced a moment before. Her nose twitches adorably and she hops away, leaving some eggs behind. @Gully laughs. \"Mount Procrastination has a way of making even the smallest challenges seem insurmountable. Let's gather these eggs and head for home.\"",
-    "questBunnyDropBunnyEgg": "Bunny (Egg)",
-    "questBunnyUnlockText": "Unlocks purchasable bunny eggs in the Market",
+    "questBunnyDropBunnyEgg": "Nyuszi (tojás)",
+    "questBunnyUnlockText": "Elérhetővé teszi az nyuszi-tojások vásárlását a piacon",
     "questSlimeText": "The Jelly Regent",
     "questSlimeNotes": "As you work on your tasks, you notice you are moving slower and slower. \"It's like walking through molasses,\" @Leephon grumbles. \"No, like walking through jelly!\" @starsystemic says. \"That slimy Jelly Regent has slathered his stuff all over Habitica. It's gumming up the works. Everybody is slowing down.\" You look around. The streets are slowly filling with clear, colorful ooze, and Habiticans are struggling to get anything done. As others flee the area, you grab a mop and prepare for battle!",
     "questSlimeBoss": "Jelly Regent",
     "questSlimeCompletion": "With a final jab, you trap the Jelly Regent in an over-sized donut, rushed in by @Overomega, @LordDarkly, and @Shaner, the quick-thinking leaders of the pastry club. As everyone is patting you on the back, you feel someone slip something into your pocket. It’s the reward for your sweet success: three Marshmallow Slime eggs.",
-    "questSlimeDropSlimeEgg": "Marshmallow Slime (Egg)",
+    "questSlimeDropSlimeEgg": "Nyálkás Mályvacukor (tojás)",
     "questSlimeUnlockText": "Unlocks purchasable slime eggs in the Market",
     "questSheepText": "The Thunder Ram",
     "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
     "questSheepBoss": "Thunder Ram",
     "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
-    "questSheepDropSheepEgg": "Sheep (Egg)",
-    "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market",
+    "questSheepDropSheepEgg": "Bárány (tojás)",
+    "questSheepUnlockText": "Elérhetővé teszi a bárány-tojások vásárlását a piacon",
     "questKrakenText": "The Kraken of Inkomplete",
     "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...<br><br>Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.<br><br>\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"",
     "questKrakenBoss": "The Kraken of Inkomplete",
     "questKrakenCompletion": "As the Kraken flees, several eggs float to the surface of the water. Lemoness examines them, and her suspicion turns to delight. \"Cuttlefish eggs!\" she says. \"Here, take them as a reward for everything you've completed.\"",
-    "questKrakenDropCuttlefishEgg": "Cuttlefish (Egg)",
-    "questKrakenUnlockText": "Unlocks purchasable cuttlefish eggs in the Market",
+    "questKrakenDropCuttlefishEgg": "Tintahal (tojás)",
+    "questKrakenUnlockText": "Elérhetővé teszi a tintahal-tojások vásárlását a piacon",
     "questWhaleText": "Wail of the Whale",
     "questWhaleNotes": "You arrive at the Diligent Docks, hoping to take a submarine to watch the Dilatory Derby. Suddenly, a deafening bellow forces you to stop and cover your ears. \"Thar she blows!\" cries Captain @krazjega, pointing to a huge, wailing whale. \"It's not safe to send out the submarines while she's thrashing around!\"<br><br>\"Quick,\" calls @UncommonCriminal. \"Help me calm the poor creature so we can figure out why she's making all this noise!\"",
     "questWhaleBoss": "Wailing Whale",
     "questWhaleCompletion": "After much hard work, the whale finally ceases her thunderous cry. \"Looks like she was drowning in waves of negative habits,\" @zoebeagle explains. \"Thanks to your consistent effort, we were able to turn the tides!\" As you step into the submarine, several whale eggs bob towards you, and you scoop them up.",
-    "questWhaleDropWhaleEgg": "Whale (Egg)",
-    "questWhaleUnlockText": "Unlocks purchasable whale eggs in the Market",
+    "questWhaleDropWhaleEgg": "Bálna (tojás)",
+    "questWhaleUnlockText": "Elérhetővé teszi a bálna-tojások vásárlását a piacon",
     "questDilatoryDistress1Text": "Dilatory Distress, Part 1: Message in a Bottle",
     "questDilatoryDistress1Notes": "A message in a bottle arrived from the newly rebuilt city of Dilatory! It reads: \"Dear Habiticans, we need your help once again. Our princess has disappeared and the city is under siege by some unknown watery demons! The mantis shrimps are holding the attackers at bay. Please aid us!\" To make the long journey to the sunken city, one must be able to breathe water. Fortunately, the alchemists @Benga and @hazel can make it all possible! You only have to find the proper ingredients.",
     "questDilatoryDistress1Completion": "You don the the finned armor and swim to Dilatory as quickly as you can. The merfolk and their mantis shrimp allies have managed to keep the monsters outside the city for the moment, but they are losing. No sooner are you within the castle walls than the horrifying siege descends!",
@@ -228,27 +228,27 @@
     "questDilatoryDistress2RageTitle": "Swarm Respawn",
     "questDilatoryDistress2RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Water Skull Swarm will heal 30% of its remaining health!",
     "questDilatoryDistress2RageEffect": "`Water Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!",
-    "questDilatoryDistress2DropSkeletonPotion": "Skeleton Hatching Potion",
-    "questDilatoryDistress2DropCottonCandyBluePotion": "Cotton Candy Blue Hatching Potion",
+    "questDilatoryDistress2DropSkeletonPotion": "Csontváz keltetőfőzet",
+    "questDilatoryDistress2DropCottonCandyBluePotion": "Kék vattacukor keltetőfőzet",
     "questDilatoryDistress2DropHeadgear": "Fire Coral Circlet (Headgear)",
     "questDilatoryDistress3Text": "Dilatory Distress, Part 3: Not a Mere Maid",
     "questDilatoryDistress3Notes": "You follow the mantis shrimps deep into the Crevasse, and discover an underwater fortress. Princess Adva, escorted by more watery skulls, awaits you inside the main hall. \"My father has sent you, has he not? Tell him I refuse to return. I am content to stay here and practice my sorcery. Leave now, or you shall feel the wrath of the ocean's new queen!\" Adva seems very adamant, but as she speaks you notice a strange, ruby pendant on her neck glowing ominously... Perhaps her delusions would cease should you break it?",
     "questDilatoryDistress3Completion": "Finally, you manage to pull the bewitched pendant from Adva's neck and throw it away. Adva clutches her head. \"Where am I? What happened here?\" After hearing your story, she frowns. \"This necklace was given to me by a strange ambassador - a lady called 'Tzina'. I don't remember anything after that!\"<br><br>Back at Dilatory, Manta is overjoyed by your success. \"Allow me to reward you with this trident and shield! I ordered them from @aiseant and @starsystemic as a gift for Adva, but... I'd rather not put weapons in her hands any time soon.\"",
     "questDilatoryDistress3Boss": "Adva, the Usurping Mermaid",
-    "questDilatoryDistress3DropFish": "Fish (Food)",
+    "questDilatoryDistress3DropFish": "Hal (étel)",
     "questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)",
     "questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)",
     "questCheetahText": "Such a Cheetah",
     "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!",
     "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"",
-    "questCheetahBoss": "Cheetah",
-    "questCheetahDropCheetahEgg": "Cheetah (Egg)",
-    "questCheetahUnlockText": "Unlocks purchasable Cheetah eggs in the Market",
+    "questCheetahBoss": "Gepárd",
+    "questCheetahDropCheetahEgg": "Gepárd (tojás)",
+    "questCheetahUnlockText": "Elérhetővé teszi a gepárd-tojások vásárlását a piacon",
     "questHorseText": "Ride the Night-Mare",
     "questHorseNotes": "While relaxing in the Tavern with @beffymaroo and @JessicaChase, the talk turns to good-natured boasting about your adventuring accomplishments. Proud of your deeds, and perhaps getting a bit carried away, you brag that you can tame any task around. A nearby stranger turns toward you and smiles. One eye twinkles as he invites you to prove your claim by riding his horse.\nAs you all head for the stables, @UncommonCriminal whispers, \"You may have bitten off more than you can chew. That's no horse - that's a Night-Mare!\" Looking at its stamping hooves, you begin to regret your words...",
     "questHorseCompletion": "It takes all your skill, but finally the horse stamps a couple of hooves and nuzzles you in the shoulder before allowing you to mount. You ride briefly but proudly around the Tavern grounds while your friends cheer. The stranger breaks into a broad grin.\n\"I can see that was no idle boast! Your determination is truly impressive. Take these eggs to raise horses of your own, and perhaps we'll meet again one day.\" You take the eggs, the stranger tips his hat... and vanishes.",
     "questHorseBoss": "Night-Mare",
-    "questHorseDropHorseEgg": "Horse (Egg)",
+    "questHorseDropHorseEgg": "Ló (tojás)",
     "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market",
     "questBurnoutText": "Burnout and the Exhaust Spirits",
     "questBurnoutNotes": "It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. \"We need to evacuate all the wooden buildings!\" Redphoenix shouts. \"Hurry!\"<br><br>Kiwibot grips the wall as she catches her breath. \"It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!\"<br><br>\"'It'?'\" asks Lemoness.<br><br>And then the heat takes form.<br><br>It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.<br><br> Kiwibot whispers a single word.<br><br><em>\"Burnout.\"</em>",
@@ -265,21 +265,21 @@
     "questFrogText": "Swamp of the Clutter Frog",
     "questFrogNotes": "As you and your friends are slogging through the Swamps of Stagnation, @starsystemic points at a large sign. \"Stay on the path -- if you can.\"<br><br>\"Surely that isn't hard!\" @RosemonkeyCT says. \"It's broad and clear.\"<br><br>But as you continue, you notice that path is gradually overtaken by the muck of the swamp, laced with bits of strange blue debris and clutter, until it's impossible to proceed.<br><br>As you look around, wondering how it got this messy, @Jon Arjinborn shouts, \"Look out!\" An angry frog leaps from the sludge, clad in dirty laundry and lit by blue fire. You will have to overcome this poisonous Clutter Frog to progress!",
     "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.<br><br>Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"",
-    "questFrogBoss": "Clutter Frog",
-    "questFrogDropFrogEgg": "Frog (Egg)",
-    "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market",
+    "questFrogBoss": "Zűrzavar Béka",
+    "questFrogDropFrogEgg": "Béka (tojás)",
+    "questFrogUnlockText": "Elérhetővé teszi a béka-tojások vásárlását a piacon",
     "questSnakeText": "The Serpent of Distraction",
     "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?",
     "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.",
     "questSnakeBoss": "Serpent of Distraction",
-    "questSnakeDropSnakeEgg": "Snake (Egg)",
-    "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market",
+    "questSnakeDropSnakeEgg": "Kígyó (tojás)",
+    "questSnakeUnlockText": "Elérhetővé teszi a kígyó-tojások vásárlását a piacon",
     "questUnicornText": "Convincing the Unicorn Queen",
     "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"",
     "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.",
     "questUnicornBoss": "The Unicorn Queen",
-    "questUnicornDropUnicornEgg": "Unicorn (Egg)",
-    "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market",
+    "questUnicornDropUnicornEgg": "Egyszarvú (tojás)",
+    "questUnicornUnlockText": "Elérhetővé teszi az egyszarvú-tojások vásárlását a piacon.",
     "questSabretoothText": "The Sabre Cat",
     "questSabretoothNotes": "A roaring monster is terrorizing Habitica! The creature stalks through the wilds and woods, then bursts forth to attack before vanishing again. It's been hunting innocent pandas and frightening the flying pigs into fleeing their pens to roost in the trees. @Inventrix and @icefelis explain that the Zombie Sabre Cat was set free while they were excavating in the ancient, untouched ice-fields of the Stoikalm Steppes. \"It was perfectly friendly at first – I don't know what happened. Please, you have to help us recapture it! Only a champion of Habitica can subdue this prehistoric beast!\"",
     "questSabretoothCompletion": "After a long and tiring battle, you wrestle the Zombie Sabre Cat to the ground. As you are finally able to approach, you notice a nasty cavity in one of its sabre teeth. Realising the true cause of the cat's wrath, you're able to get the cavity filled by @Fandekasp, and advise everyone to avoid feeding their friend sweets in future. The Sabre Cat flourishes, and in gratitude, its tamers send you a generous reward – a clutch of sabretooth eggs!",
@@ -290,6 +290,12 @@
     "questMonkeyNotes": "The Sloensteadi Savannah is being torn apart by the Monstrous Mandrill and his Mischief Monkeys! They shriek loudly enough to drown out the sound of approaching deadlines, encouraging everyone to avoid their duties and keep monkeying around. Alas, plenty of people ape this bad behavior. If no one stops these primates, soon everyone's tasks will be as red as the Monstrous Mandrill's face!<br><br>\"It will take a dedicated adventurer to resist them,\" says @yamato.<br><br>\"Quick, let's get this monkey off everyone's backs!\" @Oneironaut yells, and you charge into battle.",
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
-    "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyDropMonkeyEgg": "Majom (tojás)",
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/it/backgrounds.json b/common/locales/it/backgrounds.json
index 396038a84f..735f4d1ca3 100644
--- a/common/locales/it/backgrounds.json
+++ b/common/locales/it/backgrounds.json
@@ -143,15 +143,15 @@
     "backgrounds022016": "SERIE 21: Febbraio 2016",
     "backgroundBambooForestText": "Foresta di bambù",
     "backgroundBambooForestNotes": "Passeggia attraverso una foresta di bambù.",
-    "backgroundCozyLibraryText": "Biblioteca accogliente",
-    "backgroundCozyLibraryNotes": "Leggi nella biblioteca accogliente",
+    "backgroundCozyLibraryText": "Biblioteca",
+    "backgroundCozyLibraryNotes": "Leggi in un'accogliente biblioteca.",
     "backgroundGrandStaircaseText": "Grande Scalone",
     "backgroundGrandStaircaseNotes": "Discendi il Grande Scalone",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "SERIE 22: Marzo 2016",
+    "backgroundDeepMineText": "Miniera Profonda",
+    "backgroundDeepMineNotes": "Trova metalli preziosi in una profonda miniera.",
+    "backgroundRainforestText": "Foresta Pluviale",
+    "backgroundRainforestNotes": "Avventurati in una foresta pluviale.",
+    "backgroundStoneCircleText": "Cerchio di Pietre",
+    "backgroundStoneCircleNotes": "Lancia incantesimi all'interno di un Cerchio di Pietre."
 }
\ No newline at end of file
diff --git a/common/locales/it/character.json b/common/locales/it/character.json
index e77b3a6665..adbe81957a 100644
--- a/common/locales/it/character.json
+++ b/common/locales/it/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Statistiche e medaglie",
     "profile": "Profilo",
-    "avatar": "Customize Avatar",
+    "avatar": "Personalizza Avatar",
     "other": "Altro",
     "fullName": "Nome completo",
     "displayName": "Nome mostrato",
@@ -83,7 +83,7 @@
     "allocateInt": "Punti assegnati a Intelligenza:",
     "allocateIntPop": "Aggiungi un punto a Intelligenza (INT)",
     "noMoreAllocate": "Ora che hai raggiunto il livello 100, non guadagnerai altri Punti Attributo. Puoi continuare a salire di livello, o iniziare una nuova avventura dal livello 1 usando la <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Sfera della Rinascita</a>, ora disponibile gratuitamente nel Mercato.",
-    "stats": "Avatar Stats",
+    "stats": "Statistiche Avatar",
     "strength": "Forza",
     "strengthText": "L'attributo Forza aumenta la probabilità di sferrare \"colpi critici\", aumentando l'oro, l'esperienza e la probabilità di drop che potrai guadagnare grazie ad essi. In più, permette di arrecare maggiori danni ai boss delle missioni.",
     "constitution": "Costituzione",
@@ -136,7 +136,7 @@
     "respawn": "Risorgi!",
     "youDied": "Sei morto!",
     "dieText": "Hai perso un livello, tutto il tuo oro, e un pezzo casuale dell'equipaggiamento. Risorgi, Habiteer, e provaci ancora! Metti un freno alle cattive abitudini, sii attento al completamento delle Daily, e tieni la morte a debita distanza con una Pozione di Salute se stai vacillando!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Sei sicuro? Questo resetterà la classe e i punti allocati del tuo personaggio (ti verranno ridati per poter essere ri-allocati), e ti costerà 3 gemme.",
     "purchaseFor": "Comprare per <%= cost %> Gemme?",
     "notEnoughMana": "Non hai abbastanza Mana.",
     "invalidTarget": "Bersaglio non valido",
diff --git a/common/locales/it/communityguidelines.json b/common/locales/it/communityguidelines.json
index 8c29bd7350..e32a32da9d 100644
--- a/common/locales/it/communityguidelines.json
+++ b/common/locales/it/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In una community grande come Habitica, gli utenti vanno e vengono, e alcune volte un moderatore necessita di riporre il nobile mantello in soffitta e rilassarsi. Sono chiamati moderatori emeriti. Non hanno più i poteri di moderatore, ma dovremmo tutti quanti portare loro rispetto per il lavoro che hanno svolto!",
     "commGuidePara014": "Moderatori emeriti:",
     "commGuideHeadingPublicSpaces": "Spazi pubblici in Habitica",
-    "commGuidePara015": "Habitica dispone di due tipi di spazi sociali: pubblici e privati. Gli spazi pubblici includono la Taverna, le Gilde pubbliche, GitHub, Trello e la Wiki. Gli spazi privati sono le Gilde private, la chat di squadra e i messaggi privati.",
+    "commGuidePara015": "Habitica dispone di due tipi di spazi sociali: pubblico e privato. Gli spazi pubblici comprendono la Taverna, le Gilde Pubbliche, GitHub, Trello e la Wiki. Gli spazi privati sono le Gilde Private, la chat di squadra e i Messaggi Privati. Tutti i Nomi Mostrati devono rispettare le linee guida per gli spazi pubblici. Per cambiare il tuo Nome Mostrato, vai nel sito su Utente > Profilo e clicca sul pulsante \"Modifica\".",
     "commGuidePara016": "Quando navighi negli spazi pubblici di Habitica, ci sono delle regole generali che bisogna rispettare per mantenere tutti felici e al sicuro. Dovrebbero essere semplici per un avventuriero come te!",
     "commGuidePara017": "<strong>Rispettarsi a vicenda.</strong> Sii cortese, gentile, amichevole e disposto ad aiutare. Ricorda: gli Habitichesi hanno trascorsi diversi e possono quindi avere esperienze molto divergenti. Questo è parte di ciò che rende Habitica così speciale! Costruire una comunità significa rispettarsi ed esaltare le nostre differenze così come le nostre similitudini. Di seguito potrai trovare alcuni consigli per rispettare gli altri ed essere rispettati:",
     "commGuideList02A": "<strong>Obbedisci ai Termini e Condizioni di utilizzo.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Rispetta sempre le richieste dei Moderatori</strong> sulla conclusione di una discussione o il suo spostamento nella sezione off-topic (Back Corner). Ogni eventuale chiarimento conclusivo o disaccordo dovrebbe essere discusso (cortesemente) sul \"tavolo\" nella sezione off-topic, se concesso.",
     "commGuideList02G": "<strong>Rifletti prima di dare una risposta \"arrabbiata\"</strong> se qualcuno ti dice che qualcosa che hai detto o fatto lo mette a disagio. C'è una grande forza nel sapersi scusare sinceramente con qualcuno. Se senti che il modo in cui ti hanno risposto è inappropriato, contatta un moderatore invece che arrabbiarti e rispondere male pubblicamente.",
     "commGuideList02H": "<strong>Conversazioni contenziose/inappropriate devono essere riportate ai moderatori.</strong> Se ti sembra che una conversazione stia diventando inappropriata, eccessivamente emotiva o dolorosa, bisogna fermarla. Invia un'email a <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> per farci sapere dell'accaduto. E' nostro compito farti sentire al sicuro,",
-    "commGuideList02I": "<strong>Non pubblicare spam.</strong> Lo spam può includere, ma non è limitato a: postare lo stesso commento o domanda in posti diversi, postare link senza contesto o spiegazione, postare messaggi senza senso, o postare molti messaggi consecutivamente. Anche elemosinare continuamente gemme o abbonamenti è considerato spam.",
-    "commGuidePara019": "<strong>Negli spazi privati</strong> gli utenti hanno più libertà di discutere qualunque argomento vogliano, ma devono comunque fare attenzione a non violare i Termini e Condizioni, evitando inoltre post discriminatori, violenti o con contenuti minacciosi.",
+    "commGuideList02I": "<strong>Non pubblicare spam.</strong> Lo spam può includere, ma non essere limitato a: postare lo stesso commento o domanda in più luoghi diversi, postare link senza una spiegazione o un contesto, postare messaggi senza senso o postare molti messaggi uno dopo l'altro. Anche chiedere gemme o un abbonamento in una qualsiasi delle chat o per Messaggio Privato è considerato spam.",
+    "commGuidePara019": "<strong>Negli spazi privati,</strong> gli utenti hanno più libertà per discutere di qualunque argomento vogliano, ma devono comunque fare attenzione a non violare i Termini e Condizioni, inclusi post dal contenuto discriminatorio, violento o minaccioso. Inoltre, poiché i nomi delle Sfide appaiono nel profilo pubblico del vincitore, TUTTI i nomi delle Sfide devono rispettare le linee guida per gli spazi pubblici, anche se appaiono in uno spazio privato.",
     "commGuidePara020": "I Messaggi Privati (MP) hanno alcune linee guida aggiuntive. Se qualcuno ti ha bloccato, non contattarli da qualche altra parte per chiedergli di sbloccarti. Inoltre, non dovresti mandare un MP a qualcuno che richiede assistenza (dato che le risposte pubbliche alle richieste di assistenza sono utili a tutta la community). Infine, non mandare a nessuno un MP pregandolo di regalarti gemme o un abbonamento, questo può essere considerato spam.",
     "commGuidePara021": "Inoltre, alcuni spazi pubblici in Habitica hanno delle linee guida specifiche.",
     "commGuideHeadingTavern": "Taverna",
diff --git a/common/locales/it/content.json b/common/locales/it/content.json
index a1edd06a3f..70c07be561 100644
--- a/common/locales/it/content.json
+++ b/common/locales/it/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "uno spinoso",
     "dropEggBearCubText": "Cucciolo di Orso",
     "dropEggBearCubMountText": "Orso",
-    "dropEggBearCubAdjective": "un grazioso",
+    "dropEggBearCubAdjective": "un coraggioso",
     "questEggGryphonText": "Grifone",
     "questEggGryphonMountText": "Grifone",
     "questEggGryphonAdjective": "un maestoso",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "un colorato",
     "questEggRatText": "Ratto",
     "questEggRatMountText": "Ratto",
-    "questEggRatAdjective": "uno sporco",
+    "questEggRatAdjective": "un socievole",
     "questEggOctopusText": "Polpo",
     "questEggOctopusMountText": "Polpo",
     "questEggOctopusAdjective": "un viscido",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Scimmia",
     "questEggMonkeyMountText": "Scimmia",
     "questEggMonkeyAdjective": "una dispettosa",
+    "questEggSnailText": "Chiocciola",
+    "questEggSnailMountText": "Chiocciola",
+    "questEggSnailAdjective": "un lento ma costante",
     "eggNotes": "Trova una pozione per far schiudere questo uovo, e nascerà <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Base",
     "hatchingPotionWhite": "Bianco",
diff --git a/common/locales/it/contrib.json b/common/locales/it/contrib.json
index f9da5b9eb6..b2069b4a6e 100644
--- a/common/locales/it/contrib.json
+++ b/common/locales/it/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Ha aiutato Habit a crescere",
     "helpedText1": "Ha aiutato Habitica a crescere, compilando",
     "helpedText2": "questo sondaggio.",
-    "hall": "Hall of Heroes",
+    "hall": "Salone degli Eroi",
     "contribTitle": "Titolo onorifico (per esempio \"Fabbro\")",
     "contribLevel": "Livello di contribuzione",
     "contribHallText": "Dall'1 al 7 per i sostenitori normali, 8 per i moderatori, 9 per lo staff. Questo determina quali oggetti, animali e cavalcature sono disponibili, nonché il colore dell'etichetta del nome. Ai gradi 8 e 9 viene automaticamente attribuito lo status di admin (amministratore).",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Salone dei Collaboratori",
     "hallPatrons": "Salone dei Mecenati",
     "rewardUser": "Premia utente",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Le Gilde sono gruppi di chat per persone con interessi comuni, create dai giocatori per i giocatori. Scorri la lista ed unisciti alle gilde che ti interessano!",
     "blurbChallenges": "Le Sfide sono create dagli utenti. Unirsi a una sfida aggiungerà degli elementi nella tua pagina delle attività. Vincere una sfida ti conferirà una medaglia e spesso un premio in Gemme!",
     "blurbHallPatrons": "Questo è il salone dei Mecenati, nel quale vengono onorati i nobili avventurieri che hanno sostenuto la nostra campagna su Kickstarter. Li ringraziamo per aver aiutato a far nascere Habitica!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Questo è il Salone dei Collaboratori, dove coloro che hanno contribuito ad Habitica sono onorati. Che sia attraverso programmazione, arte, musica, scrittura, o anche solo disponibilità, hanno guadagnato <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gemme, equipaggiamento esclusivo</a>, e <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>titoli prestigiosi</a>. Anche tu puoi contribuire ad Habitica! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Scopri di più qui. </a>"
 }
\ No newline at end of file
diff --git a/common/locales/it/gear.json b/common/locales/it/gear.json
index b4f4167588..1f26bd4725 100644
--- a/common/locales/it/gear.json
+++ b/common/locales/it/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "arma",
     "weaponBase0Text": "Nessuna arma",
     "weaponBase0Notes": "Non sei armato.",
@@ -69,7 +70,7 @@
     "weaponSpecialCriticalText": "Critico Martello Distruggi-Bug",
     "weaponSpecialCriticalNotes": "Questo campione ha annientato un pericoloso nemico su Github, dove molti guerrieri sono caduti. Adornato con le ossa del Bug, questo martello garantisce poderosi colpi critici. Aumenta la Forza e la Percezione di <%= attrs %>.",
     "weaponSpecialTridentOfCrashingTidesText": "Tridente delle Maree Fragorose",
-    "weaponSpecialTridentOfCrashingTidesNotes": "Concede l'abilità di comandare i pesci, e inoltre colpisce con forza le tue attività. Aumenta l'intelligenza di <%= int %>.",
+    "weaponSpecialTridentOfCrashingTidesNotes": "Conferisce l'abilità di comandare i pesci, e inoltre colpisce con forza le tue attività. Aumenta l'Intelligenza di <%= int %>.",
     "weaponSpecialYetiText": "Lancia dell'Addestra-Yeti",
     "weaponSpecialYetiNotes": "Questa lancia ti permette di domare gli yeti! Aumenta la Forza di <%= str %>. Edizione limitata, inverno 2013-2014.",
     "weaponSpecialSkiText": "Asta del Nevassassino",
@@ -155,7 +156,7 @@
     "weaponArmoireLunarSceptreText": "Scettro Lunare Lenitivo",
     "weaponArmoireLunarSceptreNotes": "Il potere curativo di questa bacchetta cresce e diminuisce. Aumenta la Costituzione di <%= con %> e l'Intelligenza di <%= int %>. Baule Incantato: Set Luna Lenitiva (Oggetto 3 di 3)",
     "weaponArmoireRancherLassoText": "Lazzo da Cowboy",
-    "weaponArmoireRancherLassoNotes": "Lazzo: lo strumento ideale per radunare e raccogliere. Aumenta la Forza di <%= str %>, la Percezione di <%= per %> e l'Intelligenza di <%= int %>. Baule Incantato: Set del Ranch (Oggetto 3 di 3)",
+    "weaponArmoireRancherLassoNotes": "Lazzo: lo strumento ideale per radunare e raccogliere. Aumenta la Forza di <%= str %>, la Percezione di <%= per %> e l'Intelligenza di <%= int %>. Baule Incantato: Set del Cowboy (Oggetto 3 di 3).",
     "weaponArmoireMythmakerSwordText": "Spada del Costruttore di Leggende",
     "weaponArmoireMythmakerSwordNotes": "Nonostante possa sembrare umile, questa spada ha forgiato numerosi eroi mitici. Aumenta la Percezione e la Forza di <%= attrs %> ciascuna. Baule Incantato: Set della Toga Dorata (Oggetto 3 di 3).",
     "weaponArmoireIronCrookText": "Uncino di Ferro",
@@ -169,15 +170,15 @@
     "weaponArmoireCrystalCrescentStaffText": "Bastone della Mezzaluna di Cristallo",
     "weaponArmoireCrystalCrescentStaffNotes": "Evoca il potere della luna crescente con questo splendente bastone! Aumenta l'Intelligenza e la Forza di <%= attrs %> ciascuna. Baule Incantato: Set della Mezzaluna di Cristallo (Oggetto 3 di 3).",
     "weaponArmoireBlueLongbowText": "Arco Lungo Blu",
-    "weaponArmoireBlueLongbowNotes": "Pronti... Mirare... Fuoco! Questo arco ha un grande raggio d'azione. Aumenta la Percezione di <%= per %>, la Costituzione di <%= con %> e la Forza di <%= str %>. Scrigno Incantato: oggetto indipendente.",
+    "weaponArmoireBlueLongbowNotes": "Pronti... Mirare... Fuoco! Questo arco ha un grande raggio d'azione. Aumenta la Percezione di <%= per %>, la Costituzione di <%= con %> e la Forza di <%= str %>. Baule Incantato: Oggetto indipendente.",
     "weaponArmoireGlowingSpearText": "Lancia Iridescente",
-    "weaponArmoireGlowingSpearNotes": "Questa lancia ipnotizza i compiti selvaggi, così tu puoi attaccarli. IAccresce la Forza di <%= str %>. Armatura Incantata: Oggetto indipendente",
+    "weaponArmoireGlowingSpearNotes": "Questa lancia ipnotizza i compiti selvaggi, così tu puoi attaccarli. Aumenta la Forza di <%= str %>. Baule Incantato: Oggetto indipendente.",
     "weaponArmoireBarristerGavelText": "Martelletto del Magistrato",
-    "weaponArmoireBarristerGavelNotes": "Ordine! Accresce la Forza e la Costituzione di <%= attrs %> ognuna. Armatura incantata del Magistrato. (3 di 3)",
+    "weaponArmoireBarristerGavelNotes": "Ordine! Aumenta la Forza e la Costituzione di <%= attrs %> ognuna. Baule Incantato: Set del Magistrato (Oggetto 3 di 3).",
     "weaponArmoireJesterBatonText": "Bastone del Giullare",
-    "weaponArmoireJesterBatonNotes": "Con una mossa del tuo bastone e qualche replica arguta, anche le situazioni più complicate diventano chiare. Accresce l'Intelligenza e la Percezione di <%= attrs %> ognuna. Armatura incantata del Giullare. (3 di 3)",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireJesterBatonNotes": "Con un movimento del tuo bastone e qualche replica arguta, anche le situazioni più complicate diventano chiare. Aumenta l'Intelligenza e la Percezione di <%= attrs %> ognuna. Baule Incantato: Set del Giullare (Oggetto 3 di 3).",
+    "weaponArmoireMiningPickaxText": "Piccone da Minatore",
+    "weaponArmoireMiningPickaxNotes": "Estrai quanto più oro possibile dalle tue attività! Aumenta la Percezione di <%= per %>. Baule Incantato: Set del Minatore (Oggetto 3 di 3).",
     "armor": "armatura",
     "armorBase0Text": "Vestiti semplici",
     "armorBase0Notes": "Vestiario comune. Non conferisce alcun bonus.",
@@ -364,13 +365,13 @@
     "armorArmoireCrystalCrescentRobesText": "Vesti della Mezzaluna di Cristallo",
     "armorArmoireCrystalCrescentRobesNotes": "Queste vesti magiche sono luminescenti di notte. Aumenta la Costituzione e la Percezione di <%= attrs %> ciascuna. Baule Incantato: Set della Mezzaluna di Cristallo (Oggetto 2 di 3).",
     "armorArmoireDragonTamerArmorText": "Armatura del Domatore di Draghi",
-    "armorArmoireDragonTamerArmorNotes": "Questa robusta armatura è impenetrabile alle fiamme. Accresce la Costituzione di <%= con %>. Armatura Incantata: Completo del Domatore di Draghi : (Oggetto 3 di 3)",
+    "armorArmoireDragonTamerArmorNotes": "Questa robusta armatura è impenetrabile alle fiamme. Aumenta la Costituzione di <%= con %>. Baule Incantato: Set del Domatore di Draghi (Oggetto 3 di 3).",
     "armorArmoireBarristerRobesText": "Toga del Magistrato",
-    "armorArmoireBarristerRobesNotes": "Molto seria e maestosa. Accresce la Costituzione di <%= con %> . Armatura incantata del Magistrato. (3 di 3)",
+    "armorArmoireBarristerRobesNotes": "Molto seria e maestosa. Aumenta la Costituzione di <%= con %>. Baule Incantato: Set del Magistrato (Oggetto 2 di 3).",
     "armorArmoireJesterCostumeText": "Costume del Giullare",
-    "armorArmoireJesterCostumeNotes": "Trallallà! A dispetto dell'aspetto, non sei affatto uno sciocco. Accresce l'intelligenza di <%= int %> . Armatura incantata del Giullare. (2 di 3)",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireJesterCostumeNotes": "Trallallà! A dispetto dell'aspetto, non sei affatto uno sciocco. Aumenta l'Intelligenza di <%= int %>. Baule Incantato: Set del Giullare (Oggetto 2 di 3).",
+    "armorArmoireMinerOverallsText": "Tuta da lavoro da Minatore",
+    "armorArmoireMinerOverallsNotes": "Può sembrare logora, ma è incantata per non sporcarsi. Aumenta la Costituzione di <%= con %>. Baule Incantato: Set del Minatore (Oggetto 2 di 3).",
     "headgear": "copricapo",
     "headBase0Text": "Nessun elmo",
     "headBase0Notes": "Non indossi nessun copricapo.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Queste fiamme bruciano fredde di puro intelletto. Oggetto per Abbonati Dicembre 2015",
     "headMystery201601Text": "Elmo dell'Autentica Determinazione",
     "headMystery201601Notes": "Sii Risoluto, fiero campione! Non conferisce alcun bonus. Oggetto per abbonati, Gennaio 2016",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Cappuccio del Rubacuori",
+    "headMystery201602Notes": "Nascondi la tua identità da tutti i tuoi ammiratori. Non conferisce alcun bonus. Oggetto per abbonati, febbraio 2016.",
     "headMystery301404Text": "Cilindro Elegante",
     "headMystery301404Notes": "Un cilindro per i più fini gentiluomini! Oggetto per abbonati, gennaio 3015. Non conferisce alcun bonus.",
     "headMystery301405Text": "Cilindro Base",
@@ -545,7 +546,7 @@
     "headArmoireGladiatorHelmText": "Elmo da Gladiatore",
     "headArmoireGladiatorHelmNotes": "Per essere un gladiatore non devi solo essere forte... Ma anche astuto. Aumenta l'Intelligenza di <%= int%> e la Percezione di <%= per %>. Baule Incantato: Set da Gladiatore (Oggetto 1 di 3).",
     "headArmoireRancherHatText": "Cappello da Cowboy",
-    "headArmoireRancherHatNotes": "Raggruppate i vostri animali e addestrate le vostre cavalcature mentre indossate questo magico Cappello Ranchero! Accresce la Forza di <%= str %>, la Percezione di <%= per %>e l’Intelligenza di <%= int %>. Armatura incantata: set del Ranchero (1 di 3). ",
+    "headArmoireRancherHatNotes": "Raggruppa i tuoi animali e addestra le tue cavalcature mentre indossi questo magico Cappello da Cowboy! Aumenta la Forza di <%= str %>, la Percezione di <%= per %>, e l’Intelligenza di <%= int %>. Baule Incantato: Set del Cowboy (Oggetto 1 di 3). ",
     "headArmoireBlueHairbowText": "Fiocchetto Blu",
     "headArmoireBlueHairbowNotes": "Diventa percettivo, resistente, e intelligente indossando questo meraviglioso Fiocchetto Blu! Aumenta la Percezione di <%= per %>, la Costituzione di <%= con %>, e l'Intelligenza di <%= int %>. Baule Incantato: Oggetto Indipendente.",
     "headArmoireRoyalCrownText": "Corona Regale",
@@ -571,13 +572,13 @@
     "headArmoireCrystalCrescentHatText": "Cappello della Mezzaluna di Cristallo",
     "headArmoireCrystalCrescentHatNotes": "Il disegno su questo cappello cresce e cala seguendo le fasi della luna. Aumenta l'Intelligenza e la Percezione di <%= attrs %> ciasuna. Baule Incantato: Set della Mezzaluna di Cristallo (Oggetto 1 di 3).",
     "headArmoireDragonTamerHelmText": "Elmo del Domatore di Draghi",
-    "headArmoireDragonTamerHelmNotes": "Assomigli proprio ad un drago. Il camuffamento perfetto... Accresce l'Intelligenza di <%= int %>.  Armatura Incantata: Completo del Domatore di Draghi : (Oggetto 1 di 3)",
+    "headArmoireDragonTamerHelmNotes": "Assomigli proprio ad un drago. Il camuffamento perfetto... Aumenta l'Intelligenza di <%= int %>. Baule Incantato: Set del Domatore di Draghi (Oggetto 1 di 3).",
     "headArmoireBarristerWigText": "Parrucca del Magistrato",
-    "headArmoireBarristerWigNotes": "Questa ondulata parrucca è sufficiente a spaventare a morte anche il più coriaceo avversario. Accresce la Forza di <%= str %> . Armatura incantata del Magistrato. (1 di 3)",
+    "headArmoireBarristerWigNotes": "Questa ondulata parrucca è sufficiente a spaventare a morte anche il più coriaceo avversario. Aumenta la Forza di <%= str %>. Baule Incantato: Set del Magistrato (Oggetto 1 di 3).",
     "headArmoireJesterCapText": "Berretto del Giullare",
-    "headArmoireJesterCapNotes": "Le campanelle su questo cappello possono distrarre i vostri oppositori, ma aiutano voi a concentrarvi. Accresce la Percezione di <%= per %> . Armatura incantata del Giullare. (1 di 3)",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireJesterCapNotes": "Le campanelle su questo cappello potrebbero distrarre i vostri avversari, ma aiutano voi a concentrarvi. Aumenta la Percezione di <%= per %>. Baule Incantato: Set del Giullare (Oggetto 1 di 3).",
+    "headArmoireMinerHelmetText": "Elmetto da Minatore",
+    "headArmoireMinerHelmetNotes": "Proteggi la tua testa dalle attività che  cadono! Aumenta l'Intelligenza di<%= int %>. Baule Incantato: Set del Minatore (Oggetto 1 di 3).",
     "offhand": "oggetto per mano da scudo",
     "shieldBase0Text": "Nessun equipaggiamento nella mano da scudo",
     "shieldBase0Notes": "Nessuno scudo o arma secondaria.",
@@ -672,9 +673,9 @@
     "shieldArmoireRoyalCaneText": "Bastone da passeggio Regale.",
     "shieldArmoireRoyalCaneNotes": "Urrá per il sovrano, degno di canzoni! Aumenta  Costituzione, Intelligenza e Percezione di <%= attrs %> ciascuna. Baule Incantato: Set Regale (Oggetto 2 di 3).",
     "shieldArmoireDragonTamerShieldText": "Scudo del Domatore di Draghi",
-    "shieldArmoireDragonTamerShieldNotes": "Distrai i nemici con questo Scudo a forma di drago. Accresce la Percezione di <%= per %>.  Armatura Incantata: Completo del Domatore di Draghi : (Oggetto 2 di 3)",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireDragonTamerShieldNotes": "Distrai i nemici con questo scudo a forma di drago. Aumenta la Percezione di <%= per %>.  Baule Incantato: Set del Domatore di Draghi (Oggetto 2 di 3).",
+    "shieldArmoireMysticLampText": "Lanterna Mistica",
+    "shieldArmoireMysticLampNotes": "Illumina le caverne più buie con questa lanterna mistica! Aumenta la Percezione di <%= per %>. Baule Incantato: Oggetto Indipendente.",
     "back": "Accessorio da schiena.",
     "backBase0Text": "Nessun accessorio da schiena",
     "backBase0Notes": "Nessun accessorio da schiena.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Fai surf sui Moli Motivati e cavalca le onde sulla Baia Inkompleta! Non conferisce alcun bonus. Oggetto per abbonati, Luglio 2015.",
     "backMystery201510Text": "Coda di Goblin.",
     "backMystery201510Notes": "Prensile e potente! Non conferisce alcun bonus. Oggetto per abbonati, Ottobre 2015. ",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Mantello del Rubacuori",
+    "backMystery201602Notes": "Con un fruscio del tuo mantello, i tuoi nemici cadono ai tuoi piedi. Non conferisce alcun beneficio. Oggetto per abbonati, febbraio 2016.",
     "backSpecialWonderconRedText": "Mantello Maestoso",
     "backSpecialWonderconRedNotes": "Fruscia con forza ed eleganza. Non conferisce alcun bonus. Edizione speciale da convegno.",
     "backSpecialWonderconBlackText": "Mantello Furtivo",
diff --git a/common/locales/it/generic.json b/common/locales/it/generic.json
index af05325713..2c719098f6 100644
--- a/common/locales/it/generic.json
+++ b/common/locales/it/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Ho fatto nascere un nuovo animaletto completando le mie attività nella vita reale!",
     "raisePetShare": "Ho fatto crescere un animaletto completando le mie attività nella vita reale!",
     "wonChallengeShare": "Ho vinto una sfida in Habitica!",
-    "achievementShare": "Ho guadagnato una nuova medaglia in Habitica!"
+    "achievementShare": "Ho guadagnato una nuova medaglia in Habitica!",
+    "orderBy": "Ordina per <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/it/groups.json b/common/locales/it/groups.json
index e7c8ff0ef0..e6bde7381a 100644
--- a/common/locales/it/groups.json
+++ b/common/locales/it/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Chat della Taverna",
     "innCheckOut": "Esci dalla Locanda",
     "innCheckIn": "Riposa nella Locanda",
     "innText": "Stai riposando nella Locanda! Mentre sei qui, le tue Daily non ti danneggeranno alla fine della giornata, ma si resetteranno comunque ogni giorno. Fai attenzione: se stai partecipando ad una missione Boss, il Boss ti danneggerà comunque per le Daily mancate dei tuoi compagni di squadra a meno che non stiano riposando anche loro nella Locanda! Inoltre, il tuo danno al Boss (o la raccolta di oggetti) non avrà effetto finchè non lasci la Locanda.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "La chat della squadra è vuota! Scrivi un messaggio nella casella qui sopra per cominciare una conversazione.",
     "guildChatEmpty": "La chat della gilda è vuota! Scrivi un messaggio nella casella qui sopra per cominciare una conversazione.",
     "possessiveParty": "Squadra di <%= name %>",
-    "requestAcceptGuidelines": "Se vuoi pubblicare messaggi nella chat della Taverna o di una qualsiasi squadra o gilda, per favore prima leggi le <%= linkStart %>Linee guida della community<%= linkEnd %> e successivamente clicca sul pulsante qui sotto per indicare che le accetti."
+    "requestAcceptGuidelines": "Se vuoi pubblicare messaggi nella chat della Taverna o di una qualsiasi squadra o gilda, per favore prima leggi le <%= linkStart %>Linee guida della community<%= linkEnd %> e successivamente clicca sul pulsante qui sotto per indicare che le accetti.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Ti sei unito ad una Squadra con un'altra persona! Divertiti a combattere mostri e a sostenervi a vicenda.",
+    "partyOnAchievement": "Ti sei unito ad una Squadra con almeno quattro persone! Goditi la tua maggiore responsabilità mentre ti unisci con i tuoi amici per sconfiggere i tuoi nemici!"
 }
\ No newline at end of file
diff --git a/common/locales/it/pets.json b/common/locales/it/pets.json
index 5a417afb02..17f969ecfc 100644
--- a/common/locales/it/pets.json
+++ b/common/locales/it/pets.json
@@ -37,13 +37,13 @@
     "dropsExplanation": "Ottieni questi oggetti più velocemente con le Gemme se non vuoi aspettare di ottenerli come drop quando completi un'attività. <a href=\"http://habitica.wikia.com/wiki/Drops\"> Per saperne di più sul sistema di drop. </a>",
     "premiumPotionNoDropExplanation": "Le Pozioni di Schiusura Magiche non possono essere usate sulle uova ottenute dalle Missioni. L'unico modo per ottenere Pozioni di Schiusura Magiche è comprarle qui sotto, non da drop casuali.",
     "beastMasterProgress": "Progresso in Re delle Bestie",
-    "stableBeastMasterProgress": "Progresso in Re delle Bestie: <%= number %> Animali trovati",
+    "stableBeastMasterProgress": "Progresso in Re delle Bestie: <%= number %> animali trovati",
     "beastAchievement": "Hai ottenuto la medaglia \"Re delle Bestie\" per aver collezionato tutti gli animali!",
     "beastMasterName": "Re delle Bestie",
     "beastMasterText": "Ha trovato tutti i 90 animali (incredibilmente difficile, fate i complimenti a questo utente!)",
     "beastMasterText2": "e ha liberato i suoi animali un totale di <%= count %> volte",
     "mountMasterProgress": "Progresso in Re delle Cavalcature",
-    "stableMountMasterProgress": "Progresso in Re delle Cavalcature: <%= number %> Cavalcature Domate",
+    "stableMountMasterProgress": "Progresso in Re delle Cavalcature: <%= number %> cavalcature domate",
     "mountAchievement": "Hai ottenuto il titolo di \"Re delle Cavalcature\" per aver domato tutte le cavalcature!",
     "mountMasterName": "Re delle Cavalcature",
     "mountMasterText": "Ha domato tutte e 90 le cavalcature (ancora piú difficile, fate i complimenti a questo utente!)",
@@ -64,7 +64,7 @@
     "earnedCompanion": "Con tutta la tua produttività, ti sei guadagnato un nuovo compagno. Nutrilo per farlo crescere!",
     "feedPet": "Dare da mangiare <%= article %><%= text %> al tuo <%= name %>?",
     "useSaddle": "Mettere la sella a <%= pet %>?",
-    "raisedPet": "Hai fatto crescere un  <%= pet %>!",
+    "raisedPet": "Hai fatto crescere un <%= pet %>!",
     "earnedSteed": "Completando le tue attività, hai ottenuto un fidato destriero!",
     "rideNow": "Cavalca ora",
     "rideLater": "Cavalca più tardi",
diff --git a/common/locales/it/questscontent.json b/common/locales/it/questscontent.json
index 1240cef77c..557e9782d1 100644
--- a/common/locales/it/questscontent.json
+++ b/common/locales/it/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "\nCe l'avete fatta! Niente banane per quei demoni oggi. Sopraffatte dalla vostra diligenza, le scimmie fuggono in preda al panico. \"Guarda \", dice @Misceo . \" Hanno lasciato indietro un paio di uova.<br><br>@Leephon sogghigna. \"Forse una scimmietta ben addestrata vi può aiutare tanto quanto quelle selvatiche vi ostacolano ! \"",
     "questMonkeyBoss": "Mostruoso Mandrillo",
     "questMonkeyDropMonkeyEgg": "Scimmia (uovo)",
-    "questMonkeyUnlockText": "Permette di acquistare le uova di Scimmia nel Mercato"
+    "questMonkeyUnlockText": "Permette di acquistare le uova di Scimmia nel Mercato",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Chiocciola (Uovo)",
+    "questSnailUnlockText": "Sblocca l'acquisto delle uova di chiocciola nel Mercato"
 }
\ No newline at end of file
diff --git a/common/locales/it/subscriber.json b/common/locales/it/subscriber.json
index 99314b4a31..b0c2dd6e97 100644
--- a/common/locales/it/subscriber.json
+++ b/common/locales/it/subscriber.json
@@ -90,14 +90,14 @@
     "mysterySet201504": "Set ape operaia",
     "mysterySet201505": "Set cavaliere verde",
     "mysterySet201506": "Set sommozzatore neon",
-    "mysterySet201507": "completo del Surfer Tuttofare",
+    "mysterySet201507": "Set del Surfer Tuttofare",
     "mysterySet201508": "Set ghepardo",
     "mysterySet201509": "Set lupo mannaro",
-    "mysterySet201510": "completo del Folletto Cornuto",
+    "mysterySet201510": "Set del Folletto Cornuto",
     "mysterySet201511": "Set guerriero di legno",
     "mysterySet201512": "Set della Fiamma Invernale",
     "mysterySet201601": "Set Campione della Risoluzione",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Set del Rubacuori",
     "mysterySet301404": "Set steampunk standard",
     "mysterySet301405": "Set accessori steampunk",
     "mysterySetwondercon": "Wondercon",
diff --git a/common/locales/it/tasks.json b/common/locales/it/tasks.json
index e6bc7a2c3e..7ccd6c6b5d 100644
--- a/common/locales/it/tasks.json
+++ b/common/locales/it/tasks.json
@@ -56,7 +56,7 @@
     "complete": "Completi",
     "dated": "Con scadenza",
     "due": "Incomplete",
-    "notDue": "Non dovuto",
+    "notDue": "Non Scade",
     "grey": "Grigie",
     "score": "Punti",
     "reward": "Ricompensa",
diff --git a/common/locales/ja/backgrounds.json b/common/locales/ja/backgrounds.json
index cc82a8640c..91e2efa2fc 100644
--- a/common/locales/ja/backgrounds.json
+++ b/common/locales/ja/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "いい感じの図書館で読書しよう。",
     "backgroundGrandStaircaseText": "正面大階段",
     "backgroundGrandStaircaseNotes": "正面大階段を滑り降りよう。",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "セット22：2016年3月リリース",
+    "backgroundDeepMineText": "深い炭鉱",
+    "backgroundDeepMineNotes": "深い炭鉱で貴重な金属を探し出しましょう。",
+    "backgroundRainforestText": "熱帯雨林",
+    "backgroundRainforestNotes": "熱帯雨林を探検しましょう。",
+    "backgroundStoneCircleText": "石の円陣",
+    "backgroundStoneCircleNotes": "石の円陣で呪文を唱えましょう。"
 }
\ No newline at end of file
diff --git a/common/locales/ja/character.json b/common/locales/ja/character.json
index e1404cd76b..fb9f7d570b 100644
--- a/common/locales/ja/character.json
+++ b/common/locales/ja/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "ステータスと実績",
     "profile": "プロフィール",
-    "avatar": "Customize Avatar",
+    "avatar": "アバターのカスタマイズ",
     "other": "その他",
     "fullName": "フルネーム",
     "displayName": "表示名",
@@ -83,7 +83,7 @@
     "allocateInt": "知能のポイント：",
     "allocateIntPop": "知能にポイントを加える",
     "noMoreAllocate": "レベル100に到達したので、これ以上能力値が増えません。レベルアップを続けることもできますし、マーケットで無料で手に入る<a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>転生のオーブ</a>をつかって、レベル1 から新しい冒険を始めることもできます。",
-    "stats": "Avatar Stats",
+    "stats": "アバターの統計",
     "strength": "力",
     "strengthText": "力は「会心の一撃」が出る確率と、ゴールド、経験値、そして何かが落ちるチャンスを上げます。さらに、ボスモンスターに与えるダメージも増えます。",
     "constitution": "体質",
@@ -136,7 +136,7 @@
     "respawn": "生き返った!",
     "youDied": "あなたは死にました!",
     "dieText": "レベルが1下がり、すべてのゴールドといくつかの装備品を失ってしまいました。Habitica の民よ、復活せよ!　後向きの習慣を抑え、日課をこなすことに気を配り、つまずいても体力回復の薬を使って、死の手が届かぬよう、もちこたえよう!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "よろしいのですか?　この操作で、あなたのキャラクターのクラスと割り当てたポイントがリセットされます(獲得したポイントについては、再割り当てできる状態に戻ります)。また、3 ジェムが必要です。",
     "purchaseFor": "<%= cost %> ジェムで購入しますか?",
     "notEnoughMana": "マナが足りません。",
     "invalidTarget": "ねらえません",
diff --git a/common/locales/ja/communityguidelines.json b/common/locales/ja/communityguidelines.json
index 1fcb188da4..0c10b52186 100644
--- a/common/locales/ja/communityguidelines.json
+++ b/common/locales/ja/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Habitica ほどの大きいコミュニティでは、ユーザーの出入りがあり、モデレーターにも聖なる外とうを脱いで心を解き放つことが必要なときがあります。以下は退任した名誉モデレーターたちです。彼らにはもうモデレーターとしての力はもっていませんが、残した業績に敬意を表します。",
     "commGuidePara014": "名誉モデレーター : ",
     "commGuideHeadingPublicSpaces": "Habitica 上でのオープンな場所",
-    "commGuidePara015": "Habiticaにはオープンとプライベートの2種類のコミュニティーがあります。オープンな場所は、キャンプ場、オープン ギルド、GitHub、Trello、そしてWiki が含まれます。プライベートな場所としては、プライベート ギルド、パーティー チャット、そしてプライベート メッセージがあります。",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "だれにとっても安全で楽しくあるために、Habitica のオープン スペースをぶらぶらするときの一般的なルールがいくつかあります。あなたのような冒険者なら、簡単なことです!",
     "commGuidePara017": "<strong>たがいに尊重する。</strong>礼儀正しく、優しく、親しみやすく、協力的に。おぼえておいてください。Habitica の民は、さまざまな背景をもち、実に幅広い経験をもっています。Habitica がすごくステキなのはそれもあるから!　コミュニティーをつくるということは、類似と同様、違いをも尊敬しほめたたえるということ。おたがいを尊敬する簡単な方法があります : ",
     "commGuideList02A": "<strong>利用規約のすべてに従ってください。</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "議論の収束や片隅への移動など、<strong>モデレーターからの要請にはすぐに従ってください</strong>。決め台詞、捨て台詞、負け犬の遠吠えなどの行為は、すべて移動先のバックコーナーの”テーブル”で（礼儀正しく）行ってください。許可の上で。",
     "commGuideList02G": "だれかが、あなたの言動を「気に入らない」といったとしても<strong>時間をおいてから回答しましょう、怒って反論するのではなく。</strong> 他人に心からの反省をできるということは、きわめて強い勇気をもっていることの証明です。あなたに対する他者の言動の方が不適切だと感じたら、オープンな場でケンカをふっかけるより、モデレーターに連絡をとりましょう。",
     "commGuideList02H": "熱くなりすぎて、感情的になりすぎたり、暴力的になってきたり、そのためやる気がなくなってきたりしたのを感じたなら、<string>対立や論争は、モデレーターに報告すべきです。</strong>\nもしくは、メールで <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> あてに知らせてください。あなた方の安全を守ることは、私たちの仕事です。",
-    "commGuideList02I": "<strong>スパムは禁止です。</strong> スパム行為とは以下の通りですが、これに限定するものではありません :  - 同じコメントや質問を複数の場所に投稿すること。 - 説明のない、または文脈と関係のないリンクを投稿すること。 - でたらめなメッセージを投稿すること。 - たくさんのメッセージを羅列すること。\nジェムや有料登録をくり返し要求することも、スパム行為とみなします。",
-    "commGuidePara019": "<strong>プライベートな空間は、</strong>どんな話題で議論するか、より自由です。しかし、そこでも、利用規約に違反する差別的・暴力的・脅しなどの内容をふくむ投稿をしてはいけません。",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "プライベート メッセージ(PM)には、特別なガイドラインがあります。あなたがだれかにブロックされた場合、他のどんな手段であれ連絡してブロックの取り消しを求めることは禁止です。また、だれかにサポートに関するPMを送るべきではありません。（サポートに関する質問と回答は、コミュニティー全体に役立つものだからです。）最後に、贈り物やジェム、有料登録を求めるPMは、スパム行為とみなされます。",
     "commGuidePara021": "さらに、Habiticaの一部のパブリックスペースは、追加のガイドラインがあります。",
     "commGuideHeadingTavern": "酒場",
diff --git a/common/locales/ja/content.json b/common/locales/ja/content.json
index 91fdfb42e5..34b3a3a13a 100644
--- a/common/locales/ja/content.json
+++ b/common/locales/ja/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "チクチクする",
     "dropEggBearCubText": "熊の子",
     "dropEggBearCubMountText": "熊",
-    "dropEggBearCubAdjective": "抱きしめたくなる",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "グリフォン",
     "questEggGryphonMountText": "グリフォン",
     "questEggGryphonAdjective": "誇り高い",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "鮮やかな",
     "questEggRatText": "ネズミ",
     "questEggRatMountText": "ネズミ",
-    "questEggRatAdjective": "汚らしい",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "タコ",
     "questEggOctopusMountText": "タコ",
     "questEggOctopusAdjective": "ぬるぬるした",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "さる",
     "questEggMonkeyMountText": "さる",
     "questEggMonkeyAdjective": "いたずら",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "たまごがえしの薬を見つけて、たまごにかけると、<%= eggAdjective(locale) %> <%= eggText(locale) %>がかえります。",
     "hatchingPotionBase": "普通の",
     "hatchingPotionWhite": "白い",
diff --git a/common/locales/ja/contrib.json b/common/locales/ja/contrib.json
index 3cd952352a..811e29260f 100644
--- a/common/locales/ja/contrib.json
+++ b/common/locales/ja/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Habitの成長を支援した。",
     "helpedText1": "このアンケート回答による",
     "helpedText2": "Habiticaの成長を支援しました。",
-    "hall": "Hall of Heroes",
+    "hall": "英雄記念館",
     "contribTitle": "貢献者タイトル (例 \"Blacksmith\")",
     "contribLevel": "貢献者層",
     "contribHallText": "通常の貢献者は1-7、モデレーターは8、スタッフは9。これは利用可能なアイテム、ペット、乗り物を決定します。また、名札の色も決定します。8および9層は、自動的に与えられる管理ステータスです。",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "貢献者記念館",
     "hallPatrons": "後援者の記念館",
     "rewardUser": "ユーザーを報奨",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "ギルドは共通の興味を持つプレイヤー同士のためのチャットグループです。リストから興味のあるグループを探して参加しましょう！",
     "blurbChallenges": "チャレンジはあなたの仲間のプレイヤーによって作成されます。チャレンジへ参加することで、あなたのタスクダッシュボードにそのタスクが追加されます。そして、チャレンジに成功することで、あなたには実績と多くの場合は賞品のジェムが与えられるでしょう!　",
     "blurbHallPatrons": "こちらは、資金協力で後援いただいた方々の記念館です。Habitica の源流となった Kickstarter で資金協力してくださった気高い冒険者のみなさんを誇りに思っています。Habitica に命を吹き込むことに手を貸してくれた彼らに感謝をささげましょう!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "こちらは Habitica をオープンソースの世界で貢献してくださった方々を称える貢献者記念館です。貢献の内容は、コード、画像、音楽、執筆などです。彼らは献身的でありましたが、<a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> ジェム、特別なアイテム</a>、そして <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>名誉ある肩書き</a>を手にしました。あなたも Habitica に貢献できます! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> 詳しくはこちらをご覧ください。</a>"
 }
\ No newline at end of file
diff --git a/common/locales/ja/gear.json b/common/locales/ja/gear.json
index beb8764537..e304efb71b 100644
--- a/common/locales/ja/gear.json
+++ b/common/locales/ja/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "武器",
     "weaponBase0Text": "武器がありません",
     "weaponBase0Notes": "武器がありません。",
@@ -371,9 +372,9 @@
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Despite the look of this costume, you are no fool. Increases Intelligence by <%= int %>. Enchanted Armoire: Jester Set (Item 2 of 3).",
     "armorArmoireMinerOverallsText": "Miner Overalls",
     "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
-    "headgear": "ヘッドギア",
+    "headgear": "帽子・かぶと",
     "headBase0Text": "兜なし",
-    "headBase0Notes": "ヘッドギアなし",
+    "headBase0Notes": "帽子・かぶとなし",
     "headWarrior1Text": "レザーヘルム",
     "headWarrior1Notes": "頑丈な革の帽子。力が<%= str %>上がる。",
     "headWarrior2Text": "チェーンコイフ",
@@ -717,11 +718,11 @@
     "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
     "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
     "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
-    "headAccessory": "ヘッドアクセサリー",
+    "headAccessory": "頭部につけるアクセサリー",
     "accessories": "装飾品",
     "animalEars": "獣耳",
-    "headAccessoryBase0Text": "ヘッドアクセサリーがありません",
-    "headAccessoryBase0Notes": "ヘッドアクセサリーがありません。",
+    "headAccessoryBase0Text": "頭部のアクセサリーなし",
+    "headAccessoryBase0Notes": "頭部につけるアクセサリーがありません。",
     "headAccessorySpecialSpringRogueText": "紫色の猫耳",
     "headAccessorySpecialSpringRogueNotes": "これら猫耳は危機が近づくのに気づくとピクピク動きます。効果なし。2014年春季限定装備。",
     "headAccessorySpecialSpringWarriorText": "緑色のウサ耳",
@@ -764,7 +765,7 @@
     "headAccessoryMystery201502Notes": "あなたの想像を飛び立たせ！効果なし。2015年2月購読者限定アイテム。",
     "headAccessoryMystery201510Text": "Goblin Horns",
     "headAccessoryMystery201510Notes": "These fearsome horns are slightly slimy. Confers no benefit. October 2015 Subscriber Item.",
-    "headAccessoryMystery301405Text": "ヘッドウェアゴーグル",
+    "headAccessoryMystery301405Text": "アイウェア",
     "headAccessoryMystery301405Notes": "「ゴーグルはかけるものだ」、「かぶりものにしか使えないゴーグルなんてだれも要らないぞ」って何だ！ほら！違うだろう？効果なし。3015年8月購読者限定アイテム。",
     "eyewear": "眼鏡",
     "eyewearBase0Text": "眼鏡がありません",
diff --git a/common/locales/ja/generic.json b/common/locales/ja/generic.json
index 7b466a9226..6e603004ee 100644
--- a/common/locales/ja/generic.json
+++ b/common/locales/ja/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "実生活でタスクを達成して、たまごから新しいペットがかえったよ!",
     "raisePetShare": "実生活でタスクを達成して、ペットが乗れるほど大きくなったよ!",
     "wonChallengeShare": "Habitica のチャレンジに成功したよ!",
-    "achievementShare": "Habitica で新しい実績を解除したよ!"
+    "achievementShare": "Habitica で新しい実績を解除したよ!",
+    "orderBy": "並び順 : <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/ja/groups.json b/common/locales/ja/groups.json
index 979c4aa4ea..193fdabafa 100644
--- a/common/locales/ja/groups.json
+++ b/common/locales/ja/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "キャンプ場チャット",
     "innCheckOut": "宿屋をチェックアウト",
     "innCheckIn": "宿屋に泊まる",
     "innText": "あなたは宿屋に泊まっています！チェックインしている間、一日の終わりに日課が未実施でもダメージを受けません、ですが日課は毎日リフレッシュされます。注意: もしあなたがボスクエストに参加しているなら、あなたのパーティの仲間が日課をし損ねたとき、その仲間も宿屋に泊まっていない限り、あなたはダメージを受けます！また、あなたのボスへのダメージ(または収集したアイテム)は宿屋をチェックアウトするまで適用されません。",
@@ -18,13 +18,13 @@
     "tavernAlert1": "注意: バグを報告する場合、開発者はここを見ません。どうか、",
     "tavernAlert2": "代わりに GitHub をご利用ください。",
     "moderatorIntro1": "キャンプ場とギルドのモデレーター : ",
-    "communityGuidelines": "コミュニティーガイドライン",
+    "communityGuidelines": "コミュニティー ガイドライン",
     "communityGuidelinesRead1": "チャットする前に",
     "communityGuidelinesRead2": "を読んでください。",
     "party": "パーティー",
     "createAParty": "パーティーを作る",
     "updatedParty": "パーティの設定が更新されました。",
-    "noPartyText": "あなたがパーティにいないか、パーティのロードに時間がかかっているかのどちらかです。あなたはパーティを作成して友人を招待するか、または既存のパーティーに参加したい場合は、下に固有のユーザーIDを入力して、その後でここに戻って来て招待状を待つかの、いずれかができます:",
+    "noPartyText": "あなたがパーティにいないか、パーティのロードに時間がかかっているかのどちらかです。あなたはパーティを作成して友だちを招待するか、または既存のパーティーに参加したい場合は、下にあなた固有のユーザーIDを入力し、その後でここに戻って来て招待状を待つかの、いずれかができます:",
     "LFG": "新しいパーティーの宣伝かパーティーに参加するなら、 <%= linkStart %> パーティ求む (グループを探す)<%= linkEnd %>ギルドへ行きましょう。",
     "wantExistingParty": "すでにあるパーティーに加わりたいですか?　<%= linkStart %>パーティー募集ギルド<%= linkEnd %>で、以下の User ID を投稿してみましょう:",
     "joinExistingParty": "すでにあるパーティーに参加する",
@@ -33,10 +33,10 @@
     "invite": "招待する",
     "leave": "やめる",
     "invitedTo": "<%= name %>に招待されました",
-    "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
+    "invitedToNewParty": "パーティーの仲間として招待されました!　こちらのパーティーを辞めて、<%= partyName %> のパーティーに参加しますか?",
     "joinNewParty": "新しいパーティーに参加する",
-    "declineInvitation": "Decline Invitation",
-    "loadingNewParty": "Your new party is loading. Please wait...",
+    "declineInvitation": "招待を断る",
+    "loadingNewParty": "新しいパーティーを読み込んでいます。お待ちください...",
     "newMsg": "\"<%= name %>\"で新しいメッセージがあります",
     "chat": "チャット",
     "sendChat": "チャット送信",
@@ -53,7 +53,7 @@
     "logoUrl": "ロゴＵＲＬ",
     "assignLeader": "グループリーダー指定",
     "members": "メンバー",
-    "partyList": "Order for party members in header",
+    "partyList": "ヘッダーに表示するパーティーの仲間の順番",
     "banTip": "メンバーを解雇",
     "moreMembers": "メンバー一覧",
     "invited": "招待された方",
@@ -101,7 +101,7 @@
     "inbox": "受信トレイ",
     "abuseFlag": "コミュニティガイドライン違反を報告する",
     "abuseFlagModalHeading": "<%= name %> を違反で報告しますか？",
-    "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to: <p></p></br><ul style='margin-left: 10px;'><li>swearing, religous oaths</li><li>bigotry, slurs</li><li>adult topics</li><li>violence, including as a joke</li><li>spam, nonsensical messages</li></ul>",
+    "abuseFlagModalBody": "本当にこの投稿を報告しますか?　投稿の報告は、それが<%= firstLinkStart %>コミュニティー ガイドライン<%= linkEnd %>および<%= secondLinkStart %>利用規約<%= linkEnd %>のいずれかまたは両方に反している場合に限定すべきです。 不適切に投稿を報告することは、コミュニティーガイドライン上の違反行為であり、あなたがそれを犯したとみなされます。投稿にしるしをつける適切な理由は以下の通り、またはそれに限定されるものではありません : <p></p></br><ul style='margin-left: 10px;'><li>ののしりや悪口、宗教的な冒涜</li><li>偏見、中傷</li><li>大人な話題</li><li>暴力、冗談も含む</li><li>スパム、無意味なメッセージ</li></ul>",
     "abuseFlagModalButton": "違反を報告する",
     "abuseReported": "違反報告ありがとうございます。モデレータに通知されます。",
     "abuseAlreadyReported": "このメッセージは報告済みです。",
@@ -115,15 +115,15 @@
     "sendGift": "贈り物を送る",
     "inviteFriends": "友達を招待する",
     "inviteByEmail": "メールで招待する",
-    "inviteByEmailExplanation": "If a friend joins Habitica via your email, they'll automatically be invited to your party!",
-    "inviteFriendsNow": "Invite Friends Now",
+    "inviteByEmailExplanation": "あなたのメールから友だちが Habitica に参加したら、自動的にあなたのパーティーの仲間に招待されます。",
+    "inviteFriendsNow": "すぐに友だちを招待する",
     "inviteFriendsLater": "後で友達を招待する",
-    "inviteAlertInfo": "If you have friends already using Habitica, invite them by <a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>User ID</a> here.",
-    "inviteExistUser": "Invite Existing Users",
+    "inviteAlertInfo": "もう Habitica をつかっている友だちがいるなら、友だちの<a href='http://habitica.wikia.com/wiki/API_Options' target='_blank'>ユーザー ID</a>を指定して、招待しましょう。",
+    "inviteExistUser": "既存のユーザーを招待する",
     "byColon": "で",
-    "inviteNewUsers": "Invite New Users",
-    "sendInvitations": "Send Invitations",
-    "invitationsSent": "Invitations sent!",
+    "inviteNewUsers": "Habitica をつかってない人を招待する",
+    "sendInvitations": "招待状を送る",
+    "invitationsSent": "招待状を送りました!",
     "inviteAlertInfo2": "もしくはこのリンクを共有する(コピー/ペースト):",
     "sendGiftHeading": "<%= name %>に贈り物を送る",
     "sendGiftGemsBalance": "<%= number %>個のジェムから",
@@ -131,21 +131,25 @@
     "sendGiftFromBalance": "残高から",
     "sendGiftPurchase": "購入する",
     "sendGiftMessagePlaceholder": "個人メッセージ(任意)",
-    "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD",
+    "sendGiftSubscription": "<%= months %> カ月 : <%= price %> 米ドル",
     "battleWithFriends": "フレンドと一緒にモンスターと戦う",
-    "startPartyWithFriends": "Start a Party with your friends!",
+    "startPartyWithFriends": "友だちと一緒にパーティーをつくりましょう!",
     "startAParty": "チームを作る",
     "addToParty": "チームに誰かを入れる",
     "likePost": "「いいね！」とすればクリックします。",
-    "partyExplanation1": "Play Habitica with friends to stay accountable!",
-    "partyExplanation2": "Battle monsters and create Challenges!",
-    "partyExplanation3": "Invite friends now to earn a Quest Scroll!",
+    "partyExplanation1": "Habitica を友だちといっしょにプレーすると責任感が生まれます!",
+    "partyExplanation2": "モンスターと戦い、チャレンジをつくりましょう!",
+    "partyExplanation3": "友だちを招待して、クエストの巻物をゲットしましょう!",
     "wantToStartParty": "パーティーを作りますか？",
-    "exclusiveQuestScroll": "Inviting a friend to your party will grant you an exclusive Quest Scroll to battle the Basi-List together!",
-    "nameYourParty": "Name your new party!",
-    "partyEmpty": "You're the only one in your party. Invite your friends!",
-    "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
-    "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
+    "exclusiveQuestScroll": "パーティーに友だちを招待すると、いっしょにバシ・リストと戦う二人だけのクエストの巻物を手にすることができます。",
+    "nameYourParty": "新しいパーティーに名前をつけましょう!",
+    "partyEmpty": "パーティーのメンバーはあなただけです。友だちを招待しましょう!",
+    "partyChatEmpty": "パーティー チャットがまっ白です!　上のボックスにメッセージを書いてチャットをはじめましょう。",
+    "guildChatEmpty": "こちらのギルド チャットはまっ白です!　上のボックスにメッセージを書いてチャットをはじめましょう。",
     "possessiveParty": "<%= name %>のパーティー",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "キャンプ場チャットやどこかのギルド チャットにメッセージを投稿したいと思ったら、まず<%= linkStart %>コミュニティ ガイドライン<%= linkEnd %>を読み、それを認めたうえで下のボタンを押してください。",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "別の人のパーティーに参加しました!　楽しんで、モンスターと戦ってお互いを助け合いましょう。",
+    "partyOnAchievement": "4人以上のパーティーに参加しました!　責任感が強くなったことを楽しんで、自分自身の敵と戦うために友だちと協力しましょう!"
 }
\ No newline at end of file
diff --git a/common/locales/ja/limited.json b/common/locales/ja/limited.json
index 444e539f1c..04c2b4c329 100644
--- a/common/locales/ja/limited.json
+++ b/common/locales/ja/limited.json
@@ -1,59 +1,59 @@
 {
     "limitedEdition": "限定版",
     "seasonalEdition": "季節限定版",
-    "winterColors": "ウィンターカラー",
-    "annoyingFriends": "迷惑なユーザー",
-    "annoyingFriendsText": "パーティメンバーから <%= snowballs %> 回雪玉を受けました。",
-    "alarmingFriends": "憂慮すべきフレンド",
-    "alarmingFriendsText": "パーティメンバーから <%= spookDust %> 回おどかされました。",
-    "agriculturalFriends": "農業の友人",
-    "agriculturalFriendsText": "パーティメンバーによって<%= seeds %>回花に変化させられました。",
+    "winterColors": "冬っぽい色",
+    "annoyingFriends": "困った友だち",
+    "annoyingFriendsText": "パーティーの仲間から <%= snowballs %> 回、雪玉を投げられました。",
+    "alarmingFriends": "要注意の友だち",
+    "alarmingFriendsText": "パーティーの仲間から <%= spookDust %> 回、オバケにされました。",
+    "agriculturalFriends": "ぶざまな友だち",
+    "agriculturalFriendsText": "パーティーの仲間から <%= seeds %> 回、花にされました。",
     "aquaticFriends": "水の中の仲間たち",
-    "aquaticFriendsText": "パーティメンバーから <%= seafoam %>回、水をかけられました。",
+    "aquaticFriendsText": "パーティーの仲間から <%= seafoam %>回、水の生き物に変えられました。",
     "valentineCard": "バレンタインカード",
-    "valentineCardExplanation": "For enduring such a saccharine poem, you both receive the \"Adoring Friends\" badge!",
+    "valentineCardExplanation": "チョコレートのようなあま～いポエムをがまんしたので、お二人は「愛情あふれる友だち」のバッジを手に入れました。",
     "valentineCardNotes": "パーティメンバーにバレンタインカードを送ろう",
-    "valentine0": "\"Roses are red\n\nMy Dailies are blue\n\nI'm happy that I'm\n\nIn a Party with you!\"",
-    "valentine1": "『薔薇は赤く\n\n紫は美しい\n\n今こそ共に\n\n悪と戦おう！』",
-    "valentine2": "『薔薇は赤く\n\nこの文体は古い\n\nそれでも貴方が気に入ってるといいな\n\nだってこれは10ゴールド分かかっているから』",
-    "valentine3": "\"Roses are red\n\nIce Drakes are blue\n\nNo treasure is better\n\nThan time spent with you!\"",
-    "valentineCardAchievementTitle": "仲の良いフレンド",
-    "valentineCardAchievementText": "ああ、貴方と貴方の友達はとっても仲がいいんですね！<%= cards %> 個のバレンタインカードを送信または受信しました。",
+    "valentine0": "バラは赤く\n\n私の日課は青い\n\n私はしあわせ\n\nだって、あなたといっしょの\nパーティーだから",
+    "valentine1": "バラは赤く\n\n紫は美しい\n\nともに手をとりあって\n\n悪（い習慣）と戦おう!",
+    "valentine2": "バラは赤く\n\nこの詩は古くさい\n\nあなたのお気に召すことを希望する\n\nだって10ゴールド払ったんだもの",
+    "valentine3": "バラは赤く\n\n氷のドレークは青い\n\nアイテムがなくたってかまわない\n\nあなたとの時間の方が価値があるのだから!",
+    "valentineCardAchievementTitle": "愛情あふれる友だち",
+    "valentineCardAchievementText": "ああ、あなたと友だちは、本当にお互いを大切にしているんですね!　<%= cards %> 通のバレンタインデー・カードを送信または受信しました。",
     "polarBear": "シロクマ",
     "turkey": "シチメンチョウ",
-    "gildedTurkey": "Gilded Turkey",
+    "gildedTurkey": "金ピカのシチメンチョウ",
     "polarBearPup": "シロクマの子",
     "jackolantern": "ジャック･オ･ランタン",
-    "seasonalShop": "季節品ショップ",
-    "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>",
-    "seasonalShopTitle": "<%= linkStart %>季節限定魔女<%= linkEnd %>",
-    "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <a href='http://habitica.wikia.com/wiki/Grand_Galas' target='_blank'>Grand Gala</a>!",
+    "seasonalShop": "期間限定ショップ",
+    "seasonalShopClosedTitle": "<%= linkStart %>レズリー<%= linkEnd %>",
+    "seasonalShopTitle": "<%= linkStart %>期間限定の魔女<%= linkEnd %>",
+    "seasonalShopClosedText": "期間限定マーケットは、現在閉店しています!!　いまどこに期間限定の魔女がいるのかはわかりませんが、きっと、次の<a href='http://habitica.wikia.com/wiki/Grand_Galas' target='_blank'>大祭</a>の間には、戻ってくるでしょう!",
     "seasonalShopText": "季節限定ショップへようこそ！ 春の <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>季節限定版</a>グッズを揃えています。ここにあるものはすべて毎年スプリングフリング期間中に買う事ができますが、4月30日までしかオープンしていません。ですので今買い備えないと、買うのにまた一年またなければなりませんよ！",
     "seasonalShopSummerText": "季節限定ショップへようこそ！ 夏の <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>季節限定版</a>グッズを揃えています。ここにあるものはすべて毎年サマースプラッシュイベント期間中に買う事ができますが、7月31日までしかオープンしていません。ですので今買い備えないと、買うのにまた一年またなければなりませんよ！",
-    "seasonalShopFallText": "Welcome to the Seasonal Shop!! We're stocking autumn <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
-    "seasonalShopWinterText": "Welcome to the Seasonal Shop!! We're stocking winter <a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Winter Wonderland event each year, but we're only open until January 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
-    "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... <strong>*sigh*</strong>",
-    "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
-    "candycaneSet": "キャンディケイン (魔道士)",
-    "skiSet": "スキーアサシン(盗賊)",
-    "snowflakeSet": "雪の結晶(神官)",
-    "yetiSet": "イエティ　テイマー(戦士)",
+    "seasonalShopFallText": "いらっしゃいませ、ようこそ期間限定ショップへ!!　ただいま秋の<a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>期間限定版</a>グッズをとりそろえております。こちらはいずれも、毎年の秋まつりイベント期間のみの商品で、当店は10月31日までの限定オープンです。今すぐお買い上げいただかないと、来年までお待ちいただくことになりますよ!",
+    "seasonalShopWinterText": "いらっしゃいませ、期間限定ショップへようこそ!!　ただいま冬の<a href='http://habitica.wikia.com/wiki/Item_Availability' target='_blank'>期間限定版</a>グッズをとりそろえております。こちらはいずれも、毎年の冬のワンダーランド イベント期間のみの商品で、当店は1月31日までの限定オープンです。今すぐお買い上げいただかないと、来年までお待ちいただくことになりますよ!",
+    "seasonalShopFallTextBroken": "ああ......期間限定ショップへよくぞお越しを...いまは秋の期間限定版グッズやなんかをとりそろえ...こちらはどれも、毎年の秋まつりイベント期間のみの商品で、当店は10月31日までの限定オープン...今すぐ買っておかないと、ずっと...ずっと...ずっと待つことになる...<strong>（ため息）</strong>",
+    "seasonalShopRebirth": "転生のオーブを使ったあとは、ごほうび列から再び購入することができます。最初は現在のクラス ( 標準では戦士) 用のものしか購入できませんが、ご心配なく。クラスを変更したあとでは、それぞれのクラス用のものが購入できるようになります。",
+    "candycaneSet": "キャンディー ステッキ (魔道士)",
+    "skiSet": "スキー暗殺者(盗賊)",
+    "snowflakeSet": "雪の結晶 (治療師)",
+    "yetiSet": "雪男つかい (戦士)",
     "northMageSet": "北の魔女(魔道士)",
-    "icicleDrakeSet": "Icicle Drake (Rogue)",
-    "soothingSkaterSet": "Soothing Skater (Healer)",
-    "gingerbreadSet": "Gingerbread Warrior (Warrior)",
+    "icicleDrakeSet": "つららのドラゴン (盗賊)",
+    "soothingSkaterSet": "慰めのスケーター (治療師)",
+    "gingerbreadSet": "ジンジャークッキーの戦士 (戦士)",
     "toAndFromCard": "<%= toName %> へ、<%= fromName %> より",
     "nyeCard": "年賀状",
-    "nyeCardExplanation": "For celebrating the new year together, you both receive the \"Auld Acquaintance\" badge!",
+    "nyeCardExplanation": "いっしょに新年を祝ったので、あなた方両方が「旧知の間がら」バッジを獲得しました。",
     "nyeCardNotes": "パーティメンバーに年賀状を送ろう",
     "seasonalItems": "季節商品",
-    "nyeCardAchievementTitle": "Auld Acquaintance",
+    "nyeCardAchievementTitle": "旧知の間がら",
     "nyeCardAchievementText": "あけましておめでとうございます！<%= cards %>年賀状を送りました、または届きました。",
-    "nye0": "あけましておめでとうございます！あなたが悪い習慣をたくさんやめられますように。",
-    "nye1": "Happy New Year! May you reap many Rewards.",
-    "nye2": "Happy New Year! May you earn many a Perfect Day.",
-    "nye3": "Happy New Year! May your To-Do list stay short and sweet.",
-    "nye4": "Happy New Year! May you not get attacked by a raging Hippogriff.",
+    "nye0": "あけましておめでとう!　今年あなたがたくさんの悪い習慣をやっつけられますように。",
+    "nye1": "あけましておめでとう!　今年あなたがたくさんのごほうびを獲得できますように。",
+    "nye2": "あけましておめでとう!　今年あなたがたくさんの「パーフェクトな日」を達成できますように。",
+    "nye3": "あけましておめでとう!　今年あなたのTo-Doがどれも早く片づき、リストがきれいでありますように。",
+    "nye4": "あけましておめでとう!　今年あなたが怒りくるったヒッポグリフの攻撃を受けませんように。",
     "holidayCard": "クリスマスカードが届きました！",
     "mightyBunnySet": "強大なウサギ(戦士)",
     "magicMouseSet": "魔法のネズミ(魔道士)",
@@ -63,10 +63,10 @@
     "emeraldMermageSet": "エメラルドマーメイジ(魔道士)",
     "reefSeahealerSet": "さんご礁のシーヒーラー(神官)",
     "roguishPirateSet": "いたずら好きな海賊(盗賊)",
-    "monsterOfScienceSet": "Monster of Science (Warrior)",
-    "witchyWizardSet": "Witchy Wizard (Mage)",
-    "mummyMedicSet": "ミイラメディック (神官)",
-    "vampireSmiterSet": "Vampire Smiter (Rogue)",
-    "fallEventAvailability": "Available until October 31",
-    "winterEventAvailability": "Available until December 31"
+    "monsterOfScienceSet": "科学のモンスター (戦士)",
+    "witchyWizardSet": "魔女のような魔法使い (魔道士)",
+    "mummyMedicSet": "ミイラの衛生兵 (治療師)",
+    "vampireSmiterSet": "吸血鬼のボクサー (盗賊)",
+    "fallEventAvailability": "10月31日まで有効",
+    "winterEventAvailability": "12月31日まで有効"
 }
\ No newline at end of file
diff --git a/common/locales/ja/messages.json b/common/locales/ja/messages.json
index 1f561865df..92dfd48d89 100644
--- a/common/locales/ja/messages.json
+++ b/common/locales/ja/messages.json
@@ -15,12 +15,12 @@
     "messageEquipped": "<%= itemText %>を装備しました",
     "messageUnEquipped": "<%= itemText %> を外しました。",
     "messageMissingEggPotion": "たまごか孵化ポーションのいずれかが不足しています",
-    "messageInvalidEggPotionCombo": "You can't hatch Quest Pet Eggs with Magic Hatching Potions! Try a different egg.",
+    "messageInvalidEggPotionCombo": "クエストペットのたまごを魔法のたまごがえしの薬でかえすことはできません!　別のたまごに試してください。",
     "messageAlreadyPet": "既にそのペットは所持しています。別の組み合わせを試してみましょう！",
     "messageHatched": "たまごが孵りました! 小屋に向かい、ペットを装備しましょう！",
     "messageNotEnoughGold": "ゴールドが不足しています",
-    "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.",
-    "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.",
+    "messageTwoHandedEquip": "<%= twoHandedText %>は両手を使って振り回すので、<%= offHandedText %>を装備から外しました。",
+    "messageTwoHandedUnequip": "<%= offHandedText %>を装備したので、両手を使って振り回す<%= twoHandedText %>を装備から外しました。",
     "messageDropFood": "<%= dropArticle %><%= dropText %> を見つけました! <%= dropNotes %>",
     "messageDropEgg": "<%= dropText %>のたまごを見つけました! <%= dropNotes %>",
     "messageDropPotion": "<%= dropText %>孵化ポーションを見つけました! <%= dropNotes %>",
@@ -39,18 +39,18 @@
     "messageAuthEmailTaken": "そのEmailアドレスは既に使われています",
     "messageAuthNoUserFound": "ユーザーが見つかりませんでした。",
     "messageAuthMustBeLoggedIn": "あなたはログインする必要があります。",
-    "messageAuthMustIncludeTokens": "You must include a token and uid (user id) in your request",
+    "messageAuthMustIncludeTokens": "リクエストには、トークンとユーザーIDの両方が必要です。",
     "messageGroupNotFound": "グループが見つからなかったかアクセスの権限を持っていません。",
     "messageGroupAlreadyInParty": "もし既にパーティに入っているならページを更新してください。",
     "messageGroupOnlyLeaderCanUpdate": "グループリーダーのみがグループの更新、アップデートができます。",
     "messageGroupRequiresInvite": "招待されていないグループに参加することはできません。",
-    "messageGroupCannotRemoveSelf": "You cannot remove yourself!",
-    "messageGroupChatBlankMessage": "You cannot send a blank message",
-    "messageGroupChatLikeOwnMessage": "Can't like your own message. Don't be that person.",
-    "messageGroupChatFlagOwnMessage": "Can't report your own message.",
-    "messageGroupChatFlagAlreadyReported": "You have already reported this message",
-    "messageGroupChatNotFound": "Message not found!",
-    "messageGroupChatAdminClearFlagCount": "Only an admin can clear the flag count!",
-    "messageUserOperationProtected": "path `<%= operation %>` was not saved, as it's a protected path.",
-    "messageUserOperationNotFound": "<%= operation %> operation not found"
+    "messageGroupCannotRemoveSelf": "自分自身を削除することはできません!",
+    "messageGroupChatBlankMessage": "空っぽのメッセージを送ることはできません。",
+    "messageGroupChatLikeOwnMessage": "自分のメッセージに「いいね」はできません。そんな人にならないで。",
+    "messageGroupChatFlagOwnMessage": "自分のメッセージは報告できません。",
+    "messageGroupChatFlagAlreadyReported": "このメッセージは報告済みです。",
+    "messageGroupChatNotFound": "メッセージが見つかりません!",
+    "messageGroupChatAdminClearFlagCount": "フラグ数をクリアーできるのは管理者だけです!",
+    "messageUserOperationProtected": "「<%= operation %>」パスは、保護されたパスなので保存できません。",
+    "messageUserOperationNotFound": "<%= operation %> の操作は見つかりません"
 }
\ No newline at end of file
diff --git a/common/locales/ja/npc.json b/common/locales/ja/npc.json
index aeb9e51362..2e3e7fa199 100644
--- a/common/locales/ja/npc.json
+++ b/common/locales/ja/npc.json
@@ -7,21 +7,21 @@
     "daniel": "ダニエル",
     "danielText": "酒場へようこそ！しばらく滞在して、地元の人と会いましょう。あなたに休息が必要な場合 (休暇? 病気?)、私が宿であなたを元気にします。チェックインしている間、あなたの日課は未実施でも一日の終わりにあなたを傷つけませんが、印を付けて実施済みにできます。",
     "danielText2": "注意してください: あなたがボスの冒険に参加している場合は、あなたのパーティーの仲間が日課を逃したことで、ボスはまだあなたを傷つけます！ また、あなたがボスに与えるダメージ(もしくは集めたアイテム)は宿をチェックアウトするまでt適用されません。",
-    "danielTextBroken": "Welcome to the Tavern... I guess... If you need to rest, I'll set you up at the Inn... While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off... if you have the energy...",
-    "danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
+    "danielTextBroken": "キャンプ場へようこそ...よろしければ...休息が必要なら、宿をご用意します...チェックインしている間は、日付が変わって日課をやっていなくてもダメージを受けません。しかし、その内容は更新される...もしエネルギーがおありなら...",
+    "danielText2Broken": "おや...ボス クエストに参加しているのでしたら、ボスはパーティーの仲間が日課をサボった分のダメージは与えてきますよ...また、あなたからボスへのダメージ(または、落としていくアイテム) は、宿にチェックインしている間は発生しません...",
     "alexander": "アレクサンダー商人",
     "welcomeMarket": "マーケットへようこそ！レアペットとポーションを買えます。",
-    "displayItemForGold": "Do you want to sell a <strong><%= itemType %></strong>?",
-    "displayEggForGold": "Do you want to sell a <strong><%= itemType %> Egg</strong>?",
-    "displayPotionForGold": "Do you want to sell a <strong><%= itemType %> Potion</strong>?",
+    "displayItemForGold": "<strong><%= itemType %></strong>を売りますか?",
+    "displayEggForGold": "<strong><%= itemType %> のたまご</strong>を売りますか?",
+    "displayPotionForGold": "<strong><%= itemType %>の薬</strong>を売りますか?",
     "sellForGold": " <%= gold %> ゴルドに売る",
     "buyGems": "ジェムを買う",
-    "purchaseGems": "Purchase Gems",
+    "purchaseGems": "ジェムの購入",
     "justin": "ジャスティン",
     "ian": "イアン",
     "ianText": "クエストショップへようこそ！ここでは友達と一緒にモンスターと戦えるクエストの巻物を手に入れられます。この美しい品ぞろえを確認して、右側で購入しましょう！",
-    "ianBrokenText": "Welcome to the Quest Shop... Here you can use Quest Scrolls to battle monsters with your friends... Be sure to check out our fine array of Quest Scrolls for purchase on the right...",
-    "USD": "(USD)",
+    "ianBrokenText": "クエスト ショップへようこそ...ここでは友だちといっしょにモンスターと戦うクエストの巻物をつかうことができます...右側にあるクエストの巻物の美しい品ぞろえもご覧になってください...",
+    "USD": "(米ドル)",
     "newStuff": "新しい事",
     "cool": "後で伝える",
     "dismissAlert": "この告示を閉じる",
@@ -31,12 +31,12 @@
     "donationDesc": "20ジェムを支払う",
     "payWithCard": "クレジットカードで支払う",
     "payNote": "備考:Paypalでの支払いは時間がかかることがあります。キャッシュカードのご使用をおすすめいたします。",
-    "card": "Credit Card (using Stripe)",
+    "card": "クレジットカード(決済サービス「Stripe」経由)",
     "amazonInstructions": "このボタンをクリックしてAmazon Paymentsで支払う。",
-    "paymentMethods": "Purchase using",
+    "paymentMethods": "購入 : ",
     "classGear": "クラスギア",
     "classGearText": "最初に: 慌てる必要はありません! あなたの古いギアは、あなたの所持品です。あなたは今、弟子の <strong><%= klass %></strong> の装備を着ています。あなたのクラスのギアを身に着けていると、ステータスに50%のボーナスが付与されます。しかし、気軽に古いギアに切り替えてください。",
-    "classStats": "These are your class's stats; they affect the game-play. Each time you level up, you get one point to allocate to a particular stat. Hover over each stat for more information.",
+    "classStats": "あなたのクラスのステータスで、ゲームの進行に影響を与えています。レベルアップするたびに、特定のステータスに割り振ることができる1ポイントを取得します。それぞれのステータスにマウスカーソルを当てると、詳しい情報が表示されます。",
     "autoAllocate": "自動割り当て",
     "autoAllocateText": "'自動割当' がチェックされている場合は、タスクの属性に基づいて、あなたのアバターは自動的にステータスを獲得します。属性は <strong>タスク > 編集 > 詳細設定 > 属性</strong> で確認することができます。例えば、あなたが頻繁にジムをヒットしている場合、そして 'ジム' 日課が '物理的' に設定されている場合、あなたは自動的に獲得します。",
     "spells": "魔法",
@@ -51,16 +51,16 @@
     "tourHabits": "この列は良い/悪い習慣で一日に何度も実行できます！続けるには、鉛筆をクリックして名前を編集し、チェックマークをクリックしてセーブしてください。",
     "tourStats": "良い習慣は経験値とゴールドを増やします。悪い習慣は体力が減ります。",
     "tourGP": "進めるには、今得たゴールドで練習用の剣を買おう！",
-    "tourAvatar": "<strong>Customize Your Avatar</strong><ul><li>Your avatar represents you.</li><li>Customize now, or return later.</li><li>Your avatar starts plain until you've earned Equipment!</li></ul>",
+    "tourAvatar": "<strong>アバターのカスタマイズ</strong><ul><li>アバターはあなたの分身です。</li><li>いますぐカスタマイズすることもできますし、後でもできます。</li><li>装備を手に入れるまでは、アバターは丸腰です。</li></ul>",
     "tourScrollDown": "必ず一番下までスクロールして全てのオプションを見よう！アバターをもう一度クリックしてタスクページに戻ろう。",
     "tourMuchMore": "タスクを実行したら、友達とパーティーを組んだり、共通の趣味のギルドでチャットしたり、チャレンジに参加できたり、他にもできます！",
     "tourStatsPage": "これはあなたのステータスページです!　タスクを完了して実績を解除しましょう。",
-    "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+    "tourTavernPage": "キャンプ場へようこそ!　年齢に関わらず参加できるチャットルームです。あいさつをしてください!\n病気や旅行など日課を実施できない事情があり、そのために発生するダメージから身を守るには、「宿で休む」をクリックしてください。",
     "tourPartyPage": "パーティーはあなたが責任を果たす事を助けてくれるでしょう。友達を招待してクエストスクロールをアンロックしましょう！",
     "tourGuildsPage": "ギルドは共通の興味を持つプレイヤー同士のためのチャットグループです。リストから興味のあるグループを探して参加しましょう。だれでもHabiticaに関する質問ができる、初心者のためのギルドのチェックも忘れずに！",
-    "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!",
+    "tourChallengesPage": "チャレンジは、ユーザーが作成したテーマをもった一連のタスクです。チャレンジに加わると、あなたにそのタスクが加わります。賞金のジェムをかけて、他のユーザーと競争しましょう!",
     "tourMarketPage": "レベル4の始めから、タスクを完了するとたまごと孵化ポーションがランダムにドロップします。それらはここに表示され、ペットを孵化するのに使いましょう！市場でアイテムを買う事もできます。",
-    "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to Habitica, too!",
+    "tourHallPage": "英雄記念館へようこそ。こちらは Habitica をオープンソースの世界で貢献してくださった方々を称える場所です。プログラム、画像、音楽、執筆などでの貢献により、彼らはジェム、特別なアイテム、そして名誉ある肩書きを手にしました。あなたも Habitica に貢献できますよ! ",
     "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
     "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!",
     "tourEquipmentPage": "装備はここに保管されています。武具はステータスに影響を与えます。ステータスを変えないままアバターに別の装備を付けたい時は「衣装を有効にする」をクリックしてください。",
@@ -69,7 +69,7 @@
     "tourSplendid": "素晴らしい！",
     "tourNifty": "二フティ！",
     "tourAvatarProceed": "タスクを見せて！",
-    "tourToDosBrief": "<strong>To-Do List</strong><ul><li>Check off To-Dos to earn Gold & Experience!</li><li>To-Dos never make your avatar lose Health.</li></ul>",
+    "tourToDosBrief": "<strong>To-Do リスト</strong><ul><li>To-Doをやったらチェックを入れて、ゴールドと経験値を稼ぎましょう!</li><li>To-Do がアバターの体力を奪うことはありません。</li></ul>",
     "tourDailiesBrief": "<strong>日課</strong><ul><li>日課は毎日繰り返します。</li><li>日課を終わらせないとHPを失います。</li></ul>",
     "tourDailiesProceed": "気をつけます！",
     "tourHabitsBrief": "<strong>良い＆悪い習慣</strong><ul><li>良い習慣ではゴールド＆経験値を獲られます。</li><li>悪い習慣ではHPが減少します。</li></ul>",
@@ -78,11 +78,11 @@
     "tourRewardsProceed": "以上です！",
     "welcomeToHabit": "Habiticaへようこそ!",
     "welcome1": "基本的なアバターを作って",
-    "welcome1notes": "This avatar will represent you as you progress.",
-    "welcome2": "Set up your tasks.",
-    "welcome2notes": "How well you do on your real-life tasks will control how well you do in the game!",
-    "welcome3": "Progress in life and the game!",
-    "welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
+    "welcome1notes": "アバターは、あなた自身と、あなたの成長の分身です。",
+    "welcome2": "タスクを設定しましょう。",
+    "welcome2notes": "実生活でのタスクをがんばりが、ゲームの進行をコントロールします!",
+    "welcome3": "生活とゲームでの成長!",
+    "welcome3notes": "あなたが生活を改善すればするほど、あなたのアバターもレベルアップし、ペットやクエスト、装備などの新しい機能がアンロックされていきます。",
     "welcome4": "あなたのHPを減らす、悪い習慣を避けましょう。さもないとあなたのアバターは死んでしまいます！",
     "welcome5": "それではアバターをカスタマイズしてタスクをセットしましょう…",
     "imReady": "Habiticaに入る"
diff --git a/common/locales/ja/pets.json b/common/locales/ja/pets.json
index b23fa82522..cc9e3bf705 100644
--- a/common/locales/ja/pets.json
+++ b/common/locales/ja/pets.json
@@ -30,7 +30,7 @@
     "magicHatchingPotions": "<strong>魔法のたまごがえしの薬</strong>",
     "hatchingPotion": "孵化ポーション",
     "noHatchingPotions": "たまごがえしの薬をもっていません。",
-    "inventoryText": "たまごをクリックすると、使える薬が緑色にハイライトされます。ハイライトされた薬の中のどれかをクリックすると、ペットのたまごがかえります。どの薬もハイライトされないなら、もう一度たまごをクリックして選択を解除し、まず薬をクリックするとつかえるたまごがハイライトされます。また、不要な拾得物は、商人・アレキサンダーに売ることもできます。",
+    "inventoryText": "たまごをクリックすると使える薬が緑色になるので、その中のどれかをクリックすると、たまごがかえってペットになります。どの薬も緑色にならないなら、もう一度そのたまごをクリックして選択を解除し、かわりにまず薬をクリックするとつかえるたまごが緑色になります。また、不要な拾得物は、商人・アレキサンダーに売ることもできます。",
     "foodText": "えさ",
     "food": "えさとサドル",
     "noFood": "えさもサドルもありません。",
diff --git a/common/locales/ja/quests.json b/common/locales/ja/quests.json
index ac704e11e8..4ef5779cef 100644
--- a/common/locales/ja/quests.json
+++ b/common/locales/ja/quests.json
@@ -1,12 +1,12 @@
 {
     "quests": "クエスト",
     "quest": "クエスト",
-    "whereAreMyQuests": "クエストに個別ページが出来、チェックしやすくなりました！所持品 -> クエストからご覧ください。",
+    "whereAreMyQuests": "クエストのページができました!　アイテム -> クエストからご覧ください。",
     "yourQuests": "あなたのクエスト",
     "questsForSale": "クエストの販売",
     "petQuests": "ペットと乗用獣のクエスト",
-    "unlockableQuests": "開放されたクエスト",
-    "goldQuests": "コインで購入できるクエスト",
+    "unlockableQuests": "アンロックできるクエスト",
+    "goldQuests": "ゴールドで購入できるクエスト",
     "questDetails": "クエストの詳細",
     "invitations": "招待状",
     "completed": "完了！",
@@ -19,64 +19,64 @@
     "questInvitationTitle": "クエストへの招待",
     "questInvitationInfo": "クエスト <%= quest %> への招待",
     "askLater": "あとで質問する",
-    "questLater": "あとでクエスト",
-    "buyQuest": "クエストを買います",
-    "accepted": "受け入れられました",
-    "rejected": "拒否されました",
+    "questLater": "あとでクエストをはじめる",
+    "buyQuest": "クエストを買う",
+    "accepted": "承認しました",
+    "rejected": "拒否しました",
     "pending": "未決",
     "questStart": "一旦、すべてのメンバーが受け入れまたは拒否のどちらかを選択すると、クエストが開始されます。「受け入れる」をクリックしたものだけがクエストに参加して、ドロップを受け取ることができるようになります。メンバーが長い間保留 (非アクティブ?) している場合は、クエストオーナーは「開始」をクリックして彼ら抜きでクエストを開始することができます。また、クエストオーナーは、「キャンセル」をクリックして、クエストをキャンセルし、クエストスクロールを取り戻すことができます。",
-    "questStartBroken": "Once all members have either accepted or rejected, the quest begins... Only those that clicked \"accept\" will be able to participate in the quest and receive the drops... If members are pending too long (inactive?), the quest owner can start the quest without them by clicking \"Begin\"... The quest owner can also cancel the quest and regain the quest scroll by clicking \"Cancel\"...",
-    "begin": "始める",
+    "questStartBroken": "一度すべてのメンバーが承認または拒否するとクエストがはじまります...「承認」をクリックしたメンバーだけがクエストに参加して、アイテムを手に入れることができます...もし長期にメンバーが保留しつづけた場合 (アクティブじゃない?)、クエストの所有者は［はじめる］をクリックすることでそのメンバーたちを除いてクエストをはじめることができます...また、クエストの所有者は［中止する］をクリックすることで、クエストを中止しクエストの巻物を取り返すことができます...",
+    "begin": "はじめる",
     "bossHP": "ボスの体力",
-    "bossStrength": "ボスの力",
-    "rage": "Rage",
+    "bossStrength": "ボスの強さ",
+    "rage": "激怒",
     "collect": "獲得",
     "collected": "獲得済み",
     "collectionItems": "<%= number %> <%= items %>",
-    "itemsToCollect": "コレクトアイテム",
-    "bossDmg1": "日課、ToDo、および良い習慣を消化することでボスにダメージを与えることが出来ます。また、赤くなったタスクを消化する、スキルの「Brutal Smash」や「Burst of Flames」を使用することで更にダメージを与えることが出来ます。また、ボスはクエストに参加したメンバーが消化しそこねた日課に応じて(設定されたボスの強さの倍率の)通常のダメージに上乗せしたダメージを与えてきます。貴方のパーティを守るため、がんばって日課をこなしましょう！<strong>ボスに与えたダメージおよびボスからの攻撃ダメージは、Cronにおいて(貴方の1日が切り替わる時間に)まとめて計上されます。</strong>",
-    "bossDmg2": "参加者だけがボスと戦い、クエストの勝利品を共有することができる",
-    "bossDmg1Broken": "Each completed Daily and To-Do and each positive Habit hurts the boss... Hurt it more with redder tasks or Brutal Smash and Burst of Flames... The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies... <strong>All damage to and from a boss is tallied on cron (your day roll-over)...</strong>",
-    "bossDmg2Broken": "Only participants will fight the boss and share in the quest loot...",
-    "tavernBossInfo": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss! Incomplete Dailies fill the Exhaust Strike Bar. When the Exhaust Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.",
-    "tavernBossInfoBroken": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss... Incomplete Dailies fill the Exhaust Strike Bar... When the Exhaust Strike bar is full, the World Boss will attack an NPC... A World Boss will never damage individual players or accounts in any way... Only active accounts not resting in the Inn will have their tasks tallied...",
-    "bossColl1": "アイテムを収集するには、良いタスクを実行します。クエストアイテムは通常のアイテムのようにドロップします。ただし、翌日までドロップは表示されません。その後あなたが見つけたものはすべて集計されて、山に寄与します。",
-    "bossColl2": "参加者だけがアイテムを探索し、クエストの勝利品を共有することができる",
-    "bossColl1Broken": "To collect items, do your positive tasks... Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile...",
-    "bossColl2Broken": "Only participants can collect items and share in the quest loot...",
-    "abort": "中止",
-    "leaveQuest": "クエストから離脱する",
-    "sureLeave": "本当に進行中のクエストを離脱しますか？現在までのクエスト進行は失われます。",
-    "questOwner": "クエストオーナー",
-    "questOwnerNotInPendingQuest": "クエストオーナーはクエストを残していますが、もはやそれを始めることはできません。それを今キャンセルすることをお勧めします。クエストオーナーはクエストスクロールの所有を保持します。",
-    "questOwnerNotInRunningQuest": "クエストオーナーはクエストを残しています。必要であれば、クエストを中止することができます。また、実行の継続を許可することもでき、残りのすべての参加者はクエストが終了した時に、クエストの報酬を受け取ります。",
-    "questOwnerNotInPendingQuestParty": "クエストオーナーはパーティを残していますが、もはやクエストを始めることはできません。それを今キャンセルすることをお勧めします。クエストスクロールはクエストオーナーに戻されます。",
-    "questOwnerNotInRunningQuestParty": "クエストオーナーはパーティを残しています。必要であれば、クエストを中止することができますが、また、実行を続けることもでき、残りのすべての参加者はクエストが終了した時に、クエストの報酬を受け取ります。",
+    "itemsToCollect": "獲得アイテム",
+    "bossDmg1": "日課やTo-Do、前向きの習慣を行うたびにボスにダメージを与えます。赤くなったタスク行う、または「強烈なスマッシュ」や「火炎爆破」のスキルをつかうとさらに大きなダメージを与えることができます。あなたが日課をサボると、通常の日課のダメージにくわえて、ボスがクエストに参加している全員に与えるダメージ ( × ボスの強さ) を受けることになります。ですから、パーティーの仲間はみんなで日課を実行しなくてはいけません!　<strong>ボスに与えるダメージ、およびボスから受けるダメージは、いずれも cron (あなたが設定した日付更新の時間) にまとめて計算されます。</strong>",
+    "bossDmg2": "参加者だけがボスと戦い、クエストの賞品を分け合うことができます。",
+    "bossDmg1Broken": "日課やTo-Do、前向きの習慣を行うたびにボスにダメージを与える...赤くなったタスクを行う、または「強烈なスマッシュ」や「火炎爆破」のスキルをつかうとさらに大きなダメージを与えられる...あなたが日課をサボると、通常の日課のダメージにくわえて、ボスがクエストに参加している全員に与えるダメージ ( × ボスの強さ) を受けることになる。だから、パーティーの仲間はみんなで日課を実行しなくてはいけない...<strong>ボスに与えるダメージ、およびボスから受けるダメージは、いずれも cron (あなたが設定した日付更新の時間) にまとめて計算される...</strong>",
+    "bossDmg2Broken": "参加者だけがボスと戦い、クエストの賞品を分け合うことができる...",
+    "tavernBossInfo": "日課やTo-Do、前向きの習慣を行うたびに世界のボスにダメージを与えます!　日課をサボると「消耗の一撃」バーがたまっていきます。「消耗の一撃」バーがいっぱいになると、世界のボスはNPCを攻撃します。世界のボスは一人ひとりのプレーヤーやアカウントを攻撃することはありません。宿で休んでいるメンバーを除いた活動中のアカウントのタスクのみ計算されます。",
+    "tavernBossInfoBroken": "日課やTo-Do、前向きの習慣を行うたびに世界のボスにダメージを与える...日課をサボると「消耗の一撃」バーがたまっていく...「消耗の一撃」バーがいっぱいになると、世界のボスはNPCを攻撃する...世界のボスは一人ひとりのプレーヤーやアカウントを攻撃することはない...宿で休んでいるメンバーを除いた活動中のアカウントのタスクのみ計算される...",
+    "bossColl1": "アイテムを収集するには、前向きのタスクを実行します。クエスト アイテムは通常のアイテムと同様に手に入ります。ただし、翌日までアイテムを確認しないと、あなたが見つけたアイテムは山に集められてしまいます。",
+    "bossColl2": "参加者だけがアイテムを集めることができ、クエストの賞品を分け合うことができる...",
+    "bossColl1Broken": "アイテムを集めるには、前向きのタスクを実行することだ...クエスト アイテムは通常のアイテムと同様に手に入る。ただし、翌日までアイテムを確認しないと、あなたが見つけたアイテムは山に集められてしまう...",
+    "bossColl2Broken": "参加者だけがアイテムを集めることができ、クエストの賞品を分け合うことができる...",
+    "abort": "中断する",
+    "leaveQuest": "クエストから抜ける",
+    "sureLeave": "進行中のクエストを抜けます。よろしいですか?　あなたのクエストの成果はすべて失われます。",
+    "questOwner": "クエストの所有者",
+    "questOwnerNotInPendingQuest": "クエストの所有者は、そのクエストを残していますが、もうそれをはじめることはありません。すぐに中断することをおすすめします。クエストの所有者は、クエストの巻物を再度取得します。",
+    "questOwnerNotInRunningQuest": "クエストの所有者はそのクエストを残しています。必要であれば、クエストを中断することができます。または、クエストを続行し、クエストの終了時に残ったすべての参加者で報酬を分け合えるよう許可することもできます。",
+    "questOwnerNotInPendingQuestParty": "クエストの所有者はそのパーティを残していますが、もうクエストをはじめることはありません。すぐに中断することをおすすめします。クエストの巻物はクエストの所有者のところに返されます。",
+    "questOwnerNotInRunningQuestParty": "クエストの所有者はパーティーを残しています。必要であれば、クエストを中断することができます。または、クエストを続行し、クエストの終了時に残ったすべての参加者で報酬を受け取れるよう許可することもできます。",
     "questParticipants": "参加者",
-    "scrolls": "クエストスクロール",
-    "noScrolls": "クエストスクロールを持っていません",
-    "scrollsText1": "クエストはパーティが必要です。もし単独でクエストしたい場合は、",
+    "scrolls": "クエストの巻物",
+    "noScrolls": "クエストの巻物を持っていません。",
+    "scrollsText1": "クエストにはパーティが必要です。もし一人でクエストをやりたい場合は、",
     "scrollsText2": "空のパーティを作る",
-    "scrollsPre": "まだこのクエストは開放されていません！",
-    "alreadyEarnedQuestLevel": "レベル <%= level %> に到達したのでクエストに挑戦できます。",
+    "scrollsPre": "このクエストはまだアンロックされていません!",
+    "alreadyEarnedQuestLevel": "レベル <%= level %> に到達したのでこのクエストに挑戦できます。",
     "alreadyEarnedQuestReward": "<%= priorQuest %> クエストを達成したので、このクエストに挑戦できます。",
     "completedQuests": "以下のクエストを完了しました",
-    "mustComplete": "<%= quest %>を最初に完了させる必要があります。",
-    "mustLevel": "レベル <%= level %> に到達するまでこのクエストに挑戦できません。",
-    "mustLvlQuest": "このクエストを購入するためにはレベルが<%= level %>以上でなければなりません！",
-    "mustInviteFriend": "このクエストを獲るには、友人をパーティーに誘う必要があります。今誘いますか？",
-    "unlockByQuesting": "To earn this quest, complete <%= title %>.",
-    "sureCancel": "このクエストをキャンセルしてもよろしいですか? 招待を受け入れた人はすべて失われます。クエストオーナーはクエストスクロールの所有を保持します。",
-    "sureAbort": "このミッションを中止してもよろしいですか? あなたのパーティのすべての人に対して中止し、すべての進行状況が失われます。クエストスクロールはクエストオーナーに戻されます。",
-    "doubleSureAbort": "本当に二つ同時に行うのですか？途中で嫌にならないか、きちんと考えてくださいね。",
-    "questWarning": "クエストが始まる前に新しいプレイヤーがパーティに参加した場合、彼らもまた、招待状を受け取ります。ただし、クエストが開始した後は、新しいパーティメンバーはクエストに参加できません。",
-    "questWarningBroken": "If new players join the party before the quest starts, they will also receive an invitation... However once the quest has started, no new party members can join the quest...",
-    "bossRageTitle": "怒り",
-    "bossRageDescription": "もしこのバーが満タンになると、ボスは特殊攻撃を放ちます！",
-    "startAQuest": "クエストを始める",
-    "startQuest": "クエストを始めよう",
-    "whichQuestStart": "どのクエストを始めますか？",
-    "getMoreQuests": "Get more quests",
-    "unlockedAQuest": "You unlocked a quest!",
-    "leveledUpReceivedQuest": "You leveled up to <strong>Level <%= level %></strong> and received a quest scroll!"
+    "mustComplete": "<%= quest %>を先に完了してください。",
+    "mustLevel": "このクエストに挑戦するにはレベル <%= level %> が必要です。",
+    "mustLvlQuest": "このクエストを購入するためにはレベルが<%= level %>以上でなければなりません!",
+    "mustInviteFriend": "このクエストを入手するには、友人をパーティーに招待しなくてはいけません。いま招待しますか?",
+    "unlockByQuesting": "このクエストを入手するには、<%= title %>を完了してください。",
+    "sureCancel": "このクエストをぢ中止します。よろしいですか?　招待を承認した人はすべて無効になります。クエストの巻物は、クエストの所有者の手に戻ります。",
+    "sureAbort": "このミッションを中断します。よろしいですか?　パーティの全員が中断になり、すべての進行状況は失われます。クエストの巻物はクエスト所有者の手に戻ります。",
+    "doubleSureAbort": "再確認します。本当に中断しますね?　パーティーの仲間から永遠に憎まれることのないように!",
+    "questWarning": "クエストをはじめる前に新しいプレイヤーがパーティに参加した場合、その人たちも招待状を受けとっています。ただし、クエストがはじまった後は、クエストのパーティーに新しいメンバーが入ることはありません。",
+    "questWarningBroken": "クエストが始まる前に新しいプレイヤーがパーティに参加した場合、彼らもまた、招待状を受け取る...ただし、クエストが開始した後は、新しいパーティメンバーはクエストに参加できない...",
+    "bossRageTitle": "激怒",
+    "bossRageDescription": "このバーがいっぱいになると、ボスは特殊攻撃の封印をときます!",
+    "startAQuest": "クエストをはじめる",
+    "startQuest": "クエストをはじめる",
+    "whichQuestStart": "どのクエストをはじめますか?",
+    "getMoreQuests": "もっとたくさんのクエストを手に入れる",
+    "unlockedAQuest": "クエストをアンロックしました!",
+    "leveledUpReceivedQuest": "レベルアップして、<strong>レベル <%= level %></strong> になったので、クエストの巻物を受けとりました!"
 }
\ No newline at end of file
diff --git a/common/locales/ja/questscontent.json b/common/locales/ja/questscontent.json
index 25a174154d..a198f1d1af 100644
--- a/common/locales/ja/questscontent.json
+++ b/common/locales/ja/questscontent.json
@@ -1,6 +1,6 @@
 {
     "questEvilSantaText": "猟師のサンタ",
-    "questEvilSantaNotes": "You hear agonized roars deep in the icefields. You follow the growls - punctuated by the sound of cackling - to a clearing in the woods, where you see a fully-grown polar bear. She's caged and shackled, fighting for her life. Dancing atop the cage is a malicious little imp wearing a castaway costume. Vanquish Trapper Santa, and save the beast!",
+    "questEvilSantaNotes": "氷原の彼方から、なげきの遠吠えが聞こえる。あなたは、甲高い笑い声にさえぎられながらも聞こえてくるうなり声を追いかけて森の中の広場にたどり着いた。そこには、大きなメスのホッキョクグマがいた。ホッキョクグマは足かせをされ、おりの中に閉じこめられている。それでも命がけで戦っているのだ。打ち捨てられた衣装を着た、意地の悪い小悪魔がおりの上で踊っている。わなをしかけたサンタを倒して、ホッキョクグマを救え!",
     "questEvilSantaCompletion": "Trapper Santa squeals in anger, and bounces off into the night. The grateful she-bear, through roars and growls, tries to tell you something. You take her back to the stables, where Matt Boch the Beast Master listens to her tale with a gasp of horror. She has a cub! He ran off into the icefields when mama bear was captured.",
     "questEvilSantaBoss": "猟師のサンタ",
     "questEvilSantaDropBearCubPolarMount": "ホッキョクグマ(乗用獣)",
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/ja/rebirth.json b/common/locales/ja/rebirth.json
index 8a44e4fb82..843f0c6786 100644
--- a/common/locales/ja/rebirth.json
+++ b/common/locales/ja/rebirth.json
@@ -19,7 +19,7 @@
     "rebirthAchievement100": "あなたは新しい冒険をはじめました! これはあなたの<%= number %>「生まれかわり」 で、あなたが達成した最高レベルは100以上です。この実績を上積みするために、少なくとも100レベル以上に達したときに、次の新しい冒険をはじめましょう!",
     "rebirthBegan": "新しい冒険が始まりました",
     "rebirthText": "<%= rebirths %> 新しい冒険を始めました",
-    "rebirthOrb": "レベルに達成したらオーブオブリバースを使って再スタートしてください",
+    "rebirthOrb": "一定のレベルに達成したら転生のオーブを使って再スタートしてください",
     "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher",
     "rebirthPop": "実績、収集物、およびタスクと履歴を残して、レベル1 の新しいキャラクターではじめます。",
     "rebirthName": "転生のオーブ",
diff --git a/common/locales/ja/settings.json b/common/locales/ja/settings.json
index 7f7433d784..7625c54175 100644
--- a/common/locales/ja/settings.json
+++ b/common/locales/ja/settings.json
@@ -44,9 +44,9 @@
     "export": "エクスポート",
     "xml": "（ＸＭＬ）",
     "json": "（ＪＳＯＮ）",
-    "customDayStart": "カスタムの日の更新",
-    "changeCustomDayStart": "Change Custom Day Start?",
-    "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
+    "customDayStart": "日付更新の設定",
+    "changeCustomDayStart": "日付更新する時間を変更しますか?",
+    "sureChangeCustomDayStart": "日付更新する時間を変更します。よろしいですか?",
     "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!",
     "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.",
     "misc": "その他",
@@ -61,11 +61,11 @@
     "newUsername": "新しいログイン名",
     "dangerZone": "危険地帯",
     "resetText1": "ご注意ください‼ これでアカウントの色んなことをリセットします。普通にくじいていますことなんですが、時々これは便利なオプションになるかもしれません。たとえば、いろんなユーザーがHabitになれると始まり直したいから、リセットしたいと思いました。",
-    "resetText2": "すべてのレベル、ゴールド、経験値を失います。すべてのタスクは完全に削除され、タスクの履歴データをすべて失います。すべての装備を失うことになりますが、既に自分が所有した、すべての限定版の装備または加入者ミステリーアイテムは、すべて買い戻すことがでいます (クラス固有のギアを再購入するには適用クラスになる必要があります)。現在のクラスとあなたのペットと乗り物は維持されます。代わりの選択肢である、オーブオブリバースの使用の方が遥かに安全ですので、ご検討ください。",
+    "resetText2": "すべてのレベル、ゴールド、経験値を失います。すべてのタスクは完全に削除され、タスクの履歴データをすべて失います。すべての装備を失うことになりますが、既に自分が所有した、すべての限定版の装備または加入者ミステリーアイテムは、すべて買い戻すことがでいます (クラス固有のギアを再購入するには適用クラスになる必要があります)。現在のクラスとあなたのペットと乗り物は維持されます。代わりの選択肢である、転生のオーブの使用の方が遥かに安全ですので、ご検討ください。",
     "deleteText": "本当によろしいですか? あなたのアカウントを永遠に削除され、復元することはできません! もう一度Habiticaを使用するには、新しいアカウントを登録する必要があります。銀行預金や使用したジェムは返金されません。本当に確実なら、下のテキストボックスに <strong><%= deleteWord %></strong> を入力してください。",
-    "API": "ＡＰＩ",
+    "API": "API",
     "APIText": "サードパーティのアプリケーションで使用する際にこれらをコピーして使用してください。しかし、APIトークンはパスワードのようなものなので、公に公開することは危険です。時折ユーザーIDを求められることがありますが、GitHubを含め、他の人が見ることができる場所にはあなたのAPIトークンは絶対に投稿しないでください。",
-    "APIToken": "API トーケン ( これはあなたのパスワードです - 上の注意事項を確認してください)",
+    "APIToken": "API トークン ( これはあなたのパスワードです。 上記の注意をよく読んでください! )",
     "resetDo": "はい、アカウントのリセットを実行してください！",
     "fixValues": "設定値を直す",
     "fixValuesText1": "バグを見つかって、他の間違ったものがあって場合に( たとえばダメージとか金の数が間違っています) このフィーチャーを使うと自分でキャラクターの数が直せます。そう、これで騙すことが出来ますよ! よく使わないと癖もハビットが悪くなるんです!",
@@ -126,7 +126,7 @@
     "promoCodeApplied": "プロモコードが適用されました！所持品を確認してください",
     "promoPlaceholder": "プロモコードを入力してください",
     "displayInviteToPartyWhenPartyIs1": "パーティにメンバーが1人の場合に「パーティに招待する」ボタンを表示する",
-    "saveCustomDayStart": "Save Custom Day Start",
+    "saveCustomDayStart": "日付更新の時間を保存する",
     "registration": "登録",
     "addLocalAuth": "Add local authentication:",
     "generateCodes": "Generate Codes",
diff --git a/common/locales/ja/spells.json b/common/locales/ja/spells.json
index 52128b35f3..1f1f57b71c 100644
--- a/common/locales/ja/spells.json
+++ b/common/locales/ja/spells.json
@@ -1,5 +1,5 @@
 {
-    "spellWizardFireballText": "炎のバースト",
+    "spellWizardFireballText": "火炎爆破",
     "spellWizardFireballNotes": "炎が手から吹き出します。XPを手に入れ、ボスにさらにダメージを与えます！タスクをクリックすることで唱えます。(知性に基づく)",
     "spellWizardMPHealText": "エーテル波動",
     "spellWizardMPHealNotes": "友人を助けるために、あなたのマナを犠牲にします。残りのパーティーのメンバー党は、MPを得ます！(知性に基づく)",
@@ -7,7 +7,7 @@
     "spellWizardEarthNotes": "あなたの精神の力が地面を揺らします。パーティー全員が知性を得ます。(知性に基づく)",
     "spellWizardFrostText": "酷寒の霜",
     "spellWizardFrostNotes": "氷があなたのタスクを覆う。あなたの連続実行のいずれも明日ゼロにリセットされない! (一度唱えると全ての連続実行に影響する)",
-    "spellWarriorSmashText": "ブルータルスマッシュ",
+    "spellWarriorSmashText": "強烈なスマッシュ",
     "spellWarriorSmashNotes": "全力でタスクを攻撃する。タスクはより青く、もしくは赤が薄くなり、ボスに追加ダメージを与える!  唱える対象のタスクをクリックしてください。(力に基づく)",
     "spellWarriorDefensiveStanceText": "守勢の体勢",
     "spellWarriorDefensiveStanceNotes": "攻め寄るタスクの覚悟をする。体質のバフを獲得！(バフ抜き体質に基づく)",
@@ -47,4 +47,4 @@
     "spellSpecialSeafoamNotes": "友達を海の生き物に変えよう!",
     "spellSpecialSandText": "砂",
     "spellSpecialSandNotes": "海の泡の効果を取り消す。"
-}
+}
\ No newline at end of file
diff --git a/common/locales/ja/subscriber.json b/common/locales/ja/subscriber.json
index ba5fb8f245..b8b3b3f7e3 100644
--- a/common/locales/ja/subscriber.json
+++ b/common/locales/ja/subscriber.json
@@ -8,7 +8,7 @@
     "retainHistoryText": "完了した To-Do とタスクの履歴の有効期限を延ばします。",
     "doubleDrops": "デイリードロップキャップが二倍になりました",
     "doubleDropsText": "早く納屋をコンプリートする！",
-    "mysteryItem": "Exclusive monthly items",
+    "mysteryItem": "非公開な月例のアイテム",
     "mysteryItemText": "毎月アバター用にユニークな化粧品アイテムを受け取るでしょう! さらに継続購読の3ヶ月ごとに、謎のタイムトラベラーズによって、歴史的(そして未来的!)化粧品アイテムへのアクセスが許されるでしょう。",
     "supportDevs": "開発者をサポート",
     "supportDevsText": "あなたの購読がHabitica繁栄の継続や新機能開発の資金援助を促進します。あなたの気前のよさに感謝します!",
@@ -47,9 +47,9 @@
     "timeSupportText": "私たちは、トレーニング、バグ、インストール、および機能のリクエストのためのサポートを提供します。",
     "gameFeatures": "ゲームの特徴",
     "gold2Gem": "ジェムはゴールドで購入することができます",
-    "gold2GemText": "Members will be able to purchase Gems with gold, meaning none of your participants need to buy anything with real money.",
+    "gold2GemText": "会員はゴールドもってジェムに買って出来ます",
     "infiniteGem": "無限リーダージェム",
-    "infiniteGemText": "We will provide the organization leaders with as many Gems as they need, for things like challenge prizes, guild-creation, etc.",
+    "infiniteGemText": "団体の首脳は必要なジェムを為に挑戦の賞とか組合の創造とか備え付ければ",
     "notYetPlan": "プランはまだ利用できませんが、クリックして私たちに連絡してください。私たちは更新し続けるでしょう。",
     "contactUs": "お問い合わせ",
     "checkout": "チェックアウト",
@@ -60,16 +60,16 @@
     "subGemPop": "あなたはHabiticaに加入していますので、あなたはGoldを使って毎月いくらかジェムを購入することができます。いくつ購入できるかについてはジェムアイコンのコーナーで確認することができます。",
     "subGemName": "購読者ジェム",
     "freeGemsTitle": "無料でジェムを手に入れる",
-    "maxBuyGems": "You have bought all the Gems you can this month. More will become available within the first three days of next month. Thanks for subscribing!",
-    "buyGemsAllow1": "You can buy",
+    "maxBuyGems": "ジェムの極度な分量は既に買った。来月の初めに三日に買って出来ます。あなたの応募は、お疲れ様！",
+    "buyGemsAllow1": "購入に出来ます",
     "buyGemsAllow2": "more Gems this month",
-    "purchaseGemsSeparately": "Purchase Additional Gems",
+    "purchaseGemsSeparately": "追加的なジェムは購入する",
     "subFreeGemsHow": "Habitica players can earn Gems for free by winning <a href=\"/#/options/groups/challenges\">challenges</a> that award Gems as a prize, or as a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">contributor reward by helping the development of Habitica.</a>",
     "seeSubscriptionDetails": "Go to <a href='/#/options/settings/subscription'>Settings &gt; Subscription</a> to see your subscription details!",
     "timeTravelers": "タイムトラベラーズ",
     "timeTravelersTitleNoSub": "<%= linkStartTyler %>タイラー<%= linkEnd %>と<%= linkStartVicky %>ビッキー<%= linkEnd %>",
     "timeTravelersTitle": "謎のタイムトラベラーズ",
-    "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a rare pet, mount, or Subscriber Item Set from the past... or maybe even the future.",
+    "timeTravelersPopoverNoSub": "不思議なタイムトラベラをミスティック砂時計に要って呼び出す<%= linkStart %>愛読者<%= linkEnd %> 3ヶ月で継続的な応募はあれば、ミスティック砂時計（1）って受けます。ミスティック砂時計があれば、不思議なタイムトラベラをあなたに珍しいペットと騎乗し愛読者の過去んアイテムか未来のアイテムは呉れる",
     "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets <a href='http://habitica.wikia.com/wiki/Mystery_Item' target='_blank'>here</a>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?",
     "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!",
     "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!",
diff --git a/common/locales/ja/tasks.json b/common/locales/ja/tasks.json
index 5e496c9188..a94be59d41 100644
--- a/common/locales/ja/tasks.json
+++ b/common/locales/ja/tasks.json
@@ -8,8 +8,8 @@
     "habits": "習慣",
     "newHabit": "新しい習慣",
     "newHabitBulk": "新しい習慣(1行に1つ)",
-    "yellowred": "後向き",
-    "greenblue": "前向き",
+    "yellowred": "強敵",
+    "greenblue": "ザコ敵",
     "edit": "編集",
     "save": "保存",
     "addChecklist": "チェックリストを追加",
@@ -80,9 +80,9 @@
     "streakText": "<%= streaks %> 個の日課を21日連続で実行しました",
     "streakSingular": "連続実行者",
     "streakSingularText": "日課を21日連続で実行しました",
-    "perfectName": "今日も完璧な一日です",
+    "perfectName": "パーフェクトな日",
     "perfectText": "やるべき日課すべてを<%=perfects %>日間、達成しました。この実績により、明日の能力値すべてに「レベル÷2」のボーナスがつきます（レベル100以上の場合はボーナスがつきません）。",
-    "perfectSingular": "完璧な一日です",
+    "perfectSingular": "パーフェクトな日",
     "perfectSingularText": "やるべき日課をすべて完了しました。この実績により、明日の能力値すべてに「レベル÷2」のボーナスがつきます（レベル100以上の場合はボーナスがつきません）。",
     "streakerAchievement": "あなたは「連続実行」の実績を手に入れました！ 21日間の連続記録は習慣形成における一つの節目です。この21日連続実行の実績を胸に、今日の日課およびほかのタスクにもとりみつづけましょう!",
     "fortifyName": "防御の薬",
@@ -102,12 +102,12 @@
     "dailyHelp1": "<%= emphasisStart %>毎日<%= emphasisEnd %>くり返し行う日課が有効です。<%= pencilIcon %> をクリックして、日課を実施する日などを編集します。",
     "dailyHelp2": "日課を完了できなければ、一日の終りに体力が減少します。",
     "dailyHelp3": "日課をさぼると<%= emphasisStart %>より赤く<%= emphasisEnd %>なり、達成すれば<%= emphasisStart %>より青く<%= emphasisEnd %>なります。赤みの強い日課は、それだけ達成したときの稼ぎも、さぼったときのダメージも大きくなります。",
-    "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+    "dailyHelp4": "何時に日付が進むのかを変更するには、 「<%= linkStart %> 設定 > サイト<%= linkEnd %> > 日付更新の設定 」で操作してください。",
     "dailyHelp5": "アイディアを得るために、 <a href='http://habitica.wikia.com/wiki/Sample_Dailies' target='_blank'>日課のサンプル</a>をクリックして下さい！",
     "toDoHelp1": "To-Doは黄色からはじまり、完了できない期間が長くなるとより赤く(色が濃く)なります。",
     "toDoHelp2": "To-DoはHPを減少させません。コインや経験値を獲るだけです。",
     "toDoHelp3": "To-Doは細かく分割してチェックリストにすることで、おそれは緩和され、獲られるポイントも増加します。",
-    "toDoHelp4": "For inspiration, check out these <a href='http://habitica.wikia.com/wiki/Sample_To-Dos' target='_blank'>sample To-Dos</a>!",
+    "toDoHelp4": "参考のために、<a href='http://habitica.wikia.com/wiki/Sample_To-Dos' target='_blank'>To-Do のサンプル</a>をチェックしてみてください!",
     "rewardHelp1": "アバターのために購入した装備は、<%= linkStart %>所持品 > 装備<%= linkEnd %>に保存されます。",
     "rewardHelp2": "装備は、ステータスに効果を与えます。(<%= linkStart %>アバター > ステータス<%= linkEnd %>)",
     "rewardHelp3": "世界的なイベントの期間中、スペシャルな装備が出現します。",
diff --git a/common/locales/nl/character.json b/common/locales/nl/character.json
index 02cabb57e2..7fa65a0a58 100644
--- a/common/locales/nl/character.json
+++ b/common/locales/nl/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Statistieken en prestaties",
     "profile": "Profiel",
-    "avatar": "Customize Avatar",
+    "avatar": "Avatar aanpassen",
     "other": "Overige",
     "fullName": "Volledige naam",
     "displayName": "Weergegeven naam",
@@ -83,7 +83,7 @@
     "allocateInt": "Punten toegewezen aan Intelligentie:",
     "allocateIntPop": "Voeg punt toe aan Intelligentie",
     "noMoreAllocate": "Nu je niveau 100 bent, verdien je geen nieuwe eigenschapspunten meer. Je kunt doorgaan met hogere niveaus bereiken of een nieuw avontuur beginnen vanaf niveau 1 door de <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Bol der Hergeboorte</a> te gebruiken. Deze is nu gratis te krijgen op de markt.",
-    "stats": "Avatar Stats",
+    "stats": "Statistieken avatar",
     "strength": "Kracht",
     "strengthText": "Kracht verhoogt de kans op willekeurige \"voltreffers\" en de extra goud, ervaringspunten, en vondstkans van deze voltreffers. Het helpt ook schade toe te brengen aan eindbazen.",
     "constitution": "Lichaam",
@@ -136,7 +136,7 @@
     "respawn": "Herrijs!",
     "youDied": "Je bent doodgegaan!",
     "dieText": "Je hebt een niveau, al je goud, en een willekeurig onderdeel van je uitrusting verloren. Herrijs, Habiteer, en probeer het opnieuw! Bedwing die slechte gewoontes, let erop je Dagelijkse Taken bij te houden, en houd de dood van je af met een Gezondheidsdrankje als je wankelt!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Weet je het zeker? Dit zal je karakters klasse en toegewezen punten resetten (je krijgt ze allemaal terug om opnieuw toe te wijzen) en kost 3 edelstenen.",
     "purchaseFor": "Kopen voor <%= cost %> edelstenen?",
     "notEnoughMana": "Niet genoeg mana.",
     "invalidTarget": "Ongeldig doel",
diff --git a/common/locales/nl/communityguidelines.json b/common/locales/nl/communityguidelines.json
index 84dc045c90..0d8067f29f 100644
--- a/common/locales/nl/communityguidelines.json
+++ b/common/locales/nl/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In een gemeenschap zo groot als Habitica is het zo dat gebruikers komen en gaan en dat ook beheerders soms hun mantels neer moeten leggen om te ontspannen. De volgende mensen zijn emeritus beheerder. Ze handelen niet meer met het gezag van een beheerder, maar toch willen we hun werk eren!",
     "commGuidePara014": "Emeritus beheerders:",
     "commGuideHeadingPublicSpaces": "Openbare ruimtes in Habitica",
-    "commGuidePara015": "Habitica heeft twee soorten gemeenschappelijke ruimtes: openbare en besloten. Openbare ruimtes zijn onder andere de herberg, openbare gildes, GitHub, Trello, en de Wiki. Besloten ruimtes zijn de particuliere gildes, groepschat en privéberichten.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "In de openbare ruimtes in Habitica gelden enkele regels om iedereen veilig en gelukkig te houden. Voor een avonturier zoals jij zou het niet moeilijk moeten zijn om je eraan te houden!",
     "commGuidePara017": "<strong>Heb respect voor elkaar. </strong> Wees netjes, aardig, vriendelijk en behulpzaam. Onthoud dat Habiticanen uit allerlei verschillende culturen komen en enorm uiteenlopende ervaringen gehad hebben. Dit is een onderdeel van wat Habitica zo cool maakt! Het opbouwen van een gemeenschap betekent dat we zowel onze verschillen als onze gelijkenissen moeten respecteren en vieren. Hier zijn een aantal eenvoudige manieren om elkaar te respecteren:",
     "commGuideList02A": "<strong>Houd je aan de algemene voorwaarden.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Volg instructies van een beheerder gelijk op</strong> als ze je vragen een discussie te staken of naar de Back Corner te verplaatsten. Laatste woorden en goed gemikte afsluiters horen allemaal (op een beleefde manier) aan je \"tafeltje\" in de Back Corner geuit te worden, als dat al toegestaan is.",
     "commGuideList02G": "<strong>Neem de tijd om na te denken in plaats van boos te reageren</strong> als iemand je laat weten dat hij of zij zich oncomfortabel voelt bij iets wat je gezegd of gedaan hebt. Oprecht je excuses aan kunnen bieden getuigt van een sterk karakter. Als je vindt dat iemand ongepast op jou reageert, spreek dan een beheerder aan en zet die persoon niet publiekelijk op zijn nummer.",
     "commGuideList02H": "<strong>Rapporteer controversiële of verhitte discussies aan de moderators.</strong> Als je vindt dat een gesprek te ruzieachtig, emotioneel of kwetsend wordt, ga er dan niet meer op in. Stuur in plaats daarvan een e-mail naar <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> om ons op de hoogte te stellen. Het is onze taak om je een veilige omgeving te bieden.",
-    "commGuideList02I": "<strong>Stuur geen spam.</strong> Onder spam valt onder andere: de zelfde opmerking of vraag op verschillende plekken posten, links posten zonder uitleg of context, nonsensberichten posten, of veel berichten achter elkaar posten. Herhaaldelijk vragen om edelstenen of een abonnement kan ook als spammen gezien worden.",
-    "commGuidePara019": "<strong>In besloten ruimtes</strong> hebben gebruikers meer vrijheid om de onderwerpen te bespreken die ze maar willen, maar ze mogen nog steeds de algemene voorwaarden niet overtreden. Plaats dus geen discriminerend, gewelddadig of bedreigend materiaal.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Er zijn enkele extra richtlijnen voor privéberichten (pm's). Als iemand jou geblokkeerd heeft, neem dan niet ergens anders contact met hem of haar op om te vragen om je te deblokkeren. Stuur geen pm's om iemand om ondersteuning te vragen (omdat het handig is voor de gemeenschap als vragen om hulp of ondersteuning openbaar beantwoord worden). Stuur tenslotte ook geen pm's om iemand om een gift van edelstenen of een abonnement te smeken, want dit valt onder spammen.",
     "commGuidePara021": "Voor sommige openbare ruimtes in Habitica gelden extra richtlijnen.",
     "commGuideHeadingTavern": "De herberg",
diff --git a/common/locales/nl/content.json b/common/locales/nl/content.json
index a7729d72e0..bfc139d07d 100644
--- a/common/locales/nl/content.json
+++ b/common/locales/nl/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "prikkelbare",
     "dropEggBearCubText": "Berenwelp",
     "dropEggBearCubMountText": "Beer",
-    "dropEggBearCubAdjective": "knuffelige",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Griffioen",
     "questEggGryphonMountText": "Griffioen",
     "questEggGryphonAdjective": "trotse",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "kleurrijke",
     "questEggRatText": "Rat",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "vieze",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Octopus",
     "questEggOctopusMountText": "Octopus",
     "questEggOctopusAdjective": "een gladde",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Aap",
     "questEggMonkeyMountText": "Aap",
     "questEggMonkeyAdjective": "een ondeugende",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Vind een uitbroedtoverdrank om over dit ei te gieten en er zal een <%= eggAdjective(locale) %> <%= eggText(locale) %> uitkomen.",
     "hatchingPotionBase": "Normale",
     "hatchingPotionWhite": "Witte",
diff --git a/common/locales/nl/gear.json b/common/locales/nl/gear.json
index f8cd8d3700..fecaa55632 100644
--- a/common/locales/nl/gear.json
+++ b/common/locales/nl/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "wapen",
     "weaponBase0Text": "Geen wapen",
     "weaponBase0Notes": "Geen wapen.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "Orde! Verhoogt kracht en lichaam elk met <%= attrs %>. Betoverd kabinet: Juridische set (Voorwerp 3 van 3).",
     "weaponArmoireJesterBatonText": "Staf van de Joker",
     "weaponArmoireJesterBatonNotes": "Met een zwaai van je staf en een gevatte persiflage worden zelfs de meest ingewikkelde situaties helder. Verhoogt intelligentie en perceptie elk met met <%= attrs %>. Betoverd Kabinet: Jokerset (Voorwerp 3 van 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Mijnwerkershouweel",
+    "weaponArmoireMiningPickaxNotes": "Houw de maximale hoeveelheid goud uit je taken! Verhoogt perceptie met <%= per %>. Betoverd kabinet: Mijnwerkersset (Voorwerp 3 van 3).",
     "armor": "wapenrusting",
     "armorBase0Text": "Eenvoudige kleding",
     "armorBase0Notes": "Normale kleding. Verleent geen voordelen.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Erg serieus en statig. Verhoogt lichaam met <%= con %>. Betoverd kabinet: Juridische set (Voorwerp 2 van 3).",
     "armorArmoireJesterCostumeText": "Jokerkostuum",
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Anders dan dit kostuum doet vermoeden, ben je geen dwaas. Verhoogt intelligentie met <%= int %>. Betoverd kabinet: jokerset (voorwerp 2 van 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Mijnwerkersoveral",
+    "armorArmoireMinerOverallsNotes": "Ze zien er misschien afgedragen uit, maar je zijn betoverd om modder af te stoten. Verhoogt lichaam met <%= con %>. Betoverd kabinet: Mijnwerkersset (Voorwerp 2 van 3).",
     "headgear": "hoofdbescherming",
     "headBase0Text": "Geen helm",
     "headBase0Notes": "Geen hoofdbescherming.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Deze vlammen branden koud met zuiver intellect. Verleent geen voordelen. Abonnee-uitrusting december 2015.",
     "headMystery201601Text": "Helm van ware Wilskracht",
     "headMystery201601Notes": "Blijf vastberaden, dappere held! Verleent geen voordelen. Abonnee-uitrusting januari 2016.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Hoed van de Hartenbreker",
+    "headMystery201602Notes": "Bescherm je identiteit voor al je aanbidders. Verleent geen voordelen. Abonnee-uitrusting februari 2016.",
     "headMystery301404Text": "Chique hoge hoed",
     "headMystery301404Notes": "Een chique hoge hoed voor lieden van deftigen huize! Abonnee-uitrusting januari 3015. Verleent geen voordelen.",
     "headMystery301405Text": "Standaard hoge hoed",
@@ -549,7 +550,7 @@
     "headArmoireBlueHairbowText": "Blauwe strik",
     "headArmoireBlueHairbowNotes": "Word scherpzinnig, onverzettelijk en slim terwijl je deze prachtige blauwe strik draagt! Verhoogt Perceptie met <%= per %>, Lichaam met <%= con %> en Intelligentie met <%= int %>. Betoverd kabinet: losstaand voorwerp.",
     "headArmoireRoyalCrownText": "Koninklijke kroon",
-    "headArmoireRoyalCrownNotes": "Hoezee voor de vorst, machtig en sterk! Verhoogt Kracht met <%= str %>. Betoverd kabinet: Koninklijke set (Voorwerp 1 van 3).",
+    "headArmoireRoyalCrownNotes": "Hoezee voor de vorst, machtig en sterk! Verhoogt kracht met <%= str %>. Betoverd kabinet: Koninklijke set (Voorwerp 1 van 3).",
     "headArmoireGoldenLaurelsText": "Gouden laurier",
     "headArmoireGoldenLaurelsNotes": "Deze gouden laurieren belonen hen die slechte gewoonten hebben overwonnen. Verhoogt Perceptie  en Lichaam met elk <%= attrs %>. Betoverd kabinet: Gouden Togaset (Onderdeel 2 van 3).",
     "headArmoireHornedIronHelmText": "Gehoornde ijzeren helm",
@@ -567,17 +568,17 @@
     "headArmoireBlueFloppyHatText": "Blauwe flaphoed",
     "headArmoireBlueFloppyHatNotes": "Vele spreuken zijn genaaid in deze eenvoudige hoed, daardoor kreeg het deze briljante blauwe kleur. Verhoogt Lichaam, Intelligentie en Perceptie elk met <%= attrs%>. Betoverd kabinet: Onafhankelijk voorwerp.",
     "headArmoireShepherdHeaddressText": "Herders Hoofdtooi",
-    "headArmoireShepherdHeaddressNotes": "Soms houden jouw griffioenen ervan om van deze hoofdtooi te snoepen, maar het maakt je daardoor des te intelligenter. Verhoogt Intelligentie met <%= int %>. Betoverd kabinet: Herder set (voorwerp 3 van 3). ",
-    "headArmoireCrystalCrescentHatText": "Kristallen halvemaanhoed",
+    "headArmoireShepherdHeaddressNotes": "Soms houden jouw griffioenen ervan om van deze hoofdtooi te snoepen, maar het maakt je desondanks intelligenter. Verhoogt Intelligentie met <%= int %>. Betoverd kabinet: Herder set (Voorwerp 3 van 3). ",
+    "headArmoireCrystalCrescentHatText": "Kristallen Halvemaanhoed",
     "headArmoireCrystalCrescentHatNotes": "Het patroon op deze hoed neemt toe en af met de fases van de maan. Verhoogt intelligentie en perceptie elk met <%= attrs %>. Betoverd kabinet: Kristallen halvemaanset (Voorwerp 1 van 3).",
     "headArmoireDragonTamerHelmText": "Drakentemmer Helm",
     "headArmoireDragonTamerHelmNotes": "Je ziet er helemaal uit als een draak. De perfecte camouflage... Verhoogt Intelligentie met <%= int %>. Betoverd Kabinet: Drakentemmer Set (voorwerp 1 van 3).",
     "headArmoireBarristerWigText": "Rechterspruik",
-    "headArmoireBarristerWigNotes": "Deze levendige pruik is genoeg om zelfs de meest meedogenloze vijand in angst te laten vluchten. Verhoogt kracht met <%= str %>. Betoverd kabinet: Juridische set (Voorwerp 1 van 3).",
+    "headArmoireBarristerWigNotes": "Deze verende pruik is genoeg om zelfs de meest meedogenloze vijand in angst te laten vluchten. Verhoogt kracht met <%= str %>. Betoverd kabinet: Juridische set (Voorwerp 1 van 3).",
     "headArmoireJesterCapText": "Kap van de Joker",
     "headArmoireJesterCapNotes": "De belletjes op deze hoed kunnen je tegenstanders afleiden, maar ze helpen jou om te focussen.  Verhoogt Perceptie met <%= per %>. Betoverd kabinet: Jokerset (Voorwerp 1 van 3). ",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Mijnwerkershelm",
+    "headArmoireMinerHelmetNotes": "Bescherm te hoofd voor vallende taken! Verhoogt intelligentie met <%= int %>. Betoverd kabinet: Mijnwerkersset (Voorwerp 1 van 3).",
     "offhand": "artikel voor schildhand",
     "shieldBase0Text": "Geen uitrusting voor schildhand",
     "shieldBase0Notes": "Geen schild of tweede wapen.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "Hulde voor de leider, waard om bezongen te worden! Verhoogt lichaam, intelligentie en perceptie elk met <%= attrs %>. Betoverd Kabinet: Koninklijke set (voorwerp 2 van 3).",
     "shieldArmoireDragonTamerShieldText": "Drakentemmer Schild",
     "shieldArmoireDragonTamerShieldNotes": "Leid vijanden af met dit schild in de vorm van een draak. Verhoogt Perceptie met <%= per %>. Betoverd Kabinet: Drakentemmer Set (Voorwerp 2 van 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Mystieke Lamp",
+    "shieldArmoireMysticLampNotes": "Verlicht de donkerste grotten met deze Mystieke Lamp! Verhoogt perceptie met <%= per %>. Betoverd Kabinet: Onafhankelijk Voorwerp. ",
     "back": "Lichaamsaccessoire",
     "backBase0Text": "Geen rugaccessoire",
     "backBase0Notes": "Geen rugaccessoire.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Surf uit de IJverige Havens en berijd de golven in Baai Incompleet! Verleent geen voordelen. Abonnee-uitrusting juli 2015.",
     "backMystery201510Text": "Koboldstaart",
     "backMystery201510Notes": "Grijpgraag en krachtig! Geeft geen voordeel. Abonnee-uitrusting oktober 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Hartenbreker Cape",
+    "backMystery201602Notes": "Met een zwier van je cape vallen je vijanden voor je neer! Geeft geen voordelen. Abonnee-uitrusting februari 2016.",
     "backSpecialWonderconRedText": "Machtige cape",
     "backSpecialWonderconRedNotes": "Zwiept met kracht en schoonheid. Verleent geen voordelen. Speciale congresuitrusting.",
     "backSpecialWonderconBlackText": "Sluiperscape",
diff --git a/common/locales/nl/generic.json b/common/locales/nl/generic.json
index d4bf1a328b..fadb837164 100644
--- a/common/locales/nl/generic.json
+++ b/common/locales/nl/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Ik heb een nieuw huisdier uitgebroed door mijn taken uit het echte leven te voltooien!",
     "raisePetShare": "Ik heb een huisdier opgevoed naar een rijdier door mijn taken uit het echte leven te voltooien!",
     "wonChallengeShare": "Ik heb een uitdaging gewonnen in Habitica!",
-    "achievementShare": "Ik heb een nieuwe prestatie behaald in Habitica!"
+    "achievementShare": "Ik heb een nieuwe prestatie behaald in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/nl/groups.json b/common/locales/nl/groups.json
index af53f6bb4c..5f4797c49c 100644
--- a/common/locales/nl/groups.json
+++ b/common/locales/nl/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Herberg Chat",
     "innCheckOut": "Uitchecken bij de herberg",
     "innCheckIn": "Rusten in de herberg",
     "innText": "Je ben aan het uitrusten in de herberg! Zolang je hier verblijft, zullen je dagelijkse taken je geen pijn doen aan het eind van de dag, maar ze zullen wel elke dag verversen. Wees gewaarschuwd: als je meedoet aan een queeste met een eindbaas, zal de eindbaas je nog steeds pijn doen voor de dagelijkse taken die je groepsgenoten missen, tenzij ze ook in de herberg verblijven! Je zult zelf ook geen schade toebrengen aan de eindbaas (of  voorwerpen krijgen) totdat je de herberg verlaat.",
@@ -101,7 +101,7 @@
     "inbox": "Inbox",
     "abuseFlag": "Overtreding van gemeenschapsrichtlijnen melden",
     "abuseFlagModalHeading": "<%= name %> rapporteren wegens overtreding?",
-    "abuseFlagModalBody": "Weet je zeker dat je deze post wil melden? Meld ENKEL posten die de <%= firstLinkStart %>Gemeenschapsrichtlijnen<%= linkEnd %> en/of <%= secondLinkStart %>Gebruiksvoorwaarden<%= linkEnd %> schenden. Ongepast melden van een post is een schending van de Gemeenschapsrichtlijnen en kan je een inbreuk bezorgen. Gepaste redenen om een post te melden zijn onder meer, maar niet beperkt tot  <p></p></br><ul style='margin-left: 10px;'><li>vloeken, religieuze vloeken</li><li>fanatisme, laster</li><li>18+ onderwerpen</li><li>geweld, ook als grap</li><li>spam, onzinnige berichten</li></ul>",
+    "abuseFlagModalBody": "Weet je zeker dat je deze post wil melden? Meld ENKEL posts die de <%= firstLinkStart %>Gemeenschapsrichtlijnen<%= linkEnd %> en/of <%= secondLinkStart %>Gebruiksvoorwaarden<%= linkEnd %> schenden. Het ongepast melden van een post is een schending van de Gemeenschapsrichtlijnen en kan je een overtreding bezorgen. Gepaste redenen om een post te melden zijn onder meer, maar niet beperkt tot:  <p></p></br><ul style='margin-left: 10px;'><li>schelden, religieuze vloeken</li><li>fanatisme, laster</li><li>18+ onderwerpen</li><li>geweld, ook als grap</li><li>spam, onzinnige berichten</li></ul>",
     "abuseFlagModalButton": "Overtreding melden",
     "abuseReported": "Dank je voor het melden van deze overtreding. De beheerders zijn op de hoogte gesteld.",
     "abuseAlreadyReported": "Je hebt dit bericht al gemeld.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Je groepschat is leeg! Typ een bericht in het bovenstaande vak om een conversatie te beginnen.",
     "guildChatEmpty": "De gildechat is leeg! Typ een bericht in het bovenstaande vak om een conversatie te beginnen.",
     "possessiveParty": "<%= name %>s groep",
-    "requestAcceptGuidelines": "Als je berichten in de herberg of een groep- of gildechat wilt plaatsen, lees dan eerst onze <%= linkStart %>Gemeenschapsrichtlijnen<%= linkEnd %> en klik dan op de knop onderaan om aan te geven dat je ze accepteert."
+    "requestAcceptGuidelines": "Als je berichten in de herberg of een groep- of gildechat wilt plaatsen, lees dan eerst onze <%= linkStart %>Gemeenschapsrichtlijnen<%= linkEnd %> en klik dan op de knop onderaan om aan te geven dat je ze accepteert.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/nl/questscontent.json b/common/locales/nl/questscontent.json
index d4888b874b..7aa6f54e8b 100644
--- a/common/locales/nl/questscontent.json
+++ b/common/locales/nl/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Je hebt het gedaan! Geen bananen meer voor die monsters vandaag. Overweldigd door je ijver,  vluchten de apen in paniek. \"Kijk,\" zegt @Misceo. \"Ze hebben een paar eieren achtergelaten.\"<br><br>@Leephon grinikt. \"Misschien kan een goed getraind aapje je net zo goed helpen, als dat de wilden je hinderen!\"",
     "questMonkeyBoss": "Monsterlijke Mandril",
     "questMonkeyDropMonkeyEgg": "Aap (ei)",
-    "questMonkeyUnlockText": "Maakt het kopen van apeneieren in de markt mogelijk"
+    "questMonkeyUnlockText": "Maakt het kopen van apeneieren in de markt mogelijk",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/nl/subscriber.json b/common/locales/nl/subscriber.json
index 91dd3dcfca..fc29beeccf 100644
--- a/common/locales/nl/subscriber.json
+++ b/common/locales/nl/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "Houtstrijderset",
     "mysterySet201512": "Winters vuur-set",
     "mysterySet201601": "Set van de Kampioen van Standvastigheid",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Hartenbrekersset",
     "mysterySet301404": "Standaard Steampunkset",
     "mysterySet301405": "Opgesmukte Steampunkset",
     "mysterySetwondercon": "Wondercon",
diff --git a/common/locales/pl/backgrounds.json b/common/locales/pl/backgrounds.json
index 0ef2c69b32..098b5f4e31 100644
--- a/common/locales/pl/backgrounds.json
+++ b/common/locales/pl/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Poczytaj w Przytulnej Bibliotece.",
     "backgroundGrandStaircaseText": "Wspaniałe Schody",
     "backgroundGrandStaircaseNotes": "Zejdź po tych Wspaniałych Schodach.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "ZESTAW 22: Opublikowany w marcu 2016",
+    "backgroundDeepMineText": "Głęboka Kopalnia",
+    "backgroundDeepMineNotes": "Szukaj cennych metali w Głębokiej Kopani.",
+    "backgroundRainforestText": "Las Deszczowy",
+    "backgroundRainforestNotes": "Zapuść się w Las Deszczowy.",
+    "backgroundStoneCircleText": "Kamienny Krąg",
+    "backgroundStoneCircleNotes": "Rzucaj zaklęcia w Kamiennym Kręgu."
 }
\ No newline at end of file
diff --git a/common/locales/pl/character.json b/common/locales/pl/character.json
index 951fdd0635..8a2d461b12 100644
--- a/common/locales/pl/character.json
+++ b/common/locales/pl/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Statystyki i osiągnięcia",
     "profile": "Profil",
-    "avatar": "Customize Avatar",
+    "avatar": "Dostosuj Awatara",
     "other": "Inne",
     "fullName": "Pełne imię",
     "displayName": "Nazwa gracza",
@@ -83,7 +83,7 @@
     "allocateInt": "Punkty przydzielone do Inteligencji:",
     "allocateIntPop": "Dodaj punkt do Inteligencji",
     "noMoreAllocate": "Teraz, gdy osiągnąłeś poziom 100, nie będziesz już zyskiwać punktów atrybutów. Możesz dalej podnosić poziom lub zacząć przygodę nową od poziomu 1 używając <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Kuli Odrodzenia</a>, dostępnej teraz za darmo na Targu.",
-    "stats": "Avatar Stats",
+    "stats": "Statystki Awatara",
     "strength": "Siła",
     "strengthText": "Siła zwiększa szansę na losowe \"trafienia krytyczne\", a także wpływa na ilość otrzymanego za nie Złota, Doświadczenia i prawdopodobieństwa łupów. Pomaga także zadawać obrażenia bossom.",
     "constitution": "Kondycja",
@@ -136,7 +136,7 @@
     "respawn": "Odrodzenie!",
     "youDied": "Zginąłeś!",
     "dieText": "Straciłeś jeden Poziom, losowo wybrany przedmiot z Ekwipunku oraz całe Złoto. A teraz powstań, dzielny Habitaninie, i jeszcze raz spróbuj sił w walce! Okiełznaj złe Nawyki, czujnie dopełniaj Codzienne, a jeśli zasłabniesz, wymknij się śmierci zażywając Eliksiru Zdrowia!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Na pewno? Ta opcja kosztuje 3 klejnoty i zresetuje klasę twojego awatara i przydzielone punkty (wrócą do puli do ponownego rozdzielenia).",
     "purchaseFor": "Kupić za <%= cost %> klejnoty?",
     "notEnoughMana": "Masz za mało many.",
     "invalidTarget": "Nieprawidłowy cel",
diff --git a/common/locales/pl/communityguidelines.json b/common/locales/pl/communityguidelines.json
index 205391ce17..9f7923514c 100644
--- a/common/locales/pl/communityguidelines.json
+++ b/common/locales/pl/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "W społeczności tak dużej jak Habitica, użytkownicy przychodzą i odchodzą, a czasem nawet moderator musi odwiesić swój szlachecki płaszcz i odpocząć. Tych drugich nazywamy Moderators Emeritus. Nie mają już uprawnień Moderatorów, ale wciąż doceniamy ich ciężką pracę.",
     "commGuidePara014": "Emerytowani Moderatorzy:",
     "commGuideHeadingPublicSpaces": "Przestrzeń publiczna w Habitice",
-    "commGuidePara015": "Habitica ma dwa rodzaje przestrzeni społecznych: publiczne i prywatne. Publicznymi są: Karczma, Publiczne Gildie, GitHub, Trello i Wiki. Prywatnymi natomiast są: Prywatne Gildie, chat drużyny i skrzynki prywatnych wiadomości.",
+    "commGuidePara015": "Habitica ma dwa rodzaje przestrzeni społecznych: publiczne i prywatne. Publicznymi są: Karczma, Publiczne Gildie, GitHub, Trello i Wiki. Prywatnymi natomiast są: Prywatne Gildie, chat drużyny i skrzynki prywatnych wiadomości. Wszystkie nazwy graczy muszą spełniać Zasady Przestrzeni Publicznej. Aby zmienić swoją nazwę gracza, przejdź do Użytkownik > Profil i wybierz opcję \"Edytuj\".",
     "commGuidePara016": "Odwiedzając strefy publiczne na Habitice, należy pamiętać o ogólnych zasadach, które pomagają w utrzymaniu bezpieczeństwa i zadowolenia. Zachowanie ich powinno być łatwe dla takiego poszukiwacza przygód jak ty!",
     "commGuidePara017": "<strong>Szanujcie się nawzajem.</strong> Bądźcie uprzejmi, mili, przyjaźni i pomocni. Pamiętajcie: Habitanie pochodzą z różnorodnych środowisk i mają bardzo odmienne doświadczenia. To część tego, co czyni Habitikę tak wspaniałą! Tworzenie społeczności oznacza respektowanie i celebrowanie tak różnic jak i podobieństw. Oto kilka prostych sposobów na okazywanie szacunku wobec innych:",
     "commGuideList02A": "<strong>Przestrzegaj wszystkich Zasad Użytkowania.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Stosujcie się bezzwłocznie do wszelkich próśb Moderatorów</strong>, by zakończyć dyskusję lub przenieść ją na Zaplecze. Ostatnie słowo, riposty, podsumowania i gesty na pożegnanie powinny być (uprzejmie) wymieniane przy waszym \"stoliku\" na Zapleczu, jeśli są zgodne z zasadami.",
     "commGuideList02G": "<strong>Poświęćcie czas na refleksję zamiast odpowiadać w gniewie </strong>, jeśli ktoś stwierdzi, że to, co powiedzieliście lub zrobiliście, spowodowało u innych zmieszanie. Szczere przeprosiny wymagają wielkiej siły. Jeżeli uważacie, że ich odpowiedź była niestosowna, raczej skontaktujcie się z modem zamiast publicznie ich o to posądzać.",
     "commGuideList02H": "<strong>Kontrowersyjne i kłótliwe dyskusje powinny być raportowane modom.</strong> Jeśli spostrzeżesz, że wymiana zdań się zaognia, emocje rozmówców biorą górę nad rozsądkiem, padają obraźliwe wypowiedzi - nie angażuj się. Zamiast tego napisz do <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a>, by dać nam o tym znać. Utrzymywanie porządku to nasze zadanie.",
-    "commGuideList02I": "<strong>Nie spamujcie.</strong> Spamem mogą być między innymi: jednakowe komentarze lub pytanie zamieszczone w kilku miejscach, linki publikowane bez wyjaśnienia lub bez kontekstu, bezsensowne wiadomości lub wiele wiadomości wysłanych pod rząd. Powtarzające się prośby o klejnoty lub subskrypcję także mogą być uznane za spam.",
-    "commGuidePara019": "<strong>W przestrzeni prywatnej</strong> użytkownicy mają większą swobodę dyskusji na wszelkie możliwe tematy, ale nadal nie mogą łamać Zasad Użytkowania, w tym, nie mogą zamieszczać żadnych dyskryminujących czy agresywnych wiadomości ani gróźb.",
+    "commGuideList02I": "<strong>Nie spamujcie.</strong> Spamem mogą być między innymi: jednakowe komentarze lub pytanie zamieszczone w kilku miejscach, linki publikowane bez wyjaśnienia lub bez kontekstu, bezsensowne wiadomości lub wiele wiadomości wysłanych pod rząd. Powtarzające się prośby o klejnoty lub subskrypcję na jakimkolwiek czacie czy w prywatnej wiadomości także mogą być uznane za spam.",
+    "commGuidePara019": "<strong>W przestrzeni prywatnej</strong> użytkownicy mają większą swobodę dyskusji na wszelkie możliwe tematy, ale nadal nie mogą łamać Zasad Użytkowania, w tym, nie mogą zamieszczać żadnych dyskryminujących czy agresywnych wiadomości ani gróźb. Pamiętaj, że nazwy Wyzwań pojawiają się w publicznym profilu zwycięzcy, zatem WSZYSTKIE nazwy wyzwań muszą spełniać Zasady Przestrzeni Publicznej, nawet jeśli samo wyzwanie jest prywatne.",
     "commGuidePara020": "Prywatnymi wiadomościami (PW) rządzi kilka dodatkowych wytycznych. Jeżeli ktoś Cię zablokował, nie kontaktuj się z tą osobą nigdzie indziej, aby poprosić o odblokowanie. Poza tym, nie powinno się wysyłać prywatnych wiadomości do kogoś, kto prosi o pomoc w rozwiązaniu problemu (publiczne odpowiedzi na takie pytania są pomocne dla społeczności). Ostatnia zasada: nie wolno wysyłać nikomu prywatnych wiadomości zachęcających do podzielenia się klejnotami lub subskrypcji, ponieważ uznaje się to za spam.",
     "commGuidePara021": "Ponadto, niektóre przestrzenie publiczne w Habitice mają dodatkowe regulaminy.",
     "commGuideHeadingTavern": "Karczma",
diff --git a/common/locales/pl/content.json b/common/locales/pl/content.json
index e7d30acaf1..f632e13884 100644
--- a/common/locales/pl/content.json
+++ b/common/locales/pl/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "kłujący",
     "dropEggBearCubText": "niedźwiedziątko",
     "dropEggBearCubMountText": "niedźwiedź",
-    "dropEggBearCubAdjective": "przytulaśny",
+    "dropEggBearCubAdjective": "odważny",
     "questEggGryphonText": "gryf",
     "questEggGryphonMountText": "Gryf",
     "questEggGryphonAdjective": "dumny",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "kolorowy",
     "questEggRatText": "szczur",
     "questEggRatMountText": "Szczur",
-    "questEggRatAdjective": "brudny",
+    "questEggRatAdjective": "społęczny",
     "questEggOctopusText": "ośmiornica",
     "questEggOctopusMountText": "Ośmiornica",
     "questEggOctopusAdjective": "śliska",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Małpa",
     "questEggMonkeyMountText": "Małpa",
     "questEggMonkeyAdjective": "psotna",
+    "questEggSnailText": "Ślimak",
+    "questEggSnailMountText": "Ślimak",
+    "questEggSnailAdjective": "powolny ale wytrwały",
     "eggNotes": "Znajdź eliksir wyklucia i wylej go na to jajo, a wykluje się z niego <%= eggAdjective(locale) %> <%= eggText(locale) %>. ",
     "hatchingPotionBase": "Zwyczajny",
     "hatchingPotionWhite": "Biały",
diff --git a/common/locales/pl/contrib.json b/common/locales/pl/contrib.json
index d40b254790..5610dbd7ab 100644
--- a/common/locales/pl/contrib.json
+++ b/common/locales/pl/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Pomógł rozwijać się Habitowi",
     "helpedText1": "Pomógł rozwinąć Habitica poprzez wypełnienie",
     "helpedText2": "tej ankiety.",
-    "hall": "Hall of Heroes",
+    "hall": "Sala Bohaterów",
     "contribTitle": "Tytuł pomocnika (np. \"Kowal\")",
     "contribLevel": "Ranga pomocnika",
     "contribHallText": "1-7 dla zwykłych pomocników, 8 dla moderatorów, 9 dla pracowników. Określa które przedmioty, chowańce, oraz wierzchowce są dostępne. Wyznacza też kolor ramki z imieniem. Rangi 8 i 9 automatycznie zostają administratorami.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Sala Współtwórców",
     "hallPatrons": "Sala patronów",
     "rewardUser": "Nagrodź użytkownika",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Gildie są grupami czatowymi zrzeszającymi graczy o wspólnych zainteresowaniach. Tworzone są przez graczy i dla graczy. Przeszukaj listę i dołącz do Gildii, które cię interesują.",
     "blurbChallenges": "Wyzwania są tworzone przez twoich współtowarzyszy. Dołączenie do wyzwania doda jego zadania do twojej tablicy, a wygranie wyzwania nagrodzi osiągnięciem, a czasami nagrodą w postaci klejnotów!",
     "blurbHallPatrons": "To jest Sala patronów, gdzie oddajemy cześć szlachetnym poszukiwaczom przygód, którzy wsparli Habitica w pierwszej zbiórce na Kickstarterze. Dziękujemy im za pomoc w powołaniu Habitiki do życia!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "To jest Sala Współtwórców, gdzie uhonorowani zostali open-source'owi współtwórcy Habitiki. Czy to za pomocą kodu, sztuki, muzyki, pisania, czy jedynie uczynności, zdobyli oni <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> klejnoty, ekskluzywne wyposażenie</a> oraz <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestiżowe tytuły</a>. Ty również możesz współtworzyć Habitikę! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Tutaj dowiesz się więcej. </a>"
 }
\ No newline at end of file
diff --git a/common/locales/pl/gear.json b/common/locales/pl/gear.json
index 4eddb2c9fa..4e85b27260 100644
--- a/common/locales/pl/gear.json
+++ b/common/locales/pl/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Zestaw",
     "weapon": "broń",
     "weaponBase0Text": "Bez broni",
     "weaponBase0Notes": "Bez broni.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "Proszę o spokój! Zwiększa siłę i kondycję o <%= attrs %> każde. Zaczarowana Szafa: Zestaw Adwokacki (Przedmiot 3 z 3).",
     "weaponArmoireJesterBatonText": "Berło Błazna",
     "weaponArmoireJesterBatonNotes": "Po machnięciu berłem i ciętej ripoście nawet najtrudniejsze sytuacje stają się jasne. Zwiększa inteligencję i percepcję o <%= attrs %>. Zaczarowana Szafa: Zestaw Błazna (Przedmiot 3 z 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Kilof",
+    "weaponArmoireMiningPickaxNotes": "Wydobądź maksimum złota ze swoich zadań! Zwiększa Percepcję o <%= per %>. Zaczarowana Szafa: Zestaw Górnika (Przedmiot 3 z 3).",
     "armor": "zbroja",
     "armorBase0Text": "Zwykłe ubranie",
     "armorBase0Notes": "Zwyczajne ubranie. Nie ma na nic wpływu.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Poważne i dostojne. Zwiększa kondycję o <%= con %>. Zaczarowana Szafa: Zestaw Adwokacki (Przedmiot 2 z 3).",
     "armorArmoireJesterCostumeText": "Kostium Błazna",
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Wbrew wyglądowi tego kostiumu, nie jesteś głupcem. Zwiększa inteligencję o <%= int %>. Zaczarowana Szafa: Zestaw Błazna (Przedmiot 2 z 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Kombinezon Górnika",
+    "armorArmoireMinerOverallsNotes": "Zdaje się być znoszony, ale magicznie odpycha brud. Zwiększa Kondycję o <%= con %>. Zaczarowana Szafa: Zestaw Górnika (Przedmiot 2 z 3).",
     "headgear": "nakrycie głowy",
     "headBase0Text": "Bez hełmu",
     "headBase0Notes": "Bez nakrycia głowy.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Te płomienie parzą zimnem czystego intelektu. Brak dodatkowych korzyści. Przedmiot Abonencki, grudzień 2015.",
     "headMystery201601Text": "Hełm prawdziwej determinacji",
     "headMystery201601Notes": "Pozostań stanowczy, odważny czempionie! Brak dodatkowych korzyści. Przedmiot Abonencki, styczeń 2016.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Kaptur Łamacza Serc",
+    "headMystery201602Notes": "Ukryj swoje oblicze przed wielbicielami. Brak dodatkowych korzyści. Przedmiot Abonencki, luty 2016.",
     "headMystery301404Text": "Szykowny cylinder",
     "headMystery301404Notes": "Fantazyjny cylinder dla najwyżej urodzonych. Przedmiot Abonencki, styczeń 2015. Brak dodatkowych korzyści.",
     "headMystery301405Text": "Klasyczny cylinder",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Ta sprężysta peruka wystarczy by wystraszyć nawet najbardziej zawziętych wrogów. Zwiększa siłę o <%= str %>. Zaczarowana Szafa: Zestaw Adwokacki (Przedmiot 1 z 3).",
     "headArmoireJesterCapText": "Czapka Błazna",
     "headArmoireJesterCapNotes": "Dzwoneczki na tej czapce mogłyby rozproszyć twoich przeciwników, ale po prostu pomagają ci się skupić. Zwiększa percepcję o <%= per %>. Zaczarowana Szafa: Zestaw Błazna (Przedmiot 1 z 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Kask Górnika",
+    "headArmoireMinerHelmetNotes": "Chroń głowę przed spadającymi zadaniami! Zwiększa Inteligencję o <%= int %>. Zaczarowana Szafa: Zestaw Górnika (Przedmiot 1 z 3).",
     "offhand": "Tarcza",
     "shieldBase0Text": "Brak tarczy w ekwipunku.",
     "shieldBase0Notes": "Bez tarczy lub drugiej broni.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "Panuj nam miłościwie, o tobie pieśni nucimy! Zwiększa kondycję, inteligencję i percepcję o <%= attrs %>. Zaczarowana Szafa: zestaw królewski (przedmiot 2 z 3).",
     "shieldArmoireDragonTamerShieldText": "Tarcza Poskramiacza Smoków",
     "shieldArmoireDragonTamerShieldNotes": "Ta tarcza w kształcie smoka rozproszy uwagę twoich wrogów. Zwiększa Percepcję o <%= per %>. Zaczarowana Szafa: Zestaw Poskramiacza Smoków (przedmiot 2 z 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Mistyczna Lampa",
+    "shieldArmoireMysticLampNotes": "Oświetl najciemniejsze z jaskiń tą mistyczną lampą! Zwiększa Percepcję o <%= per %>. Zaczarowana Szafa: przedmiot niezależny.",
     "back": "Osprzęt na plecy",
     "backBase0Text": "Nic na plecach",
     "backBase0Notes": "Nic na plecach.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Surfuj na Starannych Nabrzeżach i ujeżdżaj fale w Zatoce Niedoskonałości! Brak dodatkowych korzyści. Przedmiot Abonencki, lipiec 2015.",
     "backMystery201510Text": "Goblini ogon",
     "backMystery201510Notes": "Chwytny i silny! Brak dodatkowych korzyści. Przedmiot Abonencki, październik 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Peleryna Łamacza Serc",
+    "backMystery201602Notes": "Machnij tą peleryną, a przeciwnicy padną u twych stóp! Brak dodatkowych korzyści. Przedmiot Abonencki, luty 2016.",
     "backSpecialWonderconRedText": "Potężna peleryna",
     "backSpecialWonderconRedNotes": "Świszcze z siłą i pięknem. Nie daje żadnych korzyści. Edycja Specjalna - Konwent.",
     "backSpecialWonderconBlackText": "Podstępna peleryna",
diff --git a/common/locales/pl/generic.json b/common/locales/pl/generic.json
index fd6a5c26c9..8678de6b87 100644
--- a/common/locales/pl/generic.json
+++ b/common/locales/pl/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Mam nowego chowańca dzięki ukończeniu moich zadań w prawdziwym życiu!",
     "raisePetShare": "Mam nowego wierzchowca dzięki ukończeniu moich zadań w prawdziwym życiu!",
     "wonChallengeShare": "Wyzwanie zaliczone!",
-    "achievementShare": "Zdobyto nowe osiągnięcie w Habitice!"
+    "achievementShare": "Zdobyto nowe osiągnięcie w Habitice!",
+    "orderBy": "Sortuj po <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/pl/groups.json b/common/locales/pl/groups.json
index 9ba4a00918..096821c13b 100644
--- a/common/locales/pl/groups.json
+++ b/common/locales/pl/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Pogaduszki w Karczmie",
     "innCheckOut": "Wymelduj się z Gospody",
     "innCheckIn": "Odpoczywaj w Gospodzie",
     "innText": "Odpoczywasz w Gospodzie! Dopóki jesteś zameldowany, twoje Codzienne nie zadadzą ci obrażeń na koniec dnia, jednak w dalszym ciągu codziennie będą się odświeżać. Uważaj: Jeśli uczestniczysz w misji z bossem, wciąż może on zadać tobie obrażenia, jeśli członkowie twojej drużyny ominą Codzienne, chyba że również odpoczywają w Gospodzie! Również twoje obrażenia zadane bossowi (lub zebrane przedmioty) nie zostaną uwzględnione, dopóki nie wymeldujesz się z Gospody.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Twój czat drużynowy jest pusty! Napisz wiadomość w powyższym okienku, by zacząć rozmowę.",
     "guildChatEmpty": "Czat tej gildii jest pusty! Napisz wiadomość w powyższym okienku, by zacząć rozmowę.",
     "possessiveParty": "Drużyna należąca do <%= name %>",
-    "requestAcceptGuidelines": "Jeżeli chcesz pisać w Gospodzie lub drużynie, czy też jakimkolwiek czacie gildii, proszę, przeczytaj najpierw <%= linkStart %>Wytyczne Społeczności<%= linkEnd %>, a następnie kliknij poniższy przycisk, aby potwierdzić, że je akceptujesz."
+    "requestAcceptGuidelines": "Jeżeli chcesz pisać w Gospodzie lub drużynie, czy też jakimkolwiek czacie gildii, proszę, przeczytaj najpierw <%= linkStart %>Wytyczne Społeczności<%= linkEnd %>, a następnie kliknij poniższy przycisk, aby potwierdzić, że je akceptujesz.",
+    "partyUpName": "Razem raźniej",
+    "partyOnName": "Jeden za wszystkich, wszyscy za jednego",
+    "partyUpAchievement": "Dołączył do drużyny z inną osobą! Dobrej zabawy przy walce z potworami i wspieraniu się nawzajem.",
+    "partyOnAchievement": "Dołączył do co najmniej czteroosobowej drużyny! Ciesz się zwiększoną odpowiedzialnością po dołączeniu do przyjaciół w zwyciężaniu wrogów!"
 }
\ No newline at end of file
diff --git a/common/locales/pl/questscontent.json b/common/locales/pl/questscontent.json
index 497213f2ef..bd3d90ab6c 100644
--- a/common/locales/pl/questscontent.json
+++ b/common/locales/pl/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Udało ci się! Te małpiszony nie dostaną już dzisiaj bananów. Przytłoczone twoją pracowitością małpy uciekają w panice. \"Popatrz\", mówi @Misceo. \"Zostawili za sobą kilka jaj.\"<br><br>@Leephon szczerzy zęby. \"Może dobrze poukładany małpi chowaniec będzie tak pomocny jak dzikie małpy przeszkadzające!\"",
     "questMonkeyBoss": "Ogromny Mandryl",
     "questMonkeyDropMonkeyEgg": "Małpa (jajo)",
-    "questMonkeyUnlockText": "Odblokowuje dostęp do małpich jaj na targu"
+    "questMonkeyUnlockText": "Odblokowuje dostęp do małpich jaj na targu",
+    "questSnailText": "Ślamazara z Ślęczącego Ścieku",
+    "questSnailNotes": "Z zapałem podchodzisz do przeszukania opuszczonego Katakumbu Ślęczenia, jednak gdy tylko się do tego zabierasz, czujesz jak grunt wysysa z cię z nóg. Rozglądasz się po ścieżce, martwiąc się co będzie i dostrzegasz Habitican zamulonych w ślęczarniach. @Overomega Krzyczy: \"Mają zbyt wiele nieistotnych Zadań i CoDziennych, utknęli w rzeczach, które nie mają znaczenia! Wyciągnij ich!\" <br/><br/> \"Trzeba znaleźć źródło Ślęczarni,\" @Pfeffernusse potwierdza \"w przeciwnym razie zadania, których nie mogą skończyć będą zamulać ich przez wieczność!\" <br/><br/> \"Wyciągnąwszy broń, brniesz przez gęste błoto, wtem .. ..  napotykasz przygnębiającego Ślamazarza z Ślęczących Ścieków.",
+    "questSnailCompletion": "Dosięgasz uderzeniem skorupy wielkiego ślimaka i rozbijasz ją na pół. Uwolniona z niego, fala wody zmywa Ślamarzenie, a orzeźwieni Habiticanie radują się w koło. \"Patrzcie!\" woła @Misceo. \"Tam, w resztkach błota leży niewielka grupa ślimaczych jaj\".",
+    "questSnailBoss": "Ślamazara z Ślęczącego Ścieku.",
+    "questSnailDropSnailEgg": "Ślimak (jajo)",
+    "questSnailUnlockText": "Odblokowuje zakup jaj ślimaka na targu."
 }
\ No newline at end of file
diff --git a/common/locales/pl/subscriber.json b/common/locales/pl/subscriber.json
index 0da2ad9af7..bbc79e71d2 100644
--- a/common/locales/pl/subscriber.json
+++ b/common/locales/pl/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "Zestaw leśnego wojownika",
     "mysterySet201512": "Zestaw Zimowego Płomienia",
     "mysterySet201601": "Zestaw czempiona postanowień",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Zestaw Łamacza Serc",
     "mysterySet301404": "Standardowy zestaw steampunkowy",
     "mysterySet301405": "Zestaw steampunkowych akcesoriów",
     "mysterySetwondercon": "Konwent Wspaniałości",
diff --git a/common/locales/pt/backgrounds.json b/common/locales/pt/backgrounds.json
index 54f1fcb964..b6fbf5db12 100644
--- a/common/locales/pt/backgrounds.json
+++ b/common/locales/pt/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Leia na Biblioteca Aconchegante",
     "backgroundGrandStaircaseText": "Grande Escadaria",
     "backgroundGrandStaircaseNotes": "Descer pela Grande Escadaria",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "Conjunto 22: Lançado em Março de 2016",
+    "backgroundDeepMineText": "Mina Profunda",
+    "backgroundDeepMineNotes": "Encontre metais preciosos em uma Mina Profunda.",
+    "backgroundRainforestText": "Floresta Tropical",
+    "backgroundRainforestNotes": "Aventure-se em uma Floresta Tropical.",
+    "backgroundStoneCircleText": "Círculo de Pedras",
+    "backgroundStoneCircleNotes": "Lance feitiços em um Círculo de Pedras."
 }
\ No newline at end of file
diff --git a/common/locales/pt/character.json b/common/locales/pt/character.json
index 70e50e3963..919acd2cfc 100644
--- a/common/locales/pt/character.json
+++ b/common/locales/pt/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Estatísticas & Conquistas",
     "profile": "Perfil",
-    "avatar": "Customize Avatar",
+    "avatar": "Personalizar Avatar",
     "other": "Outros",
     "fullName": "Nome Completo",
     "displayName": "Nome de Exibição",
@@ -83,7 +83,7 @@
     "allocateInt": "Pontos distribuídos em Inteligência:",
     "allocateIntPop": "Adicionar um ponto em Inteligência",
     "noMoreAllocate": "Agora que você chegou no nível 100, não receberá mais Pontos de Atributo. Você pode continuar subindo de nível ou começar uma nova aventura no nível 1 usando um <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Orbe do Renascimento</a>, agora disponível de graça no Mercado.",
-    "stats": "Avatar Stats",
+    "stats": "Status do Avatar",
     "strength": "Força",
     "strengthText": "Força aumenta a chance de \"golpes críticos\" aleatórios e o bônus de Ouro, Experiência e chance de drop. Também ajuda a causar dano aos chefões.",
     "constitution": "Constituição",
@@ -136,7 +136,7 @@
     "respawn": "Reviver!",
     "youDied": "Você Morreu!",
     "dieText": "Você perdeu um nível, todo seu Ouro, e uma peça aleatória de Equipamento. Erga-se, Habiteer, e tente novamente! Acabe com esses Hábitos negativos, esteja atento a realização de suas Tarefas Diárias, e afaste a morte com uma Poção de Vida caso vacilar!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Você tem certeza? Isso irá resetar a classe do seu personagem e os pontos distribuídos (você receberá eles de volta para redistribuir), e custa 3 gemas.",
     "purchaseFor": "Comprar por <%= cost %> Gemas?",
     "notEnoughMana": "Mana insuficiente.",
     "invalidTarget": "Alvo inválido",
diff --git a/common/locales/pt/communityguidelines.json b/common/locales/pt/communityguidelines.json
index 8897ecc3a3..eb6357496a 100644
--- a/common/locales/pt/communityguidelines.json
+++ b/common/locales/pt/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Em uma comunidade tão grande quanto a de Habitica, usuários vem e vão, e algumas vezes um moderador precisa de abandonar seu manto nobre e relaxar. Os seguintes são Moderadores Eméritos. Eles não mais agem com o poder de um Moderador, mas nós ainda gostaríamos de honrar seu trabalho!",
     "commGuidePara014": "Moderadores Eméritos:",
     "commGuideHeadingPublicSpaces": "Espaços Públicos em Habitica",
-    "commGuidePara015": "Habitica tem dois tipos de espaços sociais: públicos e privados. Espaços públicos incluem a Taverna, as Guildas Públicas, o GitHub, o Trello e a Wiki. Espaços privados são as Guildas Privadas, as conversas da equipe e as mensagens privadas.",
+    "commGuidePara015": "Habitica tem dois tipos de espaços sociais: público e privado. Espaços públicos incluem as Tavernas, Guildas Públicas, GitHub, Trello e Wiki. Espaços privados são as Guildas Privadas, chat de grupo e mensagens privadas. Todos os nomes de exibição devem estar de acordo com as diretrizes de espaços públicos. Para mudar seu nome de exibição, navegue no website até Usuário > Perfil e clique no botão \"Editar\".",
     "commGuidePara016": "Ao navegar os espaços públicos em Habitica, existem algumas regrais gerais para manter todo mundo seguro e feliz. Elas devem ser fáceis para aventureiros como você!",
     "commGuidePara017": "<strong>Respeitar um ao outro.</strong> Seja cortês, gentil, amigável e prestativo. Lembre-se: Habiticanos vem de todos os tipos de vida e tiveram experiências bastante diferentes. Isso é parte do que faz Habitica tão legal! Construir uma comunidade significa respeitar e celebrar nossas diferenças tanto quanto nossas semelhanças. Aqui estão algumas maneiras simples de respeitar uns aos outros:",
     "commGuideList02A": "<strong>Obedeça a todos os Termos e Condições.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Obedeça imediatamente a qualquer pedido de um Moderador</strong> para acabar uma discussão ou movê-la para 'A Esquina de Trás'. Últimas palavras, despedidas e frases memoráveis devem ser todas entregues (respeitosamente) na sua \"mesa\" na Esquina de Trás, se aprovada.",
     "commGuideList02G": "<strong>Leve tempo para refletir ao invés de responder com raiva</strong> se alguém fala que algo que você fez ou disse os deixou desconfortáveis. Há sempre grande força em ser capaz de se desculpar sinceramente à alguém. Se você sente que a forma que eles te responderam foi inapropriada, contate um Moderador em vez de discutir publicamente.",
     "commGuideList02H": "<strong>Conversas divisivas ou polêmicas devem ser reportadas aos Moderadores.</strong> Se você acha que uma conversa está ficando muito acalorada, emocional ou ofensiva, pare de se envolver. Ao invés disso, mande um email para <a href=\"mailto:leslie@habitica.com\">leslie@habitica</a> e nos deixe saber a respeito. É nosso trabalho mante-lo seguro.",
-    "commGuideList02I": "<strong>Não crie spam.</strong> Fazer spam inclui, mas não está limitado à: publicar o mesmo comentário ou pergunta em múltiplos lugares, publicar links sem explicação ou contexto, publicar mensagens sem sentido, ou publicar muitas mensagens em sequência. Repetidamente mendigar por gemas ou inscrição também pode ser considerado fazer spam.",
-    "commGuidePara019": "<strong>Em espaços privados,</strong> usuários tem mais liberdade para discutir quaisquer tópicos que queiram, mas ainda não podem violar os Termos e Condições, incluindo a postagem de qualquer conteúdo discriminatório, violento ou ameaçador.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>Nos espaços privados,</strong> usuários tem mais liberdade para discutir quaisquer tópicos que queiram, mesmo assim não devem violar os Termos e Condições, ou seja, os posts não devem incluir conteúdo relacionado à discriminação, violência ou ameças. Note que, como nomes de desafio aparecem no perfil público do vencedor, TODOS os nomes de desafio devem obedecer às diretrizes de espaço público, mesmo se aparecem em espaços privados.",
     "commGuidePara020": "Mensagens Pessoais (MPs) têm algumas diretrizes adicionais. Se alguém bloqueou você, não contate essa pessoa em outro lugar pedindo a ela que o desbloqueie. Adicionalmente, você não deve mandar MPs pedindo por ajuda (uma vez que respostas públicas à pedidos de ajuda são benéficas para a comunidade). Finalmente, não mande MPs pedindo por presentes, gemas ou por uma inscrição a ninguém, pois isso pode ser considerado spam.",
     "commGuidePara021": "Além disso, alguns espaços públicos em Habitica tem regras adicionais.",
     "commGuideHeadingTavern": "A Taverna",
diff --git a/common/locales/pt/content.json b/common/locales/pt/content.json
index 2c9239ffba..45068be301 100644
--- a/common/locales/pt/content.json
+++ b/common/locales/pt/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "um espinhoso",
     "dropEggBearCubText": "Urso Filhote",
     "dropEggBearCubMountText": "Urso",
-    "dropEggBearCubAdjective": "um fofinho",
+    "dropEggBearCubAdjective": "um bravo",
     "questEggGryphonText": "Grifo",
     "questEggGryphonMountText": "Grifo",
     "questEggGryphonAdjective": "um orgulhoso",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "um colorido",
     "questEggRatText": "Rato",
     "questEggRatMountText": "Rato",
-    "questEggRatAdjective": "um sujo",
+    "questEggRatAdjective": "um sociável",
     "questEggOctopusText": "Polvo",
     "questEggOctopusMountText": "Polvo",
     "questEggOctopusAdjective": "um escorregadio",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Macaco",
     "questEggMonkeyMountText": "Macaco",
     "questEggMonkeyAdjective": "um travesso",
+    "questEggSnailText": "Caracol",
+    "questEggSnailMountText": "Caracol",
+    "questEggSnailAdjective": "um devagar mas estável",
     "eggNotes": "Ache uma poção de eclosão para usar nesse ovo e ele irá eclodir em um <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Básico",
     "hatchingPotionWhite": "Branco",
diff --git a/common/locales/pt/contrib.json b/common/locales/pt/contrib.json
index 452f4c0e2b..aa979de33c 100644
--- a/common/locales/pt/contrib.json
+++ b/common/locales/pt/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Ajudou Habit a crescer",
     "helpedText1": "Ajudou Habitica à crescer ao preencher",
     "helpedText2": "essa pesquisa.",
-    "hall": "Hall of Heroes",
+    "hall": "Salão dos Heróis",
     "contribTitle": "Título de Colaborador (Ex.: \"Ferreiro\")",
     "contribLevel": "Níveis de Contribuidor",
     "contribHallText": "1-7 para contribuidores normais, 8 para moderadores, 9 para equipe. Isso determina quais itens, mascotes e montarias estão disponíveis. Também determina a cor da etiqueta do nome. Níveis 8 e 9 são dados automaticamente a posição de administrador.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Salão dos Contribuidores",
     "hallPatrons": "Salão dos Patrões",
     "rewardUser": "Recompensar Usuário",
     "UUID": "UUID",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Guildas são grupos para conversas de interesse comum  criados por jogadores, para jogadores. Navegue pela lista e junte-se às Guildas que lhe interessam!",
     "blurbChallenges": "Desafios são criados pelos seus colegas. Juntar-se à um Desafio irá adicionar novas tarefas ao seu painel de tarefas, e ganhar um Desafio irá lhe dar uma conquista e muitas vezes um prêmio em Gemas!",
     "blurbHallPatrons": "Este é o Salão dos Patrocinadores, onde honramos os nobres aventureiros que apoiaram Habitica no Kickstarter. Agradecemos a eles por nos ajudar a trazer Habitica à vida!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Aqui é o Salão dos Contribuidores, onde colaboradores do código aberto de Habitica são homenageados. Seja através de programação, arte, música, escrita ou apenas ajudando, eles ganharam <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> Gemas, equipamentos exclusivos</a> e <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'> títulos de prestígio.</a> Você também pode colaborar com o Habitica! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Saiba mais aqui.</a>"
 }
\ No newline at end of file
diff --git a/common/locales/pt/faq.json b/common/locales/pt/faq.json
index c7aaec4933..10da6fe29e 100644
--- a/common/locales/pt/faq.json
+++ b/common/locales/pt/faq.json
@@ -2,7 +2,7 @@
     "frequentlyAskedQuestions": "Perguntas Frequentes",
     "faqQuestion0": "Estou confuso. Onde encontro uma visão geral?",
     "iosFaqAnswer0": "Primeiro, você criará tarefas que você quer realizar no seu dia-a-dia. Então, na medida que você for completando as tarefas na vida real e as marcando, você ganhará experiência e ouro. Ouro é usado para comprar equipamento e alguns itens, assim como recompensas personalizadas. A experiência faz seu personagem passar de nível e destravar conteúdos, tais como Mascotes, Habilidades e Missões! Você pode personalizar seu personagem no Menu > Personalizar Avatar.\n\nAlgumas maneiras básicas de interagir: clique no (+) no canto superior direito para adicionar uma nova tarefa. Toque em uma tarefa existente para a editar e deslize para esquerda para a deletar. Você pode classificar tarefas usando Etiquetas no canto superior esquerdo e expandir e contrair listas clicando na bolha da lista.",
-    "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users] (https://habitica.com/static/overview).",
+    "webFaqAnswer0": "Primeiro, você criará tarefas que você quer realizar no seu dia-a-dia. Então, na medida que você for completando as tarefas na vida real e as marcando, você ganhará experiência e ouro. Ouro é usado para comprar equipamento e alguns itens, assim como recompensas personalizadas. A experiência faz seu personagem passar de nível e destravar conteúdos, tais como Mascotes, Habilidades e Missões! Para mais detalhes, confira um resumo passo-a-passo do jogo em [Ajuda -> Resumo para Novos Usuários] (https://habitica.com/static/overview).",
     "faqQuestion1": "Como configuro minhas tarefas?",
     "iosFaqAnswer1": "Bons Hábitos (aqueles com um +) são tarefas que você pode fazer várias vezes por dia, como comer vegetais. Maus Hábitos (aqueles com um -) são tarefas que você deve evitar, como roer unha. Hábitos com um + e um - tem uma escolha boa e uma escolha ruim, como usar as escadas vs. usar o elevador. Bons Hábitos te dão ouro e experiência. Maus Hábitos subtraem vida.\n\nTarefas Diárias são tarefas que você deve fazer todos os dias, como escovar os dentes ou conferir seu e-mail. Você pode ajustar os dias em que uma tarefa Diária é valida ao edita-la. Se você perder uma Diária que está valendo, seu avatar irá tomar dano no fim do dia. Tome cuidado para não adicionar muitas Diárias de uma vez!\n\nAfazeres é a sua lista de afazeres. Cumprir um Afazer te dá ouro e experiência. Você nunca perde vida com Afazeres. Você pode adicionar um prazo a um Afazer clicando em editar.",
     "webFaqAnswer1": "Bons Hábitos (aqueles com um +) são tarefas que você pode fazer várias vezes por dia, como comer vegetais. Maus Hábitos (aqueles com um -) são tarefas que você deve evitar, como roer unha. Hábitos com um + e um - tem uma escolha boa e uma escolha ruim, como usar as escadas vs. usar o elevador. Bons Hábitos te dão ouro e experiência. Maus Hábitos subtraem vida.\n\nTarefas Diárias são tarefas que você deve fazer todos os dias, como escovar os dentes ou conferir seu e-mail. Você pode ajustar os dias em que uma tarefa Diária é valida ao edita-la. Se você perder uma Diária que está valendo, seu avatar irá tomar dano no fim do dia. Tome cuidado para não adicionar muitas Diárias de uma vez!\n\nAfazeres é a sua lista de afazeres. Cumprir um Afazer te dá ouro e experiência. Você nunca perde vida com Afazeres. Você pode adicionar um prazo a um Afazer clicando em editar.",
diff --git a/common/locales/pt/gear.json b/common/locales/pt/gear.json
index f4effadad9..40089d3788 100644
--- a/common/locales/pt/gear.json
+++ b/common/locales/pt/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Conjunto",
     "weapon": "arma",
     "weaponBase0Text": "Sem Arma",
     "weaponBase0Notes": "Sem Arma.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "Ordem! Aumenta Força e Constituição em <%= attrs %> cada. Armário Encantado: Conjunto de Advogado (Item 3 de 3).",
     "weaponArmoireJesterBatonText": "Bastão do Bobo da Corte",
     "weaponArmoireJesterBatonNotes": "Com um balanço do seu bastão e algumas réplicas espirituosas, até mesmo a situação mais complicada fica simples. Aumenta Inteligência e Percepção em <%= attrs %> cada. Armário Encantado: Conjunto de Bobo da Corte (Item 3 de 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Picareta de mineração",
+    "weaponArmoireMiningPickaxNotes": "Extraia a quantidade máxima de ouro de suas tarefas! Aumenta a Percepção em <%= per %>. Armadura Encantada: Conjunto \"Minerador\" (Item 3 de 3).",
     "armor": "armadura",
     "armorBase0Text": "Roupas Modestas",
     "armorBase0Notes": "Vestimenta ordinária Não concede benefícios.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Muito sério e imponente. Aumenta Constituição em <%= con %>. Armário Encantado: Conjunto de Advogado (Item 2 de 3).",
     "armorArmoireJesterCostumeText": "Traje do Bobo da Corte",
     "armorArmoireJesterCostumeNotes": "Tra-la-la! Apesar da aparência da sua fantasia, você não é bobo. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto de Bobo da Corte (Item 2 de 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Macacão de Minerador",
+    "armorArmoireMinerOverallsNotes": "Eles podem parecer estragados, mas estão encantados para repelir sujeira. Aumenta Constituição em <%= con %>. Armário Encantado: Set de Minerador (Item 2 de 3).",
     "headgear": "capacete",
     "headBase0Text": "Sem Elmo",
     "headBase0Notes": "Sem capacete.",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "Essas chamas queimam frio com puro intelecto. Não confere benefícios. Item de Assinante de Dezembro de 2015",
     "headMystery201601Text": "Elmo do Foco Verdadeiro",
     "headMystery201601Notes": "Continue focado, ó bravo campeão! Não concede benefícios. Item de Assinante Janeiro 2016",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Capuz do Quebra-Corações",
+    "headMystery201602Notes": "Proteja sua identidade de todos os seus admiradores. Não confere benefícios. Item de assinante de Fevereiro 2016",
     "headMystery301404Text": "Cartola Chique",
     "headMystery301404Notes": "Uma cartola chique para as damas e cavalheiros mais finos! Item de Assinante de Janeiro 3015. Não concede benefícios.",
     "headMystery301405Text": "Cartola Básica",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Essa peruca saltitante é o bastante para assustar até o mais feroz inimigo. Aumenta Força em <%= str %>. Armério Encantado: Conjunto de Advogado (Item 1 de 3).",
     "headArmoireJesterCapText": "Touca do Bobo da Corte",
     "headArmoireJesterCapNotes": "Os sinos nesse chapéu podem distrair seus oponentes, mas eles só ajudam no seu foco. Aumenta Percepção em <%= per %>. Armário Encantado: Conjunto de Bobo da Corte (Item 1 de 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Elmo de Minerador",
+    "headArmoireMinerHelmetNotes": "Proteja sua cabeça de Tarefas caindo! Aumenta Inteligência em <%= int %>. Armário Encantado. Set de Minerador (Item 1 de 3).",
     "offhand": "item da segunda mão",
     "shieldBase0Text": "Sem Equipamento na Segunda Mão",
     "shieldBase0Notes": "Sem escudo ou segundo armamento.",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "Hurra para o governante, digno de música! Aumenta Constituição, Inteligência, e Percepção em <%= attrs %> cada. Armário Encantado: Conjunto Real (Item 2 de 3).",
     "shieldArmoireDragonTamerShieldText": "Escudo do Domador de Dragões",
     "shieldArmoireDragonTamerShieldNotes": "Distraia os inimigos com esse escudo em forma de dragão; Aumenta sua Percepção em <%= per %>. Armário Encantado: Conjunto do Domador de Dragões (Item 2 de 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Lâmpada Mistíca",
+    "shieldArmoireMysticLampNotes": "Ilumine as cavernas mais sombrias com essa lâmpada mística! Aumenta percepção por <%= per %>. Armário Encantado: Item Independente",
     "back": "Acessório de Costas",
     "backBase0Text": "Sem Acessório de Fundo",
     "backBase0Notes": "Sem Acessório de Fundo.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Surfe na Doca dos Diligentes e monte nas ondas da Baia Imkompleta! Não concede benefícios. Item de Assinante Julho 2015.",
     "backMystery201510Text": "Cauda de Goblin",
     "backMystery201510Notes": "Multiuso e poderoso! Não concede benefícios. Item de Assinante de Outubro 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Capa do Quebra-Corações",
+    "backMystery201602Notes": "Com o suingue da sua capa, seus inimigos caem a sua frente! Não confere benefícios. Item de Assinante de Fevereiro 2016",
     "backSpecialWonderconRedText": "Capa Poderosa",
     "backSpecialWonderconRedNotes": "Sibila com força e beleza. Não concede benefícios. Equipamento Edição Especial de Convenção.",
     "backSpecialWonderconBlackText": "Capa Furtiva",
diff --git a/common/locales/pt/generic.json b/common/locales/pt/generic.json
index 248102f84e..da2866012f 100644
--- a/common/locales/pt/generic.json
+++ b/common/locales/pt/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "Choquei um novo mascote completando minhas tarefas da vida real!",
     "raisePetShare": "Transformei meu mascote em uma montaria completando minhas tarefas da vida real!",
     "wonChallengeShare": "Venci um desafio em Habitica!",
-    "achievementShare": "Consegui uma nova conquista em Habitica!"
+    "achievementShare": "Consegui uma nova conquista em Habitica!",
+    "orderBy": "Ordenar por <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/pt/groups.json b/common/locales/pt/groups.json
index be010ea976..73b1ae61d2 100644
--- a/common/locales/pt/groups.json
+++ b/common/locales/pt/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Bate-papo da taverna",
     "innCheckOut": "Sair da Pousada",
     "innCheckIn": "Descansar na Pousada",
     "innText": "Você está descansando na Pousada! Enquanto estiver hospedado por aqui, suas Tarefas Diárias não lhe causarão dano na virada do dia, mas serão atualizadas normalmente todos os dias. Mas atenção: Se você estiver participando de uma Missão, Chefões continuarão a machucá-lo pelas Tarefas Perdidas de seus companheiros de equipe, a não ser que eles também estejam na Pousada! Além disso, seu dano no Chefão (ou itens coletados) não serão aplicados enquanto você não sair da Pousada.",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Seu bate-papo da equipe está vazio! Digite uma mensagem na caixa acima para começar a conversar.",
     "guildChatEmpty": "O bate-papo desta guilda está vazio! Digite uma mensagem na caixa abaixo para começar a conversar.",
     "possessiveParty": "Equipe de <%= name %>",
-    "requestAcceptGuidelines": "Se você quiser postar mensagens na Taverna ou em qualquer chat de equipe ou guilda, por favor leia nossas <%= linkStart %>Diretrizes de Comunidade<%= linkEnd %> e então clique no botão abaixo para indicar que você as aceita."
+    "requestAcceptGuidelines": "Se você quiser postar mensagens na Taverna ou em qualquer chat de equipe ou guilda, por favor leia nossas <%= linkStart %>Diretrizes de Comunidade<%= linkEnd %> e então clique no botão abaixo para indicar que você as aceita.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Entre em um grupo com outra pessoa! Divirtam-se batalhando contra monstros e ajudando um ao outro.",
+    "partyOnAchievement": "Entre em um grupo com pelo menos 4 pessoas! Divirta-se aumentando a sua produtividade com seus amigos para derrotar seus inimigos!"
 }
\ No newline at end of file
diff --git a/common/locales/pt/noscript.json b/common/locales/pt/noscript.json
index 95cca0d01c..6765fe2969 100644
--- a/common/locales/pt/noscript.json
+++ b/common/locales/pt/noscript.json
@@ -1,6 +1,6 @@
 {
     "jsDisabledHeading": "Ai! Seu navegador não está com o JavaScript habilitado",
-    "jsDisabledHeadingFull": "Ai! Seu navegador não está com JavaScript habilitado e, sem ele, Habitica não funcionará corretamente.",
+    "jsDisabledHeadingFull": "Ai! Seu navegador não está com o JavaScript habilitado e, sem ele, o Habitica não funcionará corretamente.",
     "jsDisabledText": "Habitica não pode mostrar o site corretamente sem ele!",
     "jsDisabledLink": "Por favor, habilite o JavaScript para continuar!"
 }
\ No newline at end of file
diff --git a/common/locales/pt/quests.json b/common/locales/pt/quests.json
index fa5caada56..6460325095 100644
--- a/common/locales/pt/quests.json
+++ b/common/locales/pt/quests.json
@@ -42,7 +42,7 @@
     "tavernBossInfoBroken": "Tarefas Diárias e Afazeres completos e Hábitos positivos machucarão o Chefão Global... Tarefas perdidas enchem a Barra do Ataque de Exaustão... Quando essa barra enche, o Chefão Global atacará um NPC... Um Chefão Global nunca machucará jogadores ou contas de qualquer forma... Apenas contas ativas não descansando na Pousada terão suas Tarefas Diárias computadas...",
     "bossColl1": "Para coletar itens, complete suas tarefas positivas. Itens de missão aparecem assim como itens normais; entretanto, você não verá a coleta até o dia seguinte, então tudo que você encontrou será registrado e contribuído à pilha.",
     "bossColl2": "Apenas participantes podem coletar itens e dividir as recompensas da missão.",
-    "bossColl1Broken": "Para coletar itens, complete suas tarefas positivas... Itens de missão aparecem assim como itens normais; entretanto, você não verá a coleta até o dia seguinte, então tudo que você encontrou será registrado e contribuído à pilha...",
+    "bossColl1Broken": "Para coletar itens, complete suas tarefas positivas... Itens de missão aparecem assim como itens normais; entretanto, você não verá a coleta até o dia seguinte, então tudo que você encontrou será registrado e adicionado à pilha...",
     "bossColl2Broken": "Apenas participantes podem coletar itens e dividir as recompensas da missão.",
     "abort": "Abortar",
     "leaveQuest": "Sair da missão",
diff --git a/common/locales/pt/questscontent.json b/common/locales/pt/questscontent.json
index d885e5b112..ad58165ee3 100644
--- a/common/locales/pt/questscontent.json
+++ b/common/locales/pt/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Você conseguil! Hoje esses demônios vão ficar sem bananas. Oprimidos por sua força, os macacos fogem em pânico. \"Olha\", diz @Misceo. \"Eles deixaram alguns ovos para trás.\"<br><br>@Leephon Sorri. \"Talvez um macaco de estimação bem treinado pode ajudá-lo tanto quanto os selvagens atrapalharam!\"",
     "questMonkeyBoss": "Mandril Monstruoso",
     "questMonkeyDropMonkeyEgg": "Macaco (Ovo)",
-    "questMonkeyUnlockText": "Desbloqueia ovos de Macaco para compra no Mercado"
+    "questMonkeyUnlockText": "Desbloqueia ovos de Macaco para compra no Mercado",
+    "questSnailText": "O trabalho fastidioso do caracol Sludge",
+    "questSnailNotes": "Você está excitado para começar a sua aventura nos Calabouços abandonados do Tédio, mas logo que você entra, você sente o chão embaixo dos seus pés começarem a sugar suas botas. Você olha para o caminho a frente e vê Habiticanos afundados na gosma. @Overomega grita, \"Eles tem muitos deveres e tarefas diárias pouco relevantes, e estão se prendendo nas coisas que não importam! Puxe-os fora!\" <br><br>\"Você precisa encontrar a origem da gosma,\" @Pfeffernusse concorda, \"ou as tarefas que eles não conseguirem cumprir vão puxa-los para baixo para sempre!\"<br><br>Puxando fora a sua arma, você cruza a lama pegajosa... e encontra o temível Caracol do Lodo Tedioso",
+    "questSnailCompletion": "Você leva sua arma abaixo na grande concha do Caracol, quebrando ela em dois, liberando uma inundação de água. A gosma foi lavada embora, e os Habiticanos em volta comemoram. \"Olhe!\" fala @Misceo. \"Tem um pequeno grupo de ovos de caracol nos restos do muco.\"",
+    "questSnailBoss": "trabalho fastidioso do caracol Sludge",
+    "questSnailDropSnailEgg": "Caracol (Ovo)",
+    "questSnailUnlockText": "Desbloqueia ovos de caracol para compra no mercado"
 }
\ No newline at end of file
diff --git a/common/locales/pt/subscriber.json b/common/locales/pt/subscriber.json
index 13f6cc7487..371a523cac 100644
--- a/common/locales/pt/subscriber.json
+++ b/common/locales/pt/subscriber.json
@@ -1,10 +1,10 @@
 {
     "subscription": "Assinatura",
     "subscriptions": "Assinaturas",
-    "subDescription": "Compre Gemas com ouro, ganhe itens misteriosos mensalmente, mantenha o progresso da história, dobre o limite de drop diário, ajude os desenvolvedores. Clique para mais informações.",
+    "subDescription": "Compre Gemas com ouro, ganhe itens misteriosos mensalmente, mantenha o histórico do progresso, dobre o limite de \"drop\" diário, ajude os desenvolvedores. Clique para mais informações.",
     "buyGemsGold": "Comprar Gemas com Ouro",
-    "buyGemsGoldText": "Alexander, o Comerciante, venderá Gemas ao custo de <%= gemCost %> ouro por gema. Suas entregas mensais são inicialmente limitadas a <%= gemLimit %> Gemas por mês, mas esse limite aumenta em 5 Gemas pra cada três meses de assinatura consecutiva, até o máximo de 50 Gemas por mês!",
-    "retainHistory": "Guardar itens adicionais no histórico",
+    "buyGemsGoldText": "Alexander, o Comerciante, venderá a você Gemas por <%= gemCost %> ouro cada gema. Suas entregas mensais são inicialmente limitadas a <%= gemLimit %> Gemas por mês, mas esse limite aumenta em 5 Gemas a cada três meses consecutivos de assinatura , até o máximo de 50 Gemas por mês!",
+    "retainHistory": "Guardar Itens adicionais no histórico",
     "retainHistoryText": "Deixa os Afazeres completos e o histórico de tarefas disponíveis por mais tempo.",
     "doubleDrops": "Capacidade de drop diário dobrado",
     "doubleDropsText": "Complete seu estábulo mais rápido!",
@@ -47,9 +47,9 @@
     "timeSupportText": "Forneceremos suporte para treino, bugs, instalação, e pedido de funcionalidades.",
     "gameFeatures": "Funcionalidades do jogo",
     "gold2Gem": "Gemas compráveis com ouro",
-    "gold2GemText": "Membros poderão comprar Gemas com ouro, significando que nenhum dos seus participantes precisarão comprar nada com dinheiro real.",
+    "gold2GemText": "Membros poderão comprar Gemas com ouro, assim nenhum dos participantes precisará comprar nada com dinheiro real.",
     "infiniteGem": "Gemas infinitas de líder",
-    "infiniteGemText": "Forneceremos aos líderes de organizações quantas gemas precisarem, para coisas como prêmios de desafios, criação de guilda etc.",
+    "infiniteGemText": "Forneceremos aos líderes das organizações quantas gemas precisarem, para coisas como prêmios de desafios, criação de guildas, etc.",
     "notYetPlan": "Plano ainda não disponível, mas clique para falar conosco e o manteremos atualizado.",
     "contactUs": "Fale Conosco",
     "checkout": "Fechar a conta",
@@ -60,11 +60,11 @@
     "subGemPop": "Agora que assinou ao Habitica, você pode comprar uma quantidade de Gemas a cada mês usando Ouro. Você pode ver quantas Gemas ainda pode comprar no canto do ícone de Gemas.",
     "subGemName": "Gemas de Assinante",
     "freeGemsTitle": "Obter Gemas gratuitamente",
-    "maxBuyGems": "Você comprou todas as Gemas que você podia esse mês. Mais estarão disponíveis dentro dos três primeiros dias do próximo mês. Obrigado por assinar!",
+    "maxBuyGems": "Você comprou todas as Gemas que você podia esse mês. Mais Gemas estarão disponíveis nos três primeiros dias do próximo mês. Obrigado por assinar!",
     "buyGemsAllow1": "Você pode comprar",
     "buyGemsAllow2": "mais Gemas este mês",
     "purchaseGemsSeparately": "Comprar Gemas adicionais",
-    "subFreeGemsHow": "Jogadores do Habitica podem ganhar Gemas de graça vencendo <a href=\"/#/options/groups/challenges\">desafios</a> que dão Gemas como prêmio, ou como uma <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">recompensa de contribuinte ajudando o desenvolvimento do Habitica.</a>",
+    "subFreeGemsHow": "Jogadores do Habitica podem ganhar Gemas de graça vencendo <a href=\"/#/options/groups/challenges\">desafios</a> que dão Gemas como prêmio, ou como uma <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">recompensa de contribuinte, ajudando o desenvolvimento do Habitica.</a>",
     "seeSubscriptionDetails": "Vá até <a href='/#/options/settings/subscription'>Configurações &gt; Assinatura</a> para ver os detalhes da sua assinatura!",
     "timeTravelers": "Viajantes do Tempo",
     "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> e <%= linkStartVicky %>Vicky<%= linkEnd %>",
@@ -73,33 +73,33 @@
     "timeTravelersPopover": "Notamos que você tem uma Ampulheta Mística, então estamos felizes viajar de volta no tempo por você! Por favor escolha um mascote, montaria ou Conjunto de Itens Misteriosos que deseja. Você pode ver a lista de conjuntos passados   <a href='http://habitica.wikia.com/wiki/Mystery_Item' target='_blank'>aqui</a>! Se esses não te agradarem, talvez você esteja interessado em um de nossos elegantes novos conjuntos futurísticos Steampunk?",
     "timeTravelersAlreadyOwned": "Parabéns! Você já possui todos os itens que os Viajantes do Tempo oferecem no momento. Obrigado por apoiar o site!",
     "mysticHourglassPopover": "A Ampulheta Mística permite a compra de certos itens oferecidos por tempo limitado, como os Conjuntos de Itens Misteriosos Mensais e recompensas de Chefões do passado!",
-    "mysterySet201402": "Conjunto do Mensageiro Alado",
-    "mysterySet201403": "Conjunto do Andador da Floresta",
-    "mysterySet201404": "Conjunto da Borboleta do Crepúsculo",
-    "mysterySet201405": "Conjunto da Chama Wielder",
-    "mysterySet201406": "Conjunto do Octomago",
-    "mysterySet201407": "Conjunto de Exploração Submarina",
-    "mysterySet201408": "Conjunto do Feiticeiro do Sol",
-    "mysterySet201409": "Conjunto do Andarilho do Outono",
-    "mysterySet201410": "Conjunto do Goblin Alado",
-    "mysterySet201411": "Conjunto Festa e Diversão",
-    "mysterySet201412": "Conjunto de Pinguim",
-    "mysterySet201501": "Conjunto do Cavaleiro Estrelado",
-    "mysterySet201502": "Conjunto do Feiticeiro Alado",
-    "mysterySet201503": "Conjunto Água-marinha",
-    "mysterySet201504": "Conjunto da Abelha Ocupada",
-    "mysterySet201505": "Conjunto do Cavaleiro Verde",
-    "mysterySet201506": "Conjunto Mergulhador Neon ",
-    "mysterySet201507": "Conjunto do Surfista Radical",
-    "mysterySet201508": "Conjunto de fantasia de Guepardo",
-    "mysterySet201509": "Conjunto Lobisomem",
-    "mysterySet201510": "Conjunto do Goblin de Chifres",
-    "mysterySet201511": "Conjunto Guerreiro de Madeira",
-    "mysterySet201512": "Conjunto de Chama do Inverno",
-    "mysterySet201601": "Campeão de configuração de resoluções",
-    "mysterySet201602": "Heartbreaker Set",
-    "mysterySet301404": "Conjunto Steampunk padrão",
-    "mysterySet301405": "Conjunto de acessórios Steampunk",
+    "mysterySet201402": "Conjunto \"Mensageiro Alado\"",
+    "mysterySet201403": "Conjunto \"Andarilho da Floresta\"",
+    "mysterySet201404": "Conjunto \"Borboleta Crepuscular\"",
+    "mysterySet201405": "Conjunto \"Domador do Fogo\"",
+    "mysterySet201406": "Conjunto \"Octomago\"",
+    "mysterySet201407": "Conjunto \"Explorador Submarino\"",
+    "mysterySet201408": "Conjunto \"Feiticeiro do Sol\"",
+    "mysterySet201409": "Conjunto \"Andarilho do Outono\"",
+    "mysterySet201410": "Conjunto \"Goblin Alado\"",
+    "mysterySet201411": "Conjunto Banquete e Diversão",
+    "mysterySet201412": "Conjunto \"Pinguim\"",
+    "mysterySet201501": "Conjunto \"Cavaleiro Estrelado\"",
+    "mysterySet201502": "Conjunto \"Feiticeiro Alado\"",
+    "mysterySet201503": "Conjunto \"Água-marinha\"",
+    "mysterySet201504": "Conjunto \"Abelha Ocupada\"",
+    "mysterySet201505": "Conjunto \"Cavaleiro Verde\"",
+    "mysterySet201506": "Conjunto \"Mergulhador Neon\"",
+    "mysterySet201507": "Conjunto \"Surfista Radical\"",
+    "mysterySet201508": "Conjunto \"Fantasia de Guepardo\"",
+    "mysterySet201509": "Conjunto \"Lobisomem\"",
+    "mysterySet201510": "Conjunto \"Goblin Chifrudo\"",
+    "mysterySet201511": "Conjunto \"Guerreiro de Madeira\"",
+    "mysterySet201512": "Conjunto \"Chama do Inverno\"",
+    "mysterySet201601": "Conjunto \"Campeão de Resolução\"",
+    "mysterySet201602": "Conjunto \"Destruidor de Corações\"",
+    "mysterySet301404": "Conjunto \"Steampunk Padrão\"",
+    "mysterySet301405": "Conjunto \"Acessórios Steampunk\"",
     "mysterySetwondercon": "WonderCon",
     "subUpdateCard": "Atualizar Cartão",
     "subUpdateTitle": "Atualizar",
diff --git a/common/locales/ro/communityguidelines.json b/common/locales/ro/communityguidelines.json
index b97ac31253..e691d970cf 100644
--- a/common/locales/ro/communityguidelines.json
+++ b/common/locales/ro/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "Intr-o comunitate atât de mare precum Habitica, utilizatorii vin și pleacă și un moderator trebuie să-și depună mantia de nobil și să se relaxeze. Următorii sunt Moderatori Emeriți. Nu mai au puterile de moderator, dar ne-ar plăcea să continuăm să le onorăm munca!",
     "commGuidePara014": "Moderatorii emeriți:",
     "commGuideHeadingPublicSpaces": "Spații publice în Habitica",
-    "commGuidePara015": "Habitica are două tipuri de spații sociale: publice și private. Spațiile publice includ Taverna, Breslele Publice, GitHub, Trello și Wiki. Spațiile private sunt Breslele Private, chat-ul echipei și Mesajele Private.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Când navighezi prin spațiile publice din Habitica, sunt anumite reguli generale pentru a păstra pe toată lumea în siguranță și fericită. Acestea ar trebui să fie simple pentru aventurieri ca tine!",
     "commGuidePara017": "<strong>Respect each other.</strong> Be courteous, kind, friendly, and helpful. Remember: Habiticans come from all backgrounds and have had wildly divergent experiences. This is part of what makes Habitica so cool! Building a community means respecting and celebrating our differences as well as our similarities. Here are some easy ways to respect each other:",
     "commGuideList02A": "<strong>Respectă toate Termenele și Condițiile.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Ascultă imediat orice cerere a unui Moderator</strong> de încetare a unei discuții sau de mutare a ei în Back Corner. Ultimele cuvinte, lovituri de despărțire sau glumițe de final ar trebui date (politicos) la \"masa\" ta din Back Corner, dacă îți este permis.",
     "commGuideList02G": "<strong>Reflectă un timp în loc să răspunzi cu furie</strong> dacă o persoană îți spune că un lucru pe care l-ai zis îi face incomfortabili. Este nevoie de multă forță pentru a putea să-ți ceri scuye sincer de la cineva. Dacp simți că modul în care ți-a răspuns a fost nepotrivit, contactează un moderator în loc să îi confrunți în public.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Nu spama.</strong> Spamul poate include dar nu e limitat la: postarea aceluiași comentariu sau întrebare în mai multe locuri, postarea de link-uri fără explicație sau context, postarea de mesaje fără sens sau postarea multor mesaje unul după altul. A cerși repetat nestemate sau o abonare poate fi de asemenea considerat spam.",
-    "commGuidePara019": "<strong>În spațiile private,</strong> utilizatorii au mai multă libertate de a discuta orice temă doresc, dar în continuare nu pot viola Termenii și Condițiile, incluzînd postând conținut discriminatoriu, violent sau amenințător.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Mesajele Private au reguli adiționale. Dacă o persoană te-a blocat, nu o contacta altundeva să o rogi să te deblocheze. Nu ar trebui să trimiți mesaje private cuiva pentru a-i ruga să te susțină (din moment ce răspunsurile publice la întrebările legate de suport ajută comunitatea). În cele din urmă, nu trimite nimănui mesaj cerșind nestemate sau o abonare, deoarece pot fi considerate spam.",
     "commGuidePara021": "În plus,în  anumite spații publice în Habitica se aplică reguli suplimentare.",
     "commGuideHeadingTavern": "Cârciuma",
diff --git a/common/locales/ro/content.json b/common/locales/ro/content.json
index a5a132fb94..81eb783655 100644
--- a/common/locales/ro/content.json
+++ b/common/locales/ro/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "spinos",
     "dropEggBearCubText": "Pui de urs",
     "dropEggBearCubMountText": "Urs",
-    "dropEggBearCubAdjective": "drăgălaș",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Grifon",
     "questEggGryphonMountText": "Grifon",
     "questEggGryphonAdjective": "mândru",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "colorat",
     "questEggRatText": "Șobolan",
     "questEggRatMountText": "Șobolan",
-    "questEggRatAdjective": "murdar",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Caracatiță",
     "questEggOctopusMountText": "Caracatiță",
     "questEggOctopusAdjective": "alunecoasă",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Găsește o licoare de eclozat pentru a turna peste acest ou și va ecloza în <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "de bază",
     "hatchingPotionWhite": "Alb",
diff --git a/common/locales/ro/gear.json b/common/locales/ro/gear.json
index 7ad1638998..6a3303cd80 100644
--- a/common/locales/ro/gear.json
+++ b/common/locales/ro/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "armă",
     "weaponBase0Text": "Fără Armă",
     "weaponBase0Notes": "Fără Armă.",
diff --git a/common/locales/ro/generic.json b/common/locales/ro/generic.json
index 56d8e6958c..91484bd92a 100644
--- a/common/locales/ro/generic.json
+++ b/common/locales/ro/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/ro/groups.json b/common/locales/ro/groups.json
index fd9feb9b93..fd6f3216af 100644
--- a/common/locales/ro/groups.json
+++ b/common/locales/ro/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/ro/questscontent.json b/common/locales/ro/questscontent.json
index c0d0db7b43..042c8e33c8 100644
--- a/common/locales/ro/questscontent.json
+++ b/common/locales/ro/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/ro/subscriber.json b/common/locales/ro/subscriber.json
index 5bba2f659a..8da8d50c15 100644
--- a/common/locales/ro/subscriber.json
+++ b/common/locales/ro/subscriber.json
@@ -1,14 +1,14 @@
 {
     "subscription": "Abonament",
     "subscriptions": "Abonamente",
-    "subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.",
+    "subDescription": "Cumpără nestemate cu aur, obține articole misterioase în fiecare lună, păstrează istoricul progresului, dublează limitele zilnice de picări, sprijină dezvoltatorii. Clic pentru mai multe informații.",
     "buyGemsGold": "Cumpără Nestemate cu Aur",
-    "buyGemsGoldText": "Alexander the Merchant will sell you Gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!",
-    "retainHistory": "Retain additional history entries",
+    "buyGemsGoldText": "Alexandru Negustoru îți va vinde nestematele la un preț de <%= gemCost %> aur pe nestemată. Livrările sale lunare sunt limitate inițial la <%= gemLimit %> nestemate pe lună, dar această limită crește cu câte 5 nestemate la fiecare trei luni de abonament consecuriv, până la un maxim de 50 de nestemate pe lună!",
+    "retainHistory": "Reține mai mult din istoric",
     "retainHistoryText": "Makes completed To-Dos and task history available for longer.",
     "doubleDrops": "Limita maximă de obiecte câștigate este dublată",
     "doubleDropsText": "Umpleți grajdul mai repede!",
-    "mysteryItem": "Exclusive monthly items",
+    "mysteryItem": "Obiecte unice disponibile lunar",
     "mysteryItemText": "În fiecare lună vei primi un articol unic cu rol cosmetic pentru avatarul tău! În plus, odată la fiecare trei luni de abonament consecutiv, misterioșii călători în timp îți vor acorda acces la articole cosmetice istorice (și futuriste!).",
     "supportDevs": "Susține dezvoltatorii",
     "supportDevsText": "Abonamentul tău permite Habiticei să prospere și ajută la dezvoltarea noilor funcționalități. Mulțumim pentru generozitate!",
@@ -28,7 +28,7 @@
     "subscribed": "Abonat",
     "manageSub": "Apasă ca să gestionezi abonamentul",
     "cancelSub": "Anulează abonamentul",
-    "canceledSubscription": "Canceled Subscription",
+    "canceledSubscription": "Anulează abonamentul",
     "adminSub": "Abonamente de administrator",
     "morePlans": "Mai multe abonamente<br/>În curând",
     "organizationSub": "Organizație privată",
@@ -48,22 +48,22 @@
     "gameFeatures": "Facilități ale jocului",
     "gold2Gem": "Nestemate care pot fi cumpărate cu aur",
     "gold2GemText": "Members will be able to purchase Gems with gold, meaning none of your participants need to buy anything with real money.",
-    "infiniteGem": "Infinite leader Gems",
-    "infiniteGemText": "We will provide the organization leaders with as many Gems as they need, for things like challenge prizes, guild-creation, etc.",
+    "infiniteGem": "Număr infinit de nestemate pentru lider",
+    "infiniteGemText": "Vom furniza liderilor organizației oricâte nestemate au nevoie, pentru premii pentru provocări, creare de bresle etc.",
     "notYetPlan": "Abonamentul nu este valabil încă, dar apăsați ca să ne contactați și vă vom ține la curent.",
     "contactUs": "Contactați-ne",
     "checkout": "Plată",
     "sureCancelSub": "Sunteți sigur că vreți să anulați abonamentul?",
     "subCanceled": "Abonarea va deveni inactivă în",
-    "buyGemsGoldTitle": "To Buy Gems with Gold",
-    "becomeSubscriber": "Become a Subscriber",
+    "buyGemsGoldTitle": "Pentru a cumpăra nestemate cu aur",
+    "becomeSubscriber": "Abonează-te",
     "subGemPop": "Pentru că te-ai abonat la Habitica poți cumpăra un număr de nestemate în fiecare lună folosind Aur. Poți vedea câte îți sunt permise să le cumperi în colțul Nestematei afișate.",
     "subGemName": "Nestematele abonatului",
-    "freeGemsTitle": "Obtain Gems for Free",
-    "maxBuyGems": "You have bought all the Gems you can this month. More will become available within the first three days of next month. Thanks for subscribing!",
-    "buyGemsAllow1": "You can buy",
-    "buyGemsAllow2": "more Gems this month",
-    "purchaseGemsSeparately": "Purchase Additional Gems",
+    "freeGemsTitle": "Obține nestemate gratis",
+    "maxBuyGems": "Ai cumpărat toate nestematele disponibile pentru această lună. Mai multe vor fi disponibile în primele trei zile ale lunii următoare. Mulțumim pentru abonare!",
+    "buyGemsAllow1": "Poți cumpăra",
+    "buyGemsAllow2": "mai multe nestemate luna asta",
+    "purchaseGemsSeparately": "Cumpără nestemate suplimentare",
     "subFreeGemsHow": "Habitica players can earn Gems for free by winning <a href=\"/#/options/groups/challenges\">challenges</a> that award Gems as a prize, or as a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">contributor reward by helping the development of Habitica.</a>",
     "seeSubscriptionDetails": "Go to <a href='/#/options/settings/subscription'>Settings &gt; Subscription</a> to see your subscription details!",
     "timeTravelers": "Călători în timp",
diff --git a/common/locales/ru/backgrounds.json b/common/locales/ru/backgrounds.json
index d986abe1fe..fb083c092c 100644
--- a/common/locales/ru/backgrounds.json
+++ b/common/locales/ru/backgrounds.json
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "Почитайте книги в уютной библиотеке.",
     "backgroundGrandStaircaseText": "Парадная лестница",
     "backgroundGrandStaircaseNotes": "Спуститесь по парадной лестнице.",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "Набор 22: Выпущен в марте 2016",
+    "backgroundDeepMineText": "Глубокая шахта",
+    "backgroundDeepMineNotes": "Отыщите драгоценные металлы в глубокой шахте.",
+    "backgroundRainforestText": "Тропический лес",
+    "backgroundRainforestNotes": "Отправьтесь в тропический лес.",
+    "backgroundStoneCircleText": "Круг Каменных глыб",
+    "backgroundStoneCircleNotes": "Творите заклинания в круге Каменных глыб!"
 }
\ No newline at end of file
diff --git a/common/locales/ru/challenge.json b/common/locales/ru/challenge.json
index 85c2cbbd1c..d6d5f77814 100644
--- a/common/locales/ru/challenge.json
+++ b/common/locales/ru/challenge.json
@@ -16,7 +16,7 @@
     "selectWinner": "Выбрать победителя и закрыть испытание:",
     "deleteOrSelect": "Удалить или выбрать победителя",
     "endChallenge": "Завершить испытание",
-    "challengeDiscription": "Эти задания, входят в испытание. После присоединения к испытанию они будут добавлены к списку ваших заданий. Цвет размещенных ниже заданий испытания будет меняться, станут доступны графики, показывающие общие достижения группы.",
+    "challengeDiscription": "Эти задания входят в испытание. После присоединения к испытанию они будут добавлены к списку ваших заданий. Цвет размещенных ниже заданий испытания будет меняться, станут доступны графики, показывающие общие достижения группы.",
     "hows": "Как идут дела?",
     "filter": "Фильтр",
     "groups": "Группы",
diff --git a/common/locales/ru/character.json b/common/locales/ru/character.json
index 4c19b0b365..606338f6d7 100644
--- a/common/locales/ru/character.json
+++ b/common/locales/ru/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "Характеристики и достижения",
     "profile": "Профиль",
-    "avatar": "Customize Avatar",
+    "avatar": "Персонализировать аватар",
     "other": "Прочее",
     "fullName": "Полное имя",
     "displayName": "Отображаемое имя",
@@ -83,7 +83,7 @@
     "allocateInt": "Очки, распределенные на интеллект:",
     "allocateIntPop": "Добавить очко к интеллекту",
     "noMoreAllocate": "Теперь, после достижения 100-го уровня, вы больше не будете получать Очки Атрибутов. Вы можете продолжить повышать свой уровень или же начать новое приключение с первого уровня, воспользовавшись <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>Шаром возрождения</a>, доступным бесплатно на Рынке.",
-    "stats": "Avatar Stats",
+    "stats": "Характеристики аватара",
     "strength": "Сила",
     "strengthText": "Сила увеличивает шанс случайных «критических ударов» и количество золота, опыта и вещей, которые вы за них получите. Она также помогает наносить больший урон монстрам-боссам.",
     "constitution": "Телосложение",
@@ -136,7 +136,7 @@
     "respawn": "Возродиться!",
     "youDied": "Вы погибли!",
     "dieText": "Вы потеряли один уровень, все ваше золото и случайный предмет снаряжения. Поднимайтесь и попробуйте еще раз! Обуздайте отрицательные привычки, будьте усердны в выполнении ежедневных заданий, и держитесь от смерти на почтительном расстоянии, пользуясь эликсиром здоровья, если почувствуете слабость!",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "Вы уверены? Это действие изменит класс вашего персонажа и сбросит все размещенные очки (вы получите их вновь для перераспределения). Оно стоит 3 самоцвета.",
     "purchaseFor": "Купить за <%= cost %> самоцветов?",
     "notEnoughMana": "Недостаточно маны.",
     "invalidTarget": "Недопустимая цель",
diff --git a/common/locales/ru/communityguidelines.json b/common/locales/ru/communityguidelines.json
index a1603f6e56..f8eea3d281 100644
--- a/common/locales/ru/communityguidelines.json
+++ b/common/locales/ru/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "В таком большом сообществе как Habitica, пользователи приходят и уходят, и иногда даже модератору нужно сложить со своих плеч благородную мантию и отдохнуть. Это заслуженные модераторы. Они более не используют силу модератора, но мы по-прежнему рады почтить их работу!",
     "commGuidePara014": "Заслуженные модераторы:",
     "commGuideHeadingPublicSpaces": "Общественные места в стране Habitica",
-    "commGuidePara015": "В стране Habitica есть два типа мест для общения: публичные, и личные. Публичные места — это таверна, открытые гильдии, GitHub, и WIki. Личные места — личные гильдии, чат команды и персональные сообщения.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Посещая общественные места в стране Habitica, необходимо соблюдать определенные правила, чтобы все чувствовали себя спокойно и счастливо. Таким искателям приключений, как вы, это не составит труда!",
     "commGuidePara017": "<strong>Уважайте друг друга.</strong> Будьте вежливы, добры, дружелюбны и отзывчивы. Помните: здесь все из разных мест и у всех свой собственный жизненный опыт, отличный от других. Отчасти именно это делает Habitica таким замечательным! Создание сообщества означает уважение, как к нашим различиям, так и к общим чертам. Вот несколько простых способов, как проявлять уважение друг к другу:",
     "commGuideList02A": "<strong>Следуйте всем правилам и условиям использования.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Незамедлительно подчиняйтесь любому запросу модератора</strong>  о прекращении дискуссии или переносу ее в Black Corner. Последние слова и все остроумные замечания, если это допустимо, должны быть использованы (в вежливой форме) уже в Black Corner.",
     "commGuideList02G": "<strong>Задумывайтесь над причинами, а не злитесь</strong>, если кто-то говорит вам, что ваши слова или действия оказались причиной дискомфорта другого человека. В умении искренне извиниться за свою ошибку скрывается велика сила. Если же вы считаете тон, в котором к вам обратились неприемлимым, обратитесь к модераторам вместо того чтобы вступать публичный конфликт.",
     "commGuideList02H": "<strong>О спорах и распрях необходимо сообщать модераторам.</strong> Если вы почувствуете, что дискуссия принимает негативный окрас, в ней оскорбляют или притесняют чьи-либо чувства, немедля прекратите спор. Вместо попыток решить проблему самостоятельно, сообщите о ней на email <a href=\"mailto:leslie@habitica.com\">leslie@habitica</a>. Ваше спокойствие — наша работа.",
-    "commGuideList02I": "<strong>Не спамьте.</strong> Спам включает в себя, но не ограничивается публикацией одного и того же комментария или серии в разных местах, публикация ссылок без объяснения или соответствующего им контекста, публикация бессмысленных сообщений или публикация множества сообщений подряд. Повторяющиеся просьбы о самоцветах или подписке также могут быть рассмотрены как спам.",
-    "commGuidePara019": "<strong>В личных местах</strong> пользователям разрешается вести любые дискуссии, не нарушающие правила и условия использования ресурса. Не допускается контент, содержащий дискриминацию, насилие или угрозы.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Для личных сообщений (ЛС)  есть несколько дополнительных правил. Если кто-то заблокировал вас, не пишите ему где-либо еще просьбы разблокировать вас. Кроме того, не стоит писать ответы на публичные вопросы в ЛС (публичные ответы на вопросы помогают сообществу). И наконец, не посылайте кому-либо ЛС с просьбами о самоцветах или подписке, так как это может быть сочтено спамом.",
     "commGuidePara021": "Кроме того, в некоторых публичных местах страны Habitica действуют дополнительные правила.",
     "commGuideHeadingTavern": "Таверна",
diff --git a/common/locales/ru/content.json b/common/locales/ru/content.json
index e84ab5946a..98bace46a7 100644
--- a/common/locales/ru/content.json
+++ b/common/locales/ru/content.json
@@ -2,7 +2,7 @@
     "potionText": "Эликсир здоровья",
     "potionNotes": "Восстанавливает 15 здоровья (мгновенно)",
     "armoireText": "Зачарованный сундук",
-    "armoireNotesFull": "Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения:",
+    "armoireNotesFull": "Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: ",
     "armoireLastItem": "Вы получили последний редкий предмет из зачарованного сундука.",
     "armoireNotesEmpty": "Новое снаряжение будет появляться в сундуке в начале каждого месяца. А пока что продолжайте кликать ради опыта и еды!",
     "dropEggWolfText": "Волк",
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "колючий",
     "dropEggBearCubText": "Медвежонок",
     "dropEggBearCubMountText": "Медведь",
-    "dropEggBearCubAdjective": "пушистый",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Грифон",
     "questEggGryphonMountText": "Грифон",
     "questEggGryphonAdjective": "гордый",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "красочный",
     "questEggRatText": "Грызун",
     "questEggRatMountText": "Крыса",
-    "questEggRatAdjective": "грязная",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Осьминог",
     "questEggOctopusMountText": "Осьминог",
     "questEggOctopusAdjective": "скользкий",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Капуцин",
     "questEggMonkeyMountText": "Капуцин",
     "questEggMonkeyAdjective": "озорной",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Найдите инкубационный эликсир, чтобы полить им это яйцо, и из него вылупится <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Обыкновенный",
     "hatchingPotionWhite": "Белый",
diff --git a/common/locales/ru/contrib.json b/common/locales/ru/contrib.json
index 757185d87d..2fe961a488 100644
--- a/common/locales/ru/contrib.json
+++ b/common/locales/ru/contrib.json
@@ -28,11 +28,11 @@
     "helped": "Помог в развитии Habitica",
     "helpedText1": "Для развития Habitica заполнен",
     "helpedText2": "этот опрос.",
-    "hall": "Hall of Heroes",
+    "hall": "Зал героев",
     "contribTitle": "Звание участника (например, «Кузнец»)",
     "contribLevel": "Ранг участника",
     "contribHallText": "1-7 для всех, кто вносит свой вклад, 8 для модераторов, 9 для сотрудников. Этим определяется, какие предметы, зверушки и скакуны доступны персонажу. Также влияет на цвет, которым выделяется имя персонажа. 8 и 9 ранги автоматически наделяют обладателя правами администратора.",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "Зал участников",
     "hallPatrons": "Зал покровителей",
     "rewardUser": "Наградить пользователя",
     "UUID": "UUID",
@@ -42,7 +42,7 @@
     "moreDetails2": "подробнее (8-9)",
     "contributions": "Вклад",
     "admin": "Админ",
-    "notGems": "в долларах США, <em>не</em> в самоцветах. Т. е. если это число равно 1, это значит 4 самоцвета. Используйте эту функцию только при предоставлении самоцветов игрокам вручную. Не используйте при предоставлении участникам рангов — при получении нового ранга участник автоматически получит самоцветы.",
+    "notGems": "в долларах США, <em>не</em> в самоцветах. Т.е. если это число равно 1, это значит 4 самоцвета. Используйте эту функцию только при предоставлении самоцветов игрокам вручную. Не используйте при предоставлении участникам рангов — при получении нового ранга участник автоматически получит самоцветы.",
     "gamemaster": "Мастер игры (сотрудник / модератор)",
     "backerTier": "Ранг спонсора",
     "balance": "Баланс",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "Гильдии представляют собой групповые чаты по общим интересам, создаваемые игроками и для игроков. Просмотрите весь список и присоединитесь к гильдиям, которые вас заинтересуют!",
     "blurbChallenges": "Испытания создаются вашими собратьями-игроками. Присоединившись к испытанию, вы добавите его задачи к своим, а победа в испытании принесет вам достижение и зачастую призовые самоцветы!",
     "blurbHallPatrons": "Это Зал Покровителей, где мы чествуем благородных искателей приключений, которые поддержали проект Habitica на Kickstarter. Мы благодарим их за помощь в воплощении страны Habitica в жизнь!",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "Это — Зал Участников, в котором воздаются почести всем, кто внес свой вклад в создание страны Habitica, будь то программный код, картинки, музыка, тексты или просто помощь другим. Все они получают в награду <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> самоцветы, эксклюзивное снаряжение </a> и <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>престижные значки</a>. Вы тоже можете принять участие в создании Habitica! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Узнайте больше здесь. </a>"
 }
\ No newline at end of file
diff --git a/common/locales/ru/gear.json b/common/locales/ru/gear.json
index 35f3380d4f..f223ed36b5 100644
--- a/common/locales/ru/gear.json
+++ b/common/locales/ru/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Набор",
     "weapon": "оружие",
     "weaponBase0Text": "Нет оружия",
     "weaponBase0Notes": "Нет оружия.",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "Прошу внимания! Увеличивает силу и телосложение на <%= attrs %>. Зачарованный сундук: Набор Барристера (предмет 3 из 3).",
     "weaponArmoireJesterBatonText": "Палочка шута",
     "weaponArmoireJesterBatonNotes": "Один взмах вашей дубинки и капелька шутовской находчивости - и даже самая сложная ситуация немедленно прояснится. Увеличивает интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Набор Шута (предмет 3 из 3).",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "Кирка",
+    "weaponArmoireMiningPickaxNotes": "Добудьте как можно больше золота из ваших задач! Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Горняка (предмет 3 из 3).",
     "armor": "Броня",
     "armorBase0Text": "Обычная одежда",
     "armorBase0Notes": "Обычная одежда. Бонусов не дает.",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "Очень серьезная и величественная. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор Барристера (предмет 2 из 3).",
     "armorArmoireJesterCostumeText": "Костюм шута",
     "armorArmoireJesterCostumeNotes": "Тра-ля-ля! По этому костюму так сразу и не скажешь, но вы вовсе не дурак. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор Шута (предмет 2 из 3).",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "Комбинезон шахтера",
+    "armorArmoireMinerOverallsNotes": "Да, он выглядит поношенным, но специальное заклятие отталкивает от него грязь. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор Горняка (предмет 2 из 3).",
     "headgear": "Головной убор",
     "headBase0Text": "Нет шлема",
     "headBase0Notes": "Нет головного убора.",
@@ -521,17 +522,17 @@
     "headMystery201505Text": "Шлем Зеленого рыцаря",
     "headMystery201505Notes": "На этом шлеме гордо колышется зеленый плюмаж. Бонусов не дает. Подарок подписчикам мая 2015.",
     "headMystery201508Text": "Шляпа гепарда",
-    "headMystery201508Notes": "Уютная пушистая гепардовая шляпа! Бонусов не даёт. Предмет подписчика августа 2015.",
+    "headMystery201508Notes": "Уютная пушистая гепардовая шляпа! Бонусов не даёт. Подарок подписчикам августа 2015.",
     "headMystery201509Text": "Маска Оборотня",
     "headMystery201509Notes": "Это же и ЕСТЬ маска, так? Бонусов не даёт. Подарок подписчикам сентября 2015.",
     "headMystery201511Text": "Корона из полена",
-    "headMystery201511Notes": "Возраст этой короны можно узнать, сосчитав её годичные кольца. Преимуществ не дает. Подарок подписчикам ноября 2015.",
+    "headMystery201511Notes": "Возраст этой короны можно узнать, сосчитав её годичные кольца. Бонусов не дает. Подарок подписчикам ноября 2015.",
     "headMystery201512Text": "Зимнее пламя",
     "headMystery201512Notes": "Это пламя излучает холодное сияние чистого разума. Преимуществ не дает. Подарок подписчикам декабря 2015.",
     "headMystery201601Text": "Шлем Истинного разрешения",
     "headMystery201601Notes": "Оставайтесь решительным и храбрым чемпионом! Бонусов не дает. Подарок подписчикам января 2016.",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "Капюшон Сердцееда",
+    "headMystery201602Notes": "Оградите свою индивидуальность от всех своих поклонников. Бонусов не дает. Подарок подписчикам февраля 2016.",
     "headMystery301404Text": "Модный цилиндр",
     "headMystery301404Notes": "Модный цилиндр для самых уважаемых господ! Подарок подписчикам января 3015. Бонусов не дает.",
     "headMystery301405Text": "Обычный цилиндр",
@@ -540,8 +541,8 @@
     "headArmoireLunarCrownNotes": "Эта корона укрепляет здоровье и обостряет чувства, особенно при полной луне. Увеличивает телосложение на <%= con %> и восприятие на <%= per %>. Зачарованный сундук: Набор Лунного успокоения (предмет 1 из 3).",
     "headArmoireRedHairbowText": "Красный бант",
     "headArmoireRedHairbowNotes": "Станьте сильным, стойким и находчивым, надев этот превосходный красный бант! Увеличивает силу на <%= str %>, телосложение на <%= con %> и интеллект на <%= int %>. Зачарованный сундук: Независимый предмет.",
-    "headArmoireVioletFloppyHatText": "Свободная фиолетовая шляпа",
-    "headArmoireVioletFloppyHatNotes": "Много заклинаний было вшито в эту простую шляпу, придав ей приятный фиолетовый цвет. Увеличивает восприятие на <%= per %>, интеллект на <%= int %> и телосложение на <%= con %>. Зачарованный сундук: Независимый предмет.",
+    "headArmoireVioletFloppyHatText": "Фиолетовая широкополая шляпа",
+    "headArmoireVioletFloppyHatNotes": "Множество заклинаний было вплетено в эту простенькую шляпу, придавая ей приятный фиолетовый цвет. Увеличивает восприятие на <%= per %>, интеллект на <%= int %> и телосложение на <%= con %>. Зачарованный сундук: Независимый предмет.",
     "headArmoireGladiatorHelmText": "Шлем Гладиатора",
     "headArmoireGladiatorHelmNotes": "Чтобы быть гладиатором, вы должны быть не только сильным... но и хитрым. Увеличивает интеллект на <%= int %> и восприятие на <%= per %>. Зачарованный сундук: Набор Гладиатора (предмет 1 из 3).",
     "headArmoireRancherHatText": "Ковбойская шляпа",
@@ -556,16 +557,16 @@
     "headArmoireHornedIronHelmNotes": "Яростно выкованный из железа, этот рогатый шлем практически не уничтожим. Увеличивает телосложение на <%= con %> и силу на <%= str %>. Зачарованный сундук: Набор Рогатого железа (предмет 1 из 3).",
     "headArmoireYellowHairbowText": "Жёлтый бантик",
     "headArmoireYellowHairbowNotes": "Станьте чувствительнее, сильнее и умнее, надев этот великолепный жёлтый бантик! Увеличивает восприятие, силу и интеллект на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
-    "headArmoireRedFloppyHatText": "Красная панама",
-    "headArmoireRedFloppyHatNotes": "Множество заклинаний было вплетено в эту простую шляпку, что придало ей лучезарный красный цвет. Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
+    "headArmoireRedFloppyHatText": "Красная широкополая шляпа",
+    "headArmoireRedFloppyHatNotes": "Множество заклинаний было вплетено в эту простенькую шляпу, придавая ей лучезарный красный цвет. Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
     "headArmoirePlagueDoctorHatText": "Шляпа чумного доктора",
     "headArmoirePlagueDoctorHatNotes": "Аутентичная шляпа, которую носят доктора, борющиеся против чумы прокрастинации! Увеличивает силу на <%= str %>, интеллект на <%= int%> и телосложение на <%= con %>. Зачарованный сундук: Набор Чумного доктора (предмет 1 из 3).",
-    "headArmoireBlackCatText": "Шапка Чёрного Кота",
+    "headArmoireBlackCatText": "Шапка Чёрного кота",
     "headArmoireBlackCatNotes": "Эта чёрная шляпа... мурлыкает. И подёргивает хвостом. И дышит? Ага, на вашей голове просто спит кот.  Увеличивает интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
-    "headArmoireOrangeCatText": "Шапка Оранжевого Кота",
+    "headArmoireOrangeCatText": "Шапка Оранжевого кота",
     "headArmoireOrangeCatNotes": "Эта оранжевая шляпа... мурлыкает. И подёргивает хвостом. И дышит? Ага, на вашей голове просто спит кот.  Увеличивает силу и телосложение на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
-    "headArmoireBlueFloppyHatText": "Синяя Широкополая шляпа",
-    "headArmoireBlueFloppyHatNotes": "Многие заклинания были зашиты в эту простенькую шляпу, придавая ей искрящийся голубой цвет. Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
+    "headArmoireBlueFloppyHatText": "Синяя широкополая шляпа",
+    "headArmoireBlueFloppyHatNotes": "Множество заклинаний было вплетено в эту простенькую шляпу, придавая ей искрящийся голубой цвет. Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Независимый предмет.",
     "headArmoireShepherdHeaddressText": " Головной убор Пастуха",
     "headArmoireShepherdHeaddressNotes": "Иногда грифоны, которых вы пасёте, грызут этот головной убор, но несмотря на это, он придаёт вам умный вид. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор Пастуха (предмет 3 из 3).",
     "headArmoireCrystalCrescentHatText": "Шляпа Хрустального Полумесяца",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "Этот парик распугает даже самых свирепых противников. Увеличивает силу на <%= str %>. Зачарованный сундук: Набор Барристера (предмет 1 из 3).",
     "headArmoireJesterCapText": "Шляпа шута",
     "headArmoireJesterCapNotes": "Колокольчики на шляпе отвлекают врагов, а вам помогают сосредоточиться. Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Шута (предмет 1 из 3).",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "Каска шахтера",
+    "headArmoireMinerHelmetNotes": "Защитите свою голову от падающих задач! Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор Шахтера (предмет 1 из 3).",
     "offhand": "предмет для защитной руки",
     "shieldBase0Text": "Нет снаряжения для защитной руки",
     "shieldBase0Notes": "Нет щита или второго оружия.",
@@ -669,12 +670,12 @@
     "shieldArmoireGladiatorShieldNotes": "Чтобы быть гладиатором, вы должны... а хотя, все равно, просто оглушайте врагов своим щитом. Увеличивает телосложение на <%= con %> и силу на <%= str %>. Зачарованный сундук: Набор Гладиатора (предмет 3 из 3).",
     "shieldArmoireMidnightShieldText": "Полуночный Щит",
     "shieldArmoireMidnightShieldNotes": "Этот щит имеет самую большую мощь в самую полночь! Увеличивает телосложение на <%= con %> и силу на <%= str %>. Зачарованный сундук: Независимый предмет.",
-    "shieldArmoireRoyalCaneText": "Королевская Трость",
-    "shieldArmoireRoyalCaneNotes": "Слава правителю, достойному хвалебных песен! Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Королевский набор (предмет 2 из 3).",
+    "shieldArmoireRoyalCaneText": "Королевская трость",
+    "shieldArmoireRoyalCaneNotes": "Слава правителю, достойному хвалебных песен! Увеличивает телосложение, интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Королевский набор (предмет 2 из 3).",
     "shieldArmoireDragonTamerShieldText": "Щит укротителя драконов",
     "shieldArmoireDragonTamerShieldNotes": "Отвлеките врагов этим щитом в форме дракона. Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Укротителя драконов (предмет 2 из 3).",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "Таинственная лампа",
+    "shieldArmoireMysticLampNotes": "Осветите темные пещеры с помощью этой таинственной лампы! Увеличивает восприятие на <%= per %>. Зачарованный сундук: Независимый предмет.",
     "back": "Аксессуар на спину",
     "backBase0Text": "Нет аксессуаров на спине",
     "backBase0Notes": "Нет аксессуаров на спине.",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "Прокатитесь по волнам от причала Прилежности до бухты Незавершённости! Бонусов не даёт. Подарок подписчикам июля 2015 года.",
     "backMystery201510Text": "Хвост гоблина",
     "backMystery201510Notes": "Хваткий и мощный! Бонусов не даёт. Подарок подписчикам октября 2015.",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "Плащ Сердцееда",
+    "backMystery201602Notes": "При одном взмахе вашего плаща, враги падут перед вами! Бонусов не дает. Подарок подписчикам февраля 2016.",
     "backSpecialWonderconRedText": "Могущественный плащ",
     "backSpecialWonderconRedNotes": "Развевается мощно и красиво. Бонусов не дает. Предмет специального фестивального выпуска.",
     "backSpecialWonderconBlackText": "Тайный плащ",
@@ -758,7 +759,7 @@
     "headAccessoryMystery201403Notes": "На этих рогах переливается красками мох и лишайник. Бонусов не дают. Подарок подписчикам марта 2014.",
     "headAccessoryMystery201404Text": "Антенки Сумеречной бабочки",
     "headAccessoryMystery201404Notes": "Эти усики помогут носителю распознать опасные отвлечения! Бонусов не дают. Подарок подписчикам апреля 2014.",
-    "headAccessoryMystery201409Text": "Осенние Рога",
+    "headAccessoryMystery201409Text": "Осенние рога",
     "headAccessoryMystery201409Notes": "Эти могучие рога меняют цвет вместе с листвой. Бонусов не дают. Подарок подписчикам сентября 2014.",
     "headAccessoryMystery201502Text": "Крылья раздумий",
     "headAccessoryMystery201502Notes": "Позвольте своему воображению унести вас в мир грез! Бонусов не дает. Подарок подписчикам февраля 2015.",
@@ -779,7 +780,7 @@
     "eyewearSpecialWonderconBlackNotes": "Ваши побуждения определенно не противоречат закону. Бонусов не дает. Предмет специального фестивального выпуска.",
     "eyewearMystery201503Text": "Аквамариновая маска",
     "eyewearMystery201503Notes": "Только не выколите себе глаз одним из этих сверкающих камней! Бонусов не дает. Подарок подписчикам марта 2015.",
-    "eyewearMystery201506Text": "Неоновая Подводная Маска",
+    "eyewearMystery201506Text": "Неоновая подводная маска",
     "eyewearMystery201506Notes": "Позволяет надевшему видеть под водой. Бонусов не дает. Подарок Подписчикам июня 2015.",
     "eyewearMystery201507Text": "Крутые черные очки",
     "eyewearMystery201507Notes": "Эти черные очки помогут вам справиться с жаркой погодой.\nБонусов не дают. Подарок подписчикам июля 2015.",
diff --git a/common/locales/ru/generic.json b/common/locales/ru/generic.json
index f2d537ea5c..869dcc998d 100644
--- a/common/locales/ru/generic.json
+++ b/common/locales/ru/generic.json
@@ -117,7 +117,7 @@
     "askQuestion": "Задать вопрос",
     "reportBug": "Сообщить о проблеме",
     "HabiticaWiki": "Habitica Вики",
-    "HabiticaWikiFrontPage": "http://habitica.wikia.com/wiki/Habitica_Wiki",
+    "HabiticaWikiFrontPage": "http://ru.habitica.wikia.com/wiki/Habitica_%D0%92%D0%B8%D0%BA%D0%B8",
     "contributeToHRPG": "Участвовать в развитии Habitica",
     "overview": "Информация для новичков",
     "January": "Январь",
@@ -158,12 +158,12 @@
     "thankyou3": "Я очень признателен. Спасибо тебе!",
     "thankyouCardAchievementTitle": "Благодарный",
     "thankyouCardAchievementText": "Спасибо за спасибо! Отправлено или получено <%= cards %> Благодарственных писем.",
-    "birthdayCard": "Поздравительная открытка",
+    "birthdayCard": "Поздравление с Днем рождения",
     "birthdayCardExplanation": "Вы оба получили достижение \"Большой куш Дня рождения\"!",
-    "birthdayCardNotes": "Отправьте поздравительную открытку члену команды.",
-    "birthday0": "С днем рождения тебя!",
+    "birthdayCardNotes": "Отправьте поздравление с Днем рождения члену команды.",
+    "birthday0": "С Днем рождения!",
     "birthdayCardAchievementTitle": "Большой куш Дня рождения",
-    "birthdayCardAchievementText": "С днем рожденья! Отправлено или получено <%= cards %> поздравительных открыток.",
+    "birthdayCardAchievementText": "С днем рождения! Отправлено или получено поздравительных открыток: <%= cards %>.",
     "streakAchievement": "Вы заработали достижение Серии!",
     "firstStreakAchievement": "21-дневная серия",
     "streakAchievementCount": "<%= streaks %> 21-дневные серии",
@@ -175,5 +175,6 @@
     "hatchPetShare": "У меня вылупился новый питомец благодаря завершению заданий в реальной жизни!",
     "raisePetShare": "Мой питомец вырос в скакуна благодаря завершению заданий в реальной жизни!",
     "wonChallengeShare": "Я выиграл испытание в Habitica!",
-    "achievementShare": "Я получил новое достижение в Habitica!"
+    "achievementShare": "Я получил новое достижение в Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/ru/groups.json b/common/locales/ru/groups.json
index 32d9b1d944..437a9830ce 100644
--- a/common/locales/ru/groups.json
+++ b/common/locales/ru/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "Таверна",
     "innCheckOut": "Покинуть гостиницу",
     "innCheckIn": "В гостиницу",
     "innText": "Вы отдыхаете в Гостинице! Пропущенные Ежедневные задания не будут причинять вам вреда в конце дня, но отметки об их выполнении будут сбрасываться каждый день. Будьте осторожны: если ваша команда сражается с Боссом, он все же будет наносить вам урон за Ежедневные задания, пропущенные вашими товарищами, если только они также не в гостинице! Кроме того, нанесенный вами урон Боссу или найденные предметы не будут зарегистрированы, пока вы не покинете Гостиницу.",
@@ -127,11 +127,11 @@
     "inviteAlertInfo2": "Или поделитесь этой ссылкой (Скопировать/Вставить)",
     "sendGiftHeading": "Отправить подарок <%= name %>",
     "sendGiftGemsBalance": "Из <%= number %> самоцветов",
-    "sendGiftCost": "Всего: $<%= cost %>",
+    "sendGiftCost": "Всего: $<%= cost %> (долл. США)",
     "sendGiftFromBalance": "С баланса",
     "sendGiftPurchase": "Приобрести",
     "sendGiftMessagePlaceholder": "Личное сообщение (необязательно)",
-    "sendGiftSubscription": "<%= months %> мес.: $<%= price %> USD",
+    "sendGiftSubscription": "<%= months %> мес.: $<%= price %> (долл. США)",
     "battleWithFriends": "Побеждайте монстров с друзьями",
     "startPartyWithFriends": "Создайте команду с друзьями!",
     "startAParty": "Создать команду",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Чат вашей команды пустует! Наберите сообщение в поле сверху, чтобы начать общаться.",
     "guildChatEmpty": "Чат этой гильдии пустует! Наберите сообщение в поле сверху, чтобы начать общаться.",
     "possessiveParty": "Команда игрока <%= name %>.",
-    "requestAcceptGuidelines": "Если вы хотите оставить сообщение в Таверне или в чате любой гильдии, сперва прочитайте Принципы Сообщества и нажмите кнопку \"Принять Принципы\" внизу. Это будет означать, что вы их принимаете и обязуетесь выполнять."
+    "requestAcceptGuidelines": "Если вы хотите оставить сообщение в Таверне или в чате любой гильдии, сперва прочитайте Принципы Сообщества и нажмите кнопку \"Принять Принципы\" внизу. Это будет означать, что вы их принимаете и обязуетесь выполнять.",
+    "partyUpName": "Зажигаем",
+    "partyOnName": "Время вечеринок",
+    "partyUpAchievement": "Создайте команду с другим человеком! Веселитесь сражаясь с монстрами и поддерживая друг друга!",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/ru/noscript.json b/common/locales/ru/noscript.json
index bf7af0b70d..15414aaafb 100644
--- a/common/locales/ru/noscript.json
+++ b/common/locales/ru/noscript.json
@@ -1,5 +1,5 @@
 {
-    "jsDisabledHeading": "Увы! В вашем браузере не включен JavaScript, и без него Habitica не сможет работать как надо",
+    "jsDisabledHeading": "Увы! В вашем браузере не включен JavaScript",
     "jsDisabledHeadingFull": "Увы! В вашем браузере не включен JavaScript, и без него Habitica не сможет работать как надо",
     "jsDisabledText": "Habitica не может отобразить сайт должным образом без этого!",
     "jsDisabledLink": "Пожалуйста, включите JavaScript, чтобы продолжить!"
diff --git a/common/locales/ru/npc.json b/common/locales/ru/npc.json
index 6d17357fd8..18f7b8d04a 100644
--- a/common/locales/ru/npc.json
+++ b/common/locales/ru/npc.json
@@ -21,7 +21,7 @@
     "ian": "Ян",
     "ianText": "Добро пожаловать в Лавку квестов! Здесь вы можете использовать Свитки Квестов, чтобы сразиться с монстрами вместе с друзьями. Не забудьте оценить справа стройные ряды Свитков Квестов на продажу!",
     "ianBrokenText": "Добро пожаловать в Лавку квестов... Здесь вы можете использовать Свитки Квестов, чтобы сразиться с монстрами вместе с друзьями... Оцените стройные ряды Свитков Квестов на продажу справа от вас...",
-    "USD": "(USD)",
+    "USD": "(долл. США)",
     "newStuff": "Что-то новенькое",
     "cool": "Напомнить позже",
     "dismissAlert": "Скрыть эти вести",
diff --git a/common/locales/ru/pets.json b/common/locales/ru/pets.json
index a1bc65b82f..84f8c50861 100644
--- a/common/locales/ru/pets.json
+++ b/common/locales/ru/pets.json
@@ -40,17 +40,17 @@
     "stableBeastMasterProgress": "Мастер зверей: Найдено <%= number %> питомцев",
     "beastAchievement": "Вы заработали достижение «Повелитель зверей» за то, что собрали всех питомцев!",
     "beastMasterName": "Повелитель зверей",
-    "beastMasterText": "Нашел всех 90 питомцев (невероятно сложно - обязательно поздравьте этого пользователя!)",
-    "beastMasterText2": "и <%= count %> раз отпустил питомцев на свободу",
+    "beastMasterText": "Найдены все 90 питомцев (невероятно сложно - обязательно поздравьте этого пользователя!)",
+    "beastMasterText2": "и все питомцы выпущены на свободу <%= count %> раз(а)",
     "mountMasterProgress": "Прогресс повелителя скакунов",
     "stableMountMasterProgress": "Мастер скакунов: Приручено <%= number %> скакунов",
     "mountAchievement": "Вы заработали достижение «Властелин зверей» за приручение всех скакунов!",
     "mountMasterName": "Повелитель скакунов",
     "mountMasterText": "Найдены все 90 скакунов (ещё сложней, поздравляем этого пользователя!)",
-    "mountMasterText2": "и <%= count %> раз отпустил всех 90 скакунов на свободу",
+    "mountMasterText2": "и все 90 скакунов выпущены на свободу <%= count %> раз(а)",
     "beastMountMasterName": "Повелитель зверей и Повелитель скакунов",
     "triadBingoName": "Тройное бинго",
-    "triadBingoText": "Нашёл всех 90 питомцев, всех 90 скакунов, и затем нашёл всех 90 питомцев СНОВА (КАК ВАМ ЭТО УДАЛОСЬ!)",
+    "triadBingoText": "Найдены все 90 питомцев, все 90 скакунов, и затем все 90 питомцев ВНОВЬ (КАК ВАМ ЭТО УДАЛОСЬ!)",
     "triadBingoText2": "и <%= count %> раз выпустил всю конюшню на свободу",
     "triadBingoAchievement": "Вы заработали достижение «Тройное Бинго» за нахождение всех питомцев, приручение всех скакунов и повторное нахождение всех питомцев!",
     "dropsEnabled": "Включено выпадение предметов!",
@@ -58,13 +58,13 @@
     "firstDrop": "Вы открыли систему выпадения трофеев! Теперь, когда вы выполняете задания, у вас есть маленький шанс найти предмет, включая яйца, эликсиры и еду! Вы только что нашли <strong><%= eggText %> в яйце</strong>! <%= eggNotes %>",
     "useGems": "Если вы хотите питомца, но не можете больше ждать, когда он выпадет, купите его за самоцветы в меню <strong>Инвентарь > Рынок</strong>!",
     "hatchAPot": "Вылупится <%= potion %> <%= egg %>. Использовать эликсир?",
-    "hatchedPet": "У вас вылупился(ась) <%= potion %> <%= egg %>!",
+    "hatchedPet": "У вас вылупился <%= potion %> <%= egg %>!",
     "displayNow": "Показать сейчас",
     "displayLater": "Показать позже",
     "earnedCompanion": "Вы были так продуктивны, что заработали нового спутника. Кормите его, чтобы он вырос!",
     "feedPet": "Скормить <%= article %><%= text %> вашему питомцу: <%= name %>?",
     "useSaddle": "Оседлать <%= pet %>?",
-    "raisedPet": "У вас вырос(ла) <%= pet %>!",
+    "raisedPet": "У вас вырос <%= pet %>!",
     "earnedSteed": "Завершая свои задания, вы заработали верного скакуна!",
     "rideNow": "Оседлать сейчас",
     "rideLater": "Оседлать позже",
@@ -81,6 +81,6 @@
     "petKeyMounts": "Освободить моих скакунов",
     "petKeyBoth": "Освободить всех",
     "confirmPetKey": "Вы уверены?",
-    "petKeyNeverMind": "Еще не",
+    "petKeyNeverMind": "Еще нет",
     "gemsEach": "самоцветов за каждый"
 }
\ No newline at end of file
diff --git a/common/locales/ru/quests.json b/common/locales/ru/quests.json
index 0f80a4e02e..13139540d8 100644
--- a/common/locales/ru/quests.json
+++ b/common/locales/ru/quests.json
@@ -13,7 +13,7 @@
     "youReceived": "Вы получили",
     "dropQuestCongrats": "Поздравляем с получением этого свитка квеста! Вы можете пригласить команду для начала квеста прямо сейчас или вернуться к нему позже в любое время через раздел Инвентарь > Квесты.",
     "questSend": "Нажатие кнопки «Пригласить» отправит приглашения всем членам команды. Когда все члены команды ответят на него (согласием или отказом), квест начнется. Текущий статус можно посмотреть во вкладке Общение > Команда",
-    "questSendBroken": "Нажатие кнопки «Пригласить» отправит приглашения всем членам команды... Когда все члены команды ответят на него (согласием или отказом), квест начнется... Текущий статус можно посмотреть во вкладке Общение > Команда",
+    "questSendBroken": "Нажатие кнопки «Пригласить» отправит приглашения всем членам команды... Когда все члены команды ответят на него (согласием или отказом), квест начнется... Текущий статус можно посмотреть во вкладке Общение > Команда...",
     "inviteParty": "Пригласить команду в квест",
     "questInvitation": "Приглашение на участие в квесте",
     "questInvitationTitle": "Приглашение на квест",
diff --git a/common/locales/ru/questscontent.json b/common/locales/ru/questscontent.json
index 41abc967a5..60f2dfff48 100644
--- a/common/locales/ru/questscontent.json
+++ b/common/locales/ru/questscontent.json
@@ -112,7 +112,7 @@
     "questEggHuntCollectPlainEgg": "Неокрашенные яйца",
     "questEggHuntDropPlainEgg": "Неокрашенное яйцо",
     "questDilatoryText": "Ужасный Дракон Промедления",
-    "questDilatoryNotes": "<p>Мы были слепы к предзнаменованиям.</p><br/><p> Иссиня-черные сверкающие глаза. Древняя чешуя. Массивные челюсти и острые зубы. Мы пробудили что-то ужасающее, что никогда не должно было покидать своей расщелины:<strong>Ужасный Дракон Промедления!</strong> Кричащие жители Habitica рассыпаются во всех направлениях, когда его извивающаяся шея длиной в десятки метров рассекает водную гладью, а дикий рёв заставляет дрожать окна близлежащих домов.</p><br/><p>«Мы должны положить конец Промедлению!», — кричит Lemoness. «Именно откладываемые задачи и красные ежедневные задания привлекли его внимание!»</p><br/><p>«Он излучает магическую энергию!» — кричит @Baconsaur. «Живя так долго, он научился исцелять себя! Как мы сможем побороть его?»</p><br/><p>Очень просто: так же, как и всех Боссов – продуктивностью! Быстрее, Habitica, объединяйся и сражай свои задачи, вместе мы победим этого монстра. (Нет нужды бросать начатые квесты, мы уверены в ваших возможностях сражаться на двух фронтах). Он не нападет на мирных жителей, но чем больше ежедневных заданий мы пропускаем, тем больше сил он получает для Незамедлительной Атаки! И мне не нравится, как он поглядывает на Таверну...",
+    "questDilatoryNotes": "<p>Мы были слепы к предзнаменованиям.</p><br/><p> Иссиня-черные сверкающие глаза. Древняя чешуя. Массивные челюсти и острые зубы. Мы пробудили что-то ужасающее, что никогда не должно было покидать своей расщелины: <strong>Ужасный Дракон Промедления!</strong> Кричащие жители Habitica рассыпаются во всех направлениях, когда его извивающаяся шея длиной в десятки метров рассекает водную гладью, а дикий рёв заставляет дрожать окна близлежащих домов.</p><br/><p>«Мы должны положить конец Промедлению!», — кричит Lemoness. «Именно откладываемые задачи и красные ежедневные задания привлекли его внимание!»</p><br/><p>«Он излучает магическую энергию!» — кричит @Baconsaur. «Живя так долго, он научился исцелять себя! Как мы сможем побороть его?»</p><br/><p>Очень просто: так же, как и всех Боссов – продуктивностью! Быстрее, Habitica, объединяйся и сражай свои задачи, вместе мы победим этого монстра. (Нет нужды бросать начатые квесты, мы уверены в ваших возможностях сражаться на двух фронтах). Он не нападет на мирных жителей, но чем больше ежедневных заданий мы пропускаем, тем больше сил он получает для Незамедлительной Атаки! И мне не нравится, как он поглядывает на Таверну...</p>",
     "questDilatoryBoss": "Ужасный Дракон Промедления",
     "questDilatoryBossRageTitle": "Незамедлительная атака",
     "questDilatoryBossRageDescription": "Как только эта полоса заполнится полностью, Ужасный Дракон Промедления обрушит свою ярость на местность Habitica.",
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "Вы это сделали! Сегодня им бананов не видать. Обезьяны сбегают в панике,  сокрушенные вашими силами. \"Смотри\", говорит @Misceo. \"Они оставили яйца.\"<br><br>@Leephon усмехается: \"Может быть, хорошо обученный ручной капуцин станет помогать нам так же хорошо, как дикие мешают!\"",
     "questMonkeyBoss": "Ужасный Мандрил",
     "questMonkeyDropMonkeyEgg": "Капуцин (яйцо)",
-    "questMonkeyUnlockText": "Позволяет покупать на рынке капуцина в яйце."
+    "questMonkeyUnlockText": "Позволяет покупать на рынке капуцина в яйце.",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/ru/settings.json b/common/locales/ru/settings.json
index 0e6dbee2df..4091297264 100644
--- a/common/locales/ru/settings.json
+++ b/common/locales/ru/settings.json
@@ -114,8 +114,8 @@
     "unsubscribeAllEmails": "Поставьте галочку, чтобы отписаться от е-мейлов.",
     "unsubscribeAllEmailsText": "Отписываясь от е-мейлов, я понимаю, что Habitica никогда не сможет известить меня по электронной почте о важных изменениях на сайте или в моем аккаунте.",
     "correctlyUnsubscribedEmailType": "Вы успешно отписались от уведомлений \"<%= emailType %>\".",
-    "subscriptionRateText": "Регулярные $<%= price %> USD раз в <%= months %> мес.",
-    "recurringText": "регулярные",
+    "subscriptionRateText": "Автоплатеж $<%= price %> (долл. США) раз в <%= months %> мес.",
+    "recurringText": "автоплатеж",
     "benefits": "Преимущества",
     "coupon": "Промо",
     "couponPlaceholder": "Введите Промо Код",
@@ -139,7 +139,7 @@
     "buyGemsGoldCap": "Предел повышен до <%= amount %>",
     "mysticHourglass": "Кол-во мистических песочных часов: <%= amount %>",
     "mysticHourglassText": "Мистические Песочные часы позволяют покупку Комплекта Таинственных предметов предыдущего месяца",
-    "purchasedPlanId": "Регулярные $<%= price %> USD раз в <%= months %> месяц(ев) (<%= plan %>)",
+    "purchasedPlanId": "Автоплатеж $<%= price %> (долл. США) раз в <%= months %> мес. (<%= plan %>)",
     "purchasedPlanExtraMonths": "У вас остается <%= months %> мес. оплаченной подписки.",
     "consecutiveSubscription": "Непрерывная подписка",
     "consecutiveMonths": "Месяцев подряд:",
diff --git a/common/locales/ru/spells.json b/common/locales/ru/spells.json
index d829004f80..de7809cd94 100644
--- a/common/locales/ru/spells.json
+++ b/common/locales/ru/spells.json
@@ -1,6 +1,6 @@
 {
     "spellWizardFireballText": "Всплеск пламени",
-    "spellWizardFireballNotes": "Ваши руки вспыхивают пламенем. Вы получаете очки опыта и наносите Боссам дополнительный урон! Нажмите на задание, чтобы применить. (Основано на ИНТ)",
+    "spellWizardFireballNotes": "Пламя вырывается из ваших рук. Вы получаете очки опыта и наносите Боссам дополнительный урон! Нажмите на задание, чтобы применить. (Основано на ИНТ)",
     "spellWizardMPHealText": "Эфирная зарядка",
     "spellWizardMPHealNotes": "Вы жертвуете ману, чтобы помочь друзьям. Другие участники команды восстанавливают ману! (На основе ИНТ)",
     "spellWizardEarthText": "Землетрясение",
diff --git a/common/locales/ru/subscriber.json b/common/locales/ru/subscriber.json
index a4023e60d3..cd3f3fcf81 100644
--- a/common/locales/ru/subscriber.json
+++ b/common/locales/ru/subscriber.json
@@ -1,18 +1,18 @@
 {
     "subscription": "Подписка",
     "subscriptions": "Подписки",
-    "subDescription": "Покупайте самоцветы за золото, получайте ежемесячные таинственные предметы, сохраняйте историю прогресса, удвойте ежедневный предел выпадения трофеев, поддерживайте разработчиков. Нажмите, чтобы узнать больше.",
+    "subDescription": "Покупайте самоцветы за золото, получайте таинственные предметы каждый месяц, сохраняйте историю своего прогресса, удвойте ежедневный предел выпадения трофеев, поддерживайте разработчиков. Нажмите, чтобы узнать больше.",
     "buyGemsGold": "Возможность покупки самоцветов за золото",
     "buyGemsGoldText": "Торговец Александр будет продавать вам Самоцветы по цене <%= gemCost %> золота за каждый. Его ежемесячные поставки изначально ограничены до <%= gemLimit %>  Самоцветов в месяц. Но это ограничение увеличивается на 5 Самоцветов каждые три месяца последовательной подписки вплоть до максимума в 50 Самоцветов в месяц!",
     "retainHistory": "Увеличенный список выполненных задач",
-    "retainHistoryText": "Завершенные задачи дольше не архивируются и доступны для просмотра.",
+    "retainHistoryText": "Завершенные задачи дольше дольше не архивируются и доступны для просмотра.",
     "doubleDrops": "Увеличение дневного предела выпадения предметов в 2 раза",
     "doubleDropsText": "Заполните стойла быстрее!",
     "mysteryItem": "Эксклюзивные предметы месяца",
     "mysteryItemText": "За каждый месяц вы получите уникальное украшение для своего аватара. А за каждые 3 месяца непрерывной подписки Мистические Путешественники во Времени подарят вам историческое (или футуристическое) украшение.",
     "supportDevs": "Поддержка разработки",
     "supportDevsText": "Ваша подписка помогает стране Habitica развиваться и разрабатывать новые идеи. Спасибо за вашу щедрость!",
-    "monthUSD": "долларов США в месяц",
+    "monthUSD": "долл. США в месяц",
     "organization": "Организация",
     "groupPlans": "Корпоративные планы",
     "indivPlan1": "Игра в Habitica бесплатна для индивидуальных пользователей. Даже для небольших групп с общими интересами — бесплатные (или недорогие)",
@@ -55,7 +55,7 @@
     "checkout": "Оформить",
     "sureCancelSub": "Вы уверены, что хотите отменить подписку?",
     "subCanceled": "Подписка перестанет действовать с",
-    "buyGemsGoldTitle": "Купить Самоцветы за Золото.",
+    "buyGemsGoldTitle": "Покупать Самоцветы за Золото",
     "becomeSubscriber": "Стать Подписчиком",
     "subGemPop": "Будучи подписчиком Habitica, вы каждый месяц имеете возможность покупать самоцветы за золото. Посмотреть, сколько самоцветов вам доступно, можно в углу иконки самоцвета.",
     "subGemName": "Самоцветы подписчика",
@@ -97,7 +97,7 @@
     "mysterySet201511": "Набор Деревянного воина",
     "mysterySet201512": "Набор Зимнего Пламени",
     "mysterySet201601": "Набор Чемпиона Решительности",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "Набор Сердцееда",
     "mysterySet301404": "Стандартный Стимпанковый набор",
     "mysterySet301405": "Набор аксессуаров в стиле Стимпанка",
     "mysterySetwondercon": "Вандер-Кон",
diff --git a/common/locales/sk/communityguidelines.json b/common/locales/sk/communityguidelines.json
index 05303e0761..ab05eeb950 100644
--- a/common/locales/sk/communityguidelines.json
+++ b/common/locales/sk/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a moderator needs to lay down their noble mantle and relax. The following are Moderators Emeritus. They no longer act with the power of a Moderator, but we would still like to honor their work!",
     "commGuidePara014": "Moderators Emeritus:",
     "commGuideHeadingPublicSpaces": "Verejné priestory v Habitica",
-    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "When navigating the public spaces in Habitica, there are some general rules to keep everyone safe and happy. These should be easy for adventurers like you!",
     "commGuidePara017": "<strong>Respect each other.</strong> Be courteous, kind, friendly, and helpful. Remember: Habiticans come from all backgrounds and have had wildly divergent experiences. This is part of what makes Habitica so cool! Building a community means respecting and celebrating our differences as well as our similarities. Here are some easy ways to respect each other:",
     "commGuideList02A": "<strong>Riaď sa všetkými Podmienkami a Pravidlami Užívania.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Comply immediately with any Mod request</strong> to cease a discussion or move it to the Back Corner. Last words, parting shots and conclusive zingers should all be delivered (courteously) at your \"table\" in the Back Corner, if allowed.",
     "commGuideList02G": "<strong>Take time to reflect instead of responding in anger</strong> if someone tells you that something you said or did made them uncomfortable. There is great strength in being able to sincerely apologize to someone. If you feel that the way they responded to you was inappropriate, contact a mod rather than calling them out on it publicly.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Repeatedly begging for gems or a subscription may also be considered spamming.",
-    "commGuidePara019": "<strong>Na súkromných miestach,</strong> majú užívatelia viac voľnosti na diskusiu ľubovoľnej témy, ale stále nesmú porušiť Podmienky a Pravidlá Užívania, vrátane zdieľania akéhokoľvek diskriminačného, násilného alebo výhražného obsahu. ",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Private Messages (PMs) have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
     "commGuidePara021": "Okrem toho majú niektoré verejné priestory vo svete Habitica ďalšie pokyny.",
     "commGuideHeadingTavern": "Hostinec",
diff --git a/common/locales/sk/content.json b/common/locales/sk/content.json
index bd154dc8b4..29d9b0353f 100644
--- a/common/locales/sk/content.json
+++ b/common/locales/sk/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "a prickly",
     "dropEggBearCubText": "Medvedík",
     "dropEggBearCubMountText": "Medveď",
-    "dropEggBearCubAdjective": "a cuddly",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Gryf",
     "questEggGryphonMountText": "Gryphon",
     "questEggGryphonAdjective": "a proud",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "a colorful",
     "questEggRatText": "Potkan",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "a dirty",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Chobotnica",
     "questEggOctopusMountText": "Octopus",
     "questEggOctopusAdjective": "a slippery",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Základný",
     "hatchingPotionWhite": "Biely",
diff --git a/common/locales/sk/gear.json b/common/locales/sk/gear.json
index a47370a45b..5712835137 100644
--- a/common/locales/sk/gear.json
+++ b/common/locales/sk/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "zbraň",
     "weaponBase0Text": "Bez zbrane",
     "weaponBase0Notes": "Bez zbrane.",
diff --git a/common/locales/sk/generic.json b/common/locales/sk/generic.json
index 4869643c12..7af34da795 100644
--- a/common/locales/sk/generic.json
+++ b/common/locales/sk/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/sk/groups.json b/common/locales/sk/groups.json
index e81be6ea9f..1d99556fcb 100644
--- a/common/locales/sk/groups.json
+++ b/common/locales/sk/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/sk/questscontent.json b/common/locales/sk/questscontent.json
index 9841af2a1f..a22c4de415 100644
--- a/common/locales/sk/questscontent.json
+++ b/common/locales/sk/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/sr/communityguidelines.json b/common/locales/sr/communityguidelines.json
index 8ed2166b84..1ac8e3d5ff 100644
--- a/common/locales/sr/communityguidelines.json
+++ b/common/locales/sr/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "U velikoj zajednici kakvu imamo u Habitici, korisnici odlaze i dolaze, i povremeno neko od modatora odluči da ode u zasluženu penziju. Ovo su <i>moderatori emeriti</i>. Oni više ne obavljaju posao moderatora, ali ipak želimo da im se zahvalimo!",
     "commGuidePara014": "Moderatori emeriti:",
     "commGuideHeadingPublicSpaces": "Javna mesta u Habitici",
-    "commGuidePara015": "Habitika ima dve vrste društvenih mesta: javna, i privatna. Javna mesta su Krčma, Otvorena udruženja, Github, Trello, i Wiki. Privatna mesta su Privatna udruženja, čat družine, i privatne poruke.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Postoje određena pravila kojih se treba pridržavati na javnim mestima u Habitici, kako bi svi bili bezbedni i zadovoljni.",
     "commGuidePara017": "<strong>Poštujte jedni druge.</strong> Budite učtivi, ljubazni, i druželjubivi. Ne zaboravite: Habitikanci dolaze iz svih delova sveta i imaju svakojake običaje koji Vama mogu biti strani. To je jedna od stvari zbog kojih je Habitica zanimljiv. Biti u zajednici podrazumeva prihvatanje međusobnih razlika. Evo nekoliko načina da se ophodite prema drugima s poštovanjem:",
     "commGuideList02A": "<strong>Pridržavajte se Uslova korišćenja.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Kad moderator zatraži da prekinete neki razgovor, prekinite ga odmah</strong> ili pređite u Back Corner. Završne komentare i opaske sačuvajte za Back Corner (pod uslovom da ne krše Pravila ponašanja).",
     "commGuideList02G": "<strong>Razmislite pre nego što besno reagujete</strong> ako neko kaže da mu smeta nešto što ste rekli ili učinili. Ako smatrate da ste nepravedno optuženi, javite se moderatoru, umesto da odgovorite javnim komentarom.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Spam je zabranjen.</strong> To se, između ostalog, odnosi i na: postavljanje istog komentara na više mesta, postavljanje linkova bez objašnjenja ili konteksta, besmislene poruke, ili veliki broj uzastopnih poruka. Molbe za dragulje ili pretplatu takođe mogu biti smatrane spamom.",
-    "commGuidePara019": "<strong>Na privatnim mestima,</strong> korisnici mogu da raspravljaju o čemu god žele, ali ipak mogu prekršiti Uslove korišćenja diskriminacijom, pretnjama, ili nasilnim sadržajem poruka.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Za privatne poruke (PM) važe dodatna pravila. Ako Vas je neko blokirao, ne kontaktirajte ga na drugim mestima da biste tražili da Vas odblokira. Ne šaljite privatne poruke da biste tražili pomoć (postavljanjem ovakvih zahteva na javna mesta pomažete zajednici). Ne tražite u privatnim porukama dragulje ili pretplatu, jer to može biti smatrano spamom.",
     "commGuidePara021": "Za neka javna mesta u Habitici važe dodatna pravila.",
     "commGuideHeadingTavern": "Krčma",
diff --git a/common/locales/sr/content.json b/common/locales/sr/content.json
index 8ff6213193..57075a2358 100644
--- a/common/locales/sr/content.json
+++ b/common/locales/sr/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "a prickly",
     "dropEggBearCubText": "Meče",
     "dropEggBearCubMountText": "Medved",
-    "dropEggBearCubAdjective": "umiljata",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Grifon",
     "questEggGryphonMountText": "Gryphon",
     "questEggGryphonAdjective": "a proud",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "a colorful",
     "questEggRatText": "Pacov",
     "questEggRatMountText": "Rat",
-    "questEggRatAdjective": "a dirty",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Hobotnica",
     "questEggOctopusMountText": "Octopus",
     "questEggOctopusAdjective": "a slippery",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Običan",
     "hatchingPotionWhite": "Beli",
diff --git a/common/locales/sr/gear.json b/common/locales/sr/gear.json
index dc6a93cc81..29dcc07f96 100644
--- a/common/locales/sr/gear.json
+++ b/common/locales/sr/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "oružje",
     "weaponBase0Text": "Bez oružja",
     "weaponBase0Notes": "Bez oružja.",
diff --git a/common/locales/sr/generic.json b/common/locales/sr/generic.json
index 0b2d859657..b3f4f0fd7e 100644
--- a/common/locales/sr/generic.json
+++ b/common/locales/sr/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/sr/groups.json b/common/locales/sr/groups.json
index e789c502aa..56817d940f 100644
--- a/common/locales/sr/groups.json
+++ b/common/locales/sr/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/sr/questscontent.json b/common/locales/sr/questscontent.json
index 6bd55ab6f1..3320c6e962 100644
--- a/common/locales/sr/questscontent.json
+++ b/common/locales/sr/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "majmun (jaje)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/sv/communityguidelines.json b/common/locales/sv/communityguidelines.json
index b9bf98886c..07ab6c0a29 100644
--- a/common/locales/sv/communityguidelines.json
+++ b/common/locales/sv/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "I en gemenskap som är så stor som Habitica kommer användare att komma och gå, och ibland behöver en moderator lägga ner sin ädla mantel och koppla av. Följande är Moderator Emeritus. De har inte längre makten att agera moderator, men vi vill ändå hedra deras arbete!",
     "commGuidePara014": "Moderatorer Emeritus",
     "commGuideHeadingPublicSpaces": "Offentliga platser i Habitica",
-    "commGuidePara015": "Habitica har två sorters sociala utrymmen: allmänna och privata. Allmänna områden inkluderar Tavernan, allmänna Gillen, GitHub, Trello och Wiki. De privata utrymmena är Privata Gillen, sällskapschat och privata meddelanden.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "När du vistas på de offentliga platserna i Habitica så finns några allmänna regler för att se till att alla är säkra och glada. Det borde vara lätt för en äventyrare som du!",
     "commGuidePara017": "<strong>Respektera varandra.</strong> Var artig, snäll, vänlig och hjälpsam. Kom ihåg: Habiticaner kommer från alla skags bakgrunder och har helt olika erfarenheter. Det är en del av vad som gör Habitica så häftigt! Att bygga en gemenskap innebär att vi respekterar och hyllar våra olikheter likväl som våra likheter. Här är några enkla sätt att respektera varandra:",
     "commGuideList02A": "<strong>Följ Användarvillkoren.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Följ omedelbart Moderatorns uppmaning</strong> att avsluta en diskussion eller flytta den till Bakfickan. Sista ordet, avslutande inlägg och avgörande pikar får levereras (hövligt) vid ditt \"bord\" i Bakfickan, om det tillåts.",
     "commGuideList02G": "<strong>Ta dig tid att reflektera istället för att svara i affekt</strong> om någon säger att något du sagt eller gjort har fått dem att känna sig obekväma. Det ligger en stor styrka i att ha förmåga att ärligt be någon om ursäkt. Om du anser att personens svar var olämpligt, kontakta Moderatorn snarare än att berätta om detta i allmänna forum.",
     "commGuideList02H": "<strong>Splittrande/hätska konversationer bör rapporteras till moderatorer.</strong> Om du känner att en konversation har blivit överhettad, överdrivet känslosam eller sårande, sluta att delta. E-posta istället <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> för att informera oss om det. Det är vårt jobb att se till att du är trygg.",
-    "commGuideList02I": "<strong>Gör inte massutskick - spamma inte.</strong> Massutskick (spam) kan vara (men behöver inte bara vara) att posta samma kommentar eller fråga på olika ställen, att posta länkar utan förklaring eller sammanhang, att posta meningslösa meddelanden eller att posta många meddelanden i följd. Att vid upprepade tillfällen be om juveler eller en prenumeration kan också räknas som massutskick.",
-    "commGuidePara019": "<strong>På privata platser</strong> har användare större frihet att diskutera valfria ämnen, men får ändå inte bryta mot användarvillkoren. Detta innefattar postande av diskriminerande, våldsamt eller hotfullt material.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Privata meddelanden (PM) har några extra riktlinjer. Om någon har blockerat dig, kontakta dem inte någon annanstans för att be dem ta bort blockeringen. Vidare bör du inte skicka PM till någon för att be om hjälp (eftersom allmänna svar på supportfrågor är till hjälp för hela gemenskapen Slutligen, skicka inte PM till någon för att be om juveler eller en prenumeration, eftersom detta kan tolkas som massutskick.",
     "commGuidePara021": "Dessutom har några offentliga platser i Habitica ytterligare riktlinjer.",
     "commGuideHeadingTavern": "Värdshuset",
diff --git a/common/locales/sv/content.json b/common/locales/sv/content.json
index cda3e8d51f..1557f1a0d0 100644
--- a/common/locales/sv/content.json
+++ b/common/locales/sv/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "retlig",
     "dropEggBearCubText": "björnunge",
     "dropEggBearCubMountText": "björn",
-    "dropEggBearCubAdjective": "kelig",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "grip",
     "questEggGryphonMountText": "Grip",
     "questEggGryphonAdjective": "stolt",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "ärgglad",
     "questEggRatText": "råtta",
     "questEggRatMountText": "Råtta",
-    "questEggRatAdjective": "smutsig",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "bläckfisk",
     "questEggOctopusMountText": "Bläckfisk",
     "questEggOctopusAdjective": "slemmig",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Hitta en kläckningsdryck och häll på det här ägget så kommer det kläckas till <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Standard",
     "hatchingPotionWhite": "Vit",
diff --git a/common/locales/sv/gear.json b/common/locales/sv/gear.json
index e32f544a67..c02bb3120a 100644
--- a/common/locales/sv/gear.json
+++ b/common/locales/sv/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "vapen",
     "weaponBase0Text": "Inget vapen",
     "weaponBase0Notes": "Inget vapen.",
diff --git a/common/locales/sv/generic.json b/common/locales/sv/generic.json
index f6e5e5179e..6f6594331b 100644
--- a/common/locales/sv/generic.json
+++ b/common/locales/sv/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/sv/groups.json b/common/locales/sv/groups.json
index 9f674c3d01..4d3c13c341 100644
--- a/common/locales/sv/groups.json
+++ b/common/locales/sv/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/sv/questscontent.json b/common/locales/sv/questscontent.json
index 43eb384ef0..c949873d17 100644
--- a/common/locales/sv/questscontent.json
+++ b/common/locales/sv/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/uk/communityguidelines.json b/common/locales/uk/communityguidelines.json
index 030133f2c6..539bd45755 100644
--- a/common/locales/uk/communityguidelines.json
+++ b/common/locales/uk/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "У такій великій спільноті, як Habitica, користувачі прибувають і відбувають, але трапляється так, що модератори мають потребу скласти свої повноваження та відпочити. Пройти шляхом Модератора Емерітуса. Вони більше не мають влади Модератора, але ми поважаємо і шануємо їх особистий внесок!",
     "commGuidePara014": "Поважний Модератор:",
     "commGuideHeadingPublicSpaces": "Громадські місця у Habitica",
-    "commGuidePara015": "Habitica має два види соціального простору: громадський та приватний. Громадські місця це Таверна, Відкриті Гільдії, GitHub, Trello і Wiki. Приватні - це Закриті Гільдії, командний чат і Приватні повідомлення.",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "Є декілька загальних правил, які допоможуть зберегти спокій і задоволення, коли ви вивчаєте нові місця у Звичанії. Такий кмітливий мандрівник, як ви легко впорається з ними!",
     "commGuidePara017": "<strong>Поважайте один одного.</strong> Будьте ввічливими, уважними, дружніми та допомагайте іншим. Пам'ятайте: Звичанійці прибули з різних місць і мають дивовижно різний досвід. Це частина того, що робить Habitica кльовою! Влаштування спільноти означає повагу та прийняття наших відмінностей, так само як і наших схожих рис. Ось кілька легких шляхів порозумітися з іншими:",
     "commGuideList02A": "<strong>Дотримуйтесь усіх Правил та Умов.</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>Негайно виконуйте будь-яке прохання Модератора</strong>: припинити дискусію або перемістити її в Чорний Куток. Останні слова, прощальні знімки і переконливі аргументі повинні бути доставлені (ввічливо) до вашого \"столу\" в Чорному Кутку, якщо це дозволено.",
     "commGuideList02G": "<strong>Не поспішайте реагувати гнівливо</strong>, якщо хтось говорить вам, що те, що ви сказали або зробили створило некомфортну ситуацію. Існує велика сила в умінні щиро вибачитися перед кимось. Якщо ви відчуваєте, що те, як вони відреагували на вас було недоречно, зв'яжіться з Модератором замість публічної сварки.",
     "commGuideList02H": "<strong>Divisive/contentious conversations should be reported to mods.</strong> If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email <a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a> to let us know about it. It's our job to keep you safe.",
-    "commGuideList02I": "<strong>Не поширюйте спам.</strong>  Спам включає в себе, але не обмежуються тільки цим: розміщення однакових за змістом коментарів чи запитів у різних місцях, розміщення посилань без пояснень або контексту, розміщення безглуздих повідомлень, або розміщення декількох однакових повідомлень поспіль. Систематичне випрошування самоцвітів чи підписки також може вважатися спамом.",
-    "commGuidePara019": "<strong>У приватному просторі,</strong>  користувачі мають змогу спілкуватися більш вільно, але всеодно не повинні порушувати Правил та Умови, в тому числі забороняється відправлення дискримінуючого, жорстокого чи образливого контенту.",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "Приватні повідомлення (ПП) мають деякі додаткові рекомендації. Якщо хтось заблокував вас, не намагайтеся зв'язатися з ними в іншому місці, щоб попросити їх розблокувати вас. Крім того, не треба надсилати ПП іншим з проханням про підтримку (так як відкриті відповіді на питання стосовно підтримки корисні для спільноти). Нарешті, не надсилайте нікому ПП, випрошуючи у подарунок самоцвіти або підписку, так як це буди вважатися спамом.",
     "commGuidePara021": "Крім того, для деяких громадських місць в Habitica є додаткові рекомендації.",
     "commGuideHeadingTavern": "Таверна",
diff --git a/common/locales/uk/content.json b/common/locales/uk/content.json
index f2028e4a65..304553c04a 100644
--- a/common/locales/uk/content.json
+++ b/common/locales/uk/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "колючий",
     "dropEggBearCubText": "Ведмежа",
     "dropEggBearCubMountText": "Ведмідь",
-    "dropEggBearCubAdjective": "милесенький",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "Ґрифон",
     "questEggGryphonMountText": "Ґрифон",
     "questEggGryphonAdjective": "гордий",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "кольоровий",
     "questEggRatText": "Щур",
     "questEggRatMountText": "Щур",
-    "questEggRatAdjective": "брудний",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "Спрут",
     "questEggOctopusMountText": "Спрут",
     "questEggOctopusAdjective": "слизький",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "Знайдіть зілля вилуплення, щоби вилити на це яйце і з нього вилупиться <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
     "hatchingPotionBase": "Простий",
     "hatchingPotionWhite": "Білий",
diff --git a/common/locales/uk/gear.json b/common/locales/uk/gear.json
index a6e49217f9..974cde0969 100644
--- a/common/locales/uk/gear.json
+++ b/common/locales/uk/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "зброя",
     "weaponBase0Text": "Без зброї",
     "weaponBase0Notes": "Без зброї.",
diff --git a/common/locales/uk/generic.json b/common/locales/uk/generic.json
index d0c51d89de..4c725c1cc3 100644
--- a/common/locales/uk/generic.json
+++ b/common/locales/uk/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "I won a challenge in Habitica!",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/uk/groups.json b/common/locales/uk/groups.json
index 61026fc57b..0a09e8303d 100644
--- a/common/locales/uk/groups.json
+++ b/common/locales/uk/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "Your party chat is empty! Type a message in the box above to start chatting.",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>'s Party",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/uk/questscontent.json b/common/locales/uk/questscontent.json
index 09ca927116..d6937b486e 100644
--- a/common/locales/uk/questscontent.json
+++ b/common/locales/uk/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/locales/zh/backgrounds.json b/common/locales/zh/backgrounds.json
index 73a3d5846d..75df101bd1 100644
--- a/common/locales/zh/backgrounds.json
+++ b/common/locales/zh/backgrounds.json
@@ -119,7 +119,7 @@
     "backgroundSlimySwampNotes": "在黏糊糊的沼泽中奋勇前进",
     "backgroundSwarmingDarknessText": "遮天蔽日的黑暗",
     "backgroundSwarmingDarknessNotes": "在遮天蔽日的黑暗中颤抖",
-    "backgrounds112015": "第18组:2015年11月推出",
+    "backgrounds112015": "第18组：2015年11月推出",
     "backgroundFloatingIslandsText": "浮游岛",
     "backgroundFloatingIslandsNotes": "在浮游岛上跳跃",
     "backgroundNightDunesText": "夜幕沙丘",
@@ -133,7 +133,7 @@
     "backgroundSnowySunriseNotes": "凝视雪地上升起的太阳",
     "backgroundWinterTownText": "冬日小镇",
     "backgroundWinterTownNotes": "在冬日小镇里穿行",
-    "backgrounds012016": "第20组：发布于2016年一月",
+    "backgrounds012016": "第20组：2016年1月推出",
     "backgroundFrozenLakeText": "冰封湖泊",
     "backgroundFrozenLakeNotes": "在冰封湖泊上溜冰",
     "backgroundSnowmanArmyText": "雪人兵团",
@@ -147,11 +147,11 @@
     "backgroundCozyLibraryNotes": "在舒适的图书馆阅读",
     "backgroundGrandStaircaseText": "宽大的楼梯",
     "backgroundGrandStaircaseNotes": "走下宽大的楼梯",
-    "backgrounds032016": "SET 22: Released March 2016",
-    "backgroundDeepMineText": "Deep Mine",
-    "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.",
-    "backgroundRainforestText": "Rainforest",
-    "backgroundRainforestNotes": "Venture into a Rainforest.",
-    "backgroundStoneCircleText": "Circle of Stones",
-    "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
+    "backgrounds032016": "第22组：2016年3月推出",
+    "backgroundDeepMineText": "深矿",
+    "backgroundDeepMineNotes": "在深矿中发现稀有金属。",
+    "backgroundRainforestText": "雨林",
+    "backgroundRainforestNotes": "到雨林中冒险。",
+    "backgroundStoneCircleText": "巨石阵",
+    "backgroundStoneCircleNotes": "在巨石阵中释放魔法"
 }
\ No newline at end of file
diff --git a/common/locales/zh/character.json b/common/locales/zh/character.json
index e602cbfbd0..0d9bb3cf89 100644
--- a/common/locales/zh/character.json
+++ b/common/locales/zh/character.json
@@ -1,7 +1,7 @@
 {
     "statsAch": "角色属性及成就",
     "profile": "角色信息",
-    "avatar": "Customize Avatar",
+    "avatar": "角色形象",
     "other": "其他",
     "fullName": "全名",
     "displayName": "显示名",
@@ -83,7 +83,7 @@
     "allocateInt": "分配到智力的点数",
     "allocateIntPop": "增加一点智力",
     "noMoreAllocate": "现在你已经达到了100级，你不会再获得任何属性点。你可以继续升级，或者使用 <a href='http://habitica.wikia.com/wiki/Orb_of_Rebirth' target='_blank'>重生之球</a>从1级开始新的冒险。现在重生之球在市场免费提供。",
-    "stats": "Avatar Stats",
+    "stats": "角色属性及成就",
     "strength": "力量",
     "strengthText": "力量增加“暴击”的几率。暴击时，金币、经验值、和物品掉落的机会都会有所增长。它也能帮助你伤害boss。",
     "constitution": "体质",
@@ -136,7 +136,7 @@
     "respawn": "重生！",
     "youDied": "你已经死亡！",
     "dieText": "你掉了一级，失去所有的金币，和随机的一件装备。起来吧，Habit世界的居民，再接再厉！远离那些坏习惯、注意完成每日任务、并在快支撑不住的时候使用生命药水免于死亡！",
-    "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.",
+    "sureReset": "你确定吗？这将会重置你角色职业和已经分配的属性点(它们将会被返还让你重新分配)，消耗3个宝石。",
     "purchaseFor": "花费<%= cost %>宝石购买？",
     "notEnoughMana": "魔法值不足。",
     "invalidTarget": "无效的目标",
diff --git a/common/locales/zh/communityguidelines.json b/common/locales/zh/communityguidelines.json
index f8a551f4fb..485b4d21fa 100644
--- a/common/locales/zh/communityguidelines.json
+++ b/common/locales/zh/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "在Habitica这样一个庞大的社区环境中，玩家来去频繁，版主们也需要适时放下自己的重任让自己休息休息。下列是名誉退休的版主们。他们不再行使版主的权利， 但是请仍然尊重他们的工作！",
     "commGuidePara014": "荣誉退休的版主们:",
     "commGuideHeadingPublicSpaces": "Habitica中的公共空间",
-    "commGuidePara015": "Habitica有两种社交区域:公开的和私人的。公开的空间包括酒馆，公开公会，GitHub，Trello还有Wiki。私人的空间包括私人公会，队伍私聊，以及私信。",
+    "commGuidePara015": "Habitica 有两种社交空间：公开的和私人的。公开空间包括酒馆、公开工会、GitHub、Trello和Wiki。私有空间包括私有工会，队伍聊天和私人消息。所有显示名称必须遵守公共空间指南。在网页中 玩家 > 角色信息 中点击“修改”按钮可以更改你的显示名称。",
     "commGuidePara016": "当参与Habitica的公共区域时，为了保证所有人的安全和愉快，有一些事项需要遵守。这些对于你这样的冒险者来说简直太容易了！",
     "commGuidePara017": "<strong> 彼此尊重</strong> 成为一位彬彬有礼、善良且乐于助人的人。请记得 Habiticans 来自五湖四海，拥有各种各样的经历和背景。Habitica正因如此才如此多姿多彩！建立社区意味着我们要尊重与赞赏我们之间的相似与不同。以下是一些简单的尊重彼此的方式：",
     "commGuideList02A": "<strong>遵守所有的条款和条件。</strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>第一时间遵从管理员的要求</strong>来平息争论或者将他转移到The Back Corner。如果管理员允许的话，所有与本次讨论相关的话，都将被(礼貌地)转移到你The Back Corner的\"桌子\"上。",
     "commGuideList02G": "<strong>花一些时间思考，而不是立刻就怒斥对方</strong>如果有人告诉你你说的话使别人很不舒服。那么能够向别人郑重的道歉就是一种美德。如果你觉得他们的反应有不当的地方，请联系一个管理员，而不是将他们轰出公共区域。",
     "commGuideList02H": "<strong>造成争议的话题应该上报给管理员。</strong>如果你觉得对话开始激烈，甚至情绪化，会伤害别人，应当终止对话，并且发邮件给<a href=\"mailto:leslie@habitica.com\">leslie@habitica</a>来让我们知道这件事。我们将保证你的匿名性。",
-    "commGuideList02I": "<strong>不要发送垃圾信息</strong>垃圾信息可能包括并不限于：在不同的地方发出同样的评论或疑问，发送没有意义的信息，或是一次发送大量的信息。重复地讨要宝石或是捐助可能被认为是垃圾信息。",
-    "commGuidePara019": "<strong>在个人空间中,</strong>玩家能更自由的讨论任何喜欢的话题,但是,他们仍不能违反条款与要求,包括发布任何歧视性的,暴力的,恐吓性的内容.",
+    "commGuideList02I": "<strong>请勿发送垃圾消息。</strong> 垃圾消息包括但不限于：在多个地方发布相同的评论或问询，没有说明和上下文发布链接，发布荒谬无聊的消息，或成排发布很多消息。在任何聊天空间或者通过私人消息中要宝石或者捐款的都被视为垃圾消息。",
+    "commGuidePara019": "<strong>在私人空间中，</strong>用户有更多自由讨论他们喜欢的话题，但是仍不能违反条款和条件，包括发布任何歧视、暴力或恐吓内容。注意，由于挑战名称会出现在胜利者的公共角色信息中，所有的挑战名称必须遵守公共空间指南，即使它们是在私人空间中。",
     "commGuidePara020": "私人信息(私信)有一些附加要求。如果某人屏蔽了你，请不要在任何别的地方联系对方来解除屏蔽。并且你不应该用私信来寻求帮助(对帮助问题的公开回答会帮助整个社区)。最后，不要给任何人发私信要求宝石或订阅来作为礼物，因为这样的行为会被认为是在发送垃圾信息。",
     "commGuidePara021": "此外,Habitica中的一些公共区域还有另外的准则.",
     "commGuideHeadingTavern": "酒馆",
diff --git a/common/locales/zh/content.json b/common/locales/zh/content.json
index b13a9d5c15..4710ce8e85 100644
--- a/common/locales/zh/content.json
+++ b/common/locales/zh/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "一只多刺的",
     "dropEggBearCubText": "幼熊",
     "dropEggBearCubMountText": "熊",
-    "dropEggBearCubAdjective": "一只要抱抱的",
+    "dropEggBearCubAdjective": "一只勇敢的",
     "questEggGryphonText": "狮鹫",
     "questEggGryphonMountText": "狮鹫",
     "questEggGryphonAdjective": "一只骄傲的",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "一只彩色的",
     "questEggRatText": "老鼠",
     "questEggRatMountText": "老鼠",
-    "questEggRatAdjective": "一只脏脏的",
+    "questEggRatAdjective": "一只友善的",
     "questEggOctopusText": "章鱼",
     "questEggOctopusMountText": "章鱼",
     "questEggOctopusAdjective": "一只滑溜溜的",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "猴子",
     "questEggMonkeyMountText": "猴子",
     "questEggMonkeyAdjective": "一个淘气的",
+    "questEggSnailText": "蜗牛",
+    "questEggSnailMountText": "蜗牛",
+    "questEggSnailAdjective": "一只缓慢但沉着的",
     "eggNotes": "将一瓶孵化药水倒在这个宠物蛋上，你就能孵化出一只<%= eggAdjective(locale) %><%= eggText(locale) %>。",
     "hatchingPotionBase": "普通",
     "hatchingPotionWhite": "白色",
diff --git a/common/locales/zh/contrib.json b/common/locales/zh/contrib.json
index 028204099a..31bf4b6fd6 100644
--- a/common/locales/zh/contrib.json
+++ b/common/locales/zh/contrib.json
@@ -28,11 +28,11 @@
     "helped": "帮助了Habit成长",
     "helpedText1": "填写以帮助Habitica成長",
     "helpedText2": "这份问卷。",
-    "hall": "Hall of Heroes",
+    "hall": "英雄殿堂",
     "contribTitle": "贡献者头衔 (例如“锻造师”)",
     "contribLevel": "贡献等级",
     "contribHallText": "1-7层级是普通贡献者，8层级是版主，9层级是职员。这决定了哪些项目，宠物和坐骑和可用。也决定了名称标签颜色。8层级和9层级会自动获得管理员身份。",
-    "hallContributors": "Hall of Contributors",
+    "hallContributors": "贡献者殿堂",
     "hallPatrons": "赞助人殿堂",
     "rewardUser": "奖励玩家",
     "UUID": "帐号",
@@ -60,5 +60,5 @@
     "blurbGuildsPage": "公会是由玩家为玩家创建的基于共同兴趣的聊天组。浏览公会目录并选择你感兴趣的加入！",
     "blurbChallenges": "挑战是由你关注的玩家创建的。加入一个挑战会将它的任务加入你的任务列表，完成一个挑战会给你一个成就，通常还有一些宝石奖励。",
     "blurbHallPatrons": "这里是赞助者的殿堂，我们纪念在Kickstarter众筹上支持Habitica的会员们。感谢他们帮助我们让Habitica诞生！",
-    "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to Habitica, too! <a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'> Find out more here. </a>"
+    "blurbHallContributors": "这里是贡献者的殿堂，纪念在开源项目中对Habitica做出贡献的人们。无论是代码、图画、音乐、剧本，甚至只是一些帮助，他们得到了<a href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank'> 宝石，独有装备</a>，以及 <a href='http://habitica.wikia.com/wiki/Contributor_Titles' target='_blank'>尊贵头衔</a>。你也可以为Habitica做出贡献！<a href='http://habitica.wikia.com/wiki/Contributing_to_Habitica' target='_blank'>查看更多。</a>"
 }
\ No newline at end of file
diff --git a/common/locales/zh/faq.json b/common/locales/zh/faq.json
index 79c8b83dbe..76a94ee23c 100644
--- a/common/locales/zh/faq.json
+++ b/common/locales/zh/faq.json
@@ -1,5 +1,5 @@
 {
-    "frequentlyAskedQuestions": "经常被问到的问题",
+    "frequentlyAskedQuestions": "常见问题",
     "faqQuestion0": "我很迷惑。我在哪里能得到简介 ？",
     "iosFaqAnswer0": "首先，你要建立起你每天要完成的任务。然后，当你在现实生活中完成这些任务时，在应用中清点它们，你就会得到经验值和金钱。金钱可以用来买装备和一些物品，也可以用来买奖励。经验可以使你的人物升级，并解锁宠物、技能、任务等内容。你可以在菜单>装扮角色中装扮你的角色。\n\n一些基本的交互方法：点击右上角的(+)添加任务。点击一个已经存在的任务去编辑它，左滑来删除它。你可以用左上角标签给任务排序，并通过点击清单气泡来增大和缩小任务清单。",
     "webFaqAnswer0": "首先，你要建立起你每天要完成的任务。然后，当你在现实生活中完成这些任务时，在应用中清点它们，你就会得到经验值和金钱。金钱可以用来买装备和一些物品，也可以用来买奖励。经验可以使你的人物升级，并解锁宠物、技能、任务等内容。更多内容，可以在[帮助 -> 新手教学](https://habitica.com/static/overview).查看详细的游戏入门。",
diff --git a/common/locales/zh/gear.json b/common/locales/zh/gear.json
index cafd120d9e..6aa5c928ec 100644
--- a/common/locales/zh/gear.json
+++ b/common/locales/zh/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "组",
     "weapon": "武器",
     "weaponBase0Text": "没有武器",
     "weaponBase0Notes": "没有武器。",
@@ -176,8 +177,8 @@
     "weaponArmoireBarristerGavelNotes": "秩序！增加力量和体质各 <%= attrs %> 点。魔法衣橱：大律师套装(3件中的第3件)",
     "weaponArmoireJesterBatonText": "小丑手杖",
     "weaponArmoireJesterBatonNotes": "挥舞着手杖，妙语连珠，最复杂的情况都会变得清晰起来。增加智力和感知各 <%= attrs %> 点。魔法衣橱：小丑套装(3件中的第3件)",
-    "weaponArmoireMiningPickaxText": "Mining Pickax",
-    "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
+    "weaponArmoireMiningPickaxText": "采矿鹤嘴锄",
+    "weaponArmoireMiningPickaxNotes": "从你的任务中挖取最大量的金币！增加感知<%= per %>点。魔法衣橱：采矿者套装(3件中的第3件)。",
     "armor": "护甲",
     "armorBase0Text": "普通服装",
     "armorBase0Notes": "普通的衣服。 没有属性加成。",
@@ -369,8 +370,8 @@
     "armorArmoireBarristerRobesNotes": "严肃！庄严！增加体质 <%= con %> 点。魔法衣橱：大律师套装(3件中的第2件)",
     "armorArmoireJesterCostumeText": "小丑服",
     "armorArmoireJesterCostumeNotes": "的啦啦啦！尽管衣服看起来呵呵，你不是一个傻瓜。增加智力 <%= int %> 点。魔法衣橱：小丑套装(3件中的第2件)",
-    "armorArmoireMinerOverallsText": "Miner Overalls",
-    "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
+    "armorArmoireMinerOverallsText": "采矿者工作裤",
+    "armorArmoireMinerOverallsNotes": "它们看起来破旧，但他们被施了魔法抵御灰尘。增加体质<%= con %>点。魔法衣橱：采矿者套装(3件中的第2件)。",
     "headgear": "头饰",
     "headBase0Text": "没有头盔",
     "headBase0Notes": "没有头饰",
@@ -530,8 +531,8 @@
     "headMystery201512Notes": "冰冷的火焰中透出最直白的智慧。没有属性加成。2015年12月订阅者物品。",
     "headMystery201601Text": "决心之头盔",
     "headMystery201601Notes": "保持坚定，勇敢的冠军！没有属性加成。2016年1月订阅者物品。",
-    "headMystery201602Text": "Heartbreaker Hood",
-    "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.",
+    "headMystery201602Text": "负心人头巾",
+    "headMystery201602Notes": "对所有你的爱慕者隐藏你的身份。没有属性加成。2016年2月捐赠者物品。",
     "headMystery301404Text": "华丽礼帽",
     "headMystery301404Notes": "上流社会佼佼者的华丽礼帽！3015年1月捐赠者物品。没有属性加成。",
     "headMystery301405Text": "基础礼帽",
@@ -576,8 +577,8 @@
     "headArmoireBarristerWigNotes": "有弹性的假发能吓退最凶猛的敌人！增加力量 <%= str %>点。魔法衣橱：大律师套装(3件中的第1件)",
     "headArmoireJesterCapText": "小丑帽",
     "headArmoireJesterCapNotes": "帽子上的铃铛让对手分心，它仅帮你集中注意力。增加感知 <%= per %> 点。魔法衣橱：小丑套装(3件中的第1件)",
-    "headArmoireMinerHelmetText": "Miner Helmet",
-    "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
+    "headArmoireMinerHelmetText": "采矿者头盔",
+    "headArmoireMinerHelmetNotes": "保护你的头不被掉下的任务砸伤！增加智力 <%= int %>点。魔法衣橱：采矿者套装(3件中的第1件)。",
     "offhand": "副手物品",
     "shieldBase0Text": "没有副手装备",
     "shieldBase0Notes": "没有盾牌或副手武器。",
@@ -673,8 +674,8 @@
     "shieldArmoireRoyalCaneNotes": "赞歌颂唱，山呼吾王！增加体质，智力和感知各<%= attrs %>点。魔法衣橱：皇家套装(3件中的第2件)",
     "shieldArmoireDragonTamerShieldText": "驯龙盾",
     "shieldArmoireDragonTamerShieldNotes": "用这件龙形的盾牌扰乱敌人吧。增加<%= per %>点感知。魔法衣橱：驯龙套装(3件套之2)。",
-    "shieldArmoireMysticLampText": "Mystic Lamp",
-    "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.",
+    "shieldArmoireMysticLampText": "神秘的灯",
+    "shieldArmoireMysticLampNotes": "用神秘的灯照亮黑暗的洞穴！增加感知<%= per %>点。魔法衣橱：独立装备。",
     "back": "背部挂件",
     "backBase0Text": "没有背部挂件",
     "backBase0Notes": "没有背部挂件。",
@@ -690,8 +691,8 @@
     "backMystery201507Notes": "在未完成之湾优雅穿行于雅致的岩石，踏浪飞驰！无增益效果。2015年7月捐赠者物品。",
     "backMystery201510Text": "地精尾巴",
     "backMystery201510Notes": "绕来抓去，强而有力！无增益效果。2015年10月订阅者物品。",
-    "backMystery201602Text": "Heartbreaker Cape",
-    "backMystery201602Notes": "With a swish of your cape, your enemies fall before you! Confers no benefit. February 2016 Subscriber Item.",
+    "backMystery201602Text": "负心人披肩",
+    "backMystery201602Notes": "扬起斗篷嗖的一声，你的敌人落在了你的后面！没有属性加成。2016年2月捐赠者物品。",
     "backSpecialWonderconRedText": "威武斗篷",
     "backSpecialWonderconRedNotes": "力量与美貌在刷刷作响。没有属性加成。特别版参与者物品。",
     "backSpecialWonderconBlackText": "潜行斗篷",
diff --git a/common/locales/zh/generic.json b/common/locales/zh/generic.json
index d504ff1691..f3f428246b 100644
--- a/common/locales/zh/generic.json
+++ b/common/locales/zh/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "我完成了我的任务，孵出了一个新宠物！",
     "raisePetShare": "我完成了我的任务，培养了一匹新坐骑！",
     "wonChallengeShare": "我在Habitica赢了一个挑战！",
-    "achievementShare": "我在Habitica得到了一个新成就！"
+    "achievementShare": "我在Habitica得到了一个新成就！",
+    "orderBy": "以<%= item %>排序"
 }
\ No newline at end of file
diff --git a/common/locales/zh/groups.json b/common/locales/zh/groups.json
index 028efca549..7e56b9fd7e 100644
--- a/common/locales/zh/groups.json
+++ b/common/locales/zh/groups.json
@@ -1,5 +1,5 @@
 {
-    "tavern": "Tavern Chat",
+    "tavern": "酒馆",
     "innCheckOut": "离开客栈",
     "innCheckIn": "在客栈休息",
     "innText": "你正在客栈中休息！当你在客栈中时，你没完成的日常任务不会在一天结束时对你造成伤害，但是它们仍然会每天刷新。注意：如果你正在参与一个Boss战任务，你仍然会因为队友未完成的每日任务受到boss的伤害！同样，你对Boss的伤害(或者收集的道具)在你离开客栈之前不会结算。",
@@ -147,5 +147,9 @@
     "partyChatEmpty": "队伍聊天框里空空如也！在上面的聊天框打字来开始聊天。",
     "guildChatEmpty": "公会聊天框里空空如也！在上面的聊天框打字来开始聊天。",
     "possessiveParty": "<%= name %>的队伍",
-    "requestAcceptGuidelines": "如果你想在酒馆里，或是队伍和公会里张贴信息，请先阅读<%= linkStart %>交流须知<%= linkEnd %>并点击按钮，表示接受其中的条款。 "
+    "requestAcceptGuidelines": "如果你想在酒馆里，或是队伍和公会里张贴信息，请先阅读<%= linkStart %>交流须知<%= linkEnd %>并点击按钮，表示接受其中的条款。 ",
+    "partyUpName": "举行派对",
+    "partyOnName": "欢乐派对",
+    "partyUpAchievement": "和另一个人一起加入一个队伍！愉快的去打怪兽并互相支持，玩的愉快。",
+    "partyOnAchievement": "加入一个队伍，至少4人！享受你肩上扛着的不断增加的对伙伴的承诺，和你的朋友一起打败你的敌人！"
 }
\ No newline at end of file
diff --git a/common/locales/zh/questscontent.json b/common/locales/zh/questscontent.json
index 8d4c6ceea3..ff18913539 100644
--- a/common/locales/zh/questscontent.json
+++ b/common/locales/zh/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "你做到了！那些朋友今天没有香蕉了。被你的勤奋吓到，猴子惊慌的逃掉。“看，” @Misceo 说，“他们留下了一些蛋。” <br><br>@Leephon grins：“一个训练有素的宠物猴子能帮助你的程度就和一个野生猴子阻碍你的程度一样”",
     "questMonkeyBoss": "巨大的山魈",
     "questMonkeyDropMonkeyEgg": "猴子 (蛋)",
-    "questMonkeyUnlockText": "解锁猴子蛋购买功能"
+    "questMonkeyUnlockText": "解锁猴子蛋购买功能",
+    "questSnailText": "苦差事淤泥蜗牛",
+    "questSnailNotes": "你很兴奋开始探索被遗弃的苦差事地下城，但是当你一进入，你就感受到你脚下的地面在吸你的靴子。你看着前面的小路，看到Habitica人们陷入了涂泥。@Overomega 大叫，“他们有太多不重要的任务和每日任务，他们正被不要紧的事情卡住！把他们拉出来！”<br><br>“你需要找到渗出的源头，”@Pfeffernusse 赞同着说，“或者他们不能完成的任务将他们永远拖下去！”<br><br>拿出你的武器，你艰难地通过黏黏的泥....突然遇上了可怕的苦差事淤泥蜗牛。",
+    "questSnailCompletion": "你把你的武器砸在巨大的蜗牛壳上，壳裂成两半，涌出了大量的水。粘液被冲走，Habitica人民在你身边欢呼。\"看！\" @Misceo 说。\"在残留的淤泥中，有一小群的蜗牛蛋。\"",
+    "questSnailBoss": "苦差事淤泥蜗牛",
+    "questSnailDropSnailEgg": "蜗牛(蛋)",
+    "questSnailUnlockText": "解锁蜗牛蛋购买功能"
 }
\ No newline at end of file
diff --git a/common/locales/zh/subscriber.json b/common/locales/zh/subscriber.json
index 39bb1fc187..196ed2cf0e 100644
--- a/common/locales/zh/subscriber.json
+++ b/common/locales/zh/subscriber.json
@@ -97,7 +97,7 @@
     "mysterySet201511": "树木战士套装",
     "mysterySet201512": "冬季火焰组合",
     "mysterySet201601": "决心组冠军",
-    "mysterySet201602": "Heartbreaker Set",
+    "mysterySet201602": "负心人套装",
     "mysterySet301404": "蒸汽朋克标准套装",
     "mysterySet301405": "蒸汽朋克配饰套装",
     "mysterySetwondercon": "Wondercon漫展",
diff --git a/common/locales/zh_TW/communityguidelines.json b/common/locales/zh_TW/communityguidelines.json
index ae9c7717b8..fc967bb138 100644
--- a/common/locales/zh_TW/communityguidelines.json
+++ b/common/locales/zh_TW/communityguidelines.json
@@ -29,7 +29,7 @@
     "commGuidePara013": "在 Habitica 這麼大的社群裡，玩家來來去去，有時管理員也需要卸下他們尊貴的外袍，讓自己放鬆一下。下面列舉的是名譽管理員：雖然他們不再有管理員的權限，但我們仍然想要表彰他們的貢獻。",
     "commGuidePara014": "名譽管理員：",
     "commGuideHeadingPublicSpaces": "Habitica 的公共空間",
-    "commGuidePara015": "Habitica 有區分公共空間和私人空間。公共空間包括酒館、公會、GitHub、Trello以及Wiki。私人空間包括私人公會和隊伍聊天室。",
+    "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.",
     "commGuidePara016": "當你在 Habitica 的公共空間四處逛逛時，請務必遵守某些普通規則，好確保大家的安全與快樂。對於像你這樣的冒險者而言，想必是易如反掌！",
     "commGuidePara017": "<strong> 彼此尊重</strong> 成為一位彬彬有禮、善良且樂於助人的人。請記得 Habiticans 來自四面八方並擁有各式各樣的經驗，這也是讓 Habitica 這麼酷的原因！建立社群意謂著尊重與讚賞我們的不同與相似。這裡是一些尊重彼此的作法：",
     "commGuideList02A": "<strong> 遵守所有規定與條款 </strong>",
@@ -40,8 +40,8 @@
     "commGuideList02F": "<strong>立即聽從管理員的要求</strong> 要麼終止爭論，要麼移駕到酒館後排角落。假設管理員允許，而你還想說上最後一句、或是臨走時撂些難聽話、或是還想總結反駁等等，請你到了酒館後排角落的 \"桌位\" 時才(有禮地)去發表.",
     "commGuideList02G": "<strong>花些時間去思考，而不是在激怒中作回應</strong>若有人告訴您說，您所說的一些話或所作的事令他們覺得不舒服。能夠向他人真誠的道歉就是您崇高的美德力量。若您覺得他們對您的反應有不恰當的地方，請通知管理員，而不是在公衆區域大聲地向他們喊罵。",
     "commGuideList02H": "<strong>分裂或有爭議的討論必須呈報給管理員。</strong> 如果你覺得討論已經變成筆戰，越來越激烈，過於情緒化，或是覺得自己被傷害，想要停戰，請寄信給<a href=\"mailto:leslie@habitica.com\">leslie@habitica.com</a>讓我們知道。這是我們的職責。",
-    "commGuideList02I": "<strong>不要發送垃圾信息</strong>垃圾信息可能包括並不限於：在不同的地方發出同樣的評論或疑問，發送沒有意義的信息，或是一次發送大量的信息。重複地討要寶石或是捐助可能被歸類為是垃圾信息。",
-    "commGuidePara019": "<strong>在個人空間中, </strong>玩家能更自由的討論任何喜歡的話題,但是,他們仍不能違反條款與要求,包括發布任何歧視性的、暴力的、恐嚇性的內容。",
+    "commGuideList02I": "<strong>Do not spam.</strong> Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Asking for gems or a subscription in any of the chat spaces or via Private Message is also considered spamming.",
+    "commGuidePara019": "<strong>In private spaces,</strong> users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content. Note that, because Challenge names appear in the winner's public profile, ALL Challenge names must obey the public space guidelines, even if they appear in a private space.",
     "commGuidePara020": "私人信息(私信)有一些附加要求。如果某人將你加入黑名單，請不要在任何別的地方聯繫對方要求解除。並且你不應該用私信來尋求幫助(對幫助問題的公開回答會幫助整個社區)。最後，不要給任何人發私信要求寶石或訂閱來作為禮物，因為這樣的行為會被認為是在發送垃圾信息。",
     "commGuidePara021": "此外,Habit大陸中的一些公共區域還有另外的準則.",
     "commGuideHeadingTavern": "酒館",
diff --git a/common/locales/zh_TW/content.json b/common/locales/zh_TW/content.json
index 9e5fc4bf13..5c678c43e0 100644
--- a/common/locales/zh_TW/content.json
+++ b/common/locales/zh_TW/content.json
@@ -31,7 +31,7 @@
     "dropEggCactusAdjective": "一隻刺手的",
     "dropEggBearCubText": "小熊",
     "dropEggBearCubMountText": "熊",
-    "dropEggBearCubAdjective": "一隻愛擁抱的",
+    "dropEggBearCubAdjective": "a brave",
     "questEggGryphonText": "獅鷲獸",
     "questEggGryphonMountText": "獅鷲獸",
     "questEggGryphonAdjective": "一隻驕傲的",
@@ -46,7 +46,7 @@
     "questEggEggAdjective": "一顆色彩繽紛的",
     "questEggRatText": "老鼠",
     "questEggRatMountText": "老鼠",
-    "questEggRatAdjective": "一隻骯髒的",
+    "questEggRatAdjective": "a sociable",
     "questEggOctopusText": "章魚",
     "questEggOctopusMountText": "章魚",
     "questEggOctopusAdjective": "一隻滑溜的",
@@ -110,6 +110,9 @@
     "questEggMonkeyText": "Monkey",
     "questEggMonkeyMountText": "Monkey",
     "questEggMonkeyAdjective": "a mischievous",
+    "questEggSnailText": "Snail",
+    "questEggSnailMountText": "Snail",
+    "questEggSnailAdjective": "a slow but steady",
     "eggNotes": "把孵化藥水倒在寵物蛋上會把它孵化成一隻<%= eggAdjective(locale) %> <%= eggText(locale) %>。",
     "hatchingPotionBase": "普通",
     "hatchingPotionWhite": "白色",
diff --git a/common/locales/zh_TW/gear.json b/common/locales/zh_TW/gear.json
index ea64590757..9fb3731433 100644
--- a/common/locales/zh_TW/gear.json
+++ b/common/locales/zh_TW/gear.json
@@ -1,4 +1,5 @@
 {
+    "set": "Set",
     "weapon": "武器",
     "weaponBase0Text": "沒有武器",
     "weaponBase0Notes": "沒有武器。",
diff --git a/common/locales/zh_TW/generic.json b/common/locales/zh_TW/generic.json
index 18fdde1c40..1b5de8eca6 100644
--- a/common/locales/zh_TW/generic.json
+++ b/common/locales/zh_TW/generic.json
@@ -175,5 +175,6 @@
     "hatchPetShare": "I hatched a new pet by completing my real-life tasks!",
     "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!",
     "wonChallengeShare": "我在 Habitica 贏得了挑戰！",
-    "achievementShare": "I earned a new achievement in Habitica!"
+    "achievementShare": "I earned a new achievement in Habitica!",
+    "orderBy": "Order By <%= item %>"
 }
\ No newline at end of file
diff --git a/common/locales/zh_TW/groups.json b/common/locales/zh_TW/groups.json
index d58cd10e3e..a300267032 100644
--- a/common/locales/zh_TW/groups.json
+++ b/common/locales/zh_TW/groups.json
@@ -147,5 +147,9 @@
     "partyChatEmpty": "你的隊伍聊天室太安靜了！趕快發送訊息打破沉默吧。",
     "guildChatEmpty": "This guild's chat is empty! Type a message in the box above to start chatting.",
     "possessiveParty": "<%= name %>的隊伍",
-    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them."
+    "requestAcceptGuidelines": "If you would like to post messages in the Tavern or any party or guild chat, please first read our <%= linkStart %>Community Guidelines<%= linkEnd %> and then click the button below to indicate that you accept them.",
+    "partyUpName": "Party Up",
+    "partyOnName": "Party On",
+    "partyUpAchievement": "Joined a Party with another person! Have fun battling monsters and supporting each other.",
+    "partyOnAchievement": "Joined a Party with at least four people! Enjoy your increased accountability as you unite with your friends to vanquish your foes!"
 }
\ No newline at end of file
diff --git a/common/locales/zh_TW/questscontent.json b/common/locales/zh_TW/questscontent.json
index 58a3f6f070..cf5cb231ad 100644
--- a/common/locales/zh_TW/questscontent.json
+++ b/common/locales/zh_TW/questscontent.json
@@ -291,5 +291,11 @@
     "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"<br><br>@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"",
     "questMonkeyBoss": "Monstrous Mandrill",
     "questMonkeyDropMonkeyEgg": "Monkey (Egg)",
-    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market"
+    "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market",
+    "questSnailText": "The Snail of Drudgery Sludge",
+    "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"<br><br>\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"<br><br>Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.",
+    "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"",
+    "questSnailBoss": "Snail of Drudgery Sludge",
+    "questSnailDropSnailEgg": "Snail (Egg)",
+    "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market"
 }
\ No newline at end of file
diff --git a/common/script/content/constants.js b/common/script/content/constants.js
index 339aadcf0b..85d67f90d1 100644
--- a/common/script/content/constants.js
+++ b/common/script/content/constants.js
@@ -23,6 +23,7 @@ export const EVENTS = {
   fall2015:   { start: '2015-09-21', end: '2015-11-01' },
   gaymerx:    { start: '2015-12-01', end: '2015-12-14' },
   winter2016: { start: '2015-12-18', end: '2016-02-02' },
+  spring2016: { start: '2016-03-18', end: '2016-05-02' },
 };
 
 export const GEAR_TYPES = [
diff --git a/common/script/content/gear/index.js b/common/script/content/gear/index.js
index cf288e89dc..d7013e9986 100644
--- a/common/script/content/gear/index.js
+++ b/common/script/content/gear/index.js
@@ -39,10 +39,12 @@ each(GEAR_TYPES, (type) => {
   each(allGearTypes, (klass) => {
     each(gear[type][klass], (item, index) => {
       let key = `${type}_${klass}_${index}`;
+      let set = `${klass}-${index}`;
 
       defaults(item, {
         type,
         key,
+        set,
         klass,
         index,
         str: 0,
diff --git a/common/script/content/gear/sets/special/index.js b/common/script/content/gear/sets/special/index.js
index 48ed0cbee3..5111eaa793 100644
--- a/common/script/content/gear/sets/special/index.js
+++ b/common/script/content/gear/sets/special/index.js
@@ -62,6 +62,9 @@ let armor = {
     notes: t('armorSpecialSpringRogueNotes', { per: 15 }),
     value: 90,
     per: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -70,6 +73,9 @@ let armor = {
     notes: t('armorSpecialSpringWarriorNotes', { con: 9 }),
     value: 90,
     con: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -78,6 +84,9 @@ let armor = {
     notes: t('armorSpecialSpringMageNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -86,6 +95,9 @@ let armor = {
     notes: t('armorSpecialSpringHealerNotes', { con: 15 }),
     value: 90,
     con: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -196,6 +208,9 @@ let armor = {
     notes: t('armorSpecialSpring2015RogueNotes', { per: 15 }),
     value: 90,
     per: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -204,6 +219,9 @@ let armor = {
     notes: t('armorSpecialSpring2015WarriorNotes', { con: 9 }),
     value: 90,
     con: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -212,6 +230,9 @@ let armor = {
     notes: t('armorSpecialSpring2015MageNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -220,6 +241,9 @@ let armor = {
     notes: t('armorSpecialSpring2015HealerNotes', { con: 15 }),
     value: 90,
     con: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -329,6 +353,38 @@ let armor = {
     value: 0,
     canOwn: ownsItem('armor_special_birthday2016'),
   },
+  spring2016Rogue: {
+    event: EVENTS.spring2016,
+    specialClass: 'rogue',
+    text: t('armorSpecialSpring2016RogueText'),
+    notes: t('armorSpecialSpring2016RogueNotes', { per: 15 }),
+    value: 90,
+    per: 15,
+  },
+  spring2016Warrior: {
+    event: EVENTS.spring2016,
+    specialClass: 'warrior',
+    text: t('armorSpecialSpring2016WarriorText'),
+    notes: t('armorSpecialSpring2016WarriorNotes', { con: 9 }),
+    value: 90,
+    con: 9,
+  },
+  spring2016Mage: {
+    event: EVENTS.spring2016,
+    specialClass: 'wizard',
+    text: t('armorSpecialSpring2016MageText'),
+    notes: t('armorSpecialSpring2016MageNotes', { int: 9 }),
+    value: 90,
+    int: 9,
+  },
+  spring2016Healer: {
+    event: EVENTS.spring2016,
+    specialClass: 'healer',
+    text: t('armorSpecialSpring2016HealerText'),
+    notes: t('armorSpecialSpring2016HealerNotes', { con: 15 }),
+    value: 90,
+    con: 15,
+  },
 };
 
 let back = {
@@ -427,9 +483,6 @@ let head = {
     notes: t('headSpecialYetiNotes', { str: 9 }),
     str: 9,
     value: 60,
-    canBuy: () => {
-      return true;
-    },
   },
   ski: {
     event: EVENTS.winter,
@@ -438,9 +491,6 @@ let head = {
     notes: t('headSpecialSkiNotes', { per: 9 }),
     per: 9,
     value: 60,
-    canBuy: () => {
-      return true;
-    },
   },
   candycane: {
     event: EVENTS.winter,
@@ -449,9 +499,6 @@ let head = {
     notes: t('headSpecialCandycaneNotes', { per: 7 }),
     per: 7,
     value: 60,
-    canBuy: () => {
-      return true;
-    },
   },
   snowflake: {
     event: EVENTS.winter,
@@ -460,9 +507,6 @@ let head = {
     notes: t('headSpecialSnowflakeNotes', { int: 7 }),
     int: 7,
     value: 60,
-    canBuy: () => {
-      return true;
-    },
   },
   springRogue: {
     event: EVENTS.spring,
@@ -471,6 +515,9 @@ let head = {
     notes: t('headSpecialSpringRogueNotes', { per: 9 }),
     value: 60,
     per: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -479,6 +526,9 @@ let head = {
     notes: t('headSpecialSpringWarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -487,6 +537,9 @@ let head = {
     notes: t('headSpecialSpringMageNotes', { per: 7 }),
     value: 60,
     per: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -495,6 +548,9 @@ let head = {
     notes: t('headSpecialSpringHealerNotes', { int: 7 }),
     value: 60,
     int: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -535,9 +591,6 @@ let head = {
     notes: t('headSpecialFallRogueNotes', { per: 9 }),
     value: 60,
     per: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   fallWarrior: {
     event: EVENTS.fall,
@@ -546,9 +599,6 @@ let head = {
     notes: t('headSpecialFallWarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   fallMage: {
     event: EVENTS.fall,
@@ -557,9 +607,6 @@ let head = {
     notes: t('headSpecialFallMageNotes', { per: 7 }),
     value: 60,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   fallHealer: {
     event: EVENTS.fall,
@@ -568,9 +615,6 @@ let head = {
     notes: t('headSpecialFallHealerNotes', { int: 7 }),
     value: 60,
     int: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Rogue: {
     event: EVENTS.winter2015,
@@ -579,9 +623,6 @@ let head = {
     notes: t('headSpecialWinter2015RogueNotes', { per: 9 }),
     value: 60,
     per: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Warrior: {
     event: EVENTS.winter2015,
@@ -590,9 +631,6 @@ let head = {
     notes: t('headSpecialWinter2015WarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Mage: {
     event: EVENTS.winter2015,
@@ -601,9 +639,6 @@ let head = {
     notes: t('headSpecialWinter2015MageNotes', { per: 7 }),
     value: 60,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Healer: {
     event: EVENTS.winter2015,
@@ -612,9 +647,6 @@ let head = {
     notes: t('headSpecialWinter2015HealerNotes', { int: 7 }),
     value: 60,
     int: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   nye2014: {
     text: t('headSpecialNye2014Text'),
@@ -629,6 +661,9 @@ let head = {
     notes: t('headSpecialSpring2015RogueNotes', { per: 9 }),
     value: 60,
     per: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -637,6 +672,9 @@ let head = {
     notes: t('headSpecialSpring2015WarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -645,6 +683,9 @@ let head = {
     notes: t('headSpecialSpring2015MageNotes', { per: 7 }),
     value: 60,
     per: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -653,6 +694,9 @@ let head = {
     notes: t('headSpecialSpring2015HealerNotes', { int: 7 }),
     value: 60,
     int: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -762,6 +806,38 @@ let head = {
     value: 0,
     canOwn: ownsItem('head_special_nye2015'),
   },
+  spring2016Rogue: {
+    event: EVENTS.spring2016,
+    specialClass: 'rogue',
+    text: t('headSpecialSpring2016RogueText'),
+    notes: t('headSpecialSpring2016RogueNotes', { per: 9 }),
+    value: 60,
+    per: 9,
+  },
+  spring2016Warrior: {
+    event: EVENTS.spring2016,
+    specialClass: 'warrior',
+    text: t('headSpecialSpring2016WarriorText'),
+    notes: t('headSpecialSpring2016WarriorNotes', { str: 9 }),
+    value: 60,
+    str: 9,
+  },
+  spring2016Mage: {
+    event: EVENTS.spring2016,
+    specialClass: 'wizard',
+    text: t('headSpecialSpring2016MageText'),
+    notes: t('headSpecialSpring2016MageNotes', { per: 7 }),
+    value: 60,
+    per: 7,
+  },
+  spring2016Healer: {
+    event: EVENTS.spring2016,
+    specialClass: 'healer',
+    text: t('headSpecialSpring2016HealerText'),
+    notes: t('headSpecialSpring2016HealerNotes', { int: 7 }),
+    value: 60,
+    int: 7,
+  },
 };
 
 let headAccessory = {
@@ -771,6 +847,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringRogueText'),
     notes: t('headAccessorySpecialSpringRogueNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -778,6 +857,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringWarriorText'),
     notes: t('headAccessorySpecialSpringWarriorNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -785,6 +867,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringMageText'),
     notes: t('headAccessorySpecialSpringMageNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -792,6 +877,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpringHealerText'),
     notes: t('headAccessorySpecialSpringHealerNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Rogue: {
     event: EVENTS.spring2015,
@@ -799,6 +887,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015RogueText'),
     notes: t('headAccessorySpecialSpring2015RogueNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -806,6 +897,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015WarriorText'),
     notes: t('headAccessorySpecialSpring2015WarriorNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -813,6 +907,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015MageText'),
     notes: t('headAccessorySpecialSpring2015MageNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -820,6 +917,9 @@ let headAccessory = {
     text: t('headAccessorySpecialSpring2015HealerText'),
     notes: t('headAccessorySpecialSpring2015HealerNotes'),
     value: 20,
+    canBuy: () => {
+      return true;
+    },
   },
   bearEars: {
     gearSet: 'animal',
@@ -901,6 +1001,34 @@ let headAccessory = {
       return true;
     },
   },
+  spring2016Rogue: {
+    event: EVENTS.spring2016,
+    specialClass: 'rogue',
+    text: t('headAccessorySpecialSpring2016RogueText'),
+    notes: t('headAccessorySpecialSpring2016RogueNotes'),
+    value: 20,
+  },
+  spring2016Warrior: {
+    event: EVENTS.spring2016,
+    specialClass: 'warrior',
+    text: t('headAccessorySpecialSpring2016WarriorText'),
+    notes: t('headAccessorySpecialSpring2016WarriorNotes'),
+    value: 20,
+  },
+  spring2016Mage: {
+    event: EVENTS.spring2016,
+    specialClass: 'wizard',
+    text: t('headAccessorySpecialSpring2016MageText'),
+    notes: t('headAccessorySpecialSpring2016MageNotes'),
+    value: 20,
+  },
+  spring2016Healer: {
+    event: EVENTS.spring2016,
+    specialClass: 'healer',
+    text: t('headAccessorySpecialSpring2016HealerText'),
+    notes: t('headAccessorySpecialSpring2016HealerNotes'),
+    value: 20,
+  },
 };
 
 let shield = {
@@ -928,9 +1056,6 @@ let shield = {
     notes: t('shieldSpecialYetiNotes', { con: 7 }),
     con: 7,
     value: 70,
-    canBuy: () => {
-      return true;
-    },
   },
   ski: {
     event: EVENTS.winter,
@@ -939,9 +1064,6 @@ let shield = {
     notes: t('weaponSpecialSkiNotes', { str: 8 }),
     str: 8,
     value: 90,
-    canBuy: () => {
-      return true;
-    },
   },
   snowflake: {
     event: EVENTS.winter,
@@ -950,9 +1072,6 @@ let shield = {
     notes: t('shieldSpecialSnowflakeNotes', { con: 9 }),
     con: 9,
     value: 70,
-    canBuy: () => {
-      return true;
-    },
   },
   springRogue: {
     event: EVENTS.spring,
@@ -961,6 +1080,9 @@ let shield = {
     notes: t('shieldSpecialSpringRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => {
+      return true;
+    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -969,6 +1091,9 @@ let shield = {
     notes: t('shieldSpecialSpringWarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -977,6 +1102,9 @@ let shield = {
     notes: t('shieldSpecialSpringHealerNotes', { con: 9 }),
     value: 70,
     con: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -1042,9 +1170,6 @@ let shield = {
     notes: t('shieldSpecialWinter2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Warrior: {
     event: EVENTS.winter2015,
@@ -1053,9 +1178,6 @@ let shield = {
     notes: t('shieldSpecialWinter2015WarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Healer: {
     event: EVENTS.winter2015,
@@ -1064,9 +1186,6 @@ let shield = {
     notes: t('shieldSpecialWinter2015HealerNotes', { con: 9 }),
     value: 70,
     con: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Rogue: {
     event: EVENTS.spring2015,
@@ -1075,6 +1194,9 @@ let shield = {
     notes: t('shieldSpecialSpring2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -1083,6 +1205,9 @@ let shield = {
     notes: t('shieldSpecialSpring2015WarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -1091,6 +1216,9 @@ let shield = {
     notes: t('shieldSpecialSpring2015HealerNotes', { con: 9 }),
     value: 70,
     con: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -1099,6 +1227,9 @@ let shield = {
     notes: t('shieldSpecialSummer2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => {
+      return true;
+    },
   },
   summer2015Warrior: {
     event: EVENTS.summer2015,
@@ -1164,6 +1295,30 @@ let shield = {
     value: 70,
     con: 9,
   },
+  spring2016Rogue: {
+    event: EVENTS.spring2016,
+    specialClass: 'rogue',
+    text: t('shieldSpecialSpring2016RogueText'),
+    notes: t('shieldSpecialSpring2016RogueNotes', { str: 8 }),
+    value: 80,
+    str: 8,
+  },
+  spring2016Warrior: {
+    event: EVENTS.spring2016,
+    specialClass: 'warrior',
+    text: t('shieldSpecialSpring2016WarriorText'),
+    notes: t('shieldSpecialSpring2016WarriorNotes', { con: 7 }),
+    value: 70,
+    con: 7,
+  },
+  spring2016Healer: {
+    event: EVENTS.spring2016,
+    specialClass: 'healer',
+    text: t('shieldSpecialSpring2016HealerText'),
+    notes: t('shieldSpecialSpring2016HealerNotes', { con: 9 }),
+    value: 70,
+    con: 9,
+  },
 };
 
 let weapon = {
@@ -1186,9 +1341,6 @@ let weapon = {
     notes: t('weaponSpecialYetiNotes', { str: 15 }),
     str: 15,
     value: 90,
-    canBuy: () => {
-      return true;
-    },
   },
   ski: {
     event: EVENTS.winter,
@@ -1197,9 +1349,6 @@ let weapon = {
     notes: t('weaponSpecialSkiNotes', { str: 8 }),
     str: 8,
     value: 90,
-    canBuy: () => {
-      return true;
-    },
   },
   candycane: {
     event: EVENTS.winter,
@@ -1210,9 +1359,6 @@ let weapon = {
     int: 15,
     per: 7,
     value: 160,
-    canBuy: () => {
-      return true;
-    },
   },
   snowflake: {
     event: EVENTS.winter,
@@ -1221,9 +1367,6 @@ let weapon = {
     notes: t('weaponSpecialSnowflakeNotes', { int: 9 }),
     int: 9,
     value: 90,
-    canBuy: () => {
-      return true;
-    },
   },
   springRogue: {
     event: EVENTS.spring,
@@ -1232,6 +1375,9 @@ let weapon = {
     notes: t('weaponSpecialSpringRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => {
+      return true;
+    },
   },
   springWarrior: {
     event: EVENTS.spring,
@@ -1240,6 +1386,9 @@ let weapon = {
     notes: t('weaponSpecialSpringWarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   springMage: {
     event: EVENTS.spring,
@@ -1250,6 +1399,9 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   springHealer: {
     event: EVENTS.spring,
@@ -1258,6 +1410,9 @@ let weapon = {
     notes: t('weaponSpecialSpringHealerNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   summerRogue: {
     event: EVENTS.summer,
@@ -1300,9 +1455,6 @@ let weapon = {
     notes: t('weaponSpecialFallRogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   fallWarrior: {
     event: EVENTS.fall,
@@ -1311,9 +1463,6 @@ let weapon = {
     notes: t('weaponSpecialFallWarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   fallMage: {
     event: EVENTS.fall,
@@ -1324,9 +1473,6 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   fallHealer: {
     event: EVENTS.fall,
@@ -1335,9 +1481,6 @@ let weapon = {
     notes: t('weaponSpecialFallHealerNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Rogue: {
     event: EVENTS.winter2015,
@@ -1346,9 +1489,6 @@ let weapon = {
     notes: t('weaponSpecialWinter2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Warrior: {
     event: EVENTS.winter2015,
@@ -1357,9 +1497,6 @@ let weapon = {
     notes: t('weaponSpecialWinter2015WarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Mage: {
     event: EVENTS.winter2015,
@@ -1370,9 +1507,6 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
-    canBuy: () => {
-      return true;
-    },
   },
   winter2015Healer: {
     event: EVENTS.winter2015,
@@ -1381,9 +1515,6 @@ let weapon = {
     notes: t('weaponSpecialWinter2015HealerNotes', { int: 9 }),
     value: 90,
     int: 9,
-    canBuy: () => {
-      return true;
-    },
   },
   spring2015Rogue: {
     event: EVENTS.spring2015,
@@ -1392,6 +1523,9 @@ let weapon = {
     notes: t('weaponSpecialSpring2015RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Warrior: {
     event: EVENTS.spring2015,
@@ -1400,6 +1534,9 @@ let weapon = {
     notes: t('weaponSpecialSpring2015WarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Mage: {
     event: EVENTS.spring2015,
@@ -1410,6 +1547,9 @@ let weapon = {
     value: 160,
     int: 15,
     per: 7,
+    canBuy: () => {
+      return true;
+    },
   },
   spring2015Healer: {
     event: EVENTS.spring2015,
@@ -1418,6 +1558,9 @@ let weapon = {
     notes: t('weaponSpecialSpring2015HealerNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => {
+      return true;
+    },
   },
   summer2015Rogue: {
     event: EVENTS.summer2015,
@@ -1521,6 +1664,40 @@ let weapon = {
     value: 90,
     int: 9,
   },
+  spring2016Rogue: {
+    event: EVENTS.spring2016,
+    specialClass: 'rogue',
+    text: t('weaponSpecialSpring2016RogueText'),
+    notes: t('weaponSpecialSpring2016RogueNotes', { str: 8 }),
+    value: 80,
+    str: 8,
+  },
+  spring2016Warrior: {
+    event: EVENTS.spring2016,
+    specialClass: 'warrior',
+    text: t('weaponSpecialSpring2016WarriorText'),
+    notes: t('weaponSpecialSpring2016WarriorNotes', { str: 15 }),
+    value: 90,
+    str: 15,
+  },
+  spring2016Mage: {
+    event: EVENTS.spring2016,
+    specialClass: 'wizard',
+    twoHanded: true,
+    text: t('weaponSpecialSpring2016MageText'),
+    notes: t('weaponSpecialSpring2016MageNotes', { int: 15, per: 7 }),
+    value: 160,
+    int: 15,
+    per: 7,
+  },
+  spring2016Healer: {
+    event: EVENTS.spring2016,
+    specialClass: 'healer',
+    text: t('weaponSpecialSpring2016HealerText'),
+    notes: t('weaponSpecialSpring2016HealerNotes', { int: 9 }),
+    value: 90,
+    int: 9,
+  },
 };
 
 let specialSet = {
diff --git a/common/script/content/index.js b/common/script/content/index.js
index d5b8af6305..cdf7ba96c0 100644
--- a/common/script/content/index.js
+++ b/common/script/content/index.js
@@ -1287,7 +1287,7 @@ api.quests = {
     completion: t('questEggHuntCompletion'),
     value: 1,
     canBuy: (function() {
-      return false;
+      return true;
     }),
     category: 'pet',
     collect: {
diff --git a/debug-scripts/_helper.js b/debug-scripts/_helper.js
new file mode 100644
index 0000000000..2055e251a5
--- /dev/null
+++ b/debug-scripts/_helper.js
@@ -0,0 +1,19 @@
+import { MongoClient as mongo } from 'mongodb';
+import config from '../config';
+
+module.exports.updateUser = (_id, path, value) => {
+  mongo.connect(config.NODE_DB_URI, (err, db) => {
+    if (err) throw err;
+
+    let collection = db.collection('users');
+    collection.updateOne(
+      { _id },
+      { $set: { [`${path}`]: value } },
+      (updateErr, result) => {
+        if (updateErr) throw updateErr;
+        console.log('done updating', _id);
+        db.close();
+      }
+    );
+  });
+}
diff --git a/debug-scripts/grant-all-equipment.js b/debug-scripts/grant-all-equipment.js
new file mode 100644
index 0000000000..905abce4e7
--- /dev/null
+++ b/debug-scripts/grant-all-equipment.js
@@ -0,0 +1,24 @@
+'use strict';
+
+require('babel-register');
+
+let _ = require('lodash');
+let updateUser = require('./_helper').updateUser;
+
+let userId = process.argv[2];
+
+if (!userId) {
+  console.error('USAGE: node debug-scripts/grant-all-equipment.js <user_id>');
+  console.error('EFFECT: Adds all gear to specified user');
+  return;
+}
+
+let gearFlat = require('../common').content.gear.flat;
+
+let userGear = {};
+
+_.each(gearFlat, (piece, key) => {
+  userGear[key] = true;
+});
+
+updateUser(userId, 'items.gear.owned', userGear);
diff --git a/debug-scripts/grant-all-mounts.js b/debug-scripts/grant-all-mounts.js
new file mode 100644
index 0000000000..1e23446b37
--- /dev/null
+++ b/debug-scripts/grant-all-mounts.js
@@ -0,0 +1,28 @@
+'use strict';
+
+require('babel-register');
+
+let _ = require('lodash');
+let updateUser = require('./_helper').updateUser;
+let userId = process.argv[2];
+
+if (!userId) {
+  console.error('USAGE: node debug-scripts/grant-all-mounts.js <user_id>');
+  console.error('EFFECT: Adds all mounts to specified user');
+  return;
+}
+
+let dropMounts = require('../common').content.mounts;
+let questMounts = require('../common').content.questMounts;
+let specialMounts = require('../common').content.specialMounts;
+let premiumMounts = require('../common').content.premiumPets; // premium mounts isn't exposed on the content object
+
+let userMounts = {};
+
+_.each([ dropMounts, questMounts, specialMounts, premiumMounts ], (set) => {
+  _.each(set, (pet, key) => {
+    userMounts[key] = true;
+  });
+})
+
+updateUser(userId, 'items.mounts', userMounts);
diff --git a/debug-scripts/grant-all-pets.js b/debug-scripts/grant-all-pets.js
new file mode 100644
index 0000000000..2cec573a5e
--- /dev/null
+++ b/debug-scripts/grant-all-pets.js
@@ -0,0 +1,28 @@
+'use strict';
+
+require('babel-register');
+
+let _ = require('lodash');
+let updateUser = require('./_helper').updateUser;
+let userId = process.argv[2];
+
+if (!userId) {
+  console.error('USAGE: node debug-scripts/grant-all-pets.js <user_id>');
+  console.error('EFFECT: Adds all pets to specified user');
+  return;
+}
+
+let dropPets = require('../common').content.pets;
+let questPets = require('../common').content.questPets;
+let specialPets = require('../common').content.specialPets;
+let premiumPets = require('../common').content.premiumPets;
+
+let userPets = {};
+
+_.each([ dropPets, questPets, specialPets, premiumPets ], (set) => {
+  _.each(set, (pet, key) => {
+    userPets[key] = 95;
+  });
+})
+
+updateUser(userId, 'items.pets', userPets);
diff --git a/package.json b/package.json
index 99e0bbfb03..7f95d19954 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "gulp-babel": "^6.1.2",
     "gulp-eslint": "^1.0.0",
     "gulp-grunt": "^0.5.2",
-    "gulp-imagemin": "^2.3.0",
+    "gulp-imagemin": "^2.4.0",
     "gulp-nodemon": "^2.0.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-uglify": "^1.4.2",
diff --git a/test/content/gear.js b/test/content/gear.js
index 1e6a80ffe9..a3d0e95917 100644
--- a/test/content/gear.js
+++ b/test/content/gear.js
@@ -13,7 +13,7 @@ describe('Gear', () => {
       each(piece, (items, klass) => {
         context(`${klass} ${gearType}s`, () => {
           it('have a value of at least 0 for each stat', () => {
-            each(items, (gear, itemKey) => {
+            each(items, (gear) => {
               expect(gear.con).to.be.at.least(0);
               expect(gear.int).to.be.at.least(0);
               expect(gear.per).to.be.at.least(0);
@@ -22,23 +22,29 @@ describe('Gear', () => {
           });
 
           it('have a purchase value of at least 0', () => {
-            each(items, (gear, itemKey) => {
+            each(items, (gear) => {
               expect(gear.value).to.be.at.least(0);
             });
           });
 
           it('has a canBuy function', () => {
-            each(items, (gear, itemKey) => {
+            each(items, (gear) => {
               expect(gear.canBuy).to.be.a('function');
             });
           });
 
           it('have valid translation strings for text and notes', () => {
-            each(items, (gear, itemKey) => {
+            each(items, (gear) => {
               expectValidTranslationString(gear.text);
               expectValidTranslationString(gear.notes);
             });
           });
+
+          it('has a set attribue', () => {
+            each(items, (gear) => {
+              expect(gear.set).to.exist;
+            });
+          });
         });
       });
     });
diff --git a/test/spec/controllers/partyCtrlSpec.js b/test/spec/controllers/partyCtrlSpec.js
index 092072988d..92401f1987 100644
--- a/test/spec/controllers/partyCtrlSpec.js
+++ b/test/spec/controllers/partyCtrlSpec.js
@@ -8,7 +8,8 @@ describe("Party Controller", function() {
     user._id = "unique-user-id";
     User = {
       user: user,
-      sync: sandbox.spy
+      sync: sandbox.spy(),
+      set: sandbox.spy()
     }
 
     module(function($provide) {
@@ -33,6 +34,108 @@ describe("Party Controller", function() {
     });
   });
 
+  describe('initialization', function() {
+    function initializeControllerWithStubbedState() {
+      inject(function(_$state_) {
+        var state = _$state_;
+        sandbox.stub(state, 'is').returns(true);
+        $controller('PartyCtrl', { $scope: scope, $state: state });
+        expect(state.is).to.be.calledOnce; // ensure initialization worked as desired
+      });
+    };
+
+    beforeEach(function() {
+      sandbox.stub(rootScope, 'openModal');
+    });
+
+    context('party has 1 member', function() {
+      it('awards no new achievements', function() {
+        sandbox.stub(groups, 'party').returns({
+          $syncParty: function() {},
+          memberCount: 1
+        });
+
+        initializeControllerWithStubbedState();
+
+        expect(User.set).to.not.be.called;
+        expect(rootScope.openModal).to.not.be.called;
+      });
+    });
+
+    context('party has 2 members', function() {
+      context('user does not have "Party Up" achievement', function() {
+        it('awards "Party Up" achievement', function() {
+          sandbox.stub(groups, 'party').returns({
+            $syncParty: function() {},
+            memberCount: 2
+          });
+
+          initializeControllerWithStubbedState();
+
+          expect(User.set).to.be.calledOnce;
+          expect(User.set).to.be.calledWith(
+            { 'achievements.partyUp': true }
+          );
+          expect(rootScope.openModal).to.be.calledOnce;
+          expect(rootScope.openModal).to.be.calledWith('achievements/partyUp');
+        });
+      });
+    });
+
+    context('party has 4 members', function() {
+      beforeEach(function() {
+        sandbox.stub(groups, 'party').returns({
+          $syncParty: function() {},
+          memberCount: 4
+        });
+      });
+
+      context('user has "Party Up" but not "Party On" achievement', function() {
+        it('awards "Party On" achievement', function() {
+          user.achievements.partyUp = true;
+
+          initializeControllerWithStubbedState();
+
+          expect(User.set).to.be.calledOnce;
+          expect(User.set).to.be.calledWith(
+            { 'achievements.partyOn': true }
+          );
+          expect(rootScope.openModal).to.be.calledOnce;
+          expect(rootScope.openModal).to.be.calledWith('achievements/partyOn');
+        });
+      });
+
+      context('user has neither "Party Up" nor "Party On" achievements', function() {
+        it('awards "Party Up" and "Party On" achievements', function() {
+          initializeControllerWithStubbedState();
+
+          expect(User.set).to.be.calledTwice;
+          expect(User.set).to.be.calledWith(
+            { 'achievements.partyUp': true}
+          );
+          expect(User.set).to.be.calledWith(
+            { 'achievements.partyOn': true}
+          );
+          expect(rootScope.openModal).to.be.calledTwice;
+          expect(rootScope.openModal).to.be.calledWith('achievements/partyUp');
+          expect(rootScope.openModal).to.be.calledWith('achievements/partyOn');
+        });
+      });
+
+      context('user has both "Party Up" and "Party On" achievements', function() {
+        it('awards no new achievements', function() {
+          user.achievements.partyUp = true;
+          user.achievements.partyOn = true;
+
+          initializeControllerWithStubbedState();
+
+          expect(User.set).to.not.be.called;
+          expect(rootScope.openModal).to.not.be.called;
+        });
+      });
+    });
+  });
+
   describe('questAccept', function() {
     beforeEach(function() {
       scope.group = {
diff --git a/test/spec/controllers/sortableInventoryCtrlSpec.js b/test/spec/controllers/sortableInventoryCtrlSpec.js
new file mode 100644
index 0000000000..bcbf35be1a
--- /dev/null
+++ b/test/spec/controllers/sortableInventoryCtrlSpec.js
@@ -0,0 +1,41 @@
+describe('Sortable Inventory Controller', () => {
+  let scope;
+
+  beforeEach(inject(($rootScope, $controller) => {
+    scope = $rootScope.$new();
+    $controller('SortableInventoryController', {$scope: scope});
+  }));
+
+  it('defaults scope.order to set', () => {
+    expect(scope.order).to.eql('set')
+  });
+
+  describe('#setOrder', () => {
+    it('sets sort criteria for all standard attributes', () =>{
+      let oldOrder = scope.order;
+
+      let attrs = [
+        'constitution',
+        'intelligence',
+        'perception',
+        'strength',
+        'set'
+      ];
+
+      attrs.forEach((attribute) => {
+        scope.setOrder(attribute);
+        expect(scope.order).to.exist;
+        expect(scope.order).to.not.eql(oldOrder);
+        oldOrder = scope.order;
+      });
+    });
+
+    it('does nothing when missing sort criteria', () =>{
+      scope.order = null;
+
+      scope.setOrder('foooo');
+
+      expect(scope.order).to.not.exist;
+    });
+  });
+});
diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js
index 89ccd46a72..80c80bf3d4 100644
--- a/website/public/js/controllers/inventoryCtrl.js
+++ b/website/public/js/controllers/inventoryCtrl.js
@@ -216,7 +216,7 @@ habitrpg.controller("InventoryCtrl",
       var questArray = _.toArray(Content.quests);
 
       var filteredArray = _.filter(questArray, function(q){
-        return q.key.indexOf('evilsanta') !== -1;
+        return q.key === ('egg');
       });
 
       return filteredArray;
diff --git a/website/public/js/controllers/partyCtrl.js b/website/public/js/controllers/partyCtrl.js
index ea0f3fa8bd..6494679911 100644
--- a/website/public/js/controllers/partyCtrl.js
+++ b/website/public/js/controllers/partyCtrl.js
@@ -2,6 +2,9 @@
 
 habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social',
     function($rootScope,$scope,Groups,Chat,User,Challenges,$state,$compile,Analytics,Quests,Social) {
+
+      var user = User.user;
+
       $scope.type = 'party';
       $scope.text = window.env.t('party');
       $scope.group = $rootScope.party = Groups.party();
@@ -11,6 +14,20 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
 
       if ($state.is('options.social.party')) {
         $scope.group.$syncParty(); // Sync party automatically when navigating to party page
+
+        // Checks if user's party has reached 2 players for the first time.
+        if(!user.achievements.partyUp
+            && $scope.group.memberCount >= 2) {
+          User.set({'achievements.partyUp':true});
+          $rootScope.openModal('achievements/partyUp', {controller:'UserCtrl', size:'sm'});
+        }
+
+        // Checks if user's party has reached 4 players for the first time.
+        if(!user.achievements.partyOn
+            && $scope.group.memberCount >= 4) {
+          User.set({'achievements.partyOn':true});
+          $rootScope.openModal('achievements/partyOn', {controller:'UserCtrl', size:'sm'});
+        }
       }
 
       Chat.seenMessage($scope.group._id);
diff --git a/website/public/js/controllers/sortableInventoryCtrl.js b/website/public/js/controllers/sortableInventoryCtrl.js
new file mode 100644
index 0000000000..73cea5b560
--- /dev/null
+++ b/website/public/js/controllers/sortableInventoryCtrl.js
@@ -0,0 +1,20 @@
+habitrpg.controller('SortableInventoryController', ['$scope',
+  function ($scope) {
+    var attributeSort = {
+      constitution: ['-con', '-(con+int+per+str)'],
+      intelligence: ['-int', '-(con+int+per+str)'],
+      perception: ['-per', '-(con+int+per+str)'],
+      strength: ['-str', '-(con+int+per+str)'],
+      set: 'set'
+    }
+
+    $scope.setOrder = function (order) {
+      $scope.orderChoice = order;
+      if (order in attributeSort) {
+        $scope.order = attributeSort[order];
+      }
+    };
+
+    $scope.orderChoice = 'set';
+    $scope.setOrder($scope.orderChoice);
+}]);
diff --git a/website/public/manifest.json b/website/public/manifest.json
index accb695df3..c4d107c03e 100644
--- a/website/public/manifest.json
+++ b/website/public/manifest.json
@@ -91,6 +91,7 @@
             "js/controllers/partyCtrl.js",
             "js/controllers/rootCtrl.js",
             "js/controllers/settingsCtrl.js",
+            "js/controllers/sortableInventoryCtrl.js",
             "js/controllers/tavernCtrl.js",
             "js/controllers/tasksCtrl.js",
             "js/controllers/userCtrl.js"
diff --git a/website/src/controllers/api-v2/groups.js b/website/src/controllers/api-v2/groups.js
index a298d420df..ca36c24199 100644
--- a/website/src/controllers/api-v2/groups.js
+++ b/website/src/controllers/api-v2/groups.js
@@ -907,7 +907,7 @@ api.questAccept = function(req, res, next) {
   var user = res.locals.user;
   var key = req.query.key;
 
-  if (!group) return res.json(400, {err: "Must be in a party to start quests."});
+  if (!group || group.type !== 'party') return res.json(400, {err: "Must be in a party to start quests."});
 
   // If ?key=xxx is provided, we're starting a new quest and inviting the party. Otherwise, we're a party member accepting the invitation
   if (key) {
diff --git a/website/src/models/user.js b/website/src/models/user.js
index b3c141e3f7..bd45c2a7c2 100644
--- a/website/src/models/user.js
+++ b/website/src/models/user.js
@@ -85,6 +85,8 @@ export let schema = new Schema({
     thankyou: Number,
     costumeContests: Number,
     birthday: Number,
+    partyUp: Boolean,
+    partyOn: Boolean,
   },
 
   backer: {
diff --git a/website/views/options/inventory/equipment.jade b/website/views/options/inventory/equipment.jade
index 8d77a25a8b..f2d11be6da 100644
--- a/website/views/options/inventory/equipment.jade
+++ b/website/views/options/inventory/equipment.jade
@@ -1,10 +1,36 @@
+mixin orderByButton
+  mixin choice(attr)
+    li(ng-class="{ 'active': orderChoice === '#{attr}' }")
+      a(ng-click="setOrder('#{attr}')")=env.t(attr)
+
+  .btn-group
+    button.btn.btn-default.dropdown-toggle(type='button', data-toggle='dropdown')
+      | {{env.t("orderBy", { item: env.t(orderChoice) })}} #[span.caret]
+    ul.dropdown-menu
+      - each attr in ["set"]
+        +choice(attr)
+      li.divider(role="separator")
+      - each attr in ["constitution", "intelligence", "perception", "strength"]
+        +choice(attr)
+
+mixin equipmentList(type)
+  menu.pets-menu(label='{{::label}}', ng-show='gear[klass]',
+    ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("armoireText")}')
+    div(ng-repeat='item in gear[klass] | orderBy: order')
+      button.customize-option(class='shop_{{::item.key}}',
+        ng-class='{selectableInventory: user.items.gear.#{type}[item.type] == item.key}',
+        ng-click='equip(item.key, "#{type}")',
+        popover='{{::item.notes()}}', popover-title='{{::item.text()}}',
+        popover-trigger='mouseenter', popover-placement='right',
+        popover-append-to-body='true')
+
 .container-fluid
   .row
-    .col-md-6.border-right
+    .col-md-6.border-right(ng-controller="SortableInventoryController")
       h3.equipment-title.hint(popover-trigger='mouseenter',
         popover-placement='right', popover-append-to-body='true',
         popover=env.t('battleGearText'))=env.t('battleGear')
-      
+
       .checkbox.equipment-title
         label
           input(type="checkbox", ng-model="user.preferences.autoEquip",
@@ -12,21 +38,15 @@
           | &nbsp;
           =env.t('autoEquipBattleGear')
 
-      div
-        button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}
+      .btn-toolbar
+        .btn-group
+          button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}
+        +orderByButton
 
       li.customize-menu.inventory-gear
-        menu.pets-menu(label='{{::label}}', ng-show='gear[klass]',
-          ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("armoireText")}')
-          div(ng-repeat='item in gear[klass]')
-            button.customize-option(, class='shop_{{::item.key}}',
-              ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}',
-              ng-click='equip(item.key, "equipped")',
-              popover='{{::item.notes()}}', popover-title='{{::item.text()}}',
-              popover-trigger='mouseenter', popover-placement='right',
-              popover-append-to-body='true')
+        +equipmentList("equipped")
 
-    .col-md-6
+    .col-md-6(ng-controller="SortableInventoryController")
       h3.equipment-title.hint(popover-trigger='mouseenter',
         popover-placement='right', popover-append-to-body='true',
         popover=env.t('costumeText'))=env.t('costume')
@@ -38,9 +58,11 @@
           | &nbsp;
           =env.t('useCostume')
 
-      div
-        button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}}
-        button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}}
+      .btn-toolbar
+        .btn-group
+          button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}}
+          button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}}
+        +orderByButton
 
       li.customize-menu(ng-if='!user.preferences.costume')
         .well.use-costume-info
@@ -49,12 +71,4 @@
           p: a(ng-click='showUseCostumeInfo = !showUseCostumeInfo') {{!showUseCostumeInfo ? env.t('showMoreMore') : env.t('showMoreLess')}}
 
       li.customize-menu(ng-if='user.preferences.costume')
-        menu.pets-menu(label='{{::label}}', ng-show='gear[klass]',
-          ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("armoireText")}')
-          div(ng-repeat='item in gear[klass]')
-            button.customize-option(class='shop_{{::item.key}}',
-              ng-class='{selectableInventory: user.items.gear.costume[item.type] == item.key}',
-              ng-click='equip(item.key, "costume")',
-              popover='{{::item.notes()}}', popover-title='{{::item.text()}}',
-              popover-trigger='mouseenter', popover-placement='right',
-              popover-append-to-body='true')
+        +equipmentList("costume")
diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade
index a3ca8d6c77..b0e89faa5b 100644
--- a/website/views/options/inventory/seasonal-shop.jade
+++ b/website/views/options/inventory/seasonal-shop.jade
@@ -1,17 +1,26 @@
 .container-fluid
   .stable.row: .col-xs-12
-    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_closed'}").pull-left-sm.col-centered
+    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered
     .popover.static-popover.fade.right.in.pull-left-sm.col-centered
       .arrow.hidden-xs
-      h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
+      h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
       .popover-content
-        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
-        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
+        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopText')
+        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopText')
 
-  // .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
+  .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
 
-  // li.customize-menu.inventory-gear
-    menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{yeti:env.t("yetiSet"), candycane:env.t("candycaneSet"), snowflake:env.t("snowflakeSet"), ski:env.t("skiSet"), winter2015Warrior:env.t("gingerbreadSet"), winter2015Mage:env.t("northMageSet"), winter2015Healer:env.t("soothingSkaterSet"), winter2015Rogue:env.t("icicleDrakeSet")}')
+  li.customize-menu.inventory-gear
+    menu.pets-menu(label=env.t('quests'))
+      div(ng-repeat='quest in ::getSeasonalShopQuests()')
+        button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"'
+          data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}",
+          popover-append-to-body='true', popover-title='{{::quest.text()}}',
+          popover-trigger='mouseenter', popover-placement='right',
+          ng-click='buyQuest(quest.key)')
+        p {{::quest.value}}&nbsp;
+          span.Pet_Currency_Gem1x.inline-gems
+    menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{springWarrior:env.t("mightyBunnySet"), springMage:env.t("magicMouseSet"), springHealer:env.t("lovingPupSet"), springRogue:env.t("stealthyKittySet"), spring2015Warrior:env.t("bewareDogSet"), spring2015Mage:env.t("magicianBunnySet"), spring2015Healer:env.t("comfortingKittySet"), spring2015Rogue:env.t("sneakySqueakerSet")}')
       div(ng-repeat='item in ::getSeasonalShopArray(set)',
         ng-class="{transparent: user.items.gear.owned[item.key] !== undefined}")
         button.customize-option(class='shop_{{::item.key}}',
@@ -22,17 +31,7 @@
         div
           | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}&nbsp;
           span.Pet_Currency_Gem1x.inline-gems
-
-    menu.pets-menu(label=env.t('quests'))
-      div(ng-repeat='quest in ::getSeasonalShopQuests()')
-        button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"'
-          data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}",
-          popover-append-to-body='true', popover-title='{{::quest.text()}}',
-          popover-trigger='mouseenter', popover-placement='right',
-          ng-click='buyQuest(quest.key)')
-        p {{::quest.value}}&nbsp;
-          span.Pet_Currency_Gem1x.inline-gems
-    menu.pets-menu(label=env.t('seasonalItems'))
+    // menu.pets-menu(label=env.t('seasonalItems'))
       div
         button.customize-option(class='inventory_special_snowball',
           popover='{{::Content.spells.special.snowball.notes()}}',
diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade
index 30eea7a748..004b054aec 100644
--- a/website/views/options/profile.jade
+++ b/website/views/options/profile.jade
@@ -207,13 +207,7 @@ mixin profileStats
                       span.glyphicon.glyphicon-download
                       |&nbsp;
                       =env.t('distributePoints')
-            each statInfo, stat in { str: {title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop'},int: {title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop'},con: {title:"allocateCon",popover:'conText',allocatepop:'allocateConPop'},per: {title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop'} }
-              tr
-                td
-                  span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover))
-                    =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}'
-                td
-                  a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")', popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) +
+            +statAllocation
 
 
       div(ng-class='user.flags.classSelected && !user.preferences.disableClasses ? "col-md-4" : "col-md-6"')
diff --git a/website/views/shared/mixins.jade b/website/views/shared/mixins.jade
index e977416c11..442e1ab5e9 100644
--- a/website/views/shared/mixins.jade
+++ b/website/views/shared/mixins.jade
@@ -33,3 +33,21 @@ mixin ownedQuests(popoverAppend, popoverPlacement)
             popover-append-to-body='#{popoverAppend}',
             popover-placement='#{popoverPlacement}')
               .badge.badge-info.stack-count {{points}}
+
+mixin statAllocation
+  -
+    var stats = {
+      str: { title:"allocateStr",popover:'strengthText',allocatepop:'allocateStrPop' },
+      int: { title:"allocateInt",popover:'intText',allocatepop:'allocateIntPop' },
+      con: { title:"allocateCon",popover:'conText',allocatepop:'allocateConPop' },
+      per: { title:"allocatePer",popover:'perText',allocatepop:'allocatePerPop' }
+    }
+
+  each statInfo, stat in stats
+    tr
+      td
+        span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.popover))
+          =env.t(statInfo.title) + ' {{user.stats.' + stat + '}}'
+      td
+        a.btn.btn-primary(ng-show='user.stats.points', ng-click='allocate("#{stat}")',
+          popover-trigger='mouseenter', popover-placement='right', popover=env.t(statInfo.allocatepop)) +
diff --git a/website/views/shared/modals/achievements.jade b/website/views/shared/modals/achievements.jade
index fdb7c02e1a..6f03746a07 100644
--- a/website/views/shared/modals/achievements.jade
+++ b/website/views/shared/modals/achievements.jade
@@ -83,7 +83,6 @@ script(id='modals/achievements/beastMaster.html', type='text/ng-template')
       button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
     +achievementFooter
 
-
 // Mount Master
 script(id='modals/achievements/mountMaster.html', type='text/ng-template')
   .modal-content(style='min-width:28em')
@@ -132,3 +131,25 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template')
       br
       button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
     +achievementFooter
+
+// Party Up
+script(id='modals/achievements/partyUp.html', type='text/ng-template')
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalAchievement')
+      +achievementAvatar('partyUp',0)
+      p=env.t('partyUpAchievement')
+      br
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+    +achievementFooter
+
+// Party On
+script(id='modals/achievements/partyOn.html', type='text/ng-template')
+  .modal-content(style='min-width:28em')
+    .modal-body.text-center
+      h3(style='margin-bottom:0')=env.t('modalAchievement')
+      +achievementAvatar('partyOn',0)
+      p=env.t('partyOnAchievement')
+      br
+      button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
+    +achievementFooter
diff --git a/website/views/shared/modals/level-up.jade b/website/views/shared/modals/level-up.jade
index 6e9df29439..2b1d44ebe9 100644
--- a/website/views/shared/modals/level-up.jade
+++ b/website/views/shared/modals/level-up.jade
@@ -16,6 +16,22 @@ script(type='text/ng-template', id='modals/levelUp.html')
       h4(style='margin-top: 1em')!=env.t('leveledUp', {level:'{{user.stats.lvl}}'})
       p=env.t('fullyHealed')
       br
+      div(ng-if='user.flags.classSelected && !user.preferences.disableClasses && !user.preferences.automaticAllocation')
+        a.btn.btn-default(ng-click='statsAllocationBoxIsOpen = !statsAllocationBoxIsOpen',
+          data-toggle='collapse', data-target='#stat-allocation', aria-expanded=false, aria-controls='stat-allocation')
+          | {{statsAllocationBoxIsOpen  ? env.t('hideQuickAllocation') : env.t('showQuickAllocation')}}
+        p &nbsp;
+        .collapse#stat-allocation
+          table.table.text-left
+            tr
+              td
+                p(ng-if='::user.stats.lvl >= 100')!=env.t('noMoreAllocate')
+                p(ng-if='user.stats.points || user.stats.lvl < 100')
+                  strong.inline
+                    | {{user.stats.points}}&nbsp;
+                  strong.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('quickAllocationLevelPopover'))=env.t('unallocated')
+              td
+            +statAllocation
       button.btn.btn-primary(ng-click='$close()')=env.t('huzzah')
       .checkbox
         label(style='display:inline-block')=env.t('dontShowAgain')
diff --git a/website/views/shared/modals/won-challenge.jade b/website/views/shared/modals/won-challenge.jade
index b10625d7d7..a8bbc0d8b1 100644
--- a/website/views/shared/modals/won-challenge.jade
+++ b/website/views/shared/modals/won-challenge.jade
@@ -5,7 +5,7 @@ script(type='text/ng-template', id='modals/wonChallenge.html')
   .modal-content(style='min-width:28em')
     .modal-body.text-center
       h3(style='margin-bottom: 0')=env.t('wonChallenge')
-      h4 {{::user.achievements.challenges[user.achievements.challenges.length - 1]}}
+      h4: markdown(text='::user.achievements.challenges[user.achievements.challenges.length - 1]')
       .container-fluid
         .row(style='margin-bottom:1em', ng-controller='UserCtrl')
           .col-xs-4(style='padding:0')
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index b61a997b6b..faa2508b48 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,32 +1,132 @@
-h2 3/9/2016 - SNAIL PET QUEST AND MOBILE CHALLENGE WINNERS. PLUS, SPRING PLOT-LINE BEGINS!
+h2 3/18/2016 - SPRING FLING BEGINS! LIMITED EDITION EQUIPMENT, SEASONAL SHOP OPENS, AND SPRING MYSTERY PLOT CONTINUES
   hr
   tr
     td
-      span.Mount_Body_Snail-Base.pull-right
-        span.Mount_Head_Snail-Base.pull-right(style='margin:0')
-      h3 Snail Pet Quest
-      p We've released a new Pet Quest: <a href='/#/options/inventory/quests'>The Snail of Drudgery Sludge</a>! Habiticans everywhere are bogged down by unimportant tasks. Can you wash away the slime? If so, you'll earn some Snail Eggs!
-      p.small.muted by Lemoness and SabreCat
-      p.small.muted Art by Overomega, Pfeffernusse, and Misceo
-      p.small.muted Writing by Maz Wendling
+      .promo_spring_classes_2016.pull-right
+      h3 Limited Edition Class Outfits 
+      p From now until April 30th, limited edition outfits are available in the Rewards column! Depending on your class, you can be a Springing Bunny, Clever Dog, Grand Malkin, or Brave Mouse. You'd better get productive to earn enough Gold before your time runs out...
+      p.small.muted by PainterProphet and Balduranne
   tr
     td
-      h3 Mobile Challenge Winners
-      p Congratulations to the winners of the Mobile App Challenges: J, Janče Skalkova, studentSeekingDiscipline, Felipe Marinelli Affonso, compl, Yuri Augusto, Ewe Pacheco, Narmence, Ryan_carter, and candieb! Thanks to everyone who participated. We hope that you're enjoying the apps!
-      p.small.muted by Lemoness
+      .promo_egg_mounts.pull-right
+      h3 Seasonal Shop Opens
+      p The <a href='/#/options/inventory/seasonalshop'>Seasonal Shop</a> has opened! It's stocking springtime Seasonal Edition goodies at the moment, including past spring outfits and the Egg Quest scroll. Everything there will be available to purchase during the Spring Fling event each year, but it's only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!
   tr
     td
-      h3 Spring Plot-line Begins
-      p A large crowd has gathered in Productivity Plaza, just outside of the Tavern. Curious, you press forward and see people peering through a telescope, which is pointed at a strange, sparkling cloud on the horizon.
+      h3 Spring Plot Continues: The Floating City of Mistiflying
+      p As the Spring Fling celebrations begin, a sparkling cloud descends from the sky to reveal… the floating city of Mistiflying!
       br
-      p Unfortunately, it turns out that the line to look through the telescope is about an hour long! Who has that kind of time when there are tasks to conquer? Oh well. Whatever it is, you’ll probably hear all about it soon...
-      p.small.muted by Lemoness
+      p Mistiflying is a flower-filled city that drifts in the clouds above Habitica, manufacturing custom rewards and raining them down on deserving Habiticans. It’s brimming with friendly, magical bees that work hard to keep the blossoms healthy and the city floating, and there’s a festive humming in the air. Looks like we’ll get a chance for plenty of parties this month! We’ve even received a visit from Mistiflying’s somewhat erratic ruler: the April Fool, a masterful rogue with a penchant for fun and an interest in illusions.
+  tr
+    td
+      .npc_aprilFool.pull-right
+      h3 Spring Plot-Line Continues: The April Fool
+      p The April Fool swishes his cape over his shoulders, striding through the mists into Habit City. “Lemoness! Redphoenix! SabreCat! My dearest and most delightful friends!” He sweeps out his arms in a striking pose, and several firework displays go off behind him. “Oho, look at your faces! It’s like you aren’t even happy to see me.”
+      br
+      p Lemoness does, in fact, seem less than thrilled. “It’s just… the last time you were here, I was kidnapped by a mutant flower uprising."
+      br
+      p “Really! Did I cause that?”
+      br
+      p Redphoenix smolders. “Two years ago, you turned me into an eggplant.”
+      br
+      p “An honest misunderstanding, I am sure. But it did only last a single day!”
+      The April Fool links his arm with SabreCat and gives the tracker a winning smile. “Which reminds me – Sabe, I can crash in your guest cottage again this month, right? No hard feelings about the Mammoth Ballet incident?”
+      br
+      p SabreCat lets out a strangled growl, and Lemoness hastily pulls the April Fool out of claw range.
+      br
+      p “You’re here for a whole month?” Redphoenix says. "What, did Lady Glaciate banish you from the Stoïkalm Steppes again?"
+      br
+      p The April Fool seems affronted at the suggestion. "Rumors, hearsay, and probably lies! Still, Habit City may temporarily be a more hospitable place to hover over. For entirely unrelated reasons, you understand."
+      br
+      p Lemoness rubs her temples.“Even so. It's not that we don’t... appreciate your yearly creativity, but we’re in the middle of the Spring Fling festivities. It’s a very busy time!!”
+      br
+      p He taps her affectionately on the nose. “Nothing to fear, my citrusy dear! Believe me, you won’t even notice I’m here.”
+      br
+      p Then he claps his hands, and a marching band starts up.
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 3/17/2016 - MAJOR iOS AND ANDROID APP UPDATES!
+    tr
+      td
+        h3 iOS App Updates: Task Reminders, Guilds, and More!
+        p We've released an update for our <a href='https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8' target='_blank'>iOS app</a>! This is a big one, so be sure to download it now.
+        ul
+          li Set TASK REMINDERS for individual tasks that send you notifications when it's time to get things done! Just tap on a task to add or edit a reminder.
+          li Join or visit GUILDS directly from the apps to discuss your favorite productivity tips, share your hobbies, and more!
+          li +1 IN CHATS! Let a user know that you liked their post by tapping the new +1 button! Go wild with power.
+          li We've also fixed lots of bugs, including header and FAQ scrolling!
+        p When we release a new iOS update, it hides all of our old reviews, so if you like the direction we're going, please consider reviewing this new version. It really helps us out! And if you have any questions or concerns, don't hesitate to email <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a> so we can respond. Thanks, and enjoy!
+    tr
+      td
+        h3 Android App Updates: Guilds, Equipment, and More!
+        p We've also released a bunch of new features for <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica' target='_blank'>our Android app</a>! Grab it now to check out all the cool stuff.
+        ul
+          li Join or visit GUILDS directly from the apps to discuss your favorite productivity tips, share your hobbies, and more!
+          li Now you can equip and view EQUIPMENT right from the app!
+          li EMOJI AND MARKDOWN are now supported in chat messages.
+          li Accept or reject QUEST INVITES right from the app! Happy battling.
+        p As always, if you're enjoying our Android app and want to help us out, please consider leaving us a review! It really means a lot to us. If you have questions or feedback, be sure to <a href='mailto:mobile@habitica.com' target='_blank'>email mobile@habitica.com</a> so it doesn't get lost!
+    tr
+      td
+        h3 Want to Contribute?
+        p Habitica is an open-source project, which means that anyone can contribute! If you're interested in helping us improve the app while earning gems and special armor, check out our Github for <a href='https://github.com/HabitRPG/habitrpg-ios' target='_blank'>iOS</a> and <a href='https://github.com/HabitRPG/habitrpg-android' target='_blank'>Android</a>. We can't wait to see what you'll contribute!
+  h2 3/15/2016 - NEW PARTY ACHIEVEMENT BADGES AND SPRING MYSTERY PLOT CONTINUES!
+    tr
+      td
+        .achievement-partyUp2x.pull-left.slight-right-margin
+        .achievement-partyOn2x.pull-right
+        h3 New Party Achievements
+        p There are two brand-new badges that you can earn by being in a party with your friends: the Party Up badge, for those in parties of 2 or more, and the Party On badge, for those in parties of 4 or more.
+        br
+        p Parties are a great way to stay accountable to your tasks. To earn these badges, invite your friends or <a href='/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'>post in the Party Wanted Guild</a> on the website to join an existing group. If you're already in a party with others, simply visit <a href='/#/options/groups/party'>the Party page</a> to claim the badges! Enjoy!
+        p.small.muted by khipkin and Lemoness
+    tr
+      td
+        h3 Spring Mystery Plot Continues
+        p A huge, glittering cloud has been slowly drifting towards Habitica, and gossip in the streets is running wild.
+        br
+        p “I think I saw an explosion of colored lights, like fireworks!”
+        br
+        p “Do you hear that distant humming sound?”
+        br
+        p “There’s a sweet scent on the breeze, for sure.”
+        br
+        p As you stop in the Tavern on a work break, you overhear Lemoness, Redphoenix, and SabreCat murmuring to each other.
+        br
+        p “It’s definitely him,” Lemoness whispers. “I sent my dragon on a stealth flight to check.”
+        br
+        p Redphoenix taps a finger against her cup of tea. “Why is he so early? Even for him, this is... unexpected.”
+        br
+        p “You don’t think he’s planning to stay in Habit City, do you?” SabreCat asks as his tiger cowers under his chair. “My pets still haven’t recovered.”
+        br
+        p Lemoness mournfully flops forward onto the table. “I don’t know... but something tells me that we’re in for an unusual Spring Fling celebration.”
+        p.small.muted by Lemoness
+  h2 3/9/2016 - SNAIL PET QUEST AND MOBILE CHALLENGE WINNERS. PLUS, SPRING PLOT-LINE BEGINS!
+    tr
+      td
+        span.Mount_Body_Snail-Base.pull-right
+          span.Mount_Head_Snail-Base.pull-right(style='margin:0')
+        h3 Snail Pet Quest
+        p We've released a new Pet Quest: <a href='/#/options/inventory/quests'>The Snail of Drudgery Sludge</a>! Habiticans everywhere are bogged down by unimportant tasks. Can you wash away the slime? If so, you'll earn some Snail Eggs!
+        p.small.muted by Lemoness and SabreCat
+        p.small.muted Art by Overomega, Pfeffernusse, and Misceo
+        p.small.muted Writing by Maz Wendling
+    tr
+      td
+        h3 Mobile Challenge Winners
+        p Congratulations to the winners of the Mobile App Challenges: J, Janče Skalkova, studentSeekingDiscipline, Felipe Marinelli Affonso, compl, Yuri Augusto, Ewe Pacheco, Narmence, Ryan_carter, and candieb! Thanks to everyone who participated. We hope that you're enjoying the apps!
+        p.small.muted by Lemoness
+    tr
+      td
+        h3 Spring Plot-line Begins
+        p A large crowd has gathered in Productivity Plaza, just outside of the Tavern. Curious, you press forward and see people peering through a telescope, which is pointed at a strange, sparkling cloud on the horizon.
+        br
+        p Unfortunately, it turns out that the line to look through the telescope is about an hour long! Who has that kind of time when there are tasks to conquer? Oh well. Whatever it is, you’ll probably hear all about it soon...
+        p.small.muted by Lemoness
   h2 3/1/2016 - MARCH BACKGROUNDS AND ARMOIRE ITEMS REVEALED! PLUS, WEB DESIGNER NEEDED AND MARCH MYSTERY BOX
     tr
       td
diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade
index e149dd26a6..53f741c918 100644
--- a/website/views/shared/profiles/achievements.jade
+++ b/website/views/shared/profiles/achievements.jade
@@ -87,6 +87,20 @@ div(ng-if='(user._id == profile._id) || #{ultimateGearCheck}')
           =env.t('warrior')
   hr
 
+div(ng-if='::profile.achievements.partyUp || user._id == profile._id')
+  .achievement.achievement-partyUp(ng-if='::profile.achievements.partyUp')
+  div(ng-class='::{muted: !profile.achievements.partyUp}')
+    h5=env.t('partyUpName')
+    small=env.t('partyUpAchievement')
+  hr
+
+div(ng-if='::profile.achievements.partyOn || user._id == profile._id')
+  .achievement.achievement-partyOn(ng-if='::profile.achievements.partyOn')
+  div(ng-class='::{muted: !profile.achievements.partyOn}')
+    h5=env.t('partyOnName')
+    small=env.t('partyOnAchievement')
+  hr
+
 div(ng-if='::profile.achievements.beastMaster || user._id == profile._id')
   .achievement.achievement-rat(ng-if='::profile.achievements.beastMaster')
   div(ng-class='::{muted: !profile.achievements.beastMaster}')
@@ -149,7 +163,7 @@ div(ng-if='::profile.achievements.challenges.length || user._id == profile._id')
     h5=env.t('challengeWinner')
     table.table.table-striped
       tr(ng-repeat='chal in profile.achievements.challenges track by $index')
-        td {{::chal}}
+        td: markdown(text='::chal')
   hr
 
 div(ng-if='::profile.achievements.quests || user._id == profile._id')