diff --git a/website/assets/sprites/spritesmith_large/promo/promo_bundle_feathered.png b/website/assets/sprites/spritesmith_large/promo/promo_bundle_feathered.png
new file mode 100644
index 0000000000..1f21bd0416
Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_bundle_feathered.png differ
diff --git a/website/views/shared/modals/classes.jade b/website/views/shared/modals/classes.jade
index cab3645448..754d6f31f0 100644
--- a/website/views/shared/modals/classes.jade
+++ b/website/views/shared/modals/classes.jade
@@ -9,61 +9,57 @@ script(type='text/ng-template', id='modals/chooseClass.html')
figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
- span(class='{{user.preferences.size}}_armor_special_spring2017Warrior')
+ span(class='{{user.preferences.size}}_armor_warrior_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
- span(class='head_special_spring2017Warrior')
- span(class='headAccessory_special_spring2017Warrior')
- span(class='shield_special_spring2017Warrior')
- span(class='weapon_special_spring2017Warrior')
+ span(class='head_warrior_5')
+ span(class='shield_warrior_5')
+ span(class='weapon_warrior_6')
.col-md-3(ng-click='selectedClass = "wizard"')
h5!=env.t('mageWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
- span(class='{{user.preferences.size}}_armor_special_spring2017Mage')
+ span(class='{{user.preferences.size}}_armor_wizard_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
- span(class='head_special_spring2017Mage')
- span(class='headAccessory_special_spring2017Mage')
- span(class='shield_special_spring2017Mage')
- span(class='weapon_special_spring2017Mage')
+ span(class='head_wizard_5')
+ span(class='shield_wizard_5')
+ span(class='weapon_wizard_6')
.col-md-3(ng-click='selectedClass = "rogue"')
h5!=env.t('rogueWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
- span(class='{{user.preferences.size}}_armor_special_spring2017Rogue')
+ span(class='{{user.preferences.size}}_armor_rogue_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
- span(class='head_special_spring2017Rogue')
- span(class='headAccessory_special_spring2017Rogue')
- span(class='shield_special_spring2017Rogue')
- span(class='weapon_special_spring2017Rogue')
+ span(class='head_rogue_5')
+ span(class='shield_rogue_6')
+ span(class='weapon_rogue_6')
.col-md-3(ng-click='selectedClass = "healer"')
h5!=env.t('healerWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}')
.character-sprites
span(class='skin_{{user.preferences.skin}}')
- span(class='{{user.preferences.size}}_armor_special_spring2017Healer')
+ span(class='{{user.preferences.size}}_armor_healer_5')
span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
- span(class='head_special_spring2017Healer')
- span(class='headAccessory_special_spring2017Healer')
- span(class='shield_special_spring2017Healer')
- span(class='weapon_special_spring2017Healer')
+ span(class='head_healer_5')
+ span(class='shield_healer_5')
+ span(class='weapon_healer_6')
br
.well(ng-show='selectedClass=="warrior"')=env.t('warriorText')
.well(ng-show='selectedClass=="wizard"')=env.t('mageText')
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index 28db4ebf79..be28cb59e4 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,31 +1,46 @@
-h2 5/11/2017 - BLOG BONANZA: USE CASES, WIKI, AND BEHIND THE SCENES
+h2 5/18/2017 - DISCOUNTED QUEST BUNDLE AND LAST CHANCE FOR FAIRY POTIONS
+ .promo_bundle_feathered.pull-right
hr
tr
td
- .scene_arts_crafts.pull-right
- h3 Use Case Spotlight: Arts & Crafts
- p This month's Use Case Spotlight is about Arts and Crafts! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be working on creative projects!
- br
- p Plus, we're collecting user submissions for the next spotlight! How do you use Habitica to manage outdoor activities and hobbies? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog at the start of next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!
- p.small.muted by Beffymaroo
+ h3 New Discounted Pet Quest Bundle: Feathered Friends
+ p If you're a fan of bird pets and mounts, you're in luck! From now until May 31, you can purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today!
+ p.small.muted by Lemoness and SabreCat
+ p.small.muted Art by Casey, Teto Forever, Eevachu, UncommonCriminal, JonArinbjorn, Trogdorina, Onheiron, Squish
+ p.small.muted Writing by Lemoness, Token, and Bartelmy
tr
td
- .scene_todos.pull-left.slight-right-margin
- h3 Featured Wiki Article: Sample To-Dos
- p This month's featured Wiki article is about Sample To-Dos! We hope that it will help you as you set up or re-evaluate your Tasks page. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.
- .scene_meditation.pull-right
- p.small.muted by Beffymaroo and the Wiki Wizards
- tr
- td
- h3 Behind the Scenes: Meditation in 60 Seconds
- p It's Mental Health Awareness Month, and one technique that many folks find helpful in managing stress is meditation. In this month's Behind the Scenes blog post, Habitica's own redphoenix shares her tips for establishing your own meditation practice!
- p.small.muted by redphoenix
+ .Pet-LionCub-Fairy.pull-left.slight-right-margin
+ h3 Last Chance for Fairy Hatching Potions
+ p Reminder: this is the final day to buy Fairy Hatching Potions! If they come back, it won't be until next year at the earliest, so don't delay!
+ p.small.muted by Edge
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h2 5/11/2017 - BLOG BONANZA: USE CASES, WIKI, AND BEHIND THE SCENES
+ tr
+ td
+ .scene_arts_crafts.pull-right
+ h3 Use Case Spotlight: Arts & Crafts
+ p This month's Use Case Spotlight is about Arts and Crafts! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be working on creative projects!
+ br
+ p Plus, we're collecting user submissions for the next spotlight! How do you use Habitica to manage outdoor activities and hobbies? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog at the start of next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!
+ p.small.muted by Beffymaroo
+ tr
+ td
+ .scene_todos.pull-left.slight-right-margin
+ h3 Featured Wiki Article: Sample To-Dos
+ p This month's featured Wiki article is about Sample To-Dos! We hope that it will help you as you set up or re-evaluate your Tasks page. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.
+ .scene_meditation.pull-right
+ p.small.muted by Beffymaroo and the Wiki Wizards
+ tr
+ td
+ h3 Behind the Scenes: Meditation in 60 Seconds
+ p It's Mental Health Awareness Month, and one technique that many folks find helpful in managing stress is meditation. In this month's Behind the Scenes blog post, Habitica's own redphoenix shares her tips for establishing your own meditation practice!
+ p.small.muted by redphoenix
h2 5/9/2017 - GROUP PLAN MANAGERS, SWEARWORD BLOCKING, AND SPAM PREVENTION
tr
td