diff --git a/input/kh1/enemies/shadow.toml b/input/kh1/enemies/shadow.toml
index 94346dc..95df995 100644
--- a/input/kh1/enemies/shadow.toml
+++ b/input/kh1/enemies/shadow.toml
@@ -2,10 +2,15 @@ name = "Shadow"
 
 [[world]]
 name = "Wonderland"
+rooms = ["Bizzare Room"]
 
 [[world]]
 name = "Neverland"
-room = ["Ship: Freezer"]
+rooms = ["Ship: Freezer"]
+
+[[world]]
+name = "Halloween Town"
+rooms = ["Graveyard"]
 
 [[drops]]
 name = "Potion"
diff --git a/public/scripts/kh3/food-sim.js b/public/scripts/kh3/food-sim.js
index 1e2b7c8..e1f29d8 100644
--- a/public/scripts/kh3/food-sim.js
+++ b/public/scripts/kh3/food-sim.js
@@ -33,7 +33,6 @@ document.addEventListener("DOMContentLoaded", (event) => {
 	document
 		.getElementById("hearty-meal")
 		.addEventListener("click", function () {
-			console.log(this);
 			if (this.checked) {
 				let bonusStr = Math.ceil(globalStats.str * 0.25);
 				let bonusMag = Math.ceil(globalStats.mag * 0.25);
diff --git a/src/common/materials.rs b/src/common/materials.rs
index c5c303f..06c0be1 100644
--- a/src/common/materials.rs
+++ b/src/common/materials.rs
@@ -21,6 +21,7 @@ pub struct MaterialDetails {
 #[serde(rename_all = "lowercase")]
 pub enum MaterialCategory {
 	// Common
+	Adamantite,
 	#[serde(alias = "blaze")]
 	Blazing,
 	#[serde(alias = "soothing")]
@@ -37,6 +38,7 @@ pub enum MaterialCategory {
 	Lucid,
 	Mythril,
 	Orichalcum,
+	#[serde(alias = "pulsing")]
 	Power,
 	#[serde(alias = "shiny")]
 	Shimmering,
@@ -50,11 +52,62 @@ pub enum MaterialCategory {
 
 	// KH2 Only
 	Remembrance,
+	Tranquility,
+	Illusion,
+
+	// KH3 Only
+	Sinister,
+	Evanescent,
+	Illusory,
+	Fluorite,
+	Damascus,
+	Electrum,
+
+	// Days Only
+	Gust,
+	Shining,
+	GearComponent,
+	ComboTech,
+	ShieldTech,
+	RuneTech,
+	PowerTech,
+	AerialTech,
+	RangeTech,
+	LuckTech,
+	Ankharite,
+	Iron,
+	Bronze,
+	DarkIngot,
+	Silver,
+	Gold,
+	Moonstone,
+	Diamond,
+	PremiumOrb,
+
+	// DDD Only
+	Fleeting,
+	Lofty,
+	Rampant,
+	Dulcet,
+	Intrepid,
+	Noble,
+	Grim,
+	Vibrant,
+	Troubling,
+	Wondrous,
+	Malleable,
+	Prickly,
+	Wild,
+	Epic,
+	Charming,
+	Brilliant,
+	Savage,
 }
 
 impl MaterialCategory {
 	pub fn get_texture_group(&self) -> String {
 		match self {
+			MaterialCategory::Adamantite => "adamantite".to_string(),
 			MaterialCategory::Blazing => "blazing".to_string(),
 			MaterialCategory::Bright => "bright".to_string(),
 			MaterialCategory::Dense => "dense".to_string(),
@@ -74,6 +127,53 @@ impl MaterialCategory {
 			MaterialCategory::Stormy => "stormy".to_string(),
 
 			MaterialCategory::Remembrance => "remembrance".to_string(),
+			MaterialCategory::Tranquility => "tranquility".to_string(),
+			MaterialCategory::Illusion => "illusion".to_string(),
+
+			MaterialCategory::Sinister => "sinister".to_string(),
+			MaterialCategory::Evanescent => "evanescent".to_string(),
+			MaterialCategory::Illusory => "illusory".to_string(),
+			MaterialCategory::Fluorite => "fluorite".to_string(),
+			MaterialCategory::Damascus => "damascus".to_string(),
+			MaterialCategory::Electrum => "electrum".to_string(),
+
+			MaterialCategory::Gust => "gust".to_string(),
+			MaterialCategory::Shining => "shining".to_string(),
+			MaterialCategory::GearComponent => "gear_component".to_string(),
+			MaterialCategory::ComboTech => "combo_tech".to_string(),
+			MaterialCategory::ShieldTech => "shield_tech".to_string(),
+			MaterialCategory::RuneTech => "rune_tech".to_string(),
+			MaterialCategory::PowerTech => "power_tech".to_string(),
+			MaterialCategory::AerialTech => "aerial_tech".to_string(),
+			MaterialCategory::RangeTech => "range_tech".to_string(),
+			MaterialCategory::LuckTech => "luck_tech".to_string(),
+			MaterialCategory::Ankharite => "ankharite".to_string(),
+			MaterialCategory::Iron => "iron".to_string(),
+			MaterialCategory::Bronze => "bronze".to_string(),
+			MaterialCategory::DarkIngot => "dark_ingot".to_string(),
+			MaterialCategory::Silver => "silver".to_string(),
+			MaterialCategory::Gold => "gold".to_string(),
+			MaterialCategory::Moonstone => "moonstone".to_string(),
+			MaterialCategory::Diamond => "diamond".to_string(),
+			MaterialCategory::PremiumOrb => "premium_orb".to_string(),
+
+			MaterialCategory::Fleeting => "fleeting".to_string(),
+			MaterialCategory::Lofty => "lofty".to_string(),
+			MaterialCategory::Rampant => "rampant".to_string(),
+			MaterialCategory::Dulcet => "dulcet".to_string(),
+			MaterialCategory::Intrepid => "intrepid".to_string(),
+			MaterialCategory::Noble => "noble".to_string(),
+			MaterialCategory::Grim => "grim".to_string(),
+			MaterialCategory::Vibrant => "vibrant".to_string(),
+			MaterialCategory::Troubling => "troubling".to_string(),
+			MaterialCategory::Wondrous => "wondrous".to_string(),
+			MaterialCategory::Malleable => "malleable".to_string(),
+			MaterialCategory::Prickly => "prickly".to_string(),
+			MaterialCategory::Wild => "wild".to_string(),
+			MaterialCategory::Epic => "epic".to_string(),
+			MaterialCategory::Charming => "charming".to_string(),
+			MaterialCategory::Brilliant => "brilliant".to_string(),
+			MaterialCategory::Savage => "savage".to_string(),
 		}
 	}
 
@@ -99,30 +199,24 @@ impl MaterialCategory {
 				Game::Kh1 | Game::Kh2 => "energy".to_string(),
 				_ => "wellspring".to_string(),
 			},
-			MaterialCategory::Frost => "frost".to_string(),
 			MaterialCategory::Lightning => match game {
 				Game::Kh1 => "thunder".to_string(),
 				_ => "lightning".to_string(),
 			},
-			MaterialCategory::Lucid => "lucid".to_string(),
-			MaterialCategory::Mythril => "mythril".to_string(),
-			MaterialCategory::Orichalcum => "orichalcum".to_string(),
-			MaterialCategory::Power => "power".to_string(),
+			MaterialCategory::Power => match game {
+				Game::Kh1 | Game::Kh2 => "power".to_string(),
+				_ => "pulsing".to_string(),
+			},
 			MaterialCategory::Shimmering => match game {
 				Game::Kh1 => "shiny".to_string(),
 				_ => "shimmering".to_string(),
 			},
 			MaterialCategory::Serenity => match game {
 				Game::Kh1 => "mystery".to_string(),
-				Game::Bbs => "hungry".to_string(),
-				_ => "serenity".to_string(),
+				Game::Kh2 => "serenity".to_string(),
+				_ => "hungry".to_string(),
 			},
-			MaterialCategory::Twilight => "twilight".to_string(),
-
-			MaterialCategory::Spirit => "spirit".to_string(),
-			MaterialCategory::Stormy => "stormy".to_string(),
-
-			MaterialCategory::Remembrance => "remembrance".to_string(),
+			_ => self.get_texture_group(),
 		}
 	}
 }
@@ -134,6 +228,10 @@ pub enum MaterialKind {
 	Stone,
 	Gem,
 	Crystal,
+
+	Figment,
+	Fancy,
+	Fantasy,
 }
 
 impl Display for MaterialKind {
@@ -143,6 +241,10 @@ impl Display for MaterialKind {
 			MaterialKind::Stone => f.write_str("stone"),
 			MaterialKind::Gem => f.write_str("gem"),
 			MaterialKind::Crystal => f.write_str("crystal"),
+
+			MaterialKind::Figment => f.write_str("figment"),
+			MaterialKind::Fancy => f.write_str("fancy"),
+			MaterialKind::Fantasy => f.write_str("fantasy"),
 		}
 	}
 }