Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json	(revision 27683)
@@ -1,75 +1,72 @@
 {
 	"Code": "athen",
 	"Culture": "hele",
 	"Music": [
 		{
 			"File": "Harvest_Festival.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Forging_a_City-State.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Highland_Mist.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Hellespont.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Silver Owls",
 			"History": "The mines at Laureion in Attica provided Athens with a wealth of silver from which to mint her famous and highly prized coin, The Athenian Owl.",
 			"Description": "Workers +10% metal gather rate per phase advance."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/athen/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/athen/civil_centre"
 		},
 		{
 			"Template": "units/athen/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/athen/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/athen/infantry_slinger_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/athen/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Themistocles",
-		"Pericles",
 		"Cimon",
 		"Aristides",
 		"Xenophon",
 		"Hippias",
 		"Cleisthenes",
 		"Thucydides",
 		"Alcibiades",
 		"Miltiades",
 		"Cleon",
 		"Cleophon",
 		"Thrasybulus",
-		"Iphicrates",
 		"Demosthenes"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/athen/infantry_slinger_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json	(revision 27683)
@@ -1,86 +1,83 @@
 {
 	"Code": "brit",
 	"Culture": "celt",
 	"Music": [
 		{
 			"File": "The_Fledgling_Kingdom.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Solstice_Festival.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Whistler.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "As_Seasons_Change.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Highland_Mist.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Celtica.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Mountain_Idyll.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Albian_Nocturne.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/brit/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/brit/civil_centre"
 		},
 		{
 			"Template": "units/brit/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/brit/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/brit/infantry_slinger_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/brit/cavalry_javelineer_b",
 			"Count": 1
 		},
 		{
 			"Template": "units/brit/war_dog"
 		}
 	],
 	"AINames": [
-		"Karatakos",
-		"Kunobelinos",
-		"Boudicca",
 		"Prasutagus",
 		"Venutius",
 		"Cogidubnus",
 		"Commius",
 		"Comux",
 		"Adminius",
 		"Dubnovellaunus",
 		"Vosenius"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/brit/infantry_slinger_b",
 		"skirmish/units/special_starting_unit": "units/brit/war_dog",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json	(revision 27683)
@@ -1,82 +1,79 @@
 {
 	"Code": "cart",
 	"Culture": "cart",
 	"Music": [
 		{
 			"File": "Mediterranean_Waves.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Harsh_Lands_Rugged_People.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Peaks_of_Atlas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "From_Every_Corner.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Commercial Acumen",
 			"History": "",
 			"Description": "Merchant Ships +25% trade gain."
 		},
 		{
 			"Name": "Desirable Products",
 			"History": "",
 			"Description": "Docks and Markets +10% international trade bonus."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/cart/wallset_short",
 		"structures/cart/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/cart/civil_centre"
 		},
 		{
 			"Template": "units/cart/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/cart/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/cart/infantry_archer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/cart/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Hannibal Barca",
-		"Hamilcar Barca",
 		"Hasdrubal Barca",
 		"Hasdrubal Gisco",
 		"Hanno the Elder",
-		"Maharbal",
 		"Mago Barca",
 		"Hasdrubal the Fair",
 		"Hanno the Great",
 		"Himilco",
 		"Hampsicora",
 		"Hannibal Gisco",
 		"Dido",
 		"Xanthippus",
 		"Himilco Phameas",
 		"Hasdrubal the Boetharch"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/cart/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json	(revision 27683)
@@ -1,71 +1,68 @@
 {
 	"Code": "gaul",
 	"Culture": "celt",
 	"Music": [
 		{
 			"File": "Celtic_Pride.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Cisalpine_Gaul.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Harvest_Festival.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Water's_Edge.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Sunrise.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Harvest_Moon.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/gaul/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/gaul/civil_centre"
 		},
 		{
 			"Template": "units/gaul/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/gaul/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/gaul/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/gaul/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Viridomarus",
-		"Brennus",
 		"Cativolcus",
 		"Cingetorix",
-		"Vercingetorix",
 		"Divico",
 		"Ambiorix",
 		"Liscus",
 		"Valetiacus",
 		"Viridovix"
 	],
 	"SkirmishReplacements": {
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json	(revision 27683)
@@ -1,82 +1,78 @@
 {
 	"Code": "iber",
 	"Culture": "iber",
 	"Music": [
 		{
 			"File": "An_old_Warhorse_goes_to_Pasture.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Celtica.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Harsh_Lands_Rugged_People.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Midwinter.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Pillars_of_Hercules.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Starting Walls",
 			"History": "With exception to alluvial plains and river valleys, stone is abundant in the Iberian Peninsula and was greatly used in construction of structures of all types.",
 			"Description": "Iberians start with City Walls around their base on most maps."
 		},
 		{
 			"Name": "Massive Towers",
 			"History": "",
 			"Description": "Stone Towers −50% wood cost, +150% stone cost, +33% build time, +60% health, +3 garrison capacity, and +1 default arrow count."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/iber/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/iber/civil_centre"
 		},
 		{
 			"Template": "units/iber/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/iber/infantry_swordsman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/iber/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/iber/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Viriato",
-		"Viriato",
-		"Karos",
-		"Indibil",
 		"Audax",
 		"Ditalcus",
 		"Minurus",
 		"Tautalus"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_melee_b": "units/iber/infantry_swordsman_b",
 		"skirmish/structures/default_house_5": "structures/{civ}/house",
 		"skirmish/structures/iber_wall_short": "structures/iber/wall_short",
 		"skirmish/structures/iber_wall_medium": "structures/iber/wall_medium",
 		"skirmish/structures/iber_wall_long": "structures/iber/wall_long",
 		"skirmish/structures/iber_wall_gate": "structures/iber/wall_gate",
 		"skirmish/structures/iber_wall_tower": "structures/iber/wall_tower"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json	(revision 27683)
@@ -1,90 +1,89 @@
 {
 	"Code": "kush",
 	"Culture": "egyptian",
 	"Music": [
 		{
 			"File": "Ammon-Ra.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Sands_of_Time.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_between_the_two_Seas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Valley_of_the_Nile.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Bandit_Country.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Mirage.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Point_of_No_Return.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Large Rams",
 			"History": "",
 			"Description": "Battering Rams +20% attack damage and +2 garrison capacity."
 		}
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/kush/civil_centre"
 		},
 		{
 			"Template": "units/kush/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/kush/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/kush/infantry_archer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/kush/cavalry_javelineer_b"
 		},
 		{
 			"Template": "units/kush/support_healer_b"
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/kush/wallset_stone"
 	],
 	"AINames": [
 		"Kashta",
 		"Alara",
 		"Pebatjma",
 		"Shabaka",
 		"Shebitku",
 		"Qalhata",
 		"Takahatenamun",
 		"Tantamani",
 		"Atlanersa",
 		"Nasalsa",
 		"Malewiebamani",
-		"Harsiotef",
 		"Shanakdakhete",
 		"Amanishakheto"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/kush/infantry_archer_b",
 		"skirmish/units/special_starting_unit": "units/kush/support_healer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json	(revision 27683)
@@ -1,80 +1,78 @@
 {
 	"Code": "mace",
 	"Culture": "hele",
 	"Music": [
 		{
 			"File": "Rise_of_Macedon.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "In_the_Shadow_of_Olympus.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Elysian_Fields.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Hellespont.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Northern_Frontier.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Upstart_King.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Epitaph.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/mace/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/mace/civil_centre"
 		},
 		{
 			"Template": "units/mace/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/mace/infantry_pikeman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/mace/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/mace/cavalry_spearman_b"
 		}
 	],
 	"AINames": [
-		"Alexander the Great",
-		"Philip II",
 		"Antipater",
 		"Philip IV",
 		"Lysander",
 		"Lysimachus",
 		"Pyrrhus of Epirus",
 		"Antigonus II Gonatas",
 		"Demetrius II Aetolicus",
 		"Philip V",
 		"Perseus",
 		"Craterus",
 		"Meleager"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_cavalry": "units/mace/cavalry_spearman_b",
 		"skirmish/units/default_infantry_melee_b": "units/mace/infantry_pikeman_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json	(revision 27683)
@@ -1,73 +1,71 @@
 {
 	"Code": "maur",
 	"Culture": "maur",
 	"Music": [
 		{
 			"File": "An_old_Warhorse_goes_to_Pasture.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_between_the_two_Seas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Eastern_Dreams.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Karmic_Confluence.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Beyond_The_Indus.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/maur/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/maur/civil_centre"
 		},
 		{
 			"Template": "units/maur/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/maur/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/maur/infantry_archer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/maur/cavalry_javelineer_b",
 			"Count": 1
 		},
 		{
 			"Template": "units/maur/support_elephant",
 			"Count": 1
 		}
 	],
 	"AINames": [
-		"Chandragupta Maurya",
 		"Bindusara Maurya",
-		"Ashoka the Great",
 		"Dasharatha Maurya",
 		"Samprati Maurya",
 		"Shalishuka Maurya",
 		"Devavarman Maurya",
 		"Shatadhanvan Maurya",
 		"Brihadratha Maurya"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/maur/infantry_archer_b",
 		"skirmish/units/special_starting_unit": "units/maur/support_elephant",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json	(revision 27683)
@@ -1,82 +1,79 @@
 {
 	"Code": "pers",
 	"Culture": "pers",
 	"Music": [
 		{
 			"File": "Eastern_Dreams.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Valley_of_the_Nile.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_between_the_two_Seas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Sands_of_Time.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Darics",
 			"History": "",
 			"Description": "Land Traders +25% trade gain."
 		},
 		{
 			"Name": "Large Rams",
 			"History": "",
 			"Description": "Battering Rams +20% attack damage and +2 garrison capacity."
 		},
 		{
 			"Name": "Time of War",
 			"History": "The Persians were known for their large cavalry contingent",
 			"Description": "Stable −10% batch training time per phase advance."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/pers/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/pers/civil_centre"
 		},
 		{
 			"Template": "units/pers/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/pers/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/pers/infantry_archer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/pers/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Kurush II the Great",
-		"Darayavahush I",
 		"Cambyses II",
 		"Bardiya",
-		"Xsayarsa I",
 		"Artaxshacha I",
 		"Darayavahush II",
 		"Darayavahush III",
 		"Artaxshacha II",
 		"Artaxshacha III",
 		"Haxamanish",
 		"Xsayarsa II"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/pers/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json	(revision 27683)
@@ -1,89 +1,87 @@
 {
 	"Code": "ptol",
 	"Culture": "ptol",
 	"Music": [
 		{
 			"File": "Ammon-Ra.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Sands_of_Time.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_between_the_two_Seas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Valley_of_the_Nile.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Epitaph.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Along_the_Nile.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Polybolos",
 			"History": "",
 			"Description": "Bolt Shooters −33% attack damage and −33% attack time."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/ptol/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/ptol/civil_centre"
 		},
 		{
 			"Template": "units/ptol/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/ptol/infantry_pikeman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/ptol/infantry_slinger_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/ptol/cavalry_archer_b"
 		}
 	],
 	"AINames": [
-		"Ptolemy Soter",
 		"Ptolemy Philadelphus",
 		"Ptolemy Epigone",
 		"Ptolemy Eurgetes",
-		"Ptolemy Philopater",
 		"Ptolemy Epiphanes",
 		"Ptolemy Philometor",
 		"Ptolemy Eupator",
 		"Ptolemy Alexander",
 		"Ptolemy Neos Dionysos",
 		"Ptolemy Neos Philopater",
 		"Berenice Philopater",
 		"Cleopatra Tryphaena",
 		"Berenice Epiphaneia",
 		"Cleopatra Philopater",
 		"Cleopatra Selene",
 		"Cleopatra II Philometora Soteira",
 		"Arsinoe IV",
 		"Arsinoe II"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_melee_b": "units/ptol/infantry_pikeman_b",
 		"skirmish/units/default_infantry_ranged_b": "units/ptol/infantry_slinger_b",
 		"skirmish/units/default_cavalry": "units/ptol/cavalry_archer_b",
 		"skirmish/structures/default_house_5": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json	(revision 27683)
@@ -1,88 +1,87 @@
 {
 	"Code": "rome",
 	"Culture": "rome",
 	"Music": [
 		{
 			"File": "Juno_Protect_You.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Mediterranean_Waves.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Elysian_Fields.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Governor.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Alba_Longa_Burns.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Roman_Ingenuity.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Testudo Formation",
 			"History": "The Romans commonly used the Testudo or 'turtle' formation for defense: Legionaries were formed into hollow squares with twelve men on each side, standing so close together that their shields overlapped like fish scales.",
 			"Description": "Roman Legionaries can form a Testudo."
 		},
 		{
 			"Name": "Legionary Engineers",
 			"History": "",
 			"Description": "Battering Rams +20% attack damage. Stone Throwers +10% attack damage."
 		}
 	],
 	"WallSets": [
 		"structures/rome/wallset_stone",
 		"structures/rome/wallset_siege"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/rome/civil_centre"
 		},
 		{
 			"Template": "units/rome/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/rome/infantry_swordsman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/rome/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/rome/cavalry_spearman_b"
 		}
 	],
 	"AINames": [
 		"Lucius Junius Brutus",
 		"Lucius Tarquinius Collatinus",
 		"Gaius Julius Caesar Octavianus",
 		"Marcus Vipsanius Agrippa",
 		"Gaius Iulius Iullus",
 		"Gaius Servilius Structus Ahala",
 		"Publius Cornelius Rufinus",
 		"Lucius Papirius Cursor",
 		"Aulus Manlius Capitolinus",
-		"Publius Cornelius Scipio Africanus",
 		"Publius Sempronius Tuditanus",
 		"Marcus Cornelius Cethegus",
 		"Quintus Caecilius Metellus Pius",
 		"Marcus Licinius Crassus"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_cavalry": "units/rome/cavalry_spearman_b",
 		"skirmish/units/default_infantry_melee_b": "units/rome/infantry_swordsman_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json	(revision 27683)
@@ -1,91 +1,88 @@
 {
 	"Code": "sele",
 	"Culture": "sele",
 	"Music": [
 		{
 			"File": "Rise_of_Macedon.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "In_the_Shadow_of_Olympus.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Hellespont.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Cradle_of_Civilization.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Expedition.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_Between_Rivers.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/sele/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/sele/civil_centre"
 		},
 		{
 			"Template": "units/sele/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/sele/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/sele/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/sele/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Seleucus I Nicator",
 		"Antiochus I Soter",
 		"Antiochus II Theos",
 		"Seleucus II Callinicus",
 		"Seleucus III Ceraunus",
-		"Antiochus III Megas",
 		"Seleucus IV Philopator",
-		"Antiochus IV Epiphanes",
 		"Antiochus V Eupator",
 		"Demetrius I Soter",
 		"Alexander I Balas",
 		"Demetrius II Nicator",
 		"Antiochus VI Dionysus",
 		"Diodotus Tryphon",
 		"Antiochus VII Sidetes",
 		"Demetrius II Nicator",
 		"Alexander II Zabinas",
 		"Cleopatra Thea",
 		"Seleucus V Philometor",
 		"Antiochus VIII Grypus",
 		"Antiochus IX Cyzicenus",
 		"Seleucus VI Epiphanes",
 		"Antiochus X Eusebes",
 		"Demetrius III Eucaerus",
 		"Antiochus XI Epiphanes",
 		"Philip I Philadelphus",
 		"Antiochus XII Dionysus",
 		"Seleucus VII Kybiosaktes",
 		"Antiochus XIII Asiaticus",
 		"Philip II Philoromaeus"
 	],
 	"SkirmishReplacements": {
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json	(revision 27682)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json	(revision 27683)
@@ -1,80 +1,78 @@
 {
 	"Code": "spart",
 	"Culture": "hele",
 	"Music": [
 		{
 			"File": "Helen_Leaves_Sparta.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Peaks_of_Atlas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Forging_a_City-State.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "The_Hellespont.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Only_300_Stood.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Spartan Women",
 			"History": "",
 			"Description": "Female Citizens +40% health and +50% melee attack hack damage."
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/spart/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/spart/civil_centre"
 		},
 		{
 			"Template": "units/spart/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/spart/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/spart/infantry_javelineer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/spart/cavalry_javelineer_b"
 		}
 	],
 	"AINames": [
-		"Leonidas",
 		"Dienekes",
-		"Brasidas",
-		"Agis",
+		"Agis II",
 		"Archidamus",
 		"Lysander",
 		"Pausanias",
 		"Agesilaus",
 		"Echestratus",
 		"Eurycrates",
 		"Eucleidas",
 		"Agesipolis"
 	],
 	"SkirmishReplacements": {
 		"skirmish/structures/default_house_10": "structures/{civ}/house",
 		"skirmish/structures/default_wall_tower": "",
 		"skirmish/structures/default_wall_gate": "",
 		"skirmish/structures/default_wall_short": "",
 		"skirmish/structures/default_wall_medium": "",
 		"skirmish/structures/default_wall_long": ""
 	},
 	"SelectableInGameSetup": true
 }