diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index e93ec9dbee1f310e19c5d3ff6dea2e5ac7ef68be..eba40f444eae2c2f88abd8bdcf5ec9f9dd86efb3 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -244,33 +244,33 @@
 	<<case "Afghan">>
 		<<set $nickname = either("'Bactrian'", "'Chai Girl'", "'Kabul'", "'Pashtun'", "'Poppy'", "'Taliban'")>>
 	<<case "Albanian">>
-		<<set $nickname = either("'Hoxha'", "'Tirana'")>>
+		<<set $nickname = either("'Hoxha'", "'Sejdia'", "'Tirana'")>>
 	<<case "Algerian">>
 		<<set $nickname = either("'Algiers'", "'Casbah'", "'Corsair'", "'Djamila'", "'Hassiba'", "'Pied-Noir'", "'Zhora'", "Harki")>>
 	<<case "American">>
 		<<set $nickname = either("'Amerifat'", "'Burger'", "'California'", "'Chicago'", "'Columbia'", "'Hollywood'", "'Lady Liberty'", "'Lone Star'", "'New York'", "'Septic'", "'Stars & Stripes'", "'Trump'", "'Washington'", "'Yankee'")>>
 	<<case "Andorran">>
-		<<set $nickname = either("'Ski Trip'", "'Skossyreff'")>>
+		<<set $nickname = either("'La Vella'", "'Ski Trip'", "'Skossyreff'")>>
 	<<case "Angolan">>
-		<<set $nickname = either("'Cabinda'", "'Luanda'")>>
+		<<set $nickname = either("'Cabinda'", "'Luanda'", "'Ndongo'")>>
 	<<case "Antiguan">>
-		<<set $nickname = either("'Barbuda'", "'Redonda'")>>
+		<<set $nickname = either("'Barbuda'", "'Redonda'", "'St. John's'")>>
 	<<case "Argentinian">>
 		<<set $nickname = either("'Blanca'", "'Buenos Aires'", "'Evita'", "'Gaucha'", "'Macri'", "'Malvinas'")>>
 	<<case "Armenian">>
 		<<set $nickname = either("'Hachik'", "'Khorovats'", "'Rabiz'")>>
 	<<case "Aruban">>
-		<<set $nickname = either("'Caquetio'", "'Oranjestad'")>>
+		<<set $nickname = either("'Caquetio'", "'Croes'", "'Oranjestad'")>>
 	<<case "Australian">>
 		<<set $nickname = either("'Abo'", "'Aussie'", "'Bogan'", "'Convict'", "'Crikey'", "'Down Under'", "'Mad'", "'Sheila'", "'Sydney'")>>
 	<<case "Austrian">>
 		<<set $nickname = either("'Fritzl'", "'Fut'", "'Maria'", "'Vienna'", "'Wiener'")>>
 	<<case "Azerbaijani">>
-		<<set $nickname = either("'Baku'", "'Black January'")>>
+		<<set $nickname = either("'Atropatene'", "'Baku'", "'Black January'")>>
 	<<case "Bahamian">>
-		<<set $nickname = either("'Columbus'", "'Nassau'")>>
+		<<set $nickname = either("'Columbus'", "'Lucayan'", "'Nassau'")>>
 	<<case "Bahraini">>
-		<<set $nickname = either("'Manama'", "'Two Seas'")>>
+		<<set $nickname = either("'Manama'", "'Pearl'", "'Two Seas'")>>
 	<<case "Bangladeshi">>
 		<<set $nickname = either("'Bengali'", "'Bhibhi'", "'Dhaka'", "'Sweatshop'", "'Tiger'")>>
 	<<case "Barbadian">>
@@ -280,45 +280,45 @@
 	<<case "Belgian">>
 		<<set $nickname = either("'Antwerp'", "'Brussels'", "'Sprout'", "'Straatmeid'", "'Truttemie'", "'Waffles'")>>
 	<<case "Belizean">>
-		<<set $nickname = either("'Belmopan'", "'Great Blue Hole'")>>
+		<<set $nickname = either("'Belmopan'", "'Great Blue Hole'", "'Punta'")>>
 	<<case "Beninese">>
 		<<set $nickname = either("'Cotonou'", "'Dahomey'", "'Porto-Novo'")>>
 	<<case "Bermudian">>
-		<<set $nickname = either("'Bermuda Triangle'", "'Hamilton'")>>
+		<<set $nickname = either("'Bermuda Triangle'", "'Hamilton'", "'St. George's'")>>
 	<<case "Bhutanese">>
-		<<set $nickname = either("'Druk'", "'Thimphu'")>>
+		<<set $nickname = either("'Dragon Queen'", "'Druk'", "'Phuntsholing'", "'Thimphu'")>>
 	<<case "Bissau-Guinean">>
 		<<set $nickname = either("'Bissau'", "'Bolama'", "'Kriol'")>>
 	<<case "Bolivian">>
 		<<set $nickname = either("'La Paz'", "'Sucre'", "'Titicaca'")>>
 	<<case "Bosnian">>
-		<<set $nickname = either("'Herzegovina'", "'Sarajevo'")>>
+		<<set $nickname = either("'Herzegovina'", "'Sarajevo'", "'Tvrtko'")>>
 	<<case "Brazilian">>
 		<<set $nickname = either("'7-1'", "'Amazon'", "'Bauru'", "'Brasília'", "'Bunda'", "'Carmen Miranda'", "'Dago'", "'Favelada'", "'Hue'", "'Ipanema'", "'Monkey'", "'Rio de Janeiro'", "'São Paulo'", "'Zika'")>>
 	<<case "British">>
 		<<set $nickname = either("'Brexit'", "'Brit'", "'Britannia'", "'Britbong'", "'Chav'", "'Fish'n'Chips'", "'Gov'nor'", "'Limey'", "'London'", "'Pikey'", "'Pommie'", "'Rosbif'", "'Scrubber'", "'Slag'", "'Slapper'")>>
 	<<case "Bruneian">>
-		<<set $nickname = either("'Abode of Peace'", "'Bandar Seri Begawan'")>>
+		<<set $nickname = either("'Abode of Peace'", "'Bandar Seri Begawan'", "'Bolkiah'", "'Sultan'")>>
 	<<case "Bulgarian">>
-		<<set $nickname = either("'Sofia'", "'Zhivkov'")>>
+		<<set $nickname = either("'Bulgar'", "'Sofia'", "'Zhivkov'")>>
 	<<case "Burkinabé">>
-		<<set $nickname = either("'Ouagadougou'", "'Upper Volta'")>>
+		<<set $nickname = either("'Ouagadougou'", "'Sankara'", "'Upper Volta'")>>
 	<<case "Burmese">>
 		<<set $nickname = either("'Burma Shave'", "'Burmese Python'", "'Golden Triangle'", "'Rangoon'")>>
 	<<case "Burundian">>
-		<<set $nickname = either("'Bujumbura'", "'Heha'")>>
+		<<set $nickname = either("'Bagaza'", "'Bujumbura'", "'Heha'")>>
 	<<case "Cambodian">>
-		<<set $nickname = either("'Angkor Wat'", "'Holiday in Cambodia'", "'Phnom Penh'")>>
+		<<set $nickname = either("'Angkor Wat'", "'Holiday in Cambodia'", "'Khmer'", "'Phnom Penh'")>>
 	<<case "Cameroonian">>
-		<<set $nickname = either("'Douala'", "'Yaoundé'")>>
+		<<set $nickname = either("'Biya'", "'Douala'", "'Yaoundé'")>>
 	<<case "Canadian">>
 		<<set $nickname = either("'Canuck'", "'Leaf'", "'Loonie'", "'Maple Syrup'", "'Mountie'", "'Poutine'", "'Quebec'", "'Toronto'", "'Vancouver'", "'Yukon'")>>
 	<<case "Cape Verdean">>
-		<<set $nickname = either("'Cabo Verde'", "'Praia'")>>
+		<<set $nickname = either("'Cabo Verde'", "'Cap-Vert'", "'Praia'")>>
 	<<case "Catalan">>
 		<<set $nickname = either("'Barcelona'", "'Castell'", "'Senyera'")>>
 	<<case "Central African">>
-		<<set $nickname = either("'Bangui'", "'Bokassa'")>>
+		<<set $nickname = either("'Bangui'", "'Bokassa'", "'Ubangi-Shari'")>>
 	<<case "Chadian">>
 		<<set $nickname = either("'Chad'", "'Habré'", "'N'Djamena'", "'Tombalbaye'")>>
 	<<case "Chilean">>
@@ -332,31 +332,31 @@
 	<<case "Congolese">>
 		<<set $nickname = either("'Brazzaville'", "'Ngouabi'", "'Nguesso'")>>
 	<<case "a Cook Islander">>
-		<<set $nickname = either("'Avarua'", "'Rarotonga'")>>
+		<<set $nickname = either("'Avarua'", "'Cook'", "'Rarotonga'")>>
 	<<case "Costa Rican">>
-		<<set $nickname = either("'Oxcart'", "'San José'")>>
+		<<set $nickname = either("'Cartago'", "'Ferrer'", "'Oxcart'", "'San José'")>>
 	<<case "Croatian">>
-		<<set $nickname = either("'Tito'", "'Zagreb'")>>
+		<<set $nickname = either("'Croat'", "'Tito'", "'Zagreb'")>>
 	<<case "Cuban">>
 		<<set $nickname = either("'Blockade'", "'Castro'", "'Commie'", "'Havana'", "'Scarface'")>>
 	<<case "Cypriot">>
-		<<set $nickname = either("'Enosis'", "'Nicosia'")>>
+		<<set $nickname = either("'Atilla'", "'Enosis'", "'Nicosia'")>>
 	<<case "Czech">>
 		<<set $nickname = either("'Bohemian'", "'Czechnya'", "'Kunda'", "'Prague'")>>
 	<<case "Danish">>
 		<<set $nickname = either("'Copenhagen'", "'Dane'", "'Ludertæve'", "'Tøs'", "'Viking'")>>
 	<<case "Djiboutian">>
-		<<set $nickname = either("'Ifat'", "'Tadjoura'")>>
+		<<set $nickname = either("'Afar'", "'Ifat'", "'Punt'", "'Tadjoura'")>>
 	<<case "Dominican">>
 		<<set $nickname = either("'Caribbean'", "'Domingo'", "'Palo'", "'Santo Domingo'", "'Taíno'", "'Trinitaria'")>>
 	<<case "Dominiquais">>
-		<<set $nickname = either("'Red Dog'", "'Roseau'")>>
+		<<set $nickname = either("'Red Dog'", "'Roseau'", "'Sisserou'")>>
 	<<case "Dutch">>
 		<<set $nickname = either("'Amsterdam'", "'Cheesehead'", "'Dutchie'", "'Slaaf'", "'Slet'")>>
 	<<case "East Timorese">>
-		<<set $nickname = either("'Dili'", "'Timor Leste'")>>
+		<<set $nickname = either("'27th Province'", "'Dili'", "'Timor Leste'")>>
 	<<case "Ecuadorian">>
-		<<set $nickname = either("'Galápagos'", "'Quito'")>>
+		<<set $nickname = either("'Galápagos'", "'Guayaquil'", "'Quito'")>>
 	<<case "Egyptian">>
 		<<set $nickname = either("'Cairo'", "'Cleopatra'", "'Misirlou'", "'Sinai'", "'Sphinx'", "'Suez'")>>
 	<<case "Emirati">>
@@ -364,13 +364,13 @@
 	<<case "Equatoguinean">>
 		<<set $nickname = either("'Bata'", "'Malabo'", "'Nguema'", "'Oyala'")>>
 	<<case "Eritrean">>
-		<<set $nickname = either("'Asmara'", "'Punt'")>>
+		<<set $nickname = either("'Asmara'", "'Medri Bahri'", "'Punt'", "'Red Sea'")>>
 	<<case "Estonian">>
 		<<set $nickname = either("'Baltic'", "'Eesti'", "'Tallinn'")>>
 	<<case "Ethiopian">>
 		<<set $nickname = either("'Addis Ababa'", "'Oromo'", "'Rastafarian'")>>
 	<<case "Fijian">>
-		<<set $nickname = either("'Itaukei'", "'Suva'")>>
+		<<set $nickname = either("'Feejee'", "'Itaukei'", "'Suva'", "'Viti Levu'")>>
 	<<case "Filipina">>
 		<<set $nickname = either("'Flip'", "'Manila'", "'Pinoy'")>>
 	<<case "Finnish">>
@@ -378,23 +378,23 @@
 	<<case "French">>
 		<<set $nickname = either("'Belle'", "'Charlie Hebdo'", "'Fille de Joie'", "'Frenchie'", "'Frog'", "'Mademoiselle'", "'Marianne'", "'Marseille'", "'Paris'", "'Surrender Monkey'")>>
 	<<case "French Guianan">>
-		<<set $nickname = either("'Cayenne'", "'ÃŽle du Diable'")>>
+		<<set $nickname = either("'Cayenne'", "'ÃŽle du Diable'", "'Kourou'")>>
 	<<case "French Polynesian">>
 		<<set $nickname = either("'Fangataufa'", "'Moruroa'", "'Papeete'", "'Tahiti'")>>
 	<<case "Gabonese">>
-		<<set $nickname = either("'Bongo'", "'Libreville'")>>
+		<<set $nickname = either("'Bongo'", "'Libreville'", "'Orungu'")>>
 	<<case "Gambian")>>
-		<<set $nickname = either("'Banjul'", "'Serekunda'")>>
+		<<set $nickname = either("'Banjul'", "'Jammeh'", "'Serekunda'")>>
 	<<case "Georgian">>
-		<<set $nickname = either("'Kutaisi'", "'Tbilisi'")>>
+		<<set $nickname = either("'Kutaisi'", "'Mepe'", "'Tamar'", "'Tbilisi'")>>
 	<<case "German">>
 		<<set $nickname = either("'Bavarian'", "'Berlin'", "'Bratwurst'", "'Dresden'", "'Fraulein'", "'Kraut'", "'Nazi'", "'Oktoberfest'", "'Piefke'", "'Prussian'", "'Saupreiß'", "'Valkyrie'")>>
 	<<case "Ghanan">>
-		<<set $nickname = either("'Akan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
+		<<set $nickname = either("'Accra'", "'Akan'", "'Gold Coast'", "'Warrior Queen'", "'Shaman Queen'")>>
 	<<case "Greek">>
 		<<set $nickname = either("'Athens'", "'Debts'", "'Ionian'", "'Spartan'")>>
 	<<case "Greenlandic">>
-		<<set $nickname = either("'Eskimo'", "'Nuuk'")>>
+		<<set $nickname = either("'Eskimo'", "'Inuit'", "'Nuuk'")>>
 	<<case "Grenadian">>
 		<<set $nickname = either("'Grenada Dove'", "'Urgent Fury'", "'Woolie'")>>
 	<<case "Guatemalan">>
@@ -402,7 +402,7 @@
 	<<case "Guinean">>
 		<<set $nickname = either("'Bauxite'", "'Conakry'", "'Toure'")>>
 	<<case "Guyanese">>
-		<<set $nickname = either("'Georgetown'", "'Hoatzin'")>>
+		<<set $nickname = either("'Flavor Aid'", "'Georgetown'", "'Hoatzin'", "'Jonestown'")>>
 	<<case "Haitian">>
 		<<set $nickname = either("'Maîtresse'", "'Mama Doc'", "'Maman'", "'Port-au-Prince'", "'Voodoo'")>>
 	<<case "Honduran">>
@@ -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'", "'Levantine'", "'Tel Aviv'", "'Merchant'", "'Oven Dodger'", "'Shiksa'", "'Sharmuta'", "'Shekels'", "'Srulik'")>>
+		<<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">>
@@ -440,15 +440,15 @@
 	<<case "Kenyan">>
 		<<set $nickname = either("'Mau Mau'", "'Nairobi'", "'Safari'", "'Swahili'", "'Obama'")>>
 	<<case "Kittitian">>
-		<<set $nickname = either("'Basseterre'", "'Nevis'")>>
+		<<set $nickname = either("'Basseterre'", "'Liamuiga'", "'Nevis'")>>
 	<<case "Korean">>
 		<<set $nickname = either("'Dokdo'", "'Gangnam'", "'K-Pop'", "'Kimchi'", "'Nida'", "'Pyongyang'", "'Samsung'", "'Seoul'")>>
 	<<case "Kosovan">>
-		<<set $nickname = either("'Kosovar'", "'Pristina'")>>
+		<<set $nickname = either("'Kosovar'", "'Metohija'", "'Pristina'")>>
 	<<case "Kurdish">>
 		<<set $nickname = either("'Ararat'", "'Kurd'", "'Mahabad'")>>
 	<<case "Kuwaiti">>
-		<<set $nickname = either("'Burgan'", "'Gulf War'")>>
+		<<set $nickname = either("'Burgan'", "'Gulf War'", "'Sabah'")>>
 	<<case "Kyrgyz">>
 		<<set $nickname = either("'Bishkek'", "'Forty'", "'Manas'", "'Osh'")>>
 	<<case "Laotian">>
@@ -458,73 +458,73 @@
 	<<case "Lebanese">>
 		<<set $nickname = either("'Beirut'", "'Cedar'", "'Druze'", "'Lebo'", "'Maronite'", "'Phoenician'")>>
 	<<case "Liberian">>
-		<<set $nickname = either("'Monrovia'", "'Taylor'")>>
+		<<set $nickname = either("'Mississippi-in-Africa'", "'Monrovia'", "'Taylor'")>>
 	<<case "Libyan">>
-		<<set $nickname = either("'Cyrene'", "'Gaddafi'", "'Silphium'", "'Tripoli'", "'Zenga Zenga'")>>
+		<<set $nickname = either("'Cyrene'", "'Gaddafi'", "'Silphium'", "'Tobruk'", "'Tripoli'", "'Zenga Zenga'")>>
 	<<case "a Liechtensteiner">>
-		<<set $nickname = either("'Schaan'", "'Vaduz'")>>
+		<<set $nickname = either("'Rhine'", "'Schaan'", "'Vaduz'")>>
 	<<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("'Sarissa'", "'Skopje'")>>
+		<<set $nickname = either("'Macedon'", "'Sarissa'", "'Skopje'")>>
 	<<case "Malagasy">>
-		<<set $nickname = either("'Antananarivo'", "'Lemur'")>>
+		<<set $nickname = either("'Antananarivo'", "'Lemur'", "'Madagascan'")>>
 	<<case "Malawian">>
 		<<set $nickname = either("'Lilongwe'", "'Warm Heart of Africa'")>>
 	<<case "Malaysian">>
 		<<set $nickname = either("'Kuala Lumpur'", "'Malay Girl'", "'Pirate'")>>
 	<<case "Maldivian">>
-		<<set $nickname = either("'Dhoni'", "'Malé'")>>
+		<<set $nickname = either("'Dhivehi'", "'Dhoni'", "'Malé'")>>
 	<<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'")>>
+		<<set $nickname = either("'Bikini Atoll'", "'Majuro'", "'Marshall'", "'Stick Chart'")>>
 	<<case "Mauritanian">>
-		<<set $nickname = either("'Coppolani'", "'Nouakchott'")>>
+		<<set $nickname = either("'Coppolani'", "'Daddah'", "'Nouakchott'")>>
 	<<case "Mauritian">>
-		<<set $nickname = either("'Dodo'", "'Port Louis'")>>
+		<<set $nickname = either("'Dodo'", "'Maurice'", "'Port Louis'")>>
 	<<case "Mexican">>
 		<<set $nickname = either("'Azteca'", "'Beaner'", "'Burrito'", "'Cartel'", "'Chiquita'", "'Fence Hopper'", "'Headless'", "'Juarez'", "'Malinche'", "'Mamacita'", "'Senorita'", "'Sinaloa'", "'Taco'", "'Tijuana'", "'Wetback'")>>
 	<<case "Micronesian">>
-		<<set $nickname = either("'Palikir'", "'Weno'")>>
+		<<set $nickname = either("'Palikir'", "'Weno'", "'Yap'")>>
 	<<case "Moldovan">>
-		<<set $nickname = either("'Bessarabia'", "'Chișinău'")>>
+		<<set $nickname = either("'Bessarabia'", "'Chișinău'", "'Molda'")>>
 	<<case "Monégasque">>
-		<<set $nickname = either("'Grace Kelly'", "'Monte Carlo'")>>
+		<<set $nickname = either("'Grace Kelly'", "'Grimaldi'", "'Monte Carlo'")>>
 	<<case "Mongolian">>
 		<<set $nickname = either("'Genghis Khan'", "'Mongol'", "'Ulaanbaatar'")>>
 	<<case "Montenegrin">>
 		<<set $nickname = either("'Black Mountain'", "'Crna Gora'", "'Podgorica'")>>
 	<<case "Moroccan">>
-		<<set $nickname = either("'Casablanca'", "'Rabat'")>>
+		<<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'", "'Windhoek'")>>
+		<<set $nickname = either("'Namib'", "'Walvis Bay'", "'Windhoek'")>>
 	<<case "Nauruan">>
-		<<set $nickname = either("'Phosphate'", "'Pleasant Island'")>>
+		<<set $nickname = either("'Meneng'", "'Phosphate'", "'Pleasant Island'", "'Yaren'")>>
 	<<case "Nepalese">>
-		<<set $nickname = either("'Katmandu'", "'Nepali'", "'Sherpa'")>>
+		<<set $nickname = either("'Katmandu'", "'Kumari'", "'Nepali'", "'Sherpa'")>>
 	<<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,15 +532,15 @@
 	<<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'", "'Stroessner'")>>
+		<<set $nickname = either("'Asunción'", "'Guarani'", "'Stroessner'")>>
 	<<case "Peruvian">>
 		<<set $nickname = either("'Incan'", "'Lima'", "'Lorcha'", "'Perucha'", "'Trujillo'", "'Zampoña'")>>
 	<<case "Polish">>
@@ -550,25 +550,25 @@
 	<<case "Puerto Rican">>
 		<<set $nickname = either("'51st State'", "'Boricua'", "'Nuyorican'", "'P.R.'", "'San Juan'", "'West Side Story'")>>
 	<<case "Qatari">>
-		<<set $nickname = either("'Al Jazeera'", "'Doha'")>>
+		<<set $nickname = either("'Al Jazeera'", "'Cadara'", "'Doha'")>>
 	<<case "Romanian">>
 		<<set $nickname = either("'Bucharest'", "'Ceausescu'", "'Dracula'", "'Gypsy'", "'Impaler'", "'Orphan'", "'Roma'")>>
 	<<case "Russian">>
 		<<set $nickname = either("'Bolshevik'", "'Commie'", "'Kacap'", "'Moscow'", "'Moskal'", "'Red Banner'", "'Russkie'", "'Shlyukha'", "'Siberian Kitten'", "'Sickle & Hammer'", "'Slav'", "'Suchka'", "'Suka'", "'Tovarish'", "'Tsaritsa'", "'Vodka'")>>
 	<<case "Rwandan">>
-		<<set $nickname = either("'Hotel Rwanda'", "'Kigali'")>>
+		<<set $nickname = either("'Habyarimana'", "'Hotel Rwanda'", "'Kigali'")>>
 	<<case "Sahrawi">>
 		<<set $nickname = either("'El-Aaiún'", "'Tifariti'", "'Western Saharan'")>>
 	<<case "Saint Lucian">>
-		<<set $nickname = either("'Castries'", "'Helen of the West Indies'")>>
+		<<set $nickname = either("'Castries'", "'Helen of the West Indies'", "'Lucia'")>>
 	<<case "Salvadoran">>
-		<<set $nickname = either("'Duarte'", "'San Salvador'")>>
+		<<set $nickname = either("'Duarte'", "'Indigo'", "'San Salvador'", "'Savior'")>>
 	<<case "Sammarinese">>
-		<<set $nickname = either("'Saint Marinus'", "'Three Towers'")>>
+		<<set $nickname = either("'Dogana'", "'Most Serene'", "'Saint Marinus'", "'Three Towers'")>>
 	<<case "Samoan">>
-		<<set $nickname = either("'Apia'", "'Navigator'")>>
+		<<set $nickname = either("'Apia'", "'Navigator'", "'Wrestler'")>>
 	<<case "São Toméan">>
-		<<set $nickname = either("'Príncipe'", "'Roças'")>>
+		<<set $nickname = either("'Príncipe'", "'Roças'", "'Santomean'")>>
 	<<case "Saudi">>
 		<<set $nickname = either("'Al Qaeda'", "'Burqa'", "'Mecca'", "'Riyadh'", "'Sandy'")>>
 	<<case "Scottish">>
@@ -584,11 +584,11 @@
 	<<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'")>>
+		<<set $nickname = either("'Guadalcanal'", "'Honiara'", "'Solomon'")>>
 	<<case "Somali">>
 		<<set $nickname = either("'Black Hawk Down'", "'Mogadishu'", "'The Captain Now'")>>
 	<<case "South African">>
@@ -600,9 +600,9 @@
 	<<case "Sudanese">>
 		<<set $nickname = either("'Gordon's Revenge'", "'Khartoum'", "'Nubian'", "'Omdurman'")>>
 	<<case "Surinamese">>
-		<<set $nickname = either("'Bouterse'", "'Paramaribo'")>>
+		<<set $nickname = either("'Bouterse'", "'Paramaribo'", "'Surinam'")>>
 	<<case "Swazi">>
-		<<set $nickname = either("'Eswatini'", "'Mbabane'")>>
+		<<set $nickname = either("'Eswatini'", "'Lobamba'", "'Mbabane'")>>
 	<<case "Swedish">>
 		<<set $nickname = either("'Ikea'", "'Norse'", "'Stockholm'", "'Sweden Yes'")>>
 	<<case "Swiss">>
@@ -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">>
@@ -638,11 +638,11 @@
 	<<case "Ukrainian">>
 		<<set $nickname = either("'Chernobyl'", "'Chiki Briki'", "'Cossack'", "'Crimea'", "'Donbass'", "'Euromaidan'", "'Hohlina'", "'Hohlushka'", "'Kyiv'", "'Radioactive'", "'Salo'", "'Stalker'", "'Suchka'", "'Suka'", "'Svoboda'", "'Bandera'", "'Shlyukha'")>>
 	<<case "Uruguayan">>
-		<<set $nickname = either("'Garra Charrúa'", "'Montevideo'")>>
+		<<set $nickname = either("'Bordaberry'", "'Garra Charrúa'", "'Montevideo'")>>
 	<<case "Uzbek">>
 		<<set $nickname = either("'Samarkand'", "'Silk Road'", "'Steppe Princess'", "'Steppe Queen'", "'Tashkent'")>>
 	<<case "Vatican">>
-		<<set $nickname = either("'Holy See'", "'Pope Joan'")>>
+		<<set $nickname = either("'Catholic'", "'Holy See'", "'Pope Joan'", "'Swiss Guard'")>>
 	<<case "Venezuelan">>
 		<<set $nickname = either("'Caracas'", "'Chavista'", "'Chola'", "'Revolutionary'", "'Socialist'")>>
 	<<case "Vietnamese">>
@@ -681,13 +681,13 @@
 	<<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 "latina">>
-	<<set $nickname = either("'Adorada'", "'Cafe'", "'Chica'", "'Chiquita'", "'Chola'", "'Cuzinho'", "'Facil'", "'Mestiza'", "'Mexicali'", "'One Peso'", "'Rio Grande'", "'Senora'", "'Senorita'", "'Shakira'", "'Spicy'", "'Yeyo'")>>
+	<<set $nickname = either("'Adorada'", "'Cafe'", "'Chica'", "'Chiquita'", "'Chola'", "'Cuzinho'", "'Facil'", "'Mestiza'", "'Mexicali'", "'One Peso'", "'Rio Grande'", "'Senora'", "'Senorita'", "'Shakira'", "'South of the Border'", "'Spicy'", "'Yeyo'")>>
 	<<set $situationDesc = "is latina, which is not uncommon given the poor state of many Central and South American countries and the long diaspora of poor natives of those areas. 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.">>
 
 <<case "black">>
-	<<set $nickname = either("'B-Girl'", "'Blackie'", "'Bottom Bitch'", "'Cocoa'", "'Cotton'", "'Gangsta'", "'His Girl Friday'", "'House Slave'", "'Jungle Fever'", "'Miss'", "'Missie'", "'Mulatto'", "'N-Word'", "'Quadroon'", "'Sheboon'")>>
+	<<set $nickname = either("'B-Girl'", "'Blackie'", "'Bottom Bitch'", "'Cocoa'", "'Cotton'", "'Ebony'", "'Gangsta'", "'His Girl Friday'", "'House Slave'", "'Jungle Fever'", "'Miss'", "'Missie'", "'Mulatto'", "'N-Word'", "'Quadroon'", "'Sheboon'")>>
 	<<set $situationDesc = "is black, which is not uncommon given the urban collapse afflicting the first world and the wars raging in Africa.  Slaves casually reference race as much as free citizens. 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.">>
@@ -699,7 +699,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 "middle eastern">>
-	<<set $nickname = either("'Arab'", "'Arabian Nights'", "'Bibi'", "'Camel Jockey'", "'Chai Girl'", "'Desert Sun'", "'Dune'", "'Harem Girl'", "'Hijabi'", "'Jasmine'", "'Sandy'", "'Scheherazade'", "'Third Wife'")>>
+	<<set $nickname = either("'Arab'", "'Arabian Nights'", "'Bibi'", "'Camel Jockey'", "'Chai Girl'", "'Desert Sun'", "'Dune'", "'Flying Carpet'", "'Harem Girl'", "'Hijabi'", "'Jasmine'", "'Sandy'", "'Scheherazade'", "'Third Wife'")>>
 	<<set $situationDesc = "is middle eastern, which is not uncommon given the interminable wars and disruptions in 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.">>
@@ -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'")>>
@@ -1096,7 +1096,7 @@
 	<<set $notApplyDesc = "understands that she would be a sex toy even if she still had arms and legs.">>
 
 <<case "blind">>
-	<<set $nickname = either("'Batty'", "'Blind'", "'Crash'", "'Deadeye'", "'No-Sight'", "'Sightless'", "'Stares'", "'White Cane'")>>
+	<<set $nickname = either("'Batty'", "'Blind'", "'Braille'", "'Crash'", "'Deadeye'", "'No-Sight'", "'Sightless'", "'Stares'", "'White Cane'")>>
 	<<set $situationDesc = "is blind. Her dull eyes reveal her condition. She has to feel her way between jobs and is at the mercy of everyone.">>
 	<<set $applyDesc = "accepts that her disability defines her. She keeps her eyes wide open, no longer fearing what others say about them.">>
 	<<set $notApplyDesc = "understands that she is expected to obey, work, and fuck just like any of your other slaves, regardless of her eyesight.">>