diff --git a/website/client/assets/scss/animals.scss b/website/client/assets/scss/animals.scss
index 7db7ba1c04..a75f6dcb17 100644
--- a/website/client/assets/scss/animals.scss
+++ b/website/client/assets/scss/animals.scss
@@ -5,14 +5,15 @@
   right: 0;
   bottom: 0;
   left: 0;
-  top: -28px !important;
+
+  &:not([class*="FlyingPig"]) {
+    top: -28px !important;
+  }
 }
 
-/*
 .Pet[class*="FlyingPig"] {
   top: 7px !important;
 }
-*/
 
 .Pet.Pet-Dragon-Hydra {
   top: -16px !important;
diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss
index 7329fa7c66..68b5c4ae28 100644
--- a/website/client/assets/scss/variables.scss
+++ b/website/client/assets/scss/variables.scss
@@ -1,9 +1,9 @@
 // this variables are used to determine which shop npc/backgrounds should be loaded
-// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, aprilfools, summer
+// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'aprilfools';
-$npc_quests_flavor: 'aprilfools';
-$npc_seasonal_flavor: 'aprilfools';
-$npc_timetravelers_flavor: 'aprilfools';
-$npc_tavern_flavor: 'aprilfools';
+$npc_market_flavor: 'spring';
+$npc_quests_flavor: 'spring';
+$npc_seasonal_flavor: 'spring';
+$npc_timetravelers_flavor: 'spring';
+$npc_tavern_flavor: 'spring';
diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index 835fdbadea..516535cf65 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -39,7 +39,7 @@
       // Mount Head
       span(v-if="member.items.currentMount", :class="'Mount_Head_' + member.items.currentMount")
       // Pet
-      span.current-pet(:class="foolPet(member.items.currentPet)")
+      span.current-pet(v-if="member.items.currentPet", :class="'Pet-' + member.items.currentPet")
   class-badge.under-avatar(v-if="hasClass && !hideClassBadge", :member-class="member.stats.class")
 </template>
 
@@ -75,7 +75,6 @@
 
 <script>
 import { mapState } from 'client/libs/store';
-import includes from 'lodash/includes';
 
 import ClassBadge from 'client/components/members/classBadge';
 
@@ -224,53 +223,6 @@ export default {
 
       return !buffs.snowball && !buffs.spookySparkles && !buffs.shinySeed && !buffs.seafoam;
     },
-    foolPet (pet) {
-      const SPECIAL_PETS = [
-        'Wolf-Veteran',
-        'Wolf-Cerberus',
-        'Dragon-Hydra',
-        'Turkey-Base',
-        'BearCub-Polar',
-        'MantisShrimp-Base',
-        'JackOLantern-Base',
-        'Mammoth-Base',
-        'Tiger-Veteran',
-        'Phoenix-Base',
-        'Turkey-Gilded',
-        'MagicalBee-Base',
-        'Lion-Veteran',
-        'Gryphon-RoyalPurple',
-        'JackOLantern-Ghost',
-        'Jackalope-RoyalPurple',
-        'Orca-Base',
-        'Bear-Veteran',
-        'Hippogriff-Hopeful',
-        'Fox-Veteran',
-        'JackOLantern-Glow',
-      ];
-      const BASE_PETS = [
-        'Wolf',
-        'TigerCub',
-        'PandaCub',
-        'LionCub',
-        'Fox',
-        'FlyingPig',
-        'BearCub',
-        'Dragon',
-        'Cactus',
-      ];
-      if (!pet) return 'Pet-FlyingPig-Veggie';
-      if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-PandaCub-Veggie';
-      } else {
-        const species = pet.slice(0, pet.indexOf('-'));
-        if (includes(BASE_PETS, species)) {
-          return `Pet-${species}-Veggie`;
-        } else {
-          return 'Pet-Fox-Veggie';
-        }
-      }
-    },
   },
 };
 </script>
diff --git a/website/client/components/inventory/stable/petItem.vue b/website/client/components/inventory/stable/petItem.vue
index 7611b7665d..c96668b104 100644
--- a/website/client/components/inventory/stable/petItem.vue
+++ b/website/client/components/inventory/stable/petItem.vue
@@ -113,10 +113,7 @@
       },
       getPetItemClass () {
         if (this.isOwned() || this.mountOwned() && this.isHatchable()) {
-          if (this.isSpecial()) {
-            return 'Pet Pet-PandaCub-Veggie';
-          }
-          return `${this.item.class} ${this.item.eggKey}`;
+          return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
         }
 
         if (!this.isOwned() && this.isSpecial()) {
@@ -128,7 +125,7 @@
         }
 
         if (this.mountOwned()) {
-          return `GreyedOut ${this.item.class} ${this.item.eggKey}`;
+          return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
         }
 
         // Can't hatch
diff --git a/website/client/libs/createAnimal.js b/website/client/libs/createAnimal.js
index 0abceb795c..d2f273b3b6 100644
--- a/website/client/libs/createAnimal.js
+++ b/website/client/libs/createAnimal.js
@@ -2,9 +2,6 @@
 import content from 'common/script/content';
 
 const specialPets = Object.keys(content.specialPets);
-const premiumPets = Object.keys(content.premiumPets);
-const questPets = Object.keys(content.questPets);
-const dropPets = Object.keys(content.pets);
 
 function getText (textOrFunction) {
   if (textOrFunction instanceof Function) {
@@ -36,18 +33,10 @@ export function isSpecial (animal) {
 
 export function createAnimal (egg, potion, type, _content, userItems) {
   let animalKey = `${egg.key}-${potion.key}`;
-  let fooledKey = '';
-  if (questPets.includes(animalKey)) {
-    fooledKey = 'Fox-Veggie';
-  } else if (dropPets.includes(animalKey) || premiumPets.includes(animalKey)) {
-    fooledKey = `${egg.key}-Veggie`;
-  } else {
-    fooledKey = animalKey;
-  }
 
   return {
     key: animalKey,
-    class: type === 'pet' ? `Pet Pet-${fooledKey}` : `Mount_Icon_${animalKey}`,
+    class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`,
     eggKey: egg.key,
     eggName: getText(egg.text),
     potionKey: potion.key,
@@ -70,3 +59,4 @@ export function createAnimal (egg, potion, type, _content, userItems) {
     },
   };
 }
+
diff --git a/website/common/script/content/constants.js b/website/common/script/content/constants.js
index 9c0a4fd99b..a546fd153a 100644
--- a/website/common/script/content/constants.js
+++ b/website/common/script/content/constants.js
@@ -35,7 +35,7 @@ export const EVENTS = {
   summer2018: { start: '2018-06-19', end: '2018-08-02' },
   fall2018:   { start: '2018-09-20', end: '2018-11-02' },
   winter2019: { start: '2018-12-19', end: '2019-02-02' },
-  spring2019: { start: '2019-03-19', end: '2019-04-02' },
+  spring2019: { start: '2019-03-19', end: '2019-05-02' },
 };
 
 export const SEASONAL_SETS = {
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 8e36f2b911..f5df652d56 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -40,7 +40,7 @@ api.getNews = {
         <p>"HAHA!" he cries, as a dragonfruit bounces along beside him. "I've always thought good humor should be healthful and nourishing, so I've gone back to my roots, if you will, to bring some plant-powered goodness into Habitica once again!"</p>
         <p>"He's replaced all our equipped pets with fruits and vegetables!" says QuartzFox, gently patting a contented-looking tomato. "Although to be fair, they are very cute fruits and vegetables!"</p>
         <p>Equipping different pets will show different fruits and veggies. Have fun discovering them all!</p>
-        <p>The NPCs have also been turned into their fruit and vegetable forms as a tribute to Habitica's <a href='https://habitica.fandom.com/wiki/April_Fools'_Day_2014' target='_blank'>very first April Fool's prank back in 2014</a>! Go check them out.</p>
+        <p>The NPCs have also been turned into their fruit and vegetable forms as a tribute to Habitica's <a href="https://habitica.fandom.com/wiki/April_Fools'_Day_2014" target='_blank'>very first April Fool's prank back in 2014</a>! Go check them out.</p>
         <h3>Special April Fool's Social Media Challenge!</h3>
         <p>For even more fun, check out the <a href='/challenges/b0337534-ec69-4269-8cc6-f74c91881451'>official Challenge</a> posted especially for today! Share your avatar featuring your new fruit and veggie pet on social media between now and April 3, and you'll have a chance to win gems and have your avatar featured on the Habitica Blog!</p>
         <div class="small mb-3">by Beffymaroo, SabreCat, Piyo, Viirus, and Lemoness</div>