diff --git a/Assets/Python/GreatPeople.py b/Assets/Python/GreatPeople.py
index eda9170a98..496d694391 100644
--- a/Assets/Python/GreatPeople.py
+++ b/Assets/Python/GreatPeople.py
@@ -22,7 +22,6 @@ def create(iPlayer, iUnit, (x, y)):
 def getAlias(iCiv, iType):
 	if iCiv in [iCivHarappa, iCivTamils]: return iCivIndia
 	elif iCiv == iCivHolyRome: return iCivGermany
-	elif iCiv == iCivThailand: return iCivKhmer
 	elif iCiv == iCivIran: return iCivPersia
 	
 	return iCiv
@@ -130,6 +129,7 @@ def setup():
 		"Han Fei", # 3rd BC
 		iMedieval,
 		"Bodhidharma", # 6th
+		"Bukong", # 8th
 		"fLin Moniang", # 10th
 		"Wang Chongyang", # 12th
 		"fSun Bu'er", # 12th
@@ -139,6 +139,7 @@ def setup():
 		"Wang Yangming", # 16th
 		iIndustrial, 
 		"Hong Xiuquan", # 19th
+		"Wang Jueyi", # 19th
 		iGlobal,
 		"Xiong Shili", # 20th
 		"Sheng Yen", # 20th
@@ -154,6 +155,7 @@ def setup():
 		"Gu Kaizhi", # 4th
 		iMedieval,
 		"fShangguan Wan'er", # 7th
+		"Han Yu", # 8th
 		"Fan Kuan", # 10th
 		"Su Shi", # 11th 
 		"fLi Qingzhao", # 12th
@@ -195,6 +197,7 @@ def setup():
 		"Wang Anshi", # 11th
 		iRenaissance,
 		"Zheng He", # 15th
+		"Yishiha", # 15th
 		"Pan Qiguan", # 18th
 		iGlobal,
 		"Zeng Junchen", # 20th
@@ -203,11 +206,13 @@ def setup():
 	iGreatEngineer : [
 		"fLeizu", # 27th BC
 		iClassical,
+		"Lu Ban", # 5th BC
 		"Cai Lun", # 1st
 		"Zhang Heng", # 2nd
 		"Ma Jun", # 3rd
 		iMedieval,
 		"Yi Xing", # 8th
+		"Yu Hao", # 10th
 		"Bi Sheng", # 11th
 		"Su Song", # 11th
 		"Wang Zhen", # 14th
@@ -274,6 +279,9 @@ def setup():
 		iMedieval,
 		"Adi Shankara", # 9th
 		"Atisha", # 11th
+		"Ramanuja", # 11th
+		"Basava", # 12th
+		"Kabir", # 15th
 		iRenaissance,
 		"Chaitanya Mahaprabhu", # 16th
 		"fMeera", # 16th
@@ -333,7 +341,7 @@ def setup():
 		"Jagadu", # 13th
 		iIndustrial,
 		"Jamsetjee Jejeebhoy", # 19th
-		"Jamshetji Tata", # 19th
+		"Jamsetji Tata", # 19th
 		"Ardeshir Godrej", # 19th
 		iGlobal,
 		"Kappalottiya Tamizhan", # 20th
@@ -349,6 +357,7 @@ def setup():
 		iIndustrial,
 		"Jagadish Chandra Bose", # 19th
 		"Mokshagundam Visvesvaraya", # 19th
+		"Jamsetji Tata", # 19th
 		iGlobal,
 		"fEulie Chowdhury", # 20th
 		"Satish Dhawan", # 20th
@@ -370,6 +379,7 @@ def setup():
 		iGlobal,
 		"fSarojini Naidu", # 20th
 		"Sarvepalli Radhakrishnan", # 20th
+		"Bhimrao Ramji Ambedkar", # 20th
 		"Jawaharlal Nehru", # 20th
 	],
 	iGreatGeneral : [
@@ -501,6 +511,7 @@ def setup():
 		"Sneferu", # 27th BC
 		"Senenmut", # 17th BC
 		"Ineni", # 15th BC
+		"Amenhotep", # 14th BC
 		iClassical,
 		"Heron", # 1st AD
 	],
@@ -664,9 +675,10 @@ def setup():
 	],
 	iGreatMerchant : [
 		"Acerbas", # 9th BC / legendary
+		iClassical,
 		"Hanno", # 5th BC
 		"Himilco", # 5th BC
-		iClassical,
+		"Abdashtart", # 4th BC
 		"Adherbal", # 2nd BC
 		"Bocchus", # 2nd BC
 	],
@@ -704,6 +716,7 @@ def setup():
 		"Mani", # 3rd
 		"Kartir", # 3rd
 		"Mazdak", # 4th
+		"Adurbad-i Mahrspandan", # 4th
 		"Mar Aba", # 6th
 		iMedieval,
 		"Al-Muqanna", # 8th
@@ -729,8 +742,10 @@ def setup():
 		"Ferdowsi", # 10th
 		"fRabia Balkhi", # 10th
 		"Nizami Ganjavi", # 12th
+		"Farid al-Din Attar", # 12th
 		"Safi al-Din", # 13th
 		"Saadi", # 13th
+		"Rumi", # 13th
 		"Nur ad-Din Abd ar-Rahman Jami", # 15th
 		iRenaissance,
 		"Kamal ud-Din Behzad", # 15th
@@ -751,9 +766,12 @@ def setup():
 		iMedieval,
 		"Al-Khwarizmi", # 9th
 		"Muhammad ibn Zakariya al-Razi", # 9th
+		"Ibn Miskawayh", # 10th
 		"Ibn Sina", # 10th
 		"Abd al-Rahman al-Sufi", # 10th
+		"Omar Khayyam", # 11th
 		"Kamal al-Din al-Farisi", # 13th
+		"Qutb al-Din al-Shirazi", # 13th
 		iRenaissance,
 		"Al-Birjandi", # 16th
 		"Baha al-din al-Amili", # 16th
@@ -786,6 +804,7 @@ def setup():
 		"Naubakht", # 8th or 9th
 		"Al-Khujandi", # 10th
 		"Ibn al-Haitham", # 10th
+		"Nasir al-Din al-Tusi", # 13th
 		iRenaissance,
 		"Sheikh Baha'i", # 16th
 		"Ustad Mirza Shirazi", # 18th
@@ -875,6 +894,7 @@ def setup():
 	iGreatEngineer : [
 		"Sergius Orata", # 2nd BC
 		"Marcus Vitruvius Pollio", # 1st BC
+		"Celer", # 1st AD
 		"Marcus Vipsanius Agrippa", # 1st AD
 		"Sextus Julius Frontinus", # 1st AD
 		"Apollodorus Damascenus", # 2nd AD
@@ -903,6 +923,7 @@ def setup():
 },
 iCivJapan : {
 	iGreatProphet : [
+		"En no Ozunu", # 7th
 		"Kuukaii", # 8th
 		"Saichou", # 8th
 		"Abe no Seimei", # 10th
@@ -961,6 +982,7 @@ def setup():
 		"Takakazu Seki", # 17th
 		"Aida Yasuaki", # 18th
 		"Sugita Genpaku", # 18th
+		iIndustrial,
 		"Ogata Kouan", # 19th
 		"Shibasaburou Kitasato", # 19th
 		iGlobal,
@@ -1240,6 +1262,7 @@ def setup():
 },
 iCivByzantium : {
 	iGreatProphet : [
+		"Nestorios", # 5th
 		"fTheodora", # 6th
 		"Kyrillos", # 9th
 		"Methodios", # 9th
@@ -1417,6 +1440,7 @@ def setup():
 		"Tatpar Qaghan", # 6th
 		"Bulan", # 9th
 		"Abu Mansur al-Maturidi", # 9th
+		"Muhammad al-Bukhari", # 9th
 		"Al-Ghazali", # 11th (also Persian)
 		"Ahmad Yasawi", # 12th
 		"fFatima al-Samarqandi", # 12th
@@ -1459,6 +1483,7 @@ def setup():
 		"Kasym Tynystanov", # 20th
 	],
 	iGreatMerchant : [
+		"Maniakh", # 6th
 		"Muqan Qaghan", # 6th
 		"Sheguy", # 7th
 		"Ahmad ibn Rustah", # 10th
@@ -1474,6 +1499,7 @@ def setup():
 		"Kanysh Satbayev", # 20th
 	],
 	iGreatStatesman : [
+		u"Istämi", # 6th
 		"Ishbara Qaghan", # 6th
 		"Ashina Simo", # 7th
 		"Nizam al-Mulk", # 11th
@@ -1511,6 +1537,7 @@ def setup():
 		"Umar ibn al-Kattab", # 7th
 		"fRabia Basri", # 9th
 		"Al-Baqilanni", # 10th
+		"Ibn al-Jawzi", # 12th
 		iRenaissance,
 		"Muhammad ibn Abd al-Wahhab", # 18th
 	],
@@ -1526,6 +1553,7 @@ def setup():
 	],
 	iGreatScientist : [
 		"Al-Kindi", # 9th
+		"Al-Khwarizmi", # 9th (also Persian)
 		"Al-Farabi", # 10th
 		"Ibrahim ibn Sinan", # 10th
 		"Ibn al-Jazzar", # 10th
@@ -1604,6 +1632,7 @@ def setup():
 		"Jabir bin Aflah", # 12th
 		"Ibn Rushd", # 12th
 		"Ibn Bajja", # 12th
+		"Abu al-Salt", # 12th
 		"Al-Qalasadi", # 15th
 	],
 	iGreatMerchant : [
@@ -1729,6 +1758,7 @@ def setup():
 		"Ramon Llull", # 13th
 		iRenaissance,
 		"Miguel Serveto", # 16th
+		u"Carlos de Sigüenza y Góngora", # 17th
 		"Antonio de Ulloa", # 18th
 		iIndustrial,
 		u"Santiago Ramón y Cajal", # 19th
@@ -1788,8 +1818,10 @@ def setup():
 		iRenaissance,
 		"Jean Calvin", # 16th
 		"fJeanne Mance", # 17th
+		"fMarguerite Bourgeoys", # 17th
 		iIndustrial,
 		u"fThérèse de Lisieux", # 19th
+		"Auguste Comte", # 19th
 		iGlobal,
 		"Albert Schweitzer", # 20th
 		u"Marcel Légaut", # 20th
@@ -1799,7 +1831,9 @@ def setup():
 		u"Pérotin", # 12th
 		u"Chrétien de Troyes", # 12th
 		"fChristine de Pizan", # 15th
+		"Jean Fouquet", # 15th
 		iRenaissance,
+		u"François Rabelais", # 16th
 		"Charles Le Brun", # 17th
 		"Jean-Baptiste Lully", # 17th
 		"Jean Racine", # 17th
@@ -1843,6 +1877,7 @@ def setup():
 		"Jacques Monod", # 20th
 	],
 	iGreatMerchant : [
+		u"Éloi de Noyon", # 7th
 		u"fJeanne la Fouacière", # 13th
 		iRenaissance,
 		"Jacques Cartier", # 16th
@@ -1859,6 +1894,8 @@ def setup():
 		"fMarie Marvingt", # 20th
 	],
 	iGreatEngineer : [
+		"Suger", # 12th
+		"Villard de Honnecourt", # 13th
 		"Pierre de Montreuil", # 13th
 		iRenaissance,
 		u"Sébastien Le Prestre de Vauban", # 17th
@@ -1928,33 +1965,40 @@ def setup():
 },
 iCivKhmer : {
 	iGreatProphet : [
-		"Kirtipandita", # 10th x
+		"Sanghapala", # 6th
+		"Kirtipandita", # 10th
+		"Suryavarman I", # 11th
+		"fJayarajadevi", # 12th
 		"Tamalinda", # 12th
-		iIndustrial,
-		"Chuon Nath", # 19th
 		iGlobal,
+		"Chuon Nath", # 20th
 		"Maha Ghosananda", # 20th
 	],
 	iGreatArtist : [
-		"Thammaracha", # 16th
+		"Udayadityavarman II", # 11th
+		"fIndradevi", # 12th
+		"Thommaracha", # 17th
 		iIndustrial,
 		"Ang Duong", # 19th
+		"Suttantaprija Ind", # 19th
 		iGlobal,
+		"Sinn Sisamouth", # 20th
 		"Vann Nath", # 20th
 		"Chath Piersath", # 20th
 		"Chhim Sothy", # 20th
 	],
 	iGreatScientist : [
-		"Jayavarman", # 10th
+		"Semahatata", # 7th
+		"Jayavarman V", # 10th
+		"Yajnavaraha", # 10th
 		"fSaptadevakula Prana", # 10th
 		iGlobal,
-		"Krisana Kraisintu", # 20th
-		"Shaiwatna Kupratakul", # 20th
+		"Keng Vannsak", # 20th
 	],
 	iGreatMerchant : [
+		"Jayavarman IV", # 10th
 		"Srindravarman", # 14th
-		"Uthong", # 14th
-		"fDaun Penh",
+		"fDaun Penh", # 14th
 		iRenaissance,
 		"Chey Chettha", # 16th
 		"Srei Meara", # 17th
@@ -1962,14 +2006,16 @@ def setup():
 		"Teng Bunma", # 20th
 	],
 	iGreatEngineer : [
-		"Indravarman", # 9th
-		"Yasovarman", # 9th
+		"Indravarman I", # 9th
+		"Yasovarman I", # 9th
 		"fJahavi", # 10th
+		"Udayadityavarman II", # 11th
+		"Jayavarman VII", # 12th 
 		iGlobal,
 		"Vann Molyvann", # 20th
 	],
 	iGreatStatesman : [
-		"Jayavarman", # 9th
+		"Jayavarman II", # 9th
 		"Harshavarman", # 10th
 		iIndustrial,
 		"Norodom", # 19th
@@ -1977,14 +2023,17 @@ def setup():
 		"Tou Samouth", # 20th
 	],
 	iGreatGeneral : [
-		"fTrieu Thi Trinh", # 3rd
 		"Bhavavarman", # 6th
-		"Vinyanandana", # 9th
-		"Rajendravarman", # 10th
+		"Rajendravarman II", # 10th
+		"Sangrama", # 11th
+		"Vidyanandana", # 12th
 		iGlobal,
 		"Sak Sutsakhan", # 20th
 		"Dien Del", # 20th
 	],
+	iGreatSpy : [
+		"fYun Yat", # 20th
+	]
 },
 iCivEngland : {
 	iGreatProphet : [
@@ -2211,6 +2260,7 @@ def setup():
 		"Ludwig von Mises", # 20th
 	],
 	iGreatEngineer : [
+		"Heinrich Parler", # 14th
 		"Peter Parler", # 14th
 		iRenaissance,
 		"Johann Lukas von Hildebrandt", # 18th
@@ -2676,7 +2726,7 @@ def setup():
 		"Giovanni Messe", # 20th
 	],
 	iGreatSpy : [
-		"Andrea Gritti", # 15th)
+		"Andrea Gritti", # 15th
 		"Gaspar Graziani", # 17th
 		"Giacomo Casanova", # 18th
 		iGlobal,
@@ -2702,6 +2752,7 @@ def setup():
 	],
 	iGreatScientist : [
 		"Kaidu", # 13th
+		"Nasir al-Din al-Tusi", # 13th (also Persian)
 		"Ulugh Beg", # 15th
 		"Mandukhai", # 15th
 		iRenaissance,
@@ -2712,6 +2763,7 @@ def setup():
 		u"Güyük", # 13th
 		"Mengu-Timur", # 13th
 		"Gaykhatu", # 13th
+		"Qawsun", # 14th
 		iRenaissance,
 		"Altan", # 16th
 	],
@@ -2861,6 +2913,7 @@ def setup():
 iCivOttomans : {
 	iGreatProphet : [
 		"Sheikh Bedreddin", # 14th
+		"Akshamsaddin", # 15th
 		iRenaissance,
 		"Sabatai Zevi", # 17th
 		"Yaakov Culi", # 18th
@@ -2872,6 +2925,7 @@ def setup():
 		"Yunus Emre", # 13th
 		iRenaissance,
 		u"Hayâlî", # 16th
+		u"Fuzûlî", # 16th
 		u"Gül Baba", # 16th
 		u"Ahmet Nedîm Efendi", # 18th
 		"Abdullah Buhari", # 18th
@@ -2897,6 +2951,8 @@ def setup():
 		"Aziz Sancar", # 21th
 	],
 	iGreatMerchant : [
+		"Piri Reis", # 16th
+		"Seydi Ali Reis", # 16th
 		u"Evliya Çelebi", # 17th
 		iIndustrial,
 		u"Abdülmecid", # 19th
@@ -2945,11 +3001,94 @@ def setup():
 		"fDespina Storch", # 20th
 	],
 },
+iCivThailand : {
+	iGreatProphet : [
+		"Lithai", # 14th (Mahathammaracha I)
+		"Luang Pu Thuat", # 17th
+		"Upali Thera", # 18th
+		iIndustrial,
+		"Somdej Toh", # 19th
+		"Paramanuchitchinorot", # 19th
+		"Vajirananavarorasa", # 19th
+		iGlobal,
+		"Luang Pu Sodh Candasaro", # 20th
+		"Phra Dharmakosacarya", # 20th
+		"fChandra Khonnokyoong", # 20th
+		"Ajahn Chah", # 20th
+	],
+	iGreatArtist : [
+		"Si Prat", # 17th
+		"Thammathibet", # 18th
+		iIndustrial,
+		"Khrua In Khong", # 19th
+		"Phra Phutthaloetla Naphalai", # 19th (Rama II)
+		"Sunthorn Phu", # 19th
+		iGlobal,
+		"Pin Malakul", # 20th
+	],
+	iGreatScientist : [
+		"Ramkhamhaeng", # 13th
+		iIndustrial,
+		"Dan Beach Bradley", # 19th
+		"Damrong Rajanubhab", # 19th
+		iGlobal,
+		"Mahidol Adulyadej", # 20th
+		"Phraya Anuman Rajadhon", # 20th
+		"fKrisana Kraisintu", # 20th
+		"Shaiwatna Kupratakul", # 20th
+	],
+	iGreatMerchant : [
+		"Uthong", # 14th
+		"Yamada Nagamasa", # 17th
+		iIndustrial,
+		"Low Kiok Chiang", # 19th
+		iGlobal,
+		"Puey Ungphakorn", # 20th
+		"fLursakdi Sampatisiri", # 20th
+	],
+	iGreatEngineer : [
+		"Chettathirat", # 16th
+		"Tok Kayan", # 17th
+		iGlobal,
+		"Ravi Ravendro", # 20th (a.k.a. Karl Döhring)
+		"Ercole Manfredi", # 20th
+		"Purachatra Jayakara", # 20th
+		"Punya Thitimajshima", # 20th
+	],
+	iGreatStatesman : [
+		"Borommatrailokkanat", # 15h
+		"Narai", # 17th
+		"Kosa Pan", # 17th
+		"Chaophraya Wichayen", # 17th
+		iIndustrial,
+		"Prayurawongse", # 19th
+		"Sri Suriwongse", # 19th
+		"Chulalongkorn", # 19th
+		iGlobal,
+		"Pridi Banomyong", # 20th
+	],
+	iGreatGeneral : [
+		"Ramesuan", # 16th
+		"Chaiyachetthathirat", # 16th
+		"Taksin", # 18th
+		"Phraya Phichai", # 18th
+		iIndustrial,
+		"Thongduang", # 19th
+		"Bodindecha", # 19th
+		iGlobal,
+		"Phraya Phahonphonphayuhasena", # 20th
+		"Plaek Phibunsongkhram", # 20th
+	],
+	iGreatSpy : [
+		"fThao Suranari", # 19th
+	]
+},
 iCivNetherlands : {
 	iGreatProphet : [
 		"Geert Grote", # 14th
 		iRenaissance,
 		"Desiderius Erasmus", # 16th
+		"Jakob Hermanszoon", # 16th
 		"Baruch Spinoza", # 17th
 		iIndustrial,
 		"Abraham Kuyper", # 19th
@@ -3002,6 +3141,7 @@ def setup():
 		"Adolphe Sax", # 19th
 		iGlobal,
 		"Frits Philips", # 20th
+		"Gerrit Rietveld", # 20th
 	],
 	iGreatStatesman : [
 		"Desiderius Erasmus", # 16th
@@ -3111,6 +3251,7 @@ def setup():
 		"fEleanor Roosevelt", # 20th
 		"George Kennan", # 20th
 		"Martin Luther King", # 20th
+		"Henry Kissinger", # 20th
 	],
 	iGreatGeneral : [
 		"Andrew Jackson", # 19th
@@ -3662,7 +3803,8 @@ def setup():
 	iGreatProphet : [
 		"Junajpu", # mythological
 		"Xb'alanke", # mythological
-		"Kukulkan" # 10th, named after the god
+		"Kukulkan", # 10th, named after the god
+		"Ce Acatl Topiltzin", # 10th toltec
 	],
 	iGreatArtist : [
 		"Uaxaclajuun Ub'aah K'awiil", # 8th
@@ -3685,6 +3827,7 @@ def setup():
 		"Tabscoob", # 16th
 	],
 	iGreatEngineer : [
+		"Chan Imix K'awiil", # 7th
 		"fK'ab'al Xook", # 8th
 		"Ha' K'in Xook", # 8th
 		"Itzam K'an Ahk", # 8th
@@ -3699,6 +3842,7 @@ def setup():
 		u"fRigoberta Menchú", # 20th
 	],
 	iGreatGeneral : [
+		"Siyaj K'ak'", # 4th teotihuacan
 		"K'inich Yo'nal Ahk", # 7th
 		"fXochitl", # 9th toltec
 		"Hunac Ceel", # 12th