diff --git a/modules/config.py b/modules/config.py
index e89f21f..a8746db 100644
--- a/modules/config.py
+++ b/modules/config.py
@@ -15,7 +15,7 @@
 
 
 class Config(metaclass=Singleton):
-    version = "0.8.20.2"
+    version = "0.8.21.2"
     region: str
     game_region: str
     debug = False
diff --git a/modules/market_data/consolidated_map.py b/modules/market_data/consolidated_map.py
index 17fb493..9c02fbe 100644
--- a/modules/market_data/consolidated_map.py
+++ b/modules/market_data/consolidated_map.py
@@ -2279,10 +2279,10 @@
     "subcategory": "Battle Item - Offense",
     "amount": 1
   },
-  "Splendid Disguise Robe": {
-    "name": "Splendid Disguise Robe",
+  "Splendid Camouflage Robe": {
+    "name": "Splendid Camouflage Robe",
     "rarity": 2,
-    "image": "splendid-disguise-robe.webp",
+    "image": "splendid-camouflage-robe.webp",
     "category": "Combat Supplies",
     "subcategory": "Battle Item - Utility",
     "amount": 1
@@ -2391,10 +2391,10 @@
     "subcategory": "Battle Item - Utility",
     "amount": 1
   },
-  "Splendid Swift Robe": {
-    "name": "Splendid Swift Robe",
+  "Splendid Sprinter's Robe": {
+    "name": "Splendid Sprinter's Robe",
     "rarity": 2,
-    "image": "splendid-swift-robe.webp",
+    "image": "splendid-sprinter-s-robe.webp",
     "category": "Combat Supplies",
     "subcategory": "Battle Item - Buff",
     "amount": 1
@@ -2439,10 +2439,10 @@
     "subcategory": "Battle Item - Buff",
     "amount": 1
   },
-  "Swiftness Robe": {
-    "name": "Swiftness Robe",
+  "Sprinter's Robe": {
+    "name": "Sprinter's Robe",
     "rarity": 2,
-    "image": "swiftness-robe.webp",
+    "image": "sprinter-s-robe.webp",
     "category": "Combat Supplies",
     "subcategory": "Battle Item - Buff",
     "amount": 1
@@ -2658,7 +2658,7 @@
   "[Aeromancer] Windfury Engraving ...": {
     "name": "[Aeromancer] Windfury Engraving Recipie",
     "rarity": None,
-    "image": "a",
+    "image": "engraving-4.webp",
     "category": "Engraving Recipe",
     "subcategory": None,
     "amount": 1
@@ -3383,18 +3383,10 @@
     "subcategory": None,
     "amount": 1
   },
-  "Basic Oreha Fusion Material": {
-    "name": "Basic Oreha Fusion Material",
+  "Oreha Fusion Material": {
+    "name": "Oreha Fusion Material",
     "rarity": 2,
-    "image": "basic-oreha-fusion-material.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Honing Materials",
-    "amount": 1
-  },
-  "Caldarr Fusion Material": {
-    "name": "Caldarr Fusion Material",
-    "rarity": 2,
-    "image": "caldarr-fusion-material.webp",
+    "image": "oreha-fusion-material.webp",
     "category": "Enhancement Material",
     "subcategory": "Honing Materials",
     "amount": 1
@@ -3527,30 +3519,6 @@
     "subcategory": "Honing Materials",
     "amount": 1
   },
-  "Life Shard Pouch (L)": {
-    "name": "Life Shard Pouch (L)",
-    "rarity": 3,
-    "image": "life-shard-pouch-l.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Honing Materials",
-    "amount": 1
-  },
-  "Life Shard Pouch (M)": {
-    "name": "Life Shard Pouch (M)",
-    "rarity": 2,
-    "image": "life-shard-pouch-m.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Honing Materials",
-    "amount": 1
-  },
-  "Life Shard Pouch (S)": {
-    "name": "Life Shard Pouch (S)",
-    "rarity": 1,
-    "image": "life-shard-pouch-s.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Honing Materials",
-    "amount": 1
-  },
   "Metallurgy: Applied Welding": {
     "name": "Metallurgy: Applied Welding",
     "rarity": 4,
@@ -3559,14 +3527,6 @@
     "subcategory": "Additional Honing Materials",
     "amount": 1
   },
-  "Metallurgy: Basic Casting": {
-    "name": "Metallurgy: Basic Casting",
-    "rarity": 3,
-    "image": "metallurgy-basic-casting.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Additional Honing Materials",
-    "amount": 1
-  },
   "Metallurgy: Basic Folding": {
     "name": "Metallurgy: Basic Folding",
     "rarity": 3,
@@ -3599,14 +3559,6 @@
     "subcategory": "Other Materials",
     "amount": 1
   },
-  "Simple Oreha Fusion Material": {
-    "name": "Simple Oreha Fusion Material",
-    "rarity": 1,
-    "image": "simple-oreha-fusion-material.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Honing Materials",
-    "amount": 1
-  },
   "Solar Blessing": {
     "name": "Solar Blessing",
     "rarity": 2,
@@ -3647,14 +3599,6 @@
     "subcategory": "Additional Honing Materials",
     "amount": 1
   },
-  "Tailoring: Basic Design": {
-    "name": "Tailoring: Basic Design",
-    "rarity": 3,
-    "image": "tailoring-basic-design.webp",
-    "category": "Enhancement Material",
-    "subcategory": "Additional Honing Materials",
-    "amount": 1
-  },
   "Tailoring: Basic Knots": {
     "name": "Tailoring: Basic Knots",
     "rarity": 3,
@@ -5359,30 +5303,6 @@
     "subcategory": "Foraging Rewards",
     "amount": 10
   },
-  "Caldarr Relic": {
-    "name": "Caldarr Relic",
-    "rarity": 2,
-    "image": "caldarr-relic.webp",
-    "category": "Trader",
-    "subcategory": "Excavating Loot",
-    "amount": 10
-  },
-  "Caldarr Solar Carp": {
-    "name": "Caldarr Solar Carp",
-    "rarity": 2,
-    "image": "caldarr-solar-carp.webp",
-    "category": "Trader",
-    "subcategory": "Fishing Loot",
-    "amount": 10
-  },
-  "Caldarr Thick Raw Meat": {
-    "name": "Caldarr Thick Raw Meat",
-    "rarity": 2,
-    "image": "caldarr-thick-raw-meat.webp",
-    "category": "Trader",
-    "subcategory": "Hunting Loot",
-    "amount": 10
-  },
   "Crude Mushroom": {
     "name": "Crude Mushroom",
     "rarity": 0,
@@ -5391,10 +5311,10 @@
     "subcategory": "Foraging Rewards",
     "amount": 100
   },
-  "Excavating Crystal": {
-    "name": "Excavating Crystal",
+  "Crystallized Excavating Bauble": {
+    "name": "Crystallized Excavating Bauble",
     "rarity": 3,
-    "image": "excavating-crystal.webp",
+    "image": "crystallized-excavating-bauble.webp",
     "category": "Trader",
     "subcategory": "Excavating Loot",
     "amount": 10
@@ -5423,10 +5343,10 @@
     "subcategory": "Fishing Loot",
     "amount": 100
   },
-  "Fishing Crystal": {
-    "name": "Fishing Crystal",
+  "Crystallized Fishing Bauble": {
+    "name": "Crystallized Fishing Bauble",
     "rarity": 3,
-    "image": "fishing-crystal.webp",
+    "image": "crystallized-fishing-bauble.webp",
     "category": "Trader",
     "subcategory": "Fishing Loot",
     "amount": 10
@@ -5447,10 +5367,10 @@
     "subcategory": "Mining Loot",
     "amount": 10
   },
-  "Hunting Crystal": {
-    "name": "Hunting Crystal",
+  "Crystallized Hunting Bauble": {
+    "name": "Crystallized Hunting Bauble",
     "rarity": 3,
-    "image": "hunting-crystal.webp",
+    "image": "crystallized-hunting-bauble.webp",
     "category": "Trader",
     "subcategory": "Hunting Loot",
     "amount": 10