diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt
index c8b0a661..1f4ecbee 100644
--- a/common/culture/name_equivalency/00_NEOW_male_names.txt
+++ b/common/culture/name_equivalency/00_NEOW_male_names.txt
@@ -46,7 +46,7 @@ alan_male = { Al_pst_un Alain Alan Alen Alin Allan Allen Alun Arlan }
 alauddin_male = { Alaattin }
 albanus_male = { Alb_a_grv_ Alban Albano Auban }
 alberic_male = { Aubrey Aubrhyy }
-albert_male = { _A_hat_lbert Adalbert Adalberto Albeht Alber_pst_ Albert Alberto Albertus Alberzh Albet Albirt Albrecht Aubert }
+albert_male = { _A_hat_lbert Adalbert Adalberto Aelbert Albeht Alber_pst_ Albert Alberto Albertus Alberzh Albet Albirt Albrecht Aubert }
 albinus_male = { Alb_i_act_n Albin Albino Aubin Bine }
 alcide_male = { Alcides }
 alex_male = { _A_grv_lex Aahlex Ahl_i_hat_x Alec Alecs Aleks Alex Alick Allex Arlegz }
@@ -92,7 +92,7 @@ arian_male = { Ari_a_grv_ Arjan }
 aristides_male = { Aristides Aristidh Aristido }
 armel_male = { Armel Arthfael }
 arne_male = { _A_act_rni Aarne Anjes Anne_male Are Arne }
-arnold_male = { Aart Ahn_pst__o_hat_l Ahnawld Arend Arn_o_hat_l Arnald Arnaldo Arnaldur Arnau Arnaud Arnaut Arndt Arnel Arno Arnold Arnoldus Arnolldd Arnoud Arnuhd E_n_tld_aut }
+arnold_male = { Aart Aarnout Ahn_pst__o_hat_l Ahnawld Arend Arn_o_hat_l Arnald Arnaldo Arnaldur Arnau Arnaud Arnaut Arndt Arnel Arno Arnold Arnoldus Arnolldd Arnoud Arnout Arnuhd E_n_tld_aut } 
 arnulf_male = { Arnulf }
 arsenius_male = { Arsen Arsena Arseni Arsenio }
 arslan_male = { Arslan Aslan Asllan }
@@ -195,7 +195,7 @@ cedric_male = { C_e_act_dric Cedric Cydrhyc }
 celestine_male = { Celestin Celestino }
 celso_male = { Cels Celso }
 chakrabarti_male = { Chahkrabartwy Chakrehbahteh }
-charles_male = { Carl Carle Carles Carlo Carlos Ch_a_hat_hrlz Chahlz Charhlys Charle Charles Charlez Charlie Charllys Charls Charlz Kaarel Kalle Karel Karl Karlos Sharlys Siarl }
+charles_male = { Carl Carle Carles Carlo Carlos Ch_a_hat_hrlz Chahlz Charhlys Carel Charle Charles Charlez Charlie Charllys Charls Charlz Kaarel Kalle Karel Karl Karlos Sharlys Siarl }
 charlesalbert_male = { Carlos_spc_Alberto }
 charlesanthony_male = { Carlos_spc_Ant_o_act_n }
 charlesedward_male = { Carl-Edvard }
@@ -208,7 +208,7 @@ charya_male = { Chah_pst__i_hat_yya Charya Charyuh Cherryuh }
 cheops_male = { Cheops Chihops Kee_pst__a_hat_ps Keeawps Kieops }
 christ_male = { Kristaq }
 christian_male = { Carsten Christer Christiaan Christian Christianus Crestian Cristian Cristiano Karsten Kersten Kresten Kristen_male Krister Kristi_male Kristi_a_act_n Kristian Kristinn Kristj_a_act_n Kristjan }
-christopher_male = { Chriss_pst_fer Christof Christoff Christoffer Christoph Christophe Christopher Crist_o_act_bal Crist_o_act_v_a_tld_o Crist_o_grv_fol Crist_o_grv_u Cristoffer Cristoforo Kit Krestuhfuh Kri_s_crn_tof Krist_o_act_fer Kristo Kristof Kristofer Kristoffer Kristuhfuh Kristyrff_e_brv_r Kry_s_crn_tof Risto }
+christopher_male = { Chriss_pst_fer Christof Christoff Christoffer Christoffel Christoph Christophe Christopher Crist_o_act_bal Crist_o_act_v_a_tld_o Crist_o_grv_fol Crist_o_grv_u Cristoffer Cristoforo Kit Krestuhfuh Kri_s_crn_tof Krist_o_act_fer Kristo Kristof Kristofer Kristoffer Kristuhfuh Kristyrff_e_brv_r Kry_s_crn_tof Risto }
 chrysostomus_male = { Cris_o_act_stomo }
 claudius_male = { Cl_a_act_udio Claude_male Claudi Claudio Claudius Gl_a_grv_udi Glaoda Glywys Klaod Klaudio }
 clement_male = { Cl_e_act_ment Clem_e_grv_nt Clemens Clement Clemente Clemmin_pst_ Clemmyynt Climent Kleman Klemant Klemen Klemens Klement Klemuhnt }
@@ -222,7 +222,7 @@ constantine_male = { Constant_i_act_n Constantyny Constentyn Costantino Coustant
 constantius_male = { Costanzo Coustant }
 corbinian_male = { Korbinian }
 corentin_male = { Corentin Courentin }
-cornelius_male = { Cornelis Cornelius Cornyllyus Kornelis Niels_Cornelius }
+cornelius_male = { Cornelis Cornelius Cornyllyus Kornelis Niels_Cornelius Kees }
 craig_male = { Craig Crayg }
 cyngar_male = { Cyngar Cyngarh }
 cyprian_male = { Cebri_a_grv_ Ciprian Cipriano }
@@ -260,7 +260,7 @@ eberhard_male = { Eberhard Eberhardt Evert }
 ecgtheow_male = { _AE_ktheoh Ecgtheow Ecktioh Ekɡthe_i_bar_ }
 edgar_male = { Eddgair Eddgar Edgar }
 edmund_male = { Eddmund Eddmundd Edmond Edmondo Edmound Edmund Edmundo }
-edward_male = { _E_act_douard Audouard Duarte E_eth_dvar_eth_ Eaddwarhd Eddwaird Eddwardd Edorta Edouard Eduard Eduardo Eduart Edvard Edward Iorwerth Nyddardd }
+edward_male = { _E_act_douard Audouard Duarte E_eth_dvar_eth_ Eaddwarhd Eddwaird Eddwardd Ed Edorta Edouard Eduard Eduardo Eduart Edvard Edward Iorwerth Nyddardd }
 edwin_male = { Au_eth_unn Eddwyn Edvin Edwin Edwyn }
 egbert_male = { Egbert }
 ekkehard_male = { Eckehard Eckhard Eckart Eicke Eike Ekkehard Eyke  }
@@ -323,7 +323,7 @@ florent_male = { Flor_e_hat_ncio Florenc Florenci Florencio Florent Floris Flour
 florentinus_male = { Florentino }
 florian_male = { Flori_a_act_n Florian Flourian }
 fortunatus_male = { Fortunato }
-francis_male = { Chichoues Fa_n_tld_ch Ffrancys Ffransis Ffransys Ffrhancys Fr_a_act__n_crn_a Fra_n_tld_sez Fraincis Fran Fran_c_ced_ois Fran_c_crn_i_s_crn_ek Franc Franc_e_act_s France_male Francesc Francho Franci Franci_s_crn_ak Francis Francisco Franciscus Franck Franco Francoun Franjo Frank Frankie Frano Frans Franti_s_crn_ek Frantsisk Frantsysk Franz Franziskus Patxi }
+francis_male = { Chichoues Fa_n_tld_ch Ffrancys Ffransis Ffransys Ffrhancys Fr_a_act__n_crn_a Fra_n_tld_sez Fraincis Fran Fran_c_ced_ois Fran_c_crn_i_s_crn_ek Franc Franc_e_act_s France_male Francesc Francho Franci Franci_s_crn_ak Francis Francisco Franciscus Franck Franco Franchoys Francoys Francoun Franjo Frank Frankie Frano Frans Franti_s_crn_ek Frantsisk Frantsysk Franz Franziskus Patxi }
 francisanthony_male = { Francescantonio }
 francisemmanuel_male = { Francho_spc_Manuel }
 francisjohn_male = { Francesc_spc_Joan Franz_spc_Josef Patxi_spc_Joseba }
@@ -347,12 +347,12 @@ gary_male = { Garry Gary }
 gaston_male = { Gaston }
 gawayn_male = { Gaivin Gavin Gawayn Gawyyn }
 genghis_male = { Cengiz }
-geoffrey_male = { Gaufre Geoffrei Geoffrey Geoffroy Godefroy Godffrhyy Godfrey Goffredo Gottfried Gyoffrhyy Gyoffryy Gyr_eth_ir Jaufret Jeff Jeffrey Sieffre }
+geoffrey_male = { Gaufre Geoffrei Geoffrey Geoffroy Godefroy Godffrhyy Godfrey Goffredo Gottfried Govert Gyoffrhyy Gyoffryy Gyr_eth_ir Jaufret Jeff Jeffrey Sieffre }
 george_male = { _O_uml_rjan Chorche G_o_uml_ran G_o_uml_rgen Georg George Georges Giorgio Gjergj Gjergji Gorch Gorka Gyorgy Gyorhgy Hieorhij J_o_grv_rgi J_o_stk_rgen J_o_stk_rn J_o_uml_ran J_o_uml_rg J_o_uml_rn J_u_uml_rgen J_u_uml_ri Ji_r_crn__i_act_ Jord Jordi Jordy Jorge Joris Jorj Jorres Jory Jure Jurgi Jurij Jury Schorsch Si_o_hat_r Siorus Youri Yuriy }
 georgejames_male = { Jordi_spc_Jaume }
 georgejoseph_male = { Jordi_spc_Josep }
 gerald_male = { G_e_act_rald Geraildd Gerald Gerallt Gerold Giraud Guerau Gyraldd Gyralldd Gyrhaldd }
-gerard_male = { Cherardo Geert Gerard Gerardo Gerardus Gerd Gerhard Gerhardus Gerhart Gerit Gerrit Gert Girard Kert }
+gerard_male = { Cherardo Geert Gerard Gerardo Gerardus Gerd Gerhard Gerhardus Gerhart Gerit Gerrit Gert Girard Kert Jurre Jurryt }
 german_male = { Cherm_a_act_n Garmon Germ_a_grv_ German Germano Kerman }
 gerontius_male = { Geraint Gerens Gerontius Gyraynt Gyrhaynt }
 gervasius_male = { Gerv_a_act_sio Gervasi }
@@ -375,8 +375,8 @@ gregory_male = { _R_crn_eho_r_crn_ Greg_o_grv_ri Gregg Gregor Gregori Gregorio G
 griffith_male = { Grhyffyf Gruffudd Gryffyf }
 gunther_male = { G_u_uml_nter G_u_uml_nther Gunar Gunde Gunnar Gunter Gunther Kunnar }
 guntram_male = { Guntram }
-gustav_male = { G_o_uml_sta Gust_a_grv_vi Gustaf Gustau Gustav Gustavo Kusta }
-guy_male = { Gui Guido Guy Gvido Kuido Kvido Quido }
+gustav_male = { G_o_uml_sta Gust_a_grv_vi Gustaf Gustaaf Guus Gustau Gustav Gustavo Kusta }
+guy_male = { Gui Guido Guy Gvido Kuido Kvido Quido }                           
 gwenael_male = { Gu_e_act_na_e_uml_l Gwena_e_uml_l Gwenn-A_e_uml_l }
 gwenole_male = { Gu_e_act_nol_e_act_ Gw_e_act_nol_e_act_ Gwennole }
 haakon_male = { H_a_act_kon H_a_rng_kan H_a_rng_kon Haagen Haakon }
@@ -531,7 +531,7 @@ johnyves_male = { Jan-Ives Jean-Yvon Yann-Erwan }
 jonah_male = { J_o_act_nas Jon_a_act__s_crn_ Jona_Jonah Jonah Jonas Joonas Youn_e_grv_s Yunis Yunus }
 jonathan_male = { Johnafan Jonafan Jonaitain Jonat_a_act_n Jonatan Jonathan Jounatan }
 jordan_male = { Jord_a_grv_ Jordan Jorddain Jorddan Jorhddan Jourdan }
-joseph_male = { Chus_e_act_ Ioseba Iosif Jazep J_o_act_us_e_grv_ Jo_z_crn_e Jo_z_crn_ef Job_Joseph Joe Joep Joey Joosep Jos Jos_e_act_ Jose Joseba Josef Josep Joseph Josephus Josif Josip Josyff Joxe Jozeb Jozef Jusuf Pino Youssef Yusuf Zef }
+joseph_male = { Chus_e_act_ Ioseba Iosif Jazep J_o_act_us_e_grv_ Jo_z_crn_e Jo_z_crn_ef Job_Joseph Joe Joep Joey Joosep Jos Jos_e_act_ Jose Joseba Josef Josep Joseph Josephus Josif Josip Josyff Joxe Jozeb Jozef Jusuf  Pino Youssef Yusuf Zef }
 josephalbert_male = { Chus_e_act__spc_Alberto }
 josephandrew_male = { Chus_e_act__spc_Andr_e_act_s }
 josephangel_male = { Chus_e_act__spc__A_act_nchel Joseba_spc_Gotzon Josep_spc__A_grv_ngel }
@@ -610,7 +610,7 @@ louisxavier_male = { Lo_i_act_s_spc_Chabier }
 lucian_male = { Lluci_a_grv_ Lucian Luciano Lucien Luken Lukian }
 lucius_male = { L_u_act_cio Llwcyus Lucio Lwcyus Lwsyus }
 ludger_male = { Ludger Ludgero }
-luke_male = { Lluc Llwky Lu Luc Luca Lucas Luk_a_act__s_crn_ Luka Lukas Luke Luky Luuk Luukas }
+luke_male = { Lluc Llwky Lu Luc Luca Lucas Luk_a_act__s_crn_ Luka Lukas Luke Luky Luuk Luukas Loek }
 lutfi_male = { L_u_uml_tf_u_uml_ L_u_uml_tfi Lotfi Lutfi }
 lutfullah_male = { L_u_uml_tfullah }
 luther_male = { L_u_uml_der }
@@ -639,7 +639,7 @@ martin_male = { M_a_uml_rt Maarten Mairtin Marhtyn Mart Mart_i_act_ Mart_i_act_n
 marwan_male = { Marouane Marwan }
 masud_male = { Mesut }
 mathurin_male = { Mathurin Matilin }
-matthew_male = { Macviej Madis Mads Mah_e_act_ Maho Maido Mait Maittew Mat_e_crn_j Mat_i_act_s Matej Mateja Mateo Mateu Mateus Matev_z_crn_ Matfyu Matfyw Mathew Mathias Mathieu Mathis Mathvey Mati Mati_e_act_u Matias Matic Matija Matja_z_crn_ Matko Mats Matteo Matth_a_uml_us Matth_i_act_as Matthew Matthias Matthijs Mattia Mattias Matou_s_crn_ Maty_a_act__s_crn_ Mazhev Thees Theis Thies Thijs }
+matthew_male = { Macviej Madis Mads Mah_e_act_ Maho Maido Mait Maittew Mat_e_crn_j Mat_i_act_s Matej Mateja Mateo Mateu Mateus Matev_z_crn_ Matfyu Matfyw Mathew Mathias Mathieu Mathis Mathvey Mati Mati_e_act_u Matias Matic Matija Matja_z_crn_ Matko Mats Matteo Matth_a_uml_us Matth_i_act_as Matthew Matthias Matthijs Mattia Mattias Matou_s_crn_ Maty_a_act__s_crn_ Mazhev Thees Theis Thies Thijs Ties }
 maurice_male = { Maoris Maur_i_act_cio Maurhycy Maurice Maurici Mauricio Maurise Mauritz Maurizio Maurycy Maurysy Meurig Moritz Morris }
 maurus_male = { Mauro }
 mawlud_male = { Mevl_u_uml_t Miloud Mouloud }
@@ -737,7 +737,7 @@ paulinus_male = { Paolino Paul_i_act_ Paulin Paulino }
 pauljohn_male = { Paul_spc_Johannes }
 pelagius_male = { Pel_a_act_gio Pelagius }
 percival_male = { Percivail Percival Percy Pyrcywyall Pyrhcywyal Pyrsyval }
-peter_male = { Kepa P_a_uml_r P_e_act_tur P_e_grv_ire P_e_hat_r P_e_uml_ter Peder Pedr Pedro Peedo Peep Peer Peet Peeter Pehr Peio Pelle Pello Per Peran Pere Periko Pero Peru Peter Petr Petro Petrok Petrus Petter Piatro Piatru_s_act_ Piero Pierre Piers Pierrick Piet Pieter Pietro Pirro Pjet_e_uml_r Pyrh Pyt Pytyr Pytyrh Pyyrs }
+peter_male = { Kepa P_a_uml_r P_e_act_tur P_e_grv_ire P_e_hat_r P_e_uml_ter Peder Pedr Pedro Peedo Peep Peer Peet Peeter Pehr Peio Pelle Pello Per Peran Pere Periko Pero Peru Peter Petr Petro Petrok Petrus Petter Piatro Piatru_s_act_ Piero Pierre Piers Pierrick Piet Pieter Pietro Pirro Pjet_e_uml_r Pyrh Pyt Pytyr Pytyrh Pyyrs Pyke }
 peteranthony_male = { P_e_grv_ire-Ant_o_grv_ni Pero_spc_Ant_o_act_n }
 petergeorge_male = { Per-G_o_uml_ran }
 peterjames_male = { P_e_hat_r-Jakez }
@@ -765,7 +765,7 @@ quirinus_male = { Krijn Quirino }
 radoslav_male = { Radoslav }
 rafiq_male = { Rafik Refik }
 rafn_male = { Hrafn Rafn }
-ragnar_male = { Ragnar Rain Rainer Raniero Rannar Rein Reiner }
+ragnar_male = { Ragnar Rain Rainer Raniero Rannar Rein Reiner Reinier }
 rahim_male = { Rahyym }
 rahman_male = { Rrahman }
 rajab_male = { Recep Rexhep }
@@ -862,7 +862,7 @@ sidonius_male = { Sid_o_act_nio }
 siegfried_male = { Siegfried Sigfred Sigfrid }
 siegmar_male = { Siemer Sigmar }
 siegmund_male = { _Z_crn_iga Segimon Siegmund Sigismund Sigmund Sigmundur Zikmund }
-sigurd_male = { Sievert Sigur_eth_ur Sigurd Sjoerd }
+sigurd_male = { Sievert Sieuwerd Sigur_eth_ur Sigurd Sjoerd }
 silverius_male = { Silv_e_act_rio }
 simon_male = { _S_crn_imen _S_crn_imon S_i_act_mon Siim Sim_a_tld_o Sim_o_act_n Simen Simeon Simon Simone_male Simoun Symon }
 slavomir_male = { Slavom_i_act_r }
@@ -899,9 +899,9 @@ thaddaeus_male = { Tade_a_act__s_crn_ Tadej Thad_a_uml_us Thadd_a_uml_us Thaddyu
 theo_male = { Teo Th_e_act_o Theo }
 theobald_male = { Tepot Theobald Thibault Thyobaldd Tibaud }
 theodore_male = { F_e_uml_dor Fyoddorhy Fyoddory Theodhor Teodor Teodoro Teoudor Theodor Theodore Theodorus Tudor }
-theodoric_male = { Ddyryk Derek Derk Derrick Diedrich Dierk Dieter Dietrich Dirk F_e_uml_oderik Terris Tewdrig Thierry Tiit Till Tyll Tyrry }
-theodosius_male = { Tewdos }
-theophilus_male = { Te_o_act_filo Teoufile Theophil Thyoffylus }
+theodoric_male = { Ddyryk Derek Derk Derrick Diedrich Diederik Dierk Dieter Dietrich Dirk F_e_uml_oderik Terris Tewdrig Thierry Tiit Till Tyll Tyrry Tjerk Tjark }
+theodosius_male = { Tewdos }                                                                                                                
+theophilus_male = { Te_o_act_filo Teoufile Theophil Thyoffylus }                                                                            
 thomas_male = { Tamas T_o_act_mas Thoma Thomas Tom Tom_a_act__s_crn_ Tom_a_act_s Tom_e_act_ Toma_z_crn_ Tomais Tomas Tomaz Tomi Tommy Tomos Toomas Toumas }
 thor_male = { _TH__o_act_r Thor Tor }
 thorbjorn_male = { Thorben Thorbj_o_stk_rn Thorbj_o_uml_rn Torben Torbj_o_stk_rn Torbj_o_uml_rn }
@@ -962,7 +962,7 @@ walter_male = { Gauchi_e_act_ Gauthier Gualter Gwallter Valter Wailter Walltyr W
 wenceslaus_male = { V_a_act_clav V_e_crn_nceslav Viacheslav Viachasla_u_brv_ Vysheslav Wenzel }
 werner_male = { V_a_uml_rner Werner Wessel }
 wilfried_male = { Wilfred Wilfrid Wilfried }
-william_male = { Bill Billy Gilen Guilherme Guill_e_act_n Guillaume Guillem Gwilym Liam Llyam Lomig Lyam Guih_e_grv_n Guih_e_grv_ume Gwilherm Gwillam Pim Vil_e_act_m Vilhelm Vilhj_a_act_lmur Vili Viliam Viljem Vilko Villem Villi Villu Villy Vilyam Wilhelm Wilhelmus Wilken Will Willem Willi Williaim William Willm Wilm Willy Wyllyam }
+william_male = { Bill Billy Gilen Guilherme Guill_e_act_n Guillaume Guillem Gwilym Liam Llyam Lomig Lyam Guih_e_grv_n Guih_e_grv_ume Gwilherm Gwillam Pim Vil_e_act_m Vilhelm Vilhj_a_act_lmur Vili Viliam Viljem Vilko Villem Villi Villu Villy Vilyam Wilhelm Wilhelmus Wilken Will Willem Wim Willi Williaim William Willm Wilm Willy Wyllyam }
 wissam_male = { Wissam Wissem }
 wojtek_male = { Vojt_e_crn_ch Vojta }
 wolf_male = { Ulf Wolf Wulf }