diff --git a/Data/.DS_Store b/Data/.DS_Store
index 51593baf8..7643f7b8b 100644
Binary files a/Data/.DS_Store and b/Data/.DS_Store differ
diff --git a/Data/Map458.rxdata b/Data/Map458.rxdata
index 0ab2a8e2e..ba24cfda7 100644
Binary files a/Data/Map458.rxdata and b/Data/Map458.rxdata differ
diff --git a/Data/outfits/clothes_data.json b/Data/outfits/clothes_data.json
index b2c6f3aeb..b58ba0b94 100644
--- a/Data/outfits/clothes_data.json
+++ b/Data/outfits/clothes_data.json
@@ -89,12 +89,6 @@
         "tags": "celadon",
         "howToGet": "city exclusive outfit"
     },
-    {
-        "id": "breloomcap",
-        "name": "Breloom Cap",
-        "price": 8000,
-        "tags": "pokemon-shroomish,pokemon-breloom"
-    },
     {
         "id": "bughakama",
         "name": "Bug Hakama Dress",
@@ -551,13 +545,6 @@
         "tags": "azalea,",
         "howToGet": "city-exclusive outfit"
     },
-    {
-        "id": "pumpkaboohelmet",
-        "name": "Pumpkaboo Helmet",
-        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
-        "price": 1031,
-        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
-    },
     {
         "id": "Ramos",
         "name": "Gardener Outfit",
@@ -658,13 +645,6 @@
         "price": 12000,
         "tags": "pokemon-slowpoke,pokemon-slowbro,pokemon-slowking"
     },
-    {
-        "id": "sneaselfeather",
-        "name": "Sharp Feather",
-        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
-        "price": 4000,
-        "tags": "pokemon-sneasel,pokemon-weavile,"
-    },
     {
         "id": "SnowCoatFemale",
         "name": "Blue Snow Coat (F)",
diff --git a/Data/outfits/hats_data.json b/Data/outfits/hats_data.json
index 52e8b8572..8827a51a2 100644
--- a/Data/outfits/hats_data.json
+++ b/Data/outfits/hats_data.json
@@ -95,6 +95,12 @@
         "tags": "headband,",
         "howToGet": "reward for hatching x number of eggs? for getting every baby mon?"
     },
+    {
+        "id": "breloomcap",
+        "name": "Breloom Cap",
+        "price": 8000,
+        "tags": "pokemon-shroomish,pokemon-breloom"
+    },
     {
         "id": "brendanORAS",
         "name": "Sporty Cap",
@@ -1031,6 +1037,13 @@
         "tags": "mask,pokemon-glalie,type-ice,weather-cold,",
         "howToGet": "gym reward"
     },
+    {
+        "id": "pumpkaboohelmet",
+        "name": "Pumpkaboo Helmet",
+        "description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
+        "price": 1031,
+        "tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
+    },
     {
         "id": "Ramos",
         "name": "Green Flat cap",
@@ -1287,6 +1300,13 @@
         "price": 15000,
         "tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder"
     },
+    {
+        "id": "sneaselfeather",
+        "name": "Sharp Feather",
+        "description": "A feather worn on the head that ressembles the ear of a Sneasel.",
+        "price": 4000,
+        "tags": "pokemon-sneasel,pokemon-weavile,"
+    },
     {
         "id": "snorlaxhat",
         "name": "Snorlax Hat",
diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache
index e69de29bb..c9b054a80 100644
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -0,0 +1,7 @@
+Graphics/CustomBattlers/spritesheets/spritesheets_base/4.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/7/7b.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/19/19.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/16.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/16/16.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4.png
diff --git a/Graphics/Pokemon/FusionIcons/icon8020.png b/Graphics/Pokemon/FusionIcons/icon8020.png
new file mode 100644
index 000000000..544043123
Binary files /dev/null and b/Graphics/Pokemon/FusionIcons/icon8020.png differ