diff --git a/website/assets/img/project_files/npcs/regular/just_head.png b/website/assets/img/project_files/npcs/regular/npc_justin_head.png
similarity index 100%
rename from website/assets/img/project_files/npcs/regular/just_head.png
rename to website/assets/img/project_files/npcs/regular/npc_justin_head.png
diff --git a/website/assets/img/project_files/npcs/regular/npc_matt_blonde.png b/website/assets/img/project_files/npcs/regular/npc_matt_blonde.png
deleted file mode 100644
index c32af92c28..0000000000
Binary files a/website/assets/img/project_files/npcs/regular/npc_matt_blonde.png and /dev/null differ
diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-0.css b/website/assets/sprites/dist/spritesmith-largeSprites-0.css
index 7c15eb86d4..4a90971c90 100644
--- a/website/assets/sprites/dist/spritesmith-largeSprites-0.css
+++ b/website/assets/sprites/dist/spritesmith-largeSprites-0.css
@@ -1,30 +1,30 @@
 .promo_android {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1377px -151px;
+  background-position: -1699px -180px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -1157px -573px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1157px -573px;
+  background-position: -1299px -573px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -442px;
+  background-position: -875px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -281px -525px;
+  background-position: -734px -442px;
   width: 140px;
   height: 441px;
 }
@@ -54,19 +54,19 @@
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
+  background-position: -452px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -442px;
+  background-position: -593px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -900px;
+  background-position: -1699px -954px;
   width: 150px;
   height: 150px;
 }
@@ -78,13 +78,13 @@
 }
 .promo_chairs_glasses {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1805px -176px;
+  background-position: -1805px -532px;
   width: 51px;
   height: 210px;
 }
 .promo_checkin_incentives {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1299px -573px;
+  background-position: -306px -220px;
   width: 141px;
   height: 294px;
 }
@@ -106,33 +106,39 @@
   width: 103px;
   height: 348px;
 }
+.promo_coffee_mug {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -1699px 0px;
+  width: 200px;
+  height: 179px;
+}
 .promo_contrib_spotlight_beffymaroo {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -644px;
+  background-position: -1558px -940px;
   width: 114px;
   height: 147px;
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -661px;
+  background-position: -875px -972px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1438px -868px;
+  background-position: -734px -975px;
   width: 87px;
   height: 109px;
 }
 .promo_cow {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -281px -525px;
   width: 140px;
   height: 441px;
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -930px -1627px;
+  background-position: -1479px -1627px;
   width: 90px;
   height: 90px;
 }
@@ -156,13 +162,13 @@
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1506px -1461px;
+  background-position: -1377px -151px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -748px -1627px;
+  background-position: -933px -1627px;
   width: 90px;
   height: 90px;
 }
@@ -174,13 +180,13 @@
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -384px -1627px;
+  background-position: -1661px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -176px;
+  background-position: -1699px -532px;
   width: 105px;
   height: 273px;
 }
@@ -192,7 +198,7 @@
 }
 .promo_habitica {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px 0px;
+  background-position: -1699px -356px;
   width: 175px;
   height: 175px;
 }
@@ -204,13 +210,13 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px 0px;
+  background-position: -875px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -1087px;
+  background-position: -1428px -392px;
   width: 100px;
   height: 137px;
 }
@@ -222,121 +228,121 @@
 }
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -839px -1627px;
+  background-position: -751px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -884px;
+  background-position: 0px -1719px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -968px -884px;
+  background-position: -1857px -669px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1470px -1210px;
+  background-position: -1629px -1235px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -475px -1627px;
+  background-position: -1388px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1174px -1114px;
+  background-position: -1441px -793px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -293px -1627px;
+  background-position: -478px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1499px -498px;
+  background-position: -1857px -602px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1819px -1347px;
+  background-position: -1850px -954px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1021px -1627px;
+  background-position: -842px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -566px -1627px;
+  background-position: -1206px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1637px -1313px;
+  background-position: -1174px -1114px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -657px -1627px;
+  background-position: -569px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1819px -1411px;
+  background-position: -1857px -532px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -988px;
+  background-position: -593px -988px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -981px;
+  background-position: -1543px -1313px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1294px -1627px;
+  background-position: -1297px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -884px;
+  background-position: -293px -1627px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1385px -1627px;
+  background-position: -1115px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1813px -1495px;
+  background-position: -1470px -1210px;
   width: 60px;
   height: 81px;
 }
@@ -348,61 +354,61 @@
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1567px -1627px;
+  background-position: -1570px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1112px -1627px;
+  background-position: -387px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -975px;
+  background-position: -199px -1627px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1476px -1627px;
+  background-position: -660px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -884px;
+  background-position: -452px -884px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1203px -1627px;
+  background-position: -1024px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1543px -1313px;
+  background-position: -1600px -1461px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -199px -1627px;
+  background-position: -1506px -1461px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1658px -1627px;
+  background-position: -1477px -242px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -990px;
+  background-position: -452px -990px;
   width: 90px;
   height: 99px;
 }
@@ -414,19 +420,19 @@
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -442px;
+  background-position: -452px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1428px -392px;
+  background-position: -1441px -687px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1377px -327px;
+  background-position: -1699px -1555px;
   width: 115px;
   height: 47px;
 }
@@ -444,31 +450,31 @@
 }
 .promo_peppermint_flame {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1051px;
+  background-position: -1558px -644px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1199px;
+  background-position: -1699px -1407px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1724px -1214px;
+  background-position: -1724px -1422px;
   width: 60px;
   height: 60px;
 }
 .promo_pyromancer {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1495px;
+  background-position: -1441px -573px;
   width: 113px;
   height: 113px;
 }
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -884px;
+  background-position: -593px -884px;
   width: 92px;
   height: 103px;
 }
@@ -522,19 +528,19 @@
 }
 .promo_staff_spotlight_Lemoness {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -792px;
+  background-position: -1558px -1088px;
   width: 102px;
   height: 146px;
 }
 .promo_staff_spotlight_Viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1347px;
+  background-position: -1558px -792px;
   width: 119px;
   height: 147px;
 }
 .promo_staff_spotlight_paglias {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -939px;
+  background-position: -1377px -242px;
   width: 99px;
   height: 147px;
 }
@@ -558,37 +564,37 @@
 }
 .promo_takeThis_gear {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -1225px;
+  background-position: -1438px -868px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -573px;
+  background-position: -875px -884px;
   width: 114px;
   height: 87px;
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -442px;
+  background-position: -593px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1805px -387px;
+  background-position: -1805px -743px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1428px -498px;
+  background-position: -1558px -1235px;
   width: 70px;
   height: 74px;
 }
 .promo_updos {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -450px;
+  background-position: -1699px -806px;
   width: 156px;
   height: 147px;
 }
@@ -624,7 +630,7 @@
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -773px;
+  background-position: -734px -884px;
   width: 108px;
   height: 90px;
 }
@@ -636,13 +642,13 @@
 }
 .scene_coding {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -749px;
+  background-position: -1699px -1105px;
   width: 150px;
   height: 150px;
 }
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -598px;
+  background-position: -1699px -1256px;
   width: 150px;
   height: 150px;
 }
diff --git a/website/assets/sprites/dist/spritesmith-largeSprites-0.png b/website/assets/sprites/dist/spritesmith-largeSprites-0.png
index 3d86b98e31..e10543b736 100644
Binary files a/website/assets/sprites/dist/spritesmith-largeSprites-0.png and b/website/assets/sprites/dist/spritesmith-largeSprites-0.png differ
diff --git a/website/assets/sprites/dist/spritesmith-main-7.css b/website/assets/sprites/dist/spritesmith-main-7.css
index da78f80358..3372f93235 100644
--- a/website/assets/sprites/dist/spritesmith-main-7.css
+++ b/website/assets/sprites/dist/spritesmith-main-7.css
@@ -42,25 +42,25 @@
 }
 .Pet_Currency_Gem1x {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1782px -816px;
+  background-position: -1782px -776px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -816px;
+  background-position: -1751px -776px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1428px -1619px;
+  background-position: -1376px -1619px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1376px -1619px;
+  background-position: -1428px -1619px;
   width: 51px;
   height: 51px;
 }
@@ -108,55 +108,55 @@
 }
 .inventory_present {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -260px;
+  background-position: -1751px -364px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_01 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1480px -1619px;
+  background-position: -1751px -208px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_02 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -208px;
+  background-position: -1751px -156px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_03 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -156px;
+  background-position: -1751px -104px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_04 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -104px;
+  background-position: -1751px -52px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_05 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -52px;
+  background-position: -1751px 0px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_06 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px 0px;
+  background-position: -1676px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_07 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1676px -1619px;
+  background-position: -1627px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_08 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1627px -1619px;
+  background-position: -1578px -1619px;
   width: 48px;
   height: 51px;
 }
@@ -168,55 +168,55 @@
 }
 .inventory_present_10 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1529px -1619px;
+  background-position: -1751px -468px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_11 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -468px;
+  background-position: -1751px -416px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_12 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -364px;
+  background-position: -1751px -260px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1578px -1619px;
+  background-position: -1480px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_locked {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -312px;
+  background-position: -1529px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_birthday {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1208px -1619px;
+  background-position: -1655px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_fortify {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1655px -1520px;
+  background-position: -1597px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_greeting {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1597px -1520px;
+  background-position: -1539px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_nye {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1539px -1520px;
+  background-position: -1481px -1520px;
   width: 57px;
   height: 54px;
 }
@@ -228,37 +228,37 @@
 }
 .inventory_special_seafoam {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1423px -1520px;
+  background-position: -1365px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_shinySeed {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1481px -1520px;
+  background-position: -1249px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_snowball {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1249px -1520px;
+  background-position: -1191px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_spookySparkles {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1191px -1520px;
+  background-position: -1133px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_thankyou {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1133px -1520px;
+  background-position: -1208px -1619px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_trinket {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -416px;
+  background-position: -1751px -312px;
   width: 48px;
   height: 51px;
 }
@@ -276,7 +276,7 @@
 }
 .pet_key {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1365px -1520px;
+  background-position: -1423px -1520px;
   width: 57px;
   height: 54px;
 }
@@ -354,9 +354,9 @@
 }
 .npc_justin_head {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -776px;
+  background-position: -1712px -175px;
   width: 36px;
-  height: 39px;
+  height: 96px;
 }
 .npc_matt {
   background-image: url(/static/sprites/spritesmith-main-7.png);
diff --git a/website/assets/sprites/dist/spritesmith-main-7.png b/website/assets/sprites/dist/spritesmith-main-7.png
index 806852f6a1..4ba6daeec7 100644
Binary files a/website/assets/sprites/dist/spritesmith-main-7.png and b/website/assets/sprites/dist/spritesmith-main-7.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_alex.png b/website/assets/sprites/spritesmith/npcs/npc_alex.png
index 684e5d8510..67b7476d33 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_alex.png and b/website/assets/sprites/spritesmith/npcs/npc_alex.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_bailey.png b/website/assets/sprites/spritesmith/npcs/npc_bailey.png
index 8959c8f667..d5940b986b 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_bailey.png and b/website/assets/sprites/spritesmith/npcs/npc_bailey.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_daniel.png b/website/assets/sprites/spritesmith/npcs/npc_daniel.png
index 591efcb171..fa1df767d2 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_daniel.png and b/website/assets/sprites/spritesmith/npcs/npc_daniel.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_ian.gif b/website/assets/sprites/spritesmith/npcs/npc_ian.gif
new file mode 100644
index 0000000000..f536976ed4
Binary files /dev/null and b/website/assets/sprites/spritesmith/npcs/npc_ian.gif differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_justin.png b/website/assets/sprites/spritesmith/npcs/npc_justin.png
index 08cb56f206..08ba7025c2 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_justin.png and b/website/assets/sprites/spritesmith/npcs/npc_justin.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_justin_head.png b/website/assets/sprites/spritesmith/npcs/npc_justin_head.png
index 1c8ee99b5b..cdd2b03224 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_justin_head.png and b/website/assets/sprites/spritesmith/npcs/npc_justin_head.png differ
diff --git a/website/assets/sprites/spritesmith/npcs/npc_matt.png b/website/assets/sprites/spritesmith/npcs/npc_matt.png
index ef720ee718..2531f1084b 100644
Binary files a/website/assets/sprites/spritesmith/npcs/npc_matt.png and b/website/assets/sprites/spritesmith/npcs/npc_matt.png differ
diff --git a/website/assets/sprites/spritesmith_large/promo/promo_coffee_mug.png b/website/assets/sprites/spritesmith_large/promo/promo_coffee_mug.png
new file mode 100644
index 0000000000..1c52678f26
Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_coffee_mug.png differ
diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
index 7c15eb86d4..4a90971c90 100644
--- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,30 +1,30 @@
 .promo_android {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1377px -151px;
+  background-position: -1699px -180px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -1157px -573px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1157px -573px;
+  background-position: -1299px -573px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -442px;
+  background-position: -875px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -281px -525px;
+  background-position: -734px -442px;
   width: 140px;
   height: 441px;
 }
@@ -54,19 +54,19 @@
 }
 .promo_backgrounds_armoire_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
+  background-position: -452px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -442px;
+  background-position: -593px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backtoschool {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -900px;
+  background-position: -1699px -954px;
   width: 150px;
   height: 150px;
 }
@@ -78,13 +78,13 @@
 }
 .promo_chairs_glasses {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1805px -176px;
+  background-position: -1805px -532px;
   width: 51px;
   height: 210px;
 }
 .promo_checkin_incentives {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1299px -573px;
+  background-position: -306px -220px;
   width: 141px;
   height: 294px;
 }
@@ -106,33 +106,39 @@
   width: 103px;
   height: 348px;
 }
+.promo_coffee_mug {
+  background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
+  background-position: -1699px 0px;
+  width: 200px;
+  height: 179px;
+}
 .promo_contrib_spotlight_beffymaroo {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -644px;
+  background-position: -1558px -940px;
   width: 114px;
   height: 147px;
 }
 .promo_contrib_spotlight_blade {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -661px;
+  background-position: -875px -972px;
   width: 89px;
   height: 111px;
 }
 .promo_contrib_spotlight_cantras {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1438px -868px;
+  background-position: -734px -975px;
   width: 87px;
   height: 109px;
 }
 .promo_cow {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -281px -525px;
   width: 140px;
   height: 441px;
 }
 .promo_dilatoryDistress {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -930px -1627px;
+  background-position: -1479px -1627px;
   width: 90px;
   height: 90px;
 }
@@ -156,13 +162,13 @@
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1506px -1461px;
+  background-position: -1377px -151px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -748px -1627px;
+  background-position: -933px -1627px;
   width: 90px;
   height: 90px;
 }
@@ -174,13 +180,13 @@
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -384px -1627px;
+  background-position: -1661px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -176px;
+  background-position: -1699px -532px;
   width: 105px;
   height: 273px;
 }
@@ -192,7 +198,7 @@
 }
 .promo_habitica {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px 0px;
+  background-position: -1699px -356px;
   width: 175px;
   height: 175px;
 }
@@ -204,13 +210,13 @@
 }
 .promo_habitoween_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px 0px;
+  background-position: -875px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_haunted_hair {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -1087px;
+  background-position: -1428px -392px;
   width: 100px;
   height: 137px;
 }
@@ -222,121 +228,121 @@
 }
 .promo_mystery_201405 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -839px -1627px;
+  background-position: -751px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -884px;
+  background-position: 0px -1719px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -968px -884px;
+  background-position: -1857px -669px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1470px -1210px;
+  background-position: -1629px -1235px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -475px -1627px;
+  background-position: -1388px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1174px -1114px;
+  background-position: -1441px -793px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -293px -1627px;
+  background-position: -478px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1499px -498px;
+  background-position: -1857px -602px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1819px -1347px;
+  background-position: -1850px -954px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1021px -1627px;
+  background-position: -842px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -566px -1627px;
+  background-position: -1206px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1637px -1313px;
+  background-position: -1174px -1114px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -657px -1627px;
+  background-position: -569px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1819px -1411px;
+  background-position: -1857px -532px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -988px;
+  background-position: -593px -988px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -593px -981px;
+  background-position: -1543px -1313px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1294px -1627px;
+  background-position: -1297px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -884px;
+  background-position: -293px -1627px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1385px -1627px;
+  background-position: -1115px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1813px -1495px;
+  background-position: -1470px -1210px;
   width: 60px;
   height: 81px;
 }
@@ -348,61 +354,61 @@
 }
 .promo_mystery_201602 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1567px -1627px;
+  background-position: -1570px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1112px -1627px;
+  background-position: -387px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -975px;
+  background-position: -199px -1627px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1476px -1627px;
+  background-position: -660px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -884px;
+  background-position: -452px -884px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201607 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1203px -1627px;
+  background-position: -1024px -1627px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201608 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1543px -1313px;
+  background-position: -1600px -1461px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201609 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -199px -1627px;
+  background-position: -1506px -1461px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201610 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1658px -1627px;
+  background-position: -1477px -242px;
   width: 63px;
   height: 84px;
 }
 .promo_mystery_201611 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -734px -990px;
+  background-position: -452px -990px;
   width: 90px;
   height: 99px;
 }
@@ -414,19 +420,19 @@
 }
 .promo_new_hair_fall2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -452px -442px;
+  background-position: -452px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_orca {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1428px -392px;
+  background-position: -1441px -687px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1377px -327px;
+  background-position: -1699px -1555px;
   width: 115px;
   height: 47px;
 }
@@ -444,31 +450,31 @@
 }
 .promo_peppermint_flame {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1051px;
+  background-position: -1558px -644px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1199px;
+  background-position: -1699px -1407px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1724px -1214px;
+  background-position: -1724px -1422px;
   width: 60px;
   height: 60px;
 }
 .promo_pyromancer {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1495px;
+  background-position: -1441px -573px;
   width: 113px;
   height: 113px;
 }
 .promo_rainbow_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -884px;
+  background-position: -593px -884px;
   width: 92px;
   height: 103px;
 }
@@ -522,19 +528,19 @@
 }
 .promo_staff_spotlight_Lemoness {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -792px;
+  background-position: -1558px -1088px;
   width: 102px;
   height: 146px;
 }
 .promo_staff_spotlight_Viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -1347px;
+  background-position: -1558px -792px;
   width: 119px;
   height: 147px;
 }
 .promo_staff_spotlight_paglias {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -939px;
+  background-position: -1377px -242px;
   width: 99px;
   height: 147px;
 }
@@ -558,37 +564,37 @@
 }
 .promo_takeThis_gear {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1558px -1225px;
+  background-position: -1438px -868px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -573px;
+  background-position: -875px -884px;
   width: 114px;
   height: 87px;
 }
 .promo_turkey_day_2016 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -875px -442px;
+  background-position: -593px -442px;
   width: 140px;
   height: 441px;
 }
 .promo_unconventional_armor {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1805px -387px;
+  background-position: -1805px -743px;
   width: 60px;
   height: 60px;
 }
 .promo_unconventional_armor2 {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1428px -498px;
+  background-position: -1558px -1235px;
   width: 70px;
   height: 74px;
 }
 .promo_updos {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -450px;
+  background-position: -1699px -806px;
   width: 156px;
   height: 147px;
 }
@@ -624,7 +630,7 @@
 }
 .npc_viirus {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1441px -773px;
+  background-position: -734px -884px;
   width: 108px;
   height: 90px;
 }
@@ -636,13 +642,13 @@
 }
 .scene_coding {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -749px;
+  background-position: -1699px -1105px;
   width: 150px;
   height: 150px;
 }
 .scene_phone_peek {
   background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
-  background-position: -1699px -598px;
+  background-position: -1699px -1256px;
   width: 150px;
   height: 150px;
 }
diff --git a/website/client/assets/css/sprites/spritesmith-main-7.css b/website/client/assets/css/sprites/spritesmith-main-7.css
index da78f80358..3372f93235 100644
--- a/website/client/assets/css/sprites/spritesmith-main-7.css
+++ b/website/client/assets/css/sprites/spritesmith-main-7.css
@@ -42,25 +42,25 @@
 }
 .Pet_Currency_Gem1x {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1782px -816px;
+  background-position: -1782px -776px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -816px;
+  background-position: -1751px -776px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1428px -1619px;
+  background-position: -1376px -1619px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1376px -1619px;
+  background-position: -1428px -1619px;
   width: 51px;
   height: 51px;
 }
@@ -108,55 +108,55 @@
 }
 .inventory_present {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -260px;
+  background-position: -1751px -364px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_01 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1480px -1619px;
+  background-position: -1751px -208px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_02 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -208px;
+  background-position: -1751px -156px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_03 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -156px;
+  background-position: -1751px -104px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_04 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -104px;
+  background-position: -1751px -52px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_05 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -52px;
+  background-position: -1751px 0px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_06 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px 0px;
+  background-position: -1676px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_07 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1676px -1619px;
+  background-position: -1627px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_08 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1627px -1619px;
+  background-position: -1578px -1619px;
   width: 48px;
   height: 51px;
 }
@@ -168,55 +168,55 @@
 }
 .inventory_present_10 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1529px -1619px;
+  background-position: -1751px -468px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_11 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -468px;
+  background-position: -1751px -416px;
   width: 48px;
   height: 51px;
 }
 .inventory_present_12 {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -364px;
+  background-position: -1751px -260px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1578px -1619px;
+  background-position: -1480px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_quest_scroll_locked {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -312px;
+  background-position: -1529px -1619px;
   width: 48px;
   height: 51px;
 }
 .inventory_special_birthday {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1208px -1619px;
+  background-position: -1655px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_fortify {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1655px -1520px;
+  background-position: -1597px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_greeting {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1597px -1520px;
+  background-position: -1539px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_nye {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1539px -1520px;
+  background-position: -1481px -1520px;
   width: 57px;
   height: 54px;
 }
@@ -228,37 +228,37 @@
 }
 .inventory_special_seafoam {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1423px -1520px;
+  background-position: -1365px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_shinySeed {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1481px -1520px;
+  background-position: -1249px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_snowball {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1249px -1520px;
+  background-position: -1191px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_spookySparkles {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1191px -1520px;
+  background-position: -1133px -1520px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_thankyou {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1133px -1520px;
+  background-position: -1208px -1619px;
   width: 57px;
   height: 54px;
 }
 .inventory_special_trinket {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -416px;
+  background-position: -1751px -312px;
   width: 48px;
   height: 51px;
 }
@@ -276,7 +276,7 @@
 }
 .pet_key {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1365px -1520px;
+  background-position: -1423px -1520px;
   width: 57px;
   height: 54px;
 }
@@ -354,9 +354,9 @@
 }
 .npc_justin_head {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1751px -776px;
+  background-position: -1712px -175px;
   width: 36px;
-  height: 39px;
+  height: 96px;
 }
 .npc_matt {
   background-image: url(/static/sprites/spritesmith-main-7.png);
diff --git a/website/static/sprites/spritesmith-largeSprites-0.png b/website/static/sprites/spritesmith-largeSprites-0.png
index 3d86b98e31..e10543b736 100644
Binary files a/website/static/sprites/spritesmith-largeSprites-0.png and b/website/static/sprites/spritesmith-largeSprites-0.png differ
diff --git a/website/static/sprites/spritesmith-main-7.png b/website/static/sprites/spritesmith-main-7.png
index 806852f6a1..4ba6daeec7 100644
Binary files a/website/static/sprites/spritesmith-main-7.png and b/website/static/sprites/spritesmith-main-7.png differ
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index 0dd42b906c..bafaa3536b 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,28 +1,43 @@
-h2 11/23/2016 - DAILY CHECK-IN INCENTIVES, AND HABITICA T-SHIRTS AND MUGS
+h2 11/24/2016 - LAST CHANCE FOR NOVEMBER SUBSCRIBER ITEMS, AND HABITICA T-SHIRTS AND MUGS REMINDER
   hr
   tr
     td
-      .promo_checkin_incentives.pull-right
-      h3 Daily Check-in Incentives
-      p We're introducing an exciting new feature! Now every day that you check in to Habitica, your check-in counter will go up, and you'll start earning periodic prizes to reward you for your dedication to improving your life. These prizes will include special quest scrolls, exclusive magic hatching potions, unique equipment, and more!
+      .promo_mystery_201611.pull-right
+      h3 Last Chance for Cornucopia Set
+      p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Cornucopia Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!
       br
-      p Unlike streaks, your check-in counter never resets. It only goes up! You can learn more about check-in incentives by reading <a href='http://habitica.wikia.com/wiki/Daily_Check-In_Incentives' target='_blank'>this Wiki page</a>.
-      p.small.muted by Lemoness, SabreCat, TheHollidayInn, and paglias
-      p.small.muted Art by Inventrix, Onheiron, Starsystemic, icefelis, Gully, nonight, iamholding6, Eevachu, Balduranne, louiselouise1, Beffymaroo, and Lemoness
-      p.small.muted Writing by sephydark, ajehy, and Lemoness
+      p Thanks so much for your support! You help keep Habitica running.
+      p.small.muted by Lemoness
   tr
     td
-      h3 Habitica T-Shirts and Mugs
-      p We're running another Teespring campaign!
-      br
-      p In addition to our <a href='https://teespring.com/stores/habitica' target='_blank'>Habitica T-shirts</a>, we're now selling <a href='https://teespring.com/habitica-gryphon-mug#pid=522&cid=101870&sid=front' target='_blank'>Habitica Mugs</a>! This Teespring campaign will only run until December 13th, so be sure to snap them up now before they're gone. Thanks for supporting Habitica!
-      p.small.muted by Redphoenix and Sara Olson
+      .promo_coffee_mug.pull-left.slight-right-margin
+      h3 Habitica T-Shirt and Mug Reminder
+      p In case you missed it, Habitica is currently running <a href='https://teespring.com/stores/habitica' target='_blank'>a Teespring campaign</a> to sell Habitica T-shirts and mugs! It's only running until December 13th, so if you want to buy one, be sure to act fast. Thanks for supporting Habitica!
+      p.small.muted by redphoenix and Sara Olson
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 11/23/2016 - DAILY CHECK-IN INCENTIVES, AND HABITICA T-SHIRTS AND MUGS
+    tr
+      td
+        .promo_checkin_incentives.pull-right
+        h3 Daily Check-in Incentives
+        p We're introducing an exciting new feature! Now every day that you check in to Habitica, your check-in counter will go up, and you'll start earning periodic prizes to reward you for your dedication to improving your life. These prizes will include special quest scrolls, exclusive magic hatching potions, unique equipment, and more!
+        br
+        p Unlike streaks, your check-in counter never resets. It only goes up! You can learn more about check-in incentives by reading <a href='http://habitica.wikia.com/wiki/Daily_Check-In_Incentives' target='_blank'>this Wiki page</a>.
+        p.small.muted by Lemoness, SabreCat, TheHollidayInn, and paglias
+        p.small.muted Art by Inventrix, Onheiron, Starsystemic, icefelis, Gully, nonight, iamholding6, Eevachu, Balduranne, louiselouise1, Beffymaroo, and Lemoness
+        p.small.muted Writing by sephydark, ajehy, and Lemoness
+    tr
+      td
+        h3 Habitica T-Shirts and Mugs
+        p We're running another Teespring campaign!
+        br
+        p In addition to our <a href='https://teespring.com/stores/habitica' target='_blank'>Habitica T-shirts</a>, we're now selling <a href='https://teespring.com/habitica-gryphon-mug#pid=522&cid=101870&sid=front' target='_blank'>Habitica Mugs</a>! This Teespring campaign will only run until December 13th, so be sure to snap them up now before they're gone. Thanks for supporting Habitica!
+        p.small.muted by Redphoenix and Sara Olson
   h2 11/22/2016 - HABITICA THANKSGIVING, TURKEY PETS, AND CORNUCOPIA ITEM SETS
     .promo_turkey_day_2016.pull-right
     tr