Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
@@ -1,66 +1,74 @@
 {
-	"Code":"athen",
-	"Culture":"hele",
-	"Name":"Athenians",
-	"Emblem":"session/portraits/emblems/emblem_athenians.png",
-	"History":"As the cradle of Western civilization and the birthplace of democracy, Athens was famed as a center for the arts, learning and philosophy. The Athenians were also powerful warriors, particularly at sea. At its peak, Athens dominated a large part of the Hellenic world for several decades.",
-	"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"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Athenians",
-			"Description":"A Hellenic people of the Ionian tribe.",
-			"Technologies":
-			[
-				{
-					"Name":"Iphicratean Reforms",
-					"History":"",
-					"Description":"Athenian triremes can train Marines (Epibastes Athenaikos)."
+	"Code": "athen",
+	"Culture": "hele",
+	"Name": "Athenians",
+	"Emblem": "session/portraits/emblems/emblem_athenians.png",
+	"History": "As the cradle of Western civilization and the birthplace of democracy, Athens was famed as a center for the arts, learning and philosophy. The Athenians were also powerful warriors, particularly at sea. At its peak, Athens dominated a large part of the Hellenic world for several decades.",
+	"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"
+		}
+	],
+	"Factions": [
+		{
+			"Name": "Athenians",
+			"Description": "A Hellenic people of the Ionian tribe.",
+			"Technologies": [
+				{
+					"Name": "Iphicratean Reforms",
+					"History": "",
+					"Description": "Athenian triremes can train Marines (Epibastes Athenaikos)."
 				},
 				{
-					"Name":"Long Walls",
-					"History":"The Long Walls of Athens were constructed under the auspices of the wily Themistocles and extended 6 km from the city to the port of Piraeus. This secured the city's sea supply routes and prevented an enemy from starving out the city during a siege.",
-					"Description":"Stone walls can be built in neutral territory. Construction time for walls is reduced by 50%."
+					"Name": "Long Walls",
+					"History": "The Long Walls of Athens were constructed under the auspices of the wily Themistocles and extended 6 km from the city to the port of Piraeus. This secured the city's sea supply routes and prevented an enemy from starving out the city during a siege.",
+					"Description": "Stone walls can be built in neutral territory. Construction time for walls is reduced by 50%."
 				},
 				{
-					"Name":"Othismos",
-					"History":"The classical phalanx formation was developed about VIII century BC. It was eight men deep and up to eight hundred men wide. The men within overlapped their shields, presenting a formidable shield wall brimming with 8 foot spears.",
-					"Description":"The player gains the ability to order spear-armed troops into Phalanx formation, providing greater attack and armor."
+					"Name": "Othismos",
+					"History": "The classical phalanx formation was developed about VIII century BC. It was eight men deep and up to eight hundred men wide. The men within overlapped their shields, presenting a formidable shield wall brimming with 8 foot spears.",
+					"Description": "The player gains the ability to order spear-armed troops into Phalanx formation, providing greater attack and armor."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Themistocles",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"The general who persuaded the Athenians to invest their income from silver mines in a war navy of 200 Triremes. A key figure during the Persian Wars, he commanded the victorious Athenian navy at the decisive battle of Salamis in 479 B.C. Later, he pursued an active policy against the Persians in the Aegean, thereby laying the foundations of future Athenian power. However, he was eventually ostracised by the Athenians and forced to flee to the protection of the Persians."
+					"Name": "Themistocles",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "The general who persuaded the Athenians to invest their income from silver mines in a war navy of 200 Triremes. A key figure during the Persian Wars, he commanded the victorious Athenian navy at the decisive battle of Salamis in 479 B.C. Later, he pursued an active policy against the Persians in the Aegean, thereby laying the foundations of future Athenian power. However, he was eventually ostracised by the Athenians and forced to flee to the protection of the Persians."
 				},
 				{
-					"Name":"Pericles",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Pericles was the foremost Athenian politician of the 5th Century B.C."
+					"Name": "Pericles",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Pericles was the foremost Athenian politician of the 5th Century B.C."
 				},
 				{
-					"Name":"Iphicrates",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":""
+					"Name": "Iphicrates",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": ""
 				}
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Hellenic Architecture",
 			"History": "The Greeks used stone construction from early Mycenaean times.",
@@ -72,51 +80,47 @@
 			"Description": "Metal mining gathering rates increased by +10% for each passing age."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
+		{
+			"Name": "Delian League",
+			"History": "Shortly after the great naval victories at Salamis and Mykale, the Greek city-states instituted the so-called Delian League in 478 B.C., whose purpose was to push the Persians out of the Aegean region. The allied states contributed ships and money, while the Athenians offered their entire navy.",
+			"Description": "Allied Warships −25% construction time."
+		}
+	],
+	"Structures": [
 		{
-			"Name":"Delian League",
-			"History":"Shortly after the great naval victories at Salamis and Mykale, the Greek city-states instituted the so-called Delian League in 478 B.C., whose purpose was to push the Persians out of the Aegean region. The allied states contributed ships and money, while the Athenians offered their entire navy.",
-			"Description":"Allied Warships −25% construction time."
-		}
-	],
-	"Structures":
-	[
-		{
-			"Name":"Theatron",
-			"Class":"",
-			"Emblem":"",
-			"History":"Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%."
-		},
-		{
-			"Name":"Gymnasion",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Gymnasion was a vital place in Hellenic cities, where physical exercises were performed and social contacts established.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"Train champion units and research technologies pertaining to champion units."
-		},
-		{
-			"Name":"Prytaneion",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Prytaneion is the meeting place for the city elders to dine and to make swift decisions.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"Train heroes and research technology pertaining to heroes."
+			"Name": "Theatron",
+			"Class": "",
+			"Emblem": "",
+			"History": "Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%."
+		},
+		{
+			"Name": "Gymnasion",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Gymnasion was a vital place in Hellenic cities, where physical exercises were performed and social contacts established.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "Train champion units and research technologies pertaining to champion units."
+		},
+		{
+			"Name": "Prytaneion",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Prytaneion is the meeting place for the city elders to dine and to make swift decisions.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "Train heroes and research technology pertaining to heroes."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/athen_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/athen_civil_centre"
 		},
@@ -136,8 +140,7 @@
 			"Template": "units/athen_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -150,8 +153,7 @@
 		"special/formations/wedge",
 		"special/formations/phalanx"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Themistocles",
 		"Pericles",
 		"Cimon",
@@ -168,8 +170,7 @@
 		"Iphicrates",
 		"Demosthenes"
 	],
-	"SkirmishReplacements":
-	{
+	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/athen_infantry_slinger_b",
 		"skirmish/structures/default_house_10": "structures/{civ}_house"
 	},
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
@@ -4,21 +4,34 @@
 	"Name": "Britons",
 	"Emblem": "session/portraits/emblems/emblem_britons.png",
 	"History": "The Britons were the Celtic tribes of the British Isles. Using chariots, longswordsmen and powerful melee soldiers, they staged fearsome revolts against Rome to protect their customs and interests. Also, they built thousands of unique structures such as hill forts, crannogs and brochs.",
-	"Music":[
-			{"File":"Highland_Mist.ogg", "Type":"peace"},
-			{"File":"Water's_Edge.ogg", "Type":"peace"},
-			{"File":"Celtic_Pride.ogg", "Type":"peace"},
-			{"File":"Cisalpine_Gaul.ogg", "Type":"peace"},
-			{"File":"Celtica.ogg", "Type":"peace"}
-		],
-	"Factions":
-	[
+	"Music": [
+		{
+			"File": "Highland_Mist.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Water's_Edge.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Celtic_Pride.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Cisalpine_Gaul.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Celtica.ogg",
+			"Type": "peace"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "Britons",
 			"Description": "The Celts of the British Isles.",
 			"Technologies": [],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Karatakos",
 					"Class": "",
@@ -44,8 +57,7 @@
 		}
 	],
 	"CivBonuses": [],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Druids",
 			"History": "The Druids of the Celts maintained an organized religion that advanced the technology of their people even during wartime.",
@@ -53,13 +65,11 @@
 		}
 	],
 	"Structures": [],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/brit_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/brit_civil_centre"
 		},
@@ -83,8 +93,7 @@
 			"Template": "units/brit_war_dog"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -96,8 +105,7 @@
 		"special/formations/skirmish",
 		"special/formations/wedge"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Karatakos",
 		"Kunobelinos",
 		"Boudicca",
@@ -110,8 +118,7 @@
 		"Dubnovellaunus",
 		"Vosenius"
 	],
-	"SkirmishReplacements":
-	{
+	"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"
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
@@ -4,18 +4,25 @@
 	"Name": "Carthaginians",
 	"Emblem": "session/portraits/emblems/emblem_carthaginians.png",
 	"History": "Carthage, a city-state in modern-day Tunisia, was a formidable force in the western Mediterranean, eventually taking over much of North Africa and modern-day Spain in the third century B.C. The sailors of Carthage were among the fiercest contenders on the high seas, and masters of naval trade. They deployed towered War Elephants on the battlefield to fearsome effect, and had defensive walls so strong, they were never breached.",
-	"Music":[
-			{"File":"Mediterranean_Waves.ogg", "Type":"peace"},
-			{"File":"Harsh_Lands_Rugged_People.ogg", "Type":"peace"},
-			{"File":"Peaks_of_Atlas.ogg", "Type":"peace"}
-		],
-	"Factions":
-	[
+	"Music": [
+		{
+			"File": "Mediterranean_Waves.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Harsh_Lands_Rugged_People.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Peaks_of_Atlas.ogg",
+			"Type": "peace"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "",
 			"Description": "",
-			"Technologies":
-			[
+			"Technologies": [
 				{
 					"Name": "Exploration",
 					"History": "Nobody knew better than the Carthaginians where in the ancient world they were going and going to go; their merchant traders had missions to everywhere.",
@@ -27,8 +34,7 @@
 					"Description": "Civic Centers, Temples, and Houses -25% build time."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Hannibal Barca",
 					"Class": "",
@@ -53,69 +59,64 @@
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Triple Walls",
 			"History": "Carthaginians built triple city walls.",
 			"Description": "Walls +100% build time, +100% stone cost, and +200% health."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Trademasters",
 			"History": "The Phoenicians and Carthaginians were broadly known as the greatest trading civilization of the ancient and classical world.",
 			"Description": "Allies +10% international trade bonus."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
-			"Name":"Naval Shipyard",
-			"Class":"",
-			"Emblem":"",
-			"History":"The structure is based upon the center island of the inner harbour constructed to house the war fleet of the Carthaginian navy at Carthage.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Construct the powerful warships of the Carthaginian navy."
-		},
-		{
-			"Name":"Celtic Embassy",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Celts supplied fierce warrior mercenaries for Carthaginian armies.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Hire Celtic mercenaries."
-		},
-		{
-			"Name":"Italiote Embassy",
-			"Class":"",
-			"Emblem":"",
-			"History":"When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Hire Italian mercenaries."
-		},
-		{
-			"Name":"Iberian Embassy",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Iberians were known as fierce mercenaries, loyal to their paymasters.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Hire Iberian mercenaries."
+			"Name": "Naval Shipyard",
+			"Class": "",
+			"Emblem": "",
+			"History": "The structure is based upon the center island of the inner harbour constructed to house the war fleet of the Carthaginian navy at Carthage.",
+			"Requirements": "",
+			"Phase": "",
+			"Special": "Construct the powerful warships of the Carthaginian navy."
+		},
+		{
+			"Name": "Celtic Embassy",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Celts supplied fierce warrior mercenaries for Carthaginian armies.",
+			"Requirements": "",
+			"Phase": "",
+			"Special": "Hire Celtic mercenaries."
+		},
+		{
+			"Name": "Italiote Embassy",
+			"Class": "",
+			"Emblem": "",
+			"History": "When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.",
+			"Requirements": "",
+			"Phase": "",
+			"Special": "Hire Italian mercenaries."
+		},
+		{
+			"Name": "Iberian Embassy",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Iberians were known as fierce mercenaries, loyal to their paymasters.",
+			"Requirements": "",
+			"Phase": "",
+			"Special": "Hire Iberian mercenaries."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/cart_wallset_short",
 		"structures/cart_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/cart_civil_centre"
 		},
@@ -135,8 +136,7 @@
 			"Template": "units/cart_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -149,8 +149,7 @@
 		"special/formations/wedge",
 		"special/formations/phalanx"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Hannibal Barca",
 		"Hamilcar Barca",
 		"Hasdrubal Barca",
@@ -168,8 +167,7 @@
 		"Himilco Phameas",
 		"Hasdrubal the Boetharch"
 	],
-	"SkirmishReplacements":
-	{
+	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/cart_infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}_house"
 	},
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -4,20 +4,33 @@
 	"Name": "Gauls",
 	"Emblem": "session/portraits/emblems/emblem_celts.png",
 	"History": "The Gauls were the Celtic tribes of continental Europe. Dominated by a priestly class of Druids, they featured a sophisticated culture of advanced metalworking, agriculture, trade and even road engineering. With heavy infantry and cavalry, Gallic warriors valiantly resisted Caesar's campaign of conquest and Rome's authoritarian rule.",
-	"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"}
-		],
-	"Factions":
-	[
+	"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"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "Gauls",
 			"Description": "The Celts of mainland Europe.",
-			"Technologies":
-			[
+			"Technologies": [
 				{
 					"Name": "Harvesting Machine",
 					"History": "The Gauls invented an harvesting machine, making it much easier to harvest grain.",
@@ -34,8 +47,7 @@
 					"Description": "Gallic druids gain a small melee attack."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Viridomarus",
 					"Class": "",
@@ -60,8 +72,7 @@
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Ardiosmanae",
 			"History": "Represents Celtic farming methods. ",
@@ -73,8 +84,7 @@
 			"Description": "Druids increase attack rates of soldiers near them slightly."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Products from Gaul",
 			"History": "The Gauls produced and exported swords and scabbards, woolen and leather products, and other arms.",
@@ -82,13 +92,11 @@
 		}
 	],
 	"Structures": [],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/gaul_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/gaul_civil_centre"
 		},
@@ -108,8 +116,7 @@
 			"Template": "units/gaul_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -121,8 +128,7 @@
 		"special/formations/skirmish",
 		"special/formations/wedge"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Viridomarus",
 		"Brennus",
 		"Cativolcus",
@@ -134,8 +140,7 @@
 		"Valetiacus",
 		"Viridovix"
 	],
-	"SkirmishReplacements":
-	{
+	"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
@@ -4,18 +4,25 @@
 	"Name": "Iberians",
 	"Emblem": "session/portraits/emblems/emblem_iberians.png",
 	"History": "The Iberians were a people of mysterious origins and language, with a strong tradition of horsemanship and metalworking. A relatively peaceful culture, they usually fought in other's battles only as mercenaries. However, they proved tenacious when Rome sought to take their land and freedom from them, and employed pioneering guerrilla tactics and flaming javelins as they fought back.",
-	"Music":[
-			{"File":"An_old_Warhorse_goes_to_Pasture.ogg", "Type":"peace"},
-			{"File":"Celtica.ogg", "Type":"peace"},
-			{"File":"Harsh_Lands_Rugged_People.ogg", "Type":"peace"}
-		],
-	"Factions":
-	[
+	"Music": [
+		{
+			"File": "An_old_Warhorse_goes_to_Pasture.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Celtica.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "Harsh_Lands_Rugged_People.ogg",
+			"Type": "peace"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "",
 			"Description": "",
-			"Technologies":
-			[
+			"Technologies": [
 				{
 					"Name": "Suzko Txabalina",
 					"History": "Iberian tribesmen were noted for wrapping bundles of grass about the shafts of their throwing spears, soaking that in some sort of flammable pitch, then setting it afire just before throwing.",
@@ -27,8 +34,7 @@
 					"Description": "Metal costs for units and technologies reduced by 50%."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Viriato",
 					"Class": "",
@@ -53,24 +59,21 @@
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Harritsu Leku",
 			"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 a powerful prefabricated circuit of stone walls."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Saripeko",
 			"History": "The Iberians were long known to provide mercenaries to other nations to serve as auxiliaries to their armies in foreign wars. Carthage is the most well known example, and we have evidence of them serving in such a capacity in Aquitania.",
 			"Description": "Allied Citizen Javelineers −10% resource costs."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
 			"Name": "Gur Oroigarri",
 			"Class": "",
@@ -81,13 +84,11 @@
 			"Special": "Defensive Aura - Gives all Iberian units and buildings within vision range of the monument a 10-15% attack boost. Build Limit: Only 5 may be built per map."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/iber_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/iber_civil_centre"
 		},
@@ -107,8 +108,7 @@
 			"Template": "units/iber_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -120,8 +120,7 @@
 		"special/formations/skirmish",
 		"special/formations/wedge"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Viriato",
 		"Viriato",
 		"Karos",
@@ -131,8 +130,7 @@
 		"Minurus",
 		"Tautalus"
 	],
-	"SkirmishReplacements":
-	{
+	"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",
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/kush.json
@@ -4,24 +4,33 @@
 	"Name": "Kushites",
 	"Emblem": "session/portraits/emblems/emblem_kushites.png",
 	"History": "The Kingdom of Kush was an ancient African kingdom situated on the confluences of the Blue Nile, White Nile and River Atbara in what is now the Republic of Sudan. The Kushite era of rule in the region was established after the Bronze Age collapse of the New Kingdom of Egypt, and it was centered at Napata in its early phase. They invaded Egypt in the 8th century BC, and the Kushite emperors ruled as Pharaohs of the Twenty-fifth dynasty of Egypt for a century, until they were expelled by the Assyrians. Kushite culture was influenced heavily by the Egyptians, with Kushite pyramid building and monumental temple architecture still extent. The Kushites even worshipped many Egyptian gods, including Amun. During Classical antiquity, the Kushite imperial capital was at Meroe. In early Greek geography, the Meroitic kingdom was known as Aethiopia. The Kushite kingdom persisted until the 4th century AD, when it weakened and disintegrated due to internal rebellion, eventually succumbing to the rising power of Axum.",
-	"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" }
+	"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"
+		}
 	],
-	"Factions":
-	[
+	"Factions": [
 		{
 			"Name": "Kushite Africans",
 			"Description": "The great African kingdom that straddled the Nile River in Nubia, in the South of Egypt.",
-			"Technologies":
-			[
+			"Technologies": [
 				{
-					"Name":"Archery Tradition",
-					"History":"The Kushites had a tradition of fine archery and a penchant for using massed archers in battle.",
-					"Description":"Archers −10% training time, +8 attack range, and −10% ranged attack spread."
+					"Name": "Archery Tradition",
+					"History": "The Kushites had a tradition of fine archery and a penchant for using massed archers in battle.",
+					"Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread."
 				},
 				{
 					"Name": "Monumental Architecture",
@@ -33,8 +42,7 @@
 					"Description": "Train elite rank healers."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Nastasen",
 					"Class": "",
@@ -60,15 +68,13 @@
 		}
 	],
 	"CivBonuses": [],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Elephant Suppliers",
 			"Description": "Allied Elephants −20% resource costs and training time."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
 			"Name": "Temple of Amun",
 			"Class": "",
@@ -97,8 +103,7 @@
 			"Special": "Building a Small Kushite Pyramid unlocks the Town Phase. Building a Large Kushite Pyramid unlocks the City Phase. And each pyramid built adds +10% territory effect to Civic Centers."
 		}
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/kush_civil_centre"
 		},
@@ -118,13 +123,11 @@
 			"Template": "units/kush_cavalry_javelinist_b"
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/kush_wallset_stone"
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -137,8 +140,7 @@
 		"special/formations/wedge",
 		"special/formations/syntagma"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Kashta",
 		"Alara",
 		"Pebatjma",
@@ -154,8 +156,7 @@
 		"Shanakdakhete",
 		"Amanishakheto"
 	],
-	"SkirmishReplacements":
-	{
+	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/kush_infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}_house"
 	},
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
@@ -1,22 +1,32 @@
 {
-	"Code":"mace",
-	"Culture":"hele",
-	"Name":"Macedonians",
-	"Emblem":"session/portraits/emblems/emblem_macedonians.png",
-	"History":"Macedonia was an ancient Greek kingdom, centered in the northeastern part of the Greek peninsula. Under the leadership of Alexander the Great, Macedonian forces and allies took over most of the world they knew, including Egypt, Persia and parts of the Indian subcontinent, allowing a diffusion of Hellenic and eastern cultures for years to come.",
-	"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"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Macedonians",
-			"Description":"A Hellenistic kingdom bordering the Greek city-states.",
-			"Technologies":
-			[
+	"Code": "mace",
+	"Culture": "hele",
+	"Name": "Macedonians",
+	"Emblem": "session/portraits/emblems/emblem_macedonians.png",
+	"History": "Macedonia was an ancient Greek kingdom, centered in the northeastern part of the Greek peninsula. Under the leadership of Alexander the Great, Macedonian forces and allies took over most of the world they knew, including Egypt, Persia and parts of the Indian subcontinent, allowing a diffusion of Hellenic and eastern cultures for years to come.",
+	"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"
+		}
+	],
+	"Factions": [
+		{
+			"Name": "Macedonians",
+			"Description": "A Hellenistic kingdom bordering the Greek city-states.",
+			"Technologies": [
 				{
 					"Name": "Hellenistic Metropolis",
 					"History": "Beginning with Alexander, the Hellenistic monarchs founded many cities throughout their empires, where Greek culture and art blended with local customs to create the motley Hellenistic civilization.",
@@ -28,76 +38,70 @@
 					"Description": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with more health and attack damage."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Philip II of Macedon",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"The king of Macedonia (359-336 B.C.), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia."
+					"Name": "Philip II of Macedon",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "The king of Macedonia (359-336 B.C.), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia."
 				},
 				{
-					"Name":"Alexander the Great",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"The most powerful hero of them all - son of Philip II, king of Macedonia (336-323 B.C.). After conquering the rest of the Thracians and quelling the unrest of the Greeks, Alexander embarked on a world-conquest march. Defeating the Persian forces at Granicus (334 B.C.), Issus (333 B.C.) and Gaugamela (331 B.C.), he became master of the Persian Empire. Entering India, he defeated king Porus at Hydaspes (326 B.C.), but his weary troops made him halt. Died in Babylon at the age of 33 while planning a campaign against Arabia."
+					"Name": "Alexander the Great",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "The most powerful hero of them all - son of Philip II, king of Macedonia (336-323 B.C.). After conquering the rest of the Thracians and quelling the unrest of the Greeks, Alexander embarked on a world-conquest march. Defeating the Persian forces at Granicus (334 B.C.), Issus (333 B.C.) and Gaugamela (331 B.C.), he became master of the Persian Empire. Entering India, he defeated king Porus at Hydaspes (326 B.C.), but his weary troops made him halt. Died in Babylon at the age of 33 while planning a campaign against Arabia."
 				},
 				{
-					"Name":"Demetrios the Besieger",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"One of the Diadochi, king of Macedonia (294-288 B.C.), Demetrios was renowned as one of the bravest and most able successors of Alexander. As the son of Antigonus I Monophthalmus, he fought and won many important battles early on and was proclaimed king, along with his father, in 306 B.C. Losing his Asian possessions after the battle of Ipsos, he later won the Macedonian throne. Fearing lest they should be overpowered by Demetrios, the other Diadochi united against him and defeated him."
+					"Name": "Demetrios the Besieger",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "One of the Diadochi, king of Macedonia (294-288 B.C.), Demetrios was renowned as one of the bravest and most able successors of Alexander. As the son of Antigonus I Monophthalmus, he fought and won many important battles early on and was proclaimed king, along with his father, in 306 B.C. Losing his Asian possessions after the battle of Ipsos, he later won the Macedonian throne. Fearing lest they should be overpowered by Demetrios, the other Diadochi united against him and defeated him."
 				}
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Hellenic Architecture",
 			"History": "The Greeks used stone construction from early Mycenaean times.",
 			"Description": "Structures +10% health and +10% capture points."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
-			"Name":"Standardized Currency",
-			"History":"The Macedonians and the Diadochi minted coins of very high quality. On their currency the Diadochi in particular frequently depicted themselves as the rightful successor to Alexander the Great, attempting to legitimize their rule.",
-			"Description":"Allies +20% barter sell prices."
+			"Name": "Standardized Currency",
+			"History": "The Macedonians and the Diadochi minted coins of very high quality. On their currency the Diadochi in particular frequently depicted themselves as the rightful successor to Alexander the Great, attempting to legitimize their rule.",
+			"Description": "Allies +20% barter sell prices."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
-			"Name":"Theatron",
-			"Class":"",
-			"Emblem":"",
-			"History":"Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%. Build limit: 1."
+			"Name": "Theatron",
+			"Class": "",
+			"Emblem": "",
+			"History": "Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%. Build limit: 1."
 		},
 		{
-			"Name":"Library",
-			"Class":"",
-			"Emblem":"",
-			"History":"Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"All Special Technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%. Build limit: 1."
+			"Name": "Library",
+			"Class": "",
+			"Emblem": "",
+			"History": "Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "All Special Technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%. Build limit: 1."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/mace_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/mace_civil_centre"
 		},
@@ -117,8 +121,7 @@
 			"Template": "units/mace_cavalry_spearman_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -132,8 +135,7 @@
 		"special/formations/phalanx",
 		"special/formations/syntagma"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Alexander the Great",
 		"Philip II",
 		"Antipater",
@@ -148,9 +150,8 @@
 		"Craterus",
 		"Meleager"
 	],
-	"SkirmishReplacements":
-	{
-		"skirmish/units/default_cavalry" : "units/mace_cavalry_spearman_b",
+	"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"
 	},
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
@@ -4,53 +4,61 @@
 	"Name": "Mauryas",
 	"Emblem": "session/portraits/emblems/emblem_mauryas.png",
 	"History": "Founded in 322 B.C. by Chandragupta Maurya, the Mauryan Empire was the first to rule most of the Indian subcontinent, and was one of the largest and most populous empires of antiquity. Its military featured bowmen who used the long-range bamboo longbow, fierce female warriors, chariots, and thousands of armored war elephants. Its philosophers, especially the famous Acharya Chanakya, contributed to such varied fields such as economics, religion, diplomacy, warfare, and good governance. Under the rule of Ashoka the Great, the empire saw 40 years of peace, harmony, and prosperity.",
-	"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"}
-		],
-	"Factions":
-	[
+	"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"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "Mauryan Indians",
 			"Description": "",
-			"Technologies":
-			[
+			"Technologies": [
 				{
-					"Name":"Archery Tradition",
-					"History":"The Indian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
-					"Description":"Archers −10% training time, +8 attack range, and −10% ranged attack spread."
+					"Name": "Archery Tradition",
+					"History": "The Indian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
+					"Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Chandragupta Maurya",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Founder of the Mauryan Empire."
+					"Name": "Chandragupta Maurya",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Founder of the Mauryan Empire."
 				},
 				{
-					"Name":"Ashoka the Great",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Last great emperor of the Mauryan dynasty."
+					"Name": "Ashoka the Great",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Last great emperor of the Mauryan dynasty."
 				},
 				{
-					"Name":"Acharya Chāṇakya",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Great teacher and advisor to Chandragupta Maurya."
+					"Name": "Acharya Chāṇakya",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Great teacher and advisor to Chandragupta Maurya."
 				}
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Emperor of Emperors.",
 			"History": "The Mauryan Empire encompassed dozens of formerly independent kingdoms over an area of 5 million square kilometers, with a population of close to 60 million people. The Mauryan rulers held the title Emperor of Emperors and commanded a standing army of 600,000 infantry, 9000 elephants, 8000 chariots, and 30,000 cavalry, making it arguably the largest army of its time.",
@@ -62,16 +70,14 @@
 			"Description": "Elephants −30% training time."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Ashoka's Religious Support",
 			"History": "Ashoka the Great sent embassies West to spread knowledge of the Buddha.",
 			"Description": "Allied Temples −50% resource costs and building time; Temple technologies −50% resource costs and research time."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
 			"Name": "Elephant Stable",
 			"Class": "",
@@ -91,13 +97,11 @@
 			"Special": "Contentment: +10% Health and +10% resource gathering rates for all citizens and allied citizens within its range. Can be built anywhere except in enemy territory. Max Built: 10."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/maur_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/maur_civil_centre"
 		},
@@ -122,8 +126,7 @@
 			"Count": 1
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -135,8 +138,7 @@
 		"special/formations/skirmish",
 		"special/formations/wedge"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Chandragupta Maurya",
 		"Bindusara Maurya",
 		"Ashoka the Great",
@@ -147,8 +149,7 @@
 		"Shatadhanvan Maurya",
 		"Brihadratha Maurya"
 	],
-	"SkirmishReplacements":
-	{
+	"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"
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
@@ -4,23 +4,33 @@
 	"Name": "Persians",
 	"Emblem": "session/portraits/emblems/emblem_persians.png",
 	"History": "The Persian Empire, when ruled by the Achaemenid dynasty, was one of the greatest empires of antiquity, stretching at its zenith from the Indus Valley in the east to Greece in the west. The Persians were the pioneers of empire-building of the ancient world, successfully imposing a centralized rule over various peoples with different customs, laws, religions and languages, and building a cosmopolitan army made up of contingents from each of these nations.",
-	"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"}
-		],
-	"Factions":
-	[
+	"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"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "",
 			"Description": "",
-			"Technologies":
-			[
+			"Technologies": [
 				{
-					"Name":"Archery Tradition",
-					"History":"The Iranian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
-					"Description":"Archers −10% training time, +8 attack range, and −10% ranged attack spread."
+					"Name": "Archery Tradition",
+					"History": "The Iranian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
+					"Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread."
 				},
 				{
 					"Name": "Naval Craftsmanship",
@@ -43,8 +53,7 @@
 					"Description": "+25% health for cavalry, but +10% train time."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Kurush II",
 					"Class": "",
@@ -69,24 +78,21 @@
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Great King's Levy",
 			"History": "The Persians could and did levy a large number of infantry during wartime due to the sheer size of the Achaemenid Empire and the way in which it was set-up. In general the Persian infantry was well trained and fought with great tenacity. However while this was true the infantry were poor hand-to-hand, close combat fighters. Also, with the exception of the elite regiments, the Persian infantry was not a standing professional force.",
 			"Description": "Persians have a +10% population cap bonus (e.g. 330 pop cap instead of the usual 300)."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Royal Road",
 			"History": "Coinage was invented by the Lydians in 7th Century B.C., but it was not very common until the Persian period. Darius the Great standardized coined money and his golden coins (known as 'darics') became commonplace not only throughout his empire, but as far to the west as Central Europe.",
 			"Description": "Allied Land Traders +15% trade gain."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
 			"Name": "Stable",
 			"Class": "",
@@ -96,7 +102,7 @@
 			"Requirements": "",
 			"Special": "Train Cavalry and research Cavalry technologies."
 		},
- 		{
+		{
 			"Name": "Apadana",
 			"Class": "",
 			"Emblem": "",
@@ -106,13 +112,11 @@
 			"Special": "Train heroes and Persian Immortals. Gives a slow trickle of all resources as 'Satrapy Tribute.'"
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/pers_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/pers_civil_centre"
 		},
@@ -132,8 +136,7 @@
 			"Template": "units/pers_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -146,8 +149,7 @@
 		"special/formations/wedge",
 		"special/formations/phalanx"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Kurush II the Great",
 		"Darayavahush I",
 		"Cambyses II",
@@ -161,10 +163,9 @@
 		"Haxamanish",
 		"Xsayarsa II"
 	],
-	"SkirmishReplacements":
-	{
+	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/pers_infantry_archer_b",
-		"skirmish/structures/default_house_10" : "structures/{civ}_house"
+		"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -1,100 +1,105 @@
 {
-	"Code":"ptol",
-	"Culture":"ptol",
-	"Name":"Ptolemies",
-	"Emblem":"session/portraits/emblems/emblem_ptolemies.png",
-	"History":"The Ptolemaic dynasty was a Macedonian Greek royal family which ruled the Ptolemaic Empire in Egypt during the Hellenistic period. Their rule lasted for 275 years, from 305 BC to 30 BC. They were the last dynasty of ancient Egypt.",
-	"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"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Ptolemaic Egyptians",
-			"Description":"The great Greek-Macedonian dynastic rule over Ancient Egypt.",
-			"Technologies":
-			[
+	"Code": "ptol",
+	"Culture": "ptol",
+	"Name": "Ptolemies",
+	"Emblem": "session/portraits/emblems/emblem_ptolemies.png",
+	"History": "The Ptolemaic dynasty was a Macedonian Greek royal family which ruled the Ptolemaic Empire in Egypt during the Hellenistic period. Their rule lasted for 275 years, from 305 BC to 30 BC. They were the last dynasty of ancient Egypt.",
+	"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"
+		}
+	],
+	"Factions": [
+		{
+			"Name": "Ptolemaic Egyptians",
+			"Description": "The great Greek-Macedonian dynastic rule over Ancient Egypt.",
+			"Technologies": [
 				{
 					"Name": "Hellenistic Metropolis",
 					"History": "Beginning with Alexander, the Hellenistic monarchs founded many cities throughout their empires, where Greek culture and art blended with local customs to create the motley Hellenistic civilization.",
 					"Description": "Civic Centers +100% health and capture points, double default arrows."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Ptolemaios A' Soter",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":""
+					"Name": "Ptolemaios A' Soter",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": ""
 				},
 				{
-					"Name":"Ptolemaios D' Philopater",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":""
+					"Name": "Ptolemaios D' Philopater",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": ""
 				},
 				{
-					"Name":"Kleopatra H' Philopater",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":""
+					"Name": "Kleopatra H' Philopater",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": ""
 				}
 			]
 		}
 	],
 	"CivBonuses": [],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
-			"Name":"Breadbasket of the Mediterranean",
-			"History":"Egypt was a net exporter of grain, so much so that large cities such as Athens, Antioch, and Rome came to rely upon Egyptian grain in order to feed their masses.",
-			"Description":"Allies +1.0 food trickle rate."
+			"Name": "Breadbasket of the Mediterranean",
+			"History": "Egypt was a net exporter of grain, so much so that large cities such as Athens, Antioch, and Rome came to rely upon Egyptian grain in order to feed their masses.",
+			"Description": "Allies +1.0 food trickle rate."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
-			"Name":"Library",
-			"Class":"",
-			"Emblem":"",
-			"History":"Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"Maximum of 1 built. All Special Technologies and some regular city-phase technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%."
-		},
-		{
-			"Name":"Stratópedo Misthophóron",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Greco-Macedonian Ptolemy Dynasty relied on large numbers of Greek and foreign mercenaries for the bulk of its military force, mainly because the loyalty of native Egyptian units was often suspect. Indeed, during one native uprising, Upper Egypt was lost to the Ptolemies for decades. Mercenaries were often battle-hardened and their loyalty could be bought, sometimes cheaply, sometimes not cheaply. This was of no matter, since Egypt under the Ptolemies was so prosperous as to be the richest of Alexander's successor states.",
-			"Requirements":"",
-			"Phase":"Town",
-			"Special":"Must be constructed in neutral territory. Has no territory radius effect. Trains mercenaries."
-		},
-		{
-			"Name":"Lighthouse",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Ptolemaic dynasty in Egypt built the magnificent Lighthouse of Alexandria near the harbor mouth of that Nile Delta city. This structure could be seen for many kilometers out to sea and was one of the Seven Wonders of the World.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"When built along the shoreline, removes shroud of darkness over all the water, revealing all the coast lines on the map. Limit: 1."
+			"Name": "Library",
+			"Class": "",
+			"Emblem": "",
+			"History": "Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "Maximum of 1 built. All Special Technologies and some regular city-phase technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%."
+		},
+		{
+			"Name": "Stratópedo Misthophóron",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Greco-Macedonian Ptolemy Dynasty relied on large numbers of Greek and foreign mercenaries for the bulk of its military force, mainly because the loyalty of native Egyptian units was often suspect. Indeed, during one native uprising, Upper Egypt was lost to the Ptolemies for decades. Mercenaries were often battle-hardened and their loyalty could be bought, sometimes cheaply, sometimes not cheaply. This was of no matter, since Egypt under the Ptolemies was so prosperous as to be the richest of Alexander's successor states.",
+			"Requirements": "",
+			"Phase": "Town",
+			"Special": "Must be constructed in neutral territory. Has no territory radius effect. Trains mercenaries."
+		},
+		{
+			"Name": "Lighthouse",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Ptolemaic dynasty in Egypt built the magnificent Lighthouse of Alexandria near the harbor mouth of that Nile Delta city. This structure could be seen for many kilometers out to sea and was one of the Seven Wonders of the World.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "When built along the shoreline, removes shroud of darkness over all the water, revealing all the coast lines on the map. Limit: 1."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/ptol_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/ptol_civil_centre"
 		},
@@ -114,8 +119,7 @@
 			"Template": "units/ptol_cavalry_archer_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -129,8 +133,7 @@
 		"special/formations/phalanx",
 		"special/formations/syntagma"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Ptolemy Soter",
 		"Ptolemy Philadelphus",
 		"Ptolemy Epigone",
@@ -151,8 +154,7 @@
 		"Arsinoe IV",
 		"Arsinoe II"
 	],
-	"SkirmishReplacements":
-	{
+	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_melee_b": "units/ptol_infantry_pikeman_b",
 		"skirmish/units/default_cavalry": "units/ptol_cavalry_archer_b",
 		"skirmish/structures/default_house_5": "structures/{civ}_house"
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
@@ -4,27 +4,36 @@
 	"Name": "Romans",
 	"Emblem": "session/portraits/emblems/emblem_romans.png",
 	"History": "The Romans controlled one of the largest empires of the ancient world, stretching at its peak from southern Scotland to the Sahara Desert, and containing between 60 million and 80 million inhabitants, one quarter of the Earth's population at that time. Rome also remained one of the strongest nations on earth for almost 800 years. The Romans were the supreme builders of the ancient world, excelled at siege warfare and had an exquisite infantry and navy.",
-	"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"}
-		],
-	"Factions":
-	[
+	"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"
+		}
+	],
+	"Factions": [
 		{
 			"Name": "",
 			"Description": "",
-			"Technologies":
-			[
+			"Technologies": [
 				{
 					"Name": "Divide et Impera",
 					"History": "'Divide and conquer' was the main principle in Rome's foreign politics throughout its long history. The Romans lured enemies or neutral factions to their side by offering them certain privileges. In due period of time, friends as well as foes were subjugated.",
 					"Description": "Roman heroes can convert enemy units with great cost."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
 					"Name": "Quintus Fabius Maximus",
 					"Class": "",
@@ -49,8 +58,7 @@
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"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.",
@@ -62,16 +70,14 @@
 			"Description": "Any Roman citizen-soldier fighting within Roman territory gains a non-permanent +10% bonus in armor."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
 			"Name": "Conscription",
 			"History": "Many Roman soldiers were conscripted into service. While volunteers were preferred, the Roman state did maintain an annual military draft. During an emergency the draft and the terms of service were enlarged. The importance of military service in Republican Rome was so great it was a prerequisite for a political career. Members of the Senate were called Conscript Fathers because of this, reflected in how the ordo equester was said to have been \"conscripted\" into the Senate.",
 			"Description": "Allied Citizen Infantry −10% training time."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
 			"Name": "Entrenched Camp",
 			"Class": "",
@@ -91,13 +97,11 @@
 			"Special": "Can be built in neutral and enemy territory to strangle enemy towns."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/rome_wallset_stone",
 		"structures/rome_wallset_siege"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/rome_civil_centre"
 		},
@@ -117,8 +121,7 @@
 			"Template": "units/rome_cavalry_spearman_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -132,8 +135,7 @@
 		"special/formations/testudo",
 		"special/formations/anti_cavalry"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Lucius Junius Brutus",
 		"Lucius Tarquinius Collatinus",
 		"Gaius Julius Caesar Octavianus",
@@ -149,11 +151,10 @@
 		"Quintus Caecilius Metellus Pius",
 		"Marcus Licinius Crassus"
 	],
-	"SkirmishReplacements":
-	{
-		"skirmish/units/default_cavalry" : "units/rome_cavalry_spearman_b",
+	"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"
+		"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json
@@ -1,21 +1,28 @@
 {
-	"Code":"sele",
-	"Culture":"sele",
-	"Name":"Seleucids",
-	"Emblem":"session/portraits/emblems/emblem_seleucids.png",
-	"History":"The Macedonian-Greek dynasty that ruled most of Alexander's former empire.",
-	"Music":[
-			{"File":"Rise_of_Macedon.ogg", "Type":"peace"},
-			{"File":"In_the_Shadow_of_Olympus.ogg", "Type":"peace"},
-			{"File":"The_Hellespont.ogg", "Type":"peace"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Seleucids",
-			"Description":"The Macedonian-Greek dynasty that ruled the Eastern part of Alexander's former empire.",
-			"Technologies":
-			[
+	"Code": "sele",
+	"Culture": "sele",
+	"Name": "Seleucids",
+	"Emblem": "session/portraits/emblems/emblem_seleucids.png",
+	"History": "The Macedonian-Greek dynasty that ruled most of Alexander's former empire.",
+	"Music": [
+		{
+			"File": "Rise_of_Macedon.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "In_the_Shadow_of_Olympus.ogg",
+			"Type": "peace"
+		},
+		{
+			"File": "The_Hellespont.ogg",
+			"Type": "peace"
+		}
+	],
+	"Factions": [
+		{
+			"Name": "Seleucids",
+			"Description": "The Macedonian-Greek dynasty that ruled the Eastern part of Alexander's former empire.",
+			"Technologies": [
 				{
 					"Name": "Hellenistic Metropolis",
 					"History": "Beginning with Alexander, the Hellenistic monarchs founded many cities throughout their empires, where Greek culture and art blended with local customs to create the motley Hellenistic civilization.",
@@ -32,69 +39,64 @@
 					"Description": "Unlock either Champion Infantry Pikemen or Champion Infantry Swordsmen."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Seleukos A' Nikator",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Always lying in wait for the neighboring nations, strong in arms and persuasive in council, he (Seleucus) acquired Mesopotamia, Armenia, 'Seleucid' Cappadocia, Persis, Parthia, Bactria, Arabia, Tapouria, Sogdia, Arachosia, Hyrcania, and other adjacent peoples that had been subdued by Alexander, as far as the river Indus, so that the boundaries of his empire were the most extensive in Asia after that of Alexander. The whole region from Phrygia to the Indus was subject to Seleucus. — Appian, 'The Syrian Wars'."
+					"Name": "Seleukos A' Nikator",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Always lying in wait for the neighboring nations, strong in arms and persuasive in council, he (Seleucus) acquired Mesopotamia, Armenia, 'Seleucid' Cappadocia, Persis, Parthia, Bactria, Arabia, Tapouria, Sogdia, Arachosia, Hyrcania, and other adjacent peoples that had been subdued by Alexander, as far as the river Indus, so that the boundaries of his empire were the most extensive in Asia after that of Alexander. The whole region from Phrygia to the Indus was subject to Seleucus. — Appian, 'The Syrian Wars'."
 				},
 				{
-					"Name":"Antiokhos G' Megas",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Antiochus inherited a troubled kingdom upon the beginning of his reign. From the verge of collapse he managed to weld back together the empire Seleucus I fought so hard to found. The rebellious eastern satraps of Bactria and Parthia were brought to heel, temporarily securing his eastern borders. He then turned his attention to mother Greece, attempting to fulfill the dreams of his fathers by invading Greece under the pretext of liberation. The Achaean League and the Kingdom of Pergamon banded together with the Romans to defeat him at the Battle of Magnesia, forever burying the dream of reuniting Alexander's empire."
+					"Name": "Antiokhos G' Megas",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Antiochus inherited a troubled kingdom upon the beginning of his reign. From the verge of collapse he managed to weld back together the empire Seleucus I fought so hard to found. The rebellious eastern satraps of Bactria and Parthia were brought to heel, temporarily securing his eastern borders. He then turned his attention to mother Greece, attempting to fulfill the dreams of his fathers by invading Greece under the pretext of liberation. The Achaean League and the Kingdom of Pergamon banded together with the Romans to defeat him at the Battle of Magnesia, forever burying the dream of reuniting Alexander's empire."
 				},
 				{
-					"Name":"Antiokhos D' Epiphanes",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Antiochus IV Epiphanes was a son of Antiochus III the Great and brother of Seleucus IV Philopator. Originally named Mithridates, he assumed the name Antiochus either upon his accession to the throne or after the death of his elder brother Antiochus. Notable events during his reign include the near-conquest of Egypt (twice), which was halted by the threat of Roman intervention, and the beginning of the Jewish revolt of the Maccabees. He died of sudden illness while fighting off a Parthian invasion from the East."
+					"Name": "Antiokhos D' Epiphanes",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Antiochus IV Epiphanes was a son of Antiochus III the Great and brother of Seleucus IV Philopator. Originally named Mithridates, he assumed the name Antiochus either upon his accession to the throne or after the death of his elder brother Antiochus. Notable events during his reign include the near-conquest of Egypt (twice), which was halted by the threat of Roman intervention, and the beginning of the Jewish revolt of the Maccabees. He died of sudden illness while fighting off a Parthian invasion from the East."
 				}
 			]
 		}
 	],
 	"CivBonuses": [],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
-			"Name":"Syrian Tetrapolis",
-			"History":"The political core of the Seleucid Empire consisted of four 'sister' cities: Antioch (the capital), Seleucia Pieria, Apamea, and Laodicea.",
-			"Description":"Allied Civil Centers −20% resource costs."
+			"Name": "Syrian Tetrapolis",
+			"History": "The political core of the Seleucid Empire consisted of four 'sister' cities: Antioch (the capital), Seleucia Pieria, Apamea, and Laodicea.",
+			"Description": "Allied Civil Centers −20% resource costs."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
+		{
+			"Name": "Library",
+			"Class": "",
+			"Emblem": "",
+			"History": "Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
+			"Phase": "City",
+			"Requirements": "",
+			"Special": "Maximum of 1 built. All Special Technologies and some regular city-phase technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%."
+		},
 		{
-			"Name":"Library",
-			"Class":"",
-			"Emblem":"",
-			"History":"Alexander the Great founded libraries all over his new empire. These became a center of learning for an entirely new synthesized culture: the Hellenistic culture.",
-			"Phase":"City",
-			"Requirements":"",
-			"Special":"Maximum of 1 built. All Special Technologies and some regular city-phase technologies are researched here. Building one reduces the cost of all other remaining technologies by 10%."
-		},
-		{
-			"Name":"Military Colony",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Seleucid kings invited Greeks, Macedonians, Galatians (Gauls), Cretans, and Thracians alike to settle in within the vast territories of the empire. They settled in military colonies called cleruchies (klēroukhia). Under this arrangement, the settlers were given a plot of land, or a kleros, and in return were required to serve in the great king's army when called to duty. This created a upper-middle class of military settlers who owed their livelihoods and fortunes to the Syrian kings and helped grow the available manpower for the imperial Seleucid army. A side effect of this system was that it drained the Greek homeland of military-aged men, a contributing factor to Greece's eventual conquest by Rome.",
-			"Phase":"Town",
-			"Requirements":"",
-			"Special":"This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster."
+			"Name": "Military Colony",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Seleucid kings invited Greeks, Macedonians, Galatians (Gauls), Cretans, and Thracians alike to settle in within the vast territories of the empire. They settled in military colonies called cleruchies (klēroukhia). Under this arrangement, the settlers were given a plot of land, or a kleros, and in return were required to serve in the great king's army when called to duty. This created a upper-middle class of military settlers who owed their livelihoods and fortunes to the Syrian kings and helped grow the available manpower for the imperial Seleucid army. A side effect of this system was that it drained the Greek homeland of military-aged men, a contributing factor to Greece's eventual conquest by Rome.",
+			"Phase": "Town",
+			"Requirements": "",
+			"Special": "This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/sele_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/sele_civil_centre"
 		},
@@ -114,8 +116,7 @@
 			"Template": "units/sele_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -129,8 +130,7 @@
 		"special/formations/phalanx",
 		"special/formations/syntagma"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Seleucus I Nicator",
 		"Antiochus I Soter",
 		"Antiochus II Theos",
@@ -162,9 +162,8 @@
 		"Antiochus XIII Asiaticus",
 		"Philip II Philoromaeus"
 	],
-	"SkirmishReplacements":
-	{
-		"skirmish/structures/default_house_10" : "structures/{civ}_house"
+	"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json
@@ -1,108 +1,112 @@
 {
-	"Code":"spart",
-	"Culture":"hele",
-	"Name":"Spartans",
-	"Emblem":"session/portraits/emblems/emblem_spartans.png",
-	"History":"Sparta was a prominent city-state in ancient Greece, and its dominant military power on land from circa 650 B.C. Spartan culture was obsessed with military training and excellence, with rigorous training for boys beginning at age seven. Thanks to its military might, Sparta led a coalition of Greek forces during the Greco-Persian Wars, and won over Athens in the Peloponnesian Wars, though at great cost.",
-	"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"}
-		],
-	"Factions":
-	[
-		{
-			"Name":"Spartans",
-			"Description":"",
-			"Technologies":
-			[
-				{
-					"Name":"Feminine Mystique",
-					"History":"Spartan women were some of the freest in the ancient world. They could own land and slaves and even exercise naked like Spartan men. It is said that only Spartan women gave birth to real men. Such tough-as-nails women more than once helped save their city from disaster, for example when after a lost battle against Pyrrhus of Epirus they overnight built an earthen rampart to protect the city while their men slept in preparation for the next day's siege.",
-					"Description":"Spartan female citizens cannot be captured and will doggedly fight back against any attackers. They are also capable of constructing defense towers and palisades."
+	"Code": "spart",
+	"Culture": "hele",
+	"Name": "Spartans",
+	"Emblem": "session/portraits/emblems/emblem_spartans.png",
+	"History": "Sparta was a prominent city-state in ancient Greece, and its dominant military power on land from circa 650 B.C. Spartan culture was obsessed with military training and excellence, with rigorous training for boys beginning at age seven. Thanks to its military might, Sparta led a coalition of Greek forces during the Greco-Persian Wars, and won over Athens in the Peloponnesian Wars, though at great cost.",
+	"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"
+		}
+	],
+	"Factions": [
+		{
+			"Name": "Spartans",
+			"Description": "",
+			"Technologies": [
+				{
+					"Name": "Feminine Mystique",
+					"History": "Spartan women were some of the freest in the ancient world. They could own land and slaves and even exercise naked like Spartan men. It is said that only Spartan women gave birth to real men. Such tough-as-nails women more than once helped save their city from disaster, for example when after a lost battle against Pyrrhus of Epirus they overnight built an earthen rampart to protect the city while their men slept in preparation for the next day's siege.",
+					"Description": "Spartan female citizens cannot be captured and will doggedly fight back against any attackers. They are also capable of constructing defense towers and palisades."
 				},
 				{
-					"Name":"Tyrtean Paeans",
-					"History":"Paeans were battle hymns that were sung by the hoplites when they charged the enemy lines. One of the first known Paeans were composed by Tirteus, a warrior poet of Sparta, during the First Messenian War.",
-					"Description":"Units in phalanx formation move faster."
+					"Name": "Tyrtean Paeans",
+					"History": "Paeans were battle hymns that were sung by the hoplites when they charged the enemy lines. One of the first known Paeans were composed by Tirteus, a warrior poet of Sparta, during the First Messenian War.",
+					"Description": "Units in phalanx formation move faster."
 				},
 				{
-					"Name":"The Agoge",
-					"History":"Spartans were housed and trained from a young age to be superlative warriors and to endure any hardship a military life can give them.",
-					"Description":"Champion Infantry Spearmen +25% health, but +5% training time."
+					"Name": "The Agoge",
+					"History": "Spartans were housed and trained from a young age to be superlative warriors and to endure any hardship a military life can give them.",
+					"Description": "Champion Infantry Spearmen +25% health, but +5% training time."
 				}
 			],
-			"Heroes":
-			[
+			"Heroes": [
 				{
-					"Name":"Leonidas I",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"The king of Sparta, who fought and died at the battle of Thermopylae in 480 B.C. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw."
+					"Name": "Leonidas I",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "The king of Sparta, who fought and died at the battle of Thermopylae in 480 B.C. He successfully blocked the way of the huge Persian army through the narrow passage with his 7000 men, until Xerxes was made aware of a secret unobstructed path. Finding the enemy at his rear, Leonidas sent home most of his troops, choosing to stay behind with 300 hand-picked hoplites and win time for the others to withdraw."
 				},
 				{
-					"Name":"Brasidas",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Because Brasidas has sponsored their citizenship in return for service, Helot Skirmishers fight longer and harder for Sparta while within range of him."
+					"Name": "Brasidas",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Because Brasidas has sponsored their citizenship in return for service, Helot Skirmishers fight longer and harder for Sparta while within range of him."
 				},
 				{
-					"Name":"Agis III",
-					"Class":"",
-					"Armament":"",
-					"Emblem":"",
-					"History":"Agis III was the 20th Spartan king of the Eurypontid lineage. Agis cobbled together an alliance of Southern Greek states to fight off Macedonian hegemony while Alexander the Great was away in Asia on his conquest march. After securing Crete as a Spartan tributary, Agis then moved to besiege the city of Megalopolis in the Peloponnese, who was an ally of Macedon. Antipater, the Macedonian regent, lead an army to stop this new uprising. In the Battle of Megalopolis, the Macedonians prevailed in a long and bloody battle. Much like Leonidas 150 years earlier, instead of surrendering, Agis made a heroic final stand in order to buy time for his troops to retreat."
+					"Name": "Agis III",
+					"Class": "",
+					"Armament": "",
+					"Emblem": "",
+					"History": "Agis III was the 20th Spartan king of the Eurypontid lineage. Agis cobbled together an alliance of Southern Greek states to fight off Macedonian hegemony while Alexander the Great was away in Asia on his conquest march. After securing Crete as a Spartan tributary, Agis then moved to besiege the city of Megalopolis in the Peloponnese, who was an ally of Macedon. Antipater, the Macedonian regent, lead an army to stop this new uprising. In the Battle of Megalopolis, the Macedonians prevailed in a long and bloody battle. Much like Leonidas 150 years earlier, instead of surrendering, Agis made a heroic final stand in order to buy time for his troops to retreat."
 				}
 			]
 		}
 	],
-	"CivBonuses":
-	[
+	"CivBonuses": [
 		{
 			"Name": "Hellenic Architecture",
 			"History": "The Greeks used stone construction from early Mycenaean times.",
 			"Description": "Structures +10% health and +10% capture points."
 		}
 	],
-	"TeamBonuses":
-	[
+	"TeamBonuses": [
 		{
-			"Name":"Peloponnesian League",
-			"History":"Much of the Peloponnese was subject to Sparta in one way or another. This loose confederation, with Sparta as its leader, was later dubbed the Peloponnesian League by historians, but in ancient times was called 'The Lacedaemonians and their allies.'",
-			"Description":"Allied Citizen Infantry Spearmen +10% health."
+			"Name": "Peloponnesian League",
+			"History": "Much of the Peloponnese was subject to Sparta in one way or another. This loose confederation, with Sparta as its leader, was later dubbed the Peloponnesian League by historians, but in ancient times was called 'The Lacedaemonians and their allies.'",
+			"Description": "Allied Citizen Infantry Spearmen +10% health."
 		}
 	],
-	"Structures":
-	[
+	"Structures": [
 		{
-			"Name":"Theatron",
-			"Class":"",
-			"Emblem":"",
-			"History":"Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%."
+			"Name": "Theatron",
+			"Class": "",
+			"Emblem": "",
+			"History": "Greek theatres were places where the immortal tragedies of Aeschylus, Sophocles and many other talented dramatists were staged to the delight of the populace. They were instrumental in enriching Hellenic culture.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "The Hellenization civ bonus. Building a Theatron increases the territory effect of all buildings by 25%."
 		},
 		{
-			"Name":"Syssition",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Syssition was the Mess Hall for full-blooded Spartiates. Every Spartan peer, even kings, belonged to one.",
-			"Requirements":"",
-			"Phase":"City",
-			"Special":"Train heroes and Spartiates and research technologies related to them."
+			"Name": "Syssition",
+			"Class": "",
+			"Emblem": "",
+			"History": "The Syssition was the Mess Hall for full-blooded Spartiates. Every Spartan peer, even kings, belonged to one.",
+			"Requirements": "",
+			"Phase": "City",
+			"Special": "Train heroes and Spartiates and research technologies related to them."
 		}
 	],
-	"WallSets":
-	[
+	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/spart_wallset_stone"
 	],
-	"StartEntities":
-	[
+	"StartEntities": [
 		{
 			"Template": "structures/spart_civil_centre"
 		},
@@ -122,8 +126,7 @@
 			"Template": "units/spart_cavalry_javelinist_b"
 		}
 	],
-	"Formations":
-	[
+	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
@@ -136,8 +139,7 @@
 		"special/formations/wedge",
 		"special/formations/phalanx"
 	],
-	"AINames":
-	[
+	"AINames": [
 		"Leonidas",
 		"Dienekes",
 		"Brasidas",
@@ -151,9 +153,8 @@
 		"Eucleidas",
 		"Agesipolis"
 	],
-	"SkirmishReplacements":
-	{
-		"skirmish/structures/default_house_10" : "structures/{civ}_house",
+	"SkirmishReplacements": {
+		"skirmish/structures/default_house_10": "structures/{civ}_house",
 		"skirmish/structures/default_wall_tower": "",
 		"skirmish/structures/default_wall_gate": "",
 		"skirmish/structures/default_wall_short": "",