diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
index 96382fc7f..5388c6fc1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
@@ -396,16 +396,14 @@ public class CastleAssault extends TeamGame
 		this.CreatureAllowOverride = true;
 		_kings.put(red, new TeamKing(red, "King Jon", redKing));
 		_kings.put(blue, new TeamKing(blue, "King Ryan", blueKing));
-		int kitIndex = 0;
-		for (int i = 0; i < WorldData.GetDataLocs("WHITE").size(); i++)
+		for (Kit kit : GetKits())
 		{
-			if (kitIndex >= GetKits().length)
+			List<Location> spawns = WorldData.GetDataLocs("K:" + kit.GetName());
+			for (Location spawn : spawns)
 			{
-				kitIndex = 0;
+				Entity ent = kit.SpawnEntity(spawn);
+				Manager.GetLobby().addKitLocation(ent, kit, spawn);
 			}
-			Entity ent = GetKits()[kitIndex].SpawnEntity(WorldData.GetDataLocs("WHITE").get(i)); 
-			Manager.GetLobby().addKitLocation(ent, GetKits()[kitIndex], WorldData.GetDataLocs("WHITE").get(i));
-			kitIndex++;
 		}
 		this.CreatureAllowOverride = false;
 		_tntSpawner = new ObjectiveTNTSpawner(WorldData.GetDataLocs("BLACK"));