diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 8a1c9bf1b6bd2358aacf385bb00c49e08ee945e5..eba40f444eae2c2f88abd8bdcf5ec9f9dd86efb3 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -410,7 +410,7 @@
 	<<case "Hungarian">>
 		<<set $nickname = either("'Budapest'", "'Magyar'", "'Szuka'")>>
 	<<case "I-Kiribati">>
-		<<set $nickname = either("'Gilbert'", "'Tarawa'")>>
+		<<set $nickname = either("'Gilbert'", "'Tarawa'", "'Tungaru'")>>
 	<<case "Icelandic">>
 		<<set $nickname = either("'Penis Museum'", "'Reykjavík'", "'Sagas'")>>
 	<<case "Indian">>
@@ -424,7 +424,7 @@
 	<<case "Irish">>
 		<<set $nickname = either("'Carbomb'", "'Dublin'", "'Emerald'", "'Hibernia'", "'Lassie'", "'Paddy'", "'Potato Famine'", "'Sinn Féin'")>>
 	<<case "Israeli">>
-		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Jaffa'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'", "'Tel Aviv'")>>
+		<<set $nickname = either("'God's Chosen'", "'Hebrew'", "'Jaffa'", "'Jerusalem'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'", "'Tel Aviv'")>>
 	<<case "Italian">>
 		<<set $nickname = either("'Bologna'", "'Greaseball'", "'Latin'", "'Mussolini'", "'Napoli'", "'Renaissance'", "'Rome'", "'Salami'", "'Sicilian'", "'Spaghetti'", "'Terrone'", "'Wop'")>>
 	<<case "Ivorian">>
@@ -466,7 +466,7 @@
 	<<case "Lithuanian">>
 		<<set $nickname = either("'Memel'", "'Pagan'", "'Vilnus'")>>
 	<<case "Luxembourgian">>
-		<<set $nickname = either("'Bureaucrat'", "'Passerelle'")>>
+		<<set $nickname = either("'Bureaucrat'", "'Luxembourgish'", "'Passerelle'")>>
 	<<case "Macedonian">>
 		<<set $nickname = either("'Macedon'", "'Sarissa'", "'Skopje'")>>
 	<<case "Malagasy">>
@@ -480,7 +480,7 @@
 	<<case "Malian">>
 		<<set $nickname = either("'Azawad'", "'Bamako'", "'Mandinka'", "'Mansa Musa'", "'Sahel'", "'Timbuktu'", "'Trans-Sahara'")>>
 	<<case "Maltese">>
-		<<set $nickname = either("'Maltese Falcon'", "'Valletta'")>>
+		<<set $nickname = either("'George Cross'", "'Maltese Falcon'", "'Valletta'")>>
 	<<case "Marshallese">>
 		<<set $nickname = either("'Bikini Atoll'", "'Majuro'", "'Marshall'", "'Stick Chart'")>>
 	<<case "Mauritanian">>
@@ -502,11 +502,11 @@
 	<<case "Moroccan">>
 		<<set $nickname = either("'Casablanca'", "'Marrakesh'", "'Rabat'")>>
 	<<case "Mosotho">>
-		<<set $nickname = either("'Maseru'", "'Moshoeshoe'")>>
+		<<set $nickname = either("'Basutoland'", "'Maseru'", "'Moshoeshoe'")>>
 	<<case "Motswana">>
-		<<set $nickname = either("'Gaborone'", "'Kalahari'")>>
+		<<set $nickname = either("'Bechuanaland'", "'Gaborone'", "'Kalahari'")>>
 	<<case "Mozambican">>
-		<<set $nickname = either("'Lourenço Marques'", "'Maputo'")>>
+		<<set $nickname = either("'Lourenço Marques'", "'Maputo'", "'Mussa Bin Bique'")>>
 	<<case "Namibian">>
 		<<set $nickname = either("'Namib'", "'Walvis Bay'", "'Windhoek'")>>
 	<<case "Nauruan">>
@@ -516,15 +516,15 @@
 	<<case "a New Zealander">>
 		<<set $nickname = either("'All-Black'", "'Auckland'", "'Kiwi'", "'Wellington'")>>
 	<<case "Ni-Vanuatu">>
-		<<set $nickname = either("'New Hebride'", "'Port Vila'")>>
+		<<set $nickname = either("'Great Cyclade'", "'New Hebride'", "'Port Vila'")>>
 	<<case "Nicaraguan">>
-		<<set $nickname = either("'Granada'", "'Managua'", "'Nica'")>>
+		<<set $nickname = either("'Contra'", "'Granada'", "'Managua'", "'Nica'")>>
 	<<case "Nigerian">>
 		<<set $nickname = either("'Abuja'", "'Kwara'", "'Lagos'", "'Scammer'")>>
 	<<case "Nigerien">>
-		<<set $nickname = either("'Kountché'", "'Niamey'")>>
+		<<set $nickname = either("'Kountché'", "'Niamey'", "'Sarraounia'")>>
 	<<case "Niuean">>
-		<<set $nickname = either("'Alofi'", "'Rock of Polynesia'")>>
+		<<set $nickname = either("'Alofi'", "'Patu-Iki'", "'Rock of Polynesia'")>>
 	<<case "Norwegian">>
 		<<set $nickname = either("'Black Metal'", "'Kuksuger'", "'Ludder'", "'Norse'", "'Norsk'", "'Oil Hog'", "'Ola'", "'Oslo'")>>
 	<<case "Omani">>
@@ -532,13 +532,13 @@
 	<<case "Pakistani">>
 		<<set $nickname = either("'Indus'", "'Karachi'", "'Lahore'", "'Paki'")>>
 	<<case "Palauan">>
-		<<set $nickname = either("'Koror'", "'Ngerulmud'")>>
+		<<set $nickname = either("'Koror'", "'Ngerulmud'", "'Peleliu'")>>
 	<<case "Palestinian">>
-		<<set $nickname = either("'Gaza'", "'Hamas'", "'Pallywood'", "'West Bank'")>>
+		<<set $nickname = either("'Gaza'", "'Hamas'", "'Jerusalem'", "'Pallywood'", "'Ramallah'", "'West Bank'")>>
 	<<case "Panamanian">>
-		<<set $nickname = either("'Noriega'", "'Panama Canal'")>>
+		<<set $nickname = either("'Balboa'", "'Noriega'", "'Panama Canal'")>>
 	<<case "Papua New Guinean">>
-		<<set $nickname = either("'Papua'", "'Port Moresby'")>>
+		<<set $nickname = either("'Bougainville'", "'Papua'", "'Port Moresby'")>>
 	<<case "Paraguayan">>
 		<<set $nickname = either("'Asunción'", "'Guarani'", "'Stroessner'")>>
 	<<case "Peruvian">>
@@ -584,9 +584,9 @@
 	<<case "Singaporean">>
 		<<set $nickname = either("'Bedok'", "'Merlion'", "'Raffles'")>>
 	<<case "Slovak">>
-		<<set $nickname = either("'Bratislava'", "'Bzdocha'", "'Shlapka'")>>
+		<<set $nickname = either("'Bratislava'", "'Bzdocha'", "'Shlapka'", "'Slovakian'")>>
 	<<case "Slovene">>
-		<<set $nickname = either("'Ljubljana'", "'Prince's Stone'")>>
+		<<set $nickname = either("'Ljubljana'", "'Prince's Stone'", "'Slovenian'")>>
 	<<case "a Solomon Islander">>
 		<<set $nickname = either("'Guadalcanal'", "'Honiara'", "'Solomon'")>>
 	<<case "Somali">>
@@ -622,7 +622,7 @@
 	<<case "Togolese">>
 		<<set $nickname = either("'Eyadéma'", "'Lomé'", "'Togoland'")>>
 	<<case "Tongan">>
-		<<set $nickname = either("'Friendly'", "'Nuku'alofa'")>>
+		<<set $nickname = either("'Friendly'", "'Nuku'alofa'", "'Tu'i Tonga'")>>
 	<<case "Trinidadian">>
 		<<set $nickname = either("'Chaguanas'", "'Tobago'", "'Trini'")>>
 	<<case "Tunisian">>
@@ -717,7 +717,7 @@
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
 
 <<case "malay">>
-	<<set $nickname = either("'Bumi'", "'Indon'", "'Island Hopper'", "'Krakatoa'", "'My Lay'", "'Nāga'", "'Nutmeg'", "'Orang'", "'Rani'", "'Samudra Kidul'", "'Sandalwood'", "'Spice Islands'", "'Trade Winds'")>>
+	<<set $nickname = either("'Bumi'", "'Indon'", "'Island Hopper'", "'Krakatoa'", "'Melayu'", "'My Lay'", "'Nāga'", "'Nutmeg'", "'Orang'", "'Rani'", "'Samudra Kidul'", "'Sandalwood'", "'Spice Islands'", "'Trade Winds'")>>
 	<<set $situationDesc = "is malay, which is not uncommon given the ongoing poverty in many majority malay countries, and the serious weather patterns savaging that part of the world. Slaves casually reference race as much or more than free citizens. They absorb the racial peccadilloes of their owners, and many of them bring prejudices from the old world into their slave lives.">>
 	<<set $applyDesc = "now has a constant reminder that as a sex slave she is judged on her appearance first.">>
 	<<set $notApplyDesc = "may feel some gratitude due to your preference that she not be defined by her ethnicity, but this is counterbalanced by the increased independence your kindness inspires.">>
@@ -1000,7 +1000,7 @@
 
 <<case "fertilityGoddess">>
 	<<switch $activeSlave.nationality>>
-	<<case "Algerian" "Congolese" "Ethiopian" "Ghanan" "Kenyan" "Libyan" "Malian" "Moroccan" "Nigerian" "Sudanese" "Tanzanian" "Tunisian" "Ugandan" "Cameroonian" "Gabonese" "Djiboutian" "Zambian" "Malagasy" "Nigerien" "Burundian", "Seychellois">>
+	<<case "Algerian" "Burundian", "Cameroonian" "Congolese" "Djiboutian" "Ethiopian" "Gabonese" "Ghanan" "Kenyan" "Libyan" "Malagasy" "Malian" "Moroccan" "Nigerian" "Nigerien" "Seychellois" "Sudanese" "Tanzanian" "Tunisian" "Ugandan" "Zairian" "Zambian">>
 		<<set $nickname = either("'Ala'", "'Asase Ya'")>>
 	<<case "Roman Revivalist">>
 		<<set $nickname = either("'Epona'", "'Fecunditas'", "'Terra'", "'Venus'")>>
@@ -1010,15 +1010,15 @@
 		<<set $nickname = either("'Xochiquetzal'")>>
 	<<case "Edo Revivalist" "Japanese">>
 		<<set $nickname = either("'Inari Ōkami'", "'Kisshōten'")>>
-	<<case "Arabian Revivalist" "Arabic">>
+	<<case "Arabian Revivalist">>
 		<<set $nickname = either("'Al-Lat'")>>
 	<<case "Ancient Chinese Revivalist" "Chinese">>
 		<<set $nickname = either("'Jiutian Xuannü'")>>
 	<<case "Armenian">>
 		<<set $nickname = either("'Anahit'")>>
-	<<case "Lithuanian" "Latvian">>
+	<<case "Latvian" "Lithuanian">>
 		<<set $nickname = either("'Laima'", "'SaulÄ—'")>>
-	<<case "Vietnamese" "Laotian" "Cambodian">>
+	<<case "Cambodian" "Laotian" "Vietnamese">>
 		<<set $nickname = either("'Sowathara'")>>
 	<<case "Irish">>
 		<<set $nickname = either("'Brigid'")>>