diff --git a/input/kh3/enemies/gambler.toml b/input/kh3/enemies/gambler.toml
index c8995ef..98716da 100644
--- a/input/kh3/enemies/gambler.toml
+++ b/input/kh3/enemies/gambler.toml
@@ -6,6 +6,7 @@ name = "Arendelle"
 
 [[world]]
 name = "The Caribbean"
+rooms = [""]
 
 [[drops]]
 name = "Twilight Stone"
diff --git a/input/kh3/enemies/gold-beat.toml b/input/kh3/enemies/gold-beat.toml
index 47f3220..9ef4b4a 100644
--- a/input/kh3/enemies/gold-beat.toml
+++ b/input/kh3/enemies/gold-beat.toml
@@ -3,6 +3,10 @@ name = "Gold Beat"
 [[world]]
 name = "Toy Box"
 
+[[world]]
+name = "The Caribbean"
+rooms = ["Exile Island"]
+
 [[drops]]
 name = "Lightning Stone"
 kind = "material"
diff --git a/input/kh3/enemies/high-soldier.toml b/input/kh3/enemies/high-soldier.toml
index c7bb0f4..5ef2687 100644
--- a/input/kh3/enemies/high-soldier.toml
+++ b/input/kh3/enemies/high-soldier.toml
@@ -2,6 +2,7 @@ name = "High Soldier"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 12", "North District (Night)"]
 
 [[drops]]
 name = "Wellspring Gem"
diff --git a/input/kh3/enemies/mechanitaur.toml b/input/kh3/enemies/mechanitaur.toml
index 881c061..8ab130c 100644
--- a/input/kh3/enemies/mechanitaur.toml
+++ b/input/kh3/enemies/mechanitaur.toml
@@ -2,6 +2,7 @@ name = "Mechanitaur"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 12"]
 
 [[drops]]
 name = "Wellspring Gem"
diff --git a/input/kh3/enemies/metal-troll.toml b/input/kh3/enemies/metal-troll.toml
index 59e409d..47f3a84 100644
--- a/input/kh3/enemies/metal-troll.toml
+++ b/input/kh3/enemies/metal-troll.toml
@@ -2,6 +2,7 @@ name = "Metal Troll"
 
 [[world]]
 name = "San Fransokyo"
+rooms = ["Battlegate 11", "North District (Night)"]
 
 [[drops]]
 name = "Wellspring Stone"
diff --git a/input/kh3/enemies/spear-lizard.toml b/input/kh3/enemies/spear-lizard.toml
index cd052de..15868df 100644
--- a/input/kh3/enemies/spear-lizard.toml
+++ b/input/kh3/enemies/spear-lizard.toml
@@ -2,6 +2,7 @@ name = "Spear Lizard"
 
 [[world]]
 name = "The Caribbean"
+rooms = ["Battlegate 10", "Isla de los Mastiles"]
 
 [[drops]]
 name = "Soothing Stone"
diff --git a/input/kh3/ingredients/basil.toml b/input/kh3/ingredients/basil.toml
index edd3cdf..1122d53 100644
--- a/input/kh3/ingredients/basil.toml
+++ b/input/kh3/ingredients/basil.toml
@@ -10,3 +10,8 @@ note = "Spawn in Thoroughfare and go back to The Forest around the trees"
 world = "Toy Box"
 room = "Andy's House"
 note = "Outside the house in the garden"
+
+[[locations]]
+world = "The Carribean"
+room = "Isla de los Mastiles"
+note = "On a rock to the right of the spawn point"
diff --git a/input/kh3/ingredients/dill.toml b/input/kh3/ingredients/dill.toml
index f780853..6be2509 100644
--- a/input/kh3/ingredients/dill.toml
+++ b/input/kh3/ingredients/dill.toml
@@ -5,3 +5,12 @@ group = "herb"
 world = "Monstropolis"
 room = "Lobby & Offices"
 note = "Vending Machine at the Laugh Floor's entrance"
+
+[[locations]]
+world = "The Carribean"
+room = "Isla de los Mastiles"
+note = "Climb the walls and traverse the platforms"
+
+[[locations]]
+world = "The Carribean"
+room = "Forsaken Isle"
diff --git a/input/kh3/ingredients/filet_mignon.toml b/input/kh3/ingredients/filet_mignon.toml
index df4867f..bf528fe 100644
--- a/input/kh3/ingredients/filet_mignon.toml
+++ b/input/kh3/ingredients/filet_mignon.toml
@@ -9,4 +9,4 @@ note = "Laugh Floor on the desk in the very back"
 [[locations]]
 world = "The Carribean"
 room = "Fort"
-note = "In a box on the front terrace from the spawn"
+note = "In an yellow box on the front terrace from the spawn"
diff --git a/input/kh3/ingredients/portobello.toml b/input/kh3/ingredients/portobello.toml
index 0e03339..1b1004c 100644
--- a/input/kh3/ingredients/portobello.toml
+++ b/input/kh3/ingredients/portobello.toml
@@ -1,2 +1,10 @@
 name = "Portobello"
 group = "mushroom"
+
+[[locations]]
+world = "The Carribean"
+room = "Horseshoe Island"
+
+[[locations]]
+world = "The Carribean"
+room = "Ship's End"
diff --git a/input/kh3/ingredients/quail.toml b/input/kh3/ingredients/quail.toml
index 7e2b14c..abb4854 100644
--- a/input/kh3/ingredients/quail.toml
+++ b/input/kh3/ingredients/quail.toml
@@ -1,2 +1,7 @@
 name = "Quail"
 group = "meat"
+
+[[locations]]
+world = "The Carribean"
+room = "Docks"
+note = "Inside the building on the right side in a yellow box"
diff --git a/public/assets/worlds/agrabah.webp b/public/assets/worlds/kh1/agrabah.webp
similarity index 100%
rename from public/assets/worlds/agrabah.webp
rename to public/assets/worlds/kh1/agrabah.webp
diff --git a/public/assets/worlds/atlantica.webp b/public/assets/worlds/kh1/atlantica.webp
similarity index 100%
rename from public/assets/worlds/atlantica.webp
rename to public/assets/worlds/kh1/atlantica.webp
diff --git a/public/assets/worlds/deep-jungle.webp b/public/assets/worlds/kh1/deep-jungle.webp
similarity index 100%
rename from public/assets/worlds/deep-jungle.webp
rename to public/assets/worlds/kh1/deep-jungle.webp
diff --git a/public/assets/worlds/end-of-the-world.webp b/public/assets/worlds/kh1/end-of-the-world.webp
similarity index 100%
rename from public/assets/worlds/end-of-the-world.webp
rename to public/assets/worlds/kh1/end-of-the-world.webp
diff --git a/public/assets/worlds/halloween-town.webp b/public/assets/worlds/kh1/halloween-town.webp
similarity index 100%
rename from public/assets/worlds/halloween-town.webp
rename to public/assets/worlds/kh1/halloween-town.webp
diff --git a/public/assets/worlds/hollow-bastion.webp b/public/assets/worlds/kh1/hollow-bastion.webp
similarity index 100%
rename from public/assets/worlds/hollow-bastion.webp
rename to public/assets/worlds/kh1/hollow-bastion.webp
diff --git a/public/assets/worlds/monstro.webp b/public/assets/worlds/kh1/monstro.webp
similarity index 100%
rename from public/assets/worlds/monstro.webp
rename to public/assets/worlds/kh1/monstro.webp
diff --git a/public/assets/worlds/neverland.webp b/public/assets/worlds/kh1/neverland.webp
similarity index 100%
rename from public/assets/worlds/neverland.webp
rename to public/assets/worlds/kh1/neverland.webp
diff --git a/public/assets/worlds/traverse-town.webp b/public/assets/worlds/kh1/traverse-town.webp
similarity index 100%
rename from public/assets/worlds/traverse-town.webp
rename to public/assets/worlds/kh1/traverse-town.webp
diff --git a/public/assets/worlds/wonderland.webp b/public/assets/worlds/kh1/wonderland.webp
similarity index 100%
rename from public/assets/worlds/wonderland.webp
rename to public/assets/worlds/kh1/wonderland.webp
diff --git a/public/assets/worlds/kh2/agrabah.webp b/public/assets/worlds/kh2/agrabah.webp
new file mode 100644
index 0000000..a0e4cfa
Binary files /dev/null and b/public/assets/worlds/kh2/agrabah.webp differ
diff --git a/public/assets/worlds/kh2/beasts-castle.webp b/public/assets/worlds/kh2/beasts-castle.webp
new file mode 100644
index 0000000..2843403
Binary files /dev/null and b/public/assets/worlds/kh2/beasts-castle.webp differ
diff --git a/public/assets/worlds/kh2/disney-castle.webp b/public/assets/worlds/kh2/disney-castle.webp
new file mode 100644
index 0000000..9800c37
Binary files /dev/null and b/public/assets/worlds/kh2/disney-castle.webp differ
diff --git a/public/assets/worlds/kh2/halloween-town.webp b/public/assets/worlds/kh2/halloween-town.webp
new file mode 100644
index 0000000..a511553
Binary files /dev/null and b/public/assets/worlds/kh2/halloween-town.webp differ
diff --git a/public/assets/worlds/kh2/olympus-coliseum.webp b/public/assets/worlds/kh2/olympus-coliseum.webp
new file mode 100644
index 0000000..e025341
Binary files /dev/null and b/public/assets/worlds/kh2/olympus-coliseum.webp differ
diff --git a/public/assets/worlds/kh2/port-royal.webp b/public/assets/worlds/kh2/port-royal.webp
new file mode 100644
index 0000000..5b20945
Binary files /dev/null and b/public/assets/worlds/kh2/port-royal.webp differ
diff --git a/public/assets/worlds/kh2/pride-lands.webp b/public/assets/worlds/kh2/pride-lands.webp
new file mode 100644
index 0000000..385b54a
Binary files /dev/null and b/public/assets/worlds/kh2/pride-lands.webp differ
diff --git a/public/assets/worlds/kh2/radiant-garden.webp b/public/assets/worlds/kh2/radiant-garden.webp
new file mode 100644
index 0000000..c855120
Binary files /dev/null and b/public/assets/worlds/kh2/radiant-garden.webp differ
diff --git a/public/assets/worlds/kh2/space-paranoids.webp b/public/assets/worlds/kh2/space-paranoids.webp
new file mode 100644
index 0000000..c3d1fbf
Binary files /dev/null and b/public/assets/worlds/kh2/space-paranoids.webp differ
diff --git a/public/assets/worlds/kh2/the-land-of-dragons.webp b/public/assets/worlds/kh2/the-land-of-dragons.webp
new file mode 100644
index 0000000..99fea9d
Binary files /dev/null and b/public/assets/worlds/kh2/the-land-of-dragons.webp differ
diff --git a/public/assets/worlds/kh2/the-world-that-never-was.webp b/public/assets/worlds/kh2/the-world-that-never-was.webp
new file mode 100644
index 0000000..73223f8
Binary files /dev/null and b/public/assets/worlds/kh2/the-world-that-never-was.webp differ
diff --git a/public/assets/worlds/kh2/timeless-river.webp b/public/assets/worlds/kh2/timeless-river.webp
new file mode 100644
index 0000000..300781f
Binary files /dev/null and b/public/assets/worlds/kh2/timeless-river.webp differ
diff --git a/public/assets/worlds/kh2/twilight-town.webp b/public/assets/worlds/kh2/twilight-town.webp
new file mode 100644
index 0000000..b822830
Binary files /dev/null and b/public/assets/worlds/kh2/twilight-town.webp differ
diff --git a/public/assets/worlds/kh3/arendelle.webp b/public/assets/worlds/kh3/arendelle.webp
new file mode 100644
index 0000000..e33b49f
Binary files /dev/null and b/public/assets/worlds/kh3/arendelle.webp differ
diff --git a/public/assets/worlds/kh3/kingdom-of-corona.webp b/public/assets/worlds/kh3/kingdom-of-corona.webp
new file mode 100644
index 0000000..725b691
Binary files /dev/null and b/public/assets/worlds/kh3/kingdom-of-corona.webp differ
diff --git a/public/assets/worlds/kh3/monstropolis.webp b/public/assets/worlds/kh3/monstropolis.webp
new file mode 100644
index 0000000..2c09fa7
Binary files /dev/null and b/public/assets/worlds/kh3/monstropolis.webp differ
diff --git a/public/assets/worlds/kh3/olympus.webp b/public/assets/worlds/kh3/olympus.webp
new file mode 100644
index 0000000..d75e37c
Binary files /dev/null and b/public/assets/worlds/kh3/olympus.webp differ
diff --git a/public/assets/worlds/kh3/san-fransokyo.webp b/public/assets/worlds/kh3/san-fransokyo.webp
new file mode 100644
index 0000000..8eb8951
Binary files /dev/null and b/public/assets/worlds/kh3/san-fransokyo.webp differ
diff --git a/public/assets/worlds/kh3/the-caribbean.webp b/public/assets/worlds/kh3/the-caribbean.webp
new file mode 100644
index 0000000..7af8d55
Binary files /dev/null and b/public/assets/worlds/kh3/the-caribbean.webp differ
diff --git a/public/assets/worlds/kh3/toy-box.webp b/public/assets/worlds/kh3/toy-box.webp
new file mode 100644
index 0000000..9e16e58
Binary files /dev/null and b/public/assets/worlds/kh3/toy-box.webp differ
diff --git a/public/assets/worlds/kh3/twilight-town.webp b/public/assets/worlds/kh3/twilight-town.webp
new file mode 100644
index 0000000..ceae348
Binary files /dev/null and b/public/assets/worlds/kh3/twilight-town.webp differ
diff --git a/src/common.rs b/src/common.rs
index 560932c..1e3060e 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use serde::Deserialize;
 
 pub mod direction;
@@ -14,3 +16,17 @@ pub enum Game {
 	Bbs,
 	Ddd,
 }
+
+impl Display for Game {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		let str = match self {
+			Game::Kh1 => "kh1",
+			Game::Kh2 => "kh2",
+			Game::Kh3 => "kh3",
+			Game::Bbs => "bbs",
+			Game::Ddd => "ddd",
+		};
+
+		f.write_str(str)
+	}
+}
diff --git a/src/common/enemy.rs b/src/common/enemy.rs
index 9ef9b9b..9260d91 100644
--- a/src/common/enemy.rs
+++ b/src/common/enemy.rs
@@ -2,7 +2,7 @@ use std::{fmt::Display, path::PathBuf};
 
 use serde::Deserialize;
 
-use super::materials::MaterialDetails;
+use super::{Game, materials::MaterialDetails};
 
 #[derive(Default, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub struct Enemy {
@@ -94,7 +94,11 @@ pub struct SpawnLocation {
 }
 
 impl SpawnLocation {
-	pub fn texture(&self) -> String {
-		self.name.replace(" ", "-").to_lowercase()
+	pub fn texture(&self, game: &Game) -> String {
+		format!(
+			"{}/{}",
+			game,
+			self.name.replace(" ", "-").replace("'", "").to_lowercase()
+		)
 	}
 }
diff --git a/templates/macros/common/drops.html b/templates/macros/common/drops.html
index 7972491..1927f29 100644
--- a/templates/macros/common/drops.html
+++ b/templates/macros/common/drops.html
@@ -30,7 +30,7 @@
 								<div>
 									<div
 										class="icon"
-										style="background-image: url('../public/assets/worlds/{{ spawn.texture() }}.webp');"
+										style="background-image: url('../public/assets/worlds/{{ spawn.texture(data.game) }}.webp');"
 									></div>
 									<div class="info">
 										<p>{{ spawn.name }}</p>