diff --git a/phsource/phonemes b/phsource/phonemes
index 53854062..9d54ae84 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1664,58 +1664,232 @@ phoneme h
 endphoneme
 
 
-
 //*******************************************************************
 // ADDITIONAL PHONEME TABLES
+// These are grouped by extended table and table name
 //*******************************************************************
 
-phonemetable ja base1
-include ph_japanese
+// *** Tables extending base1 ***
 
 phonemetable consonants base1
 include ph_consonants
 
-
 phonemetable base2 base1
 include ph_base2
 
-phonemetable en base1
-include ph_english
+phonemetable ak base1
+include ph_akan
 
-phonemetable en-n en
-include ph_english_n
+phonemetable am base1
+include ph_amhari
 
-phonemetable en-us en
-include ph_english_us
-
-phonemetable en-sc en
-include ph_english_sc
-
-phonemetable en-rp en
-include ph_english_rp
-
-phonemetable en-wm en
-include ph_english_wm
-
-phonemetable en-wi en
-include ph_english_wi
-
-
-phonemetable af base1
-include ph_afrikaans
+phonemetable ar base1
+include ph_arabic
 
 phonemetable cy base1
 include ph_welsh
 
-phonemetable ga base1
-include ph_irish
+phonemetable da base1
+include ph_danish
 
-phonemetable de base1
-include ph_german
+phonemetable en base1
+include ph_english
 
 phonemetable eo base1
 include ph_esperanto
 
+phonemetable et base1
+include ph_estonian
+
+phonemetable fa base1
+include ph_farsi
+
+phonemetable fi base1
+include ph_finnish
+
+phonemetable fr base1
+include ph_french
+
+phonemetable ga base1
+include ph_irish
+
+phonemetable gn base1
+include ph_guarani
+
+phonemetable hak base1
+include ph_hakka
+
+phonemetable hi_base base1
+include ph_hindi_base
+
+phonemetable hy base1
+include ph_armenian
+
+phonemetable hu base1
+include ph_hungarian
+
+phonemetable is base1
+include ph_icelandic
+
+phonemetable ja base1
+include ph_japanese
+
+phonemetable ka base1
+include ph_georgian
+
+phonemetable ky base1
+include ph_kyrgyz
+
+phonemetable kl base1
+include ph_greenlandic
+
+phonemetable ko base1
+include ph_korean
+
+phonemetable la base1
+include ph_latin
+
+phonemetable lt base1
+include ph_lithuanian
+
+phonemetable lv base1
+include ph_latvian
+
+phonemetable mi base1
+include ph_maori
+
+phonemetable my base1
+include ph_myanmar
+
+phonemetable mt base1
+include ph_maltese
+
+phonemetable no base1
+include ph_norwegian
+
+phonemetable om base1
+include ph_oromo
+
+phonemetable pl base1
+include ph_polish
+
+phonemetable prs base1
+include ph_dari
+
+phonemetable quc base1
+
+phonemetable ru base1
+include ph_russian
+
+phonemetable shn base1
+include ph_shan
+
+phonemetable sq base1
+include ph_albanian
+
+phonemetable sv base1
+include ph_swedish
+
+phonemetable sw base1
+include ph_swahili
+
+phonemetable tn base1
+include ph_setswana
+
+phonemetable tt base1
+include ph_tatar
+
+phonemetable vi base1
+include ph_vietnam
+
+phonemetable wo base1
+include ph_wolof
+
+phonemetable zh base1
+include ph_zh
+
+phonemetable zhy base1
+include ph_zh_yue
+
+// *** Tables extending base2 ***
+
+phonemetable el base2
+include ph_greek
+
+phonemetable es base2
+include ph_spanish
+
+phonemetable eu base2
+include ph_basque
+
+phonemetable grc base2
+include ph_greek_ancient
+
+phonemetable id base2
+include ph_indonesian
+
+phonemetable it base2
+include ph_italian
+
+phonemetable ku base2
+include ph_kurdish
+
+phonemetable nci base2
+include ph_nahuatl
+
+phonemetable pt base2
+include ph_pt_brazil
+
+phonemetable ro base2
+include ph_romanian
+
+phonemetable rw base2
+include ph_kinyarwanda
+
+phonemetable tr base2
+include ph_turkish
+
+// *** Tables extending en ***
+
+phonemetable en-n en
+include ph_english_n
+
+phonemetable en-rp en
+include ph_english_rp
+
+phonemetable en-sc en
+include ph_english_sc
+
+phonemetable en-us en
+include ph_english_us
+
+phonemetable en-wi en
+include ph_english_wi
+
+phonemetable en-wm en
+include ph_english_wm
+
+// *** Hidden dependencies ***
+// Tables which include/import phonemes from other (in comment) tables
+// TODO these may be needed to redesign
+
+phonemetable af base1 // form en
+include ph_afrikaans
+
+phonemetable de base1 // from en-us
+include ph_german
+
+phonemetable kk base1 // from sq
+include ph_kazakh
+
+phonemetable nl base1 // from af
+include ph_dutch
+
+phonemetable nso base1 // from af
+include ph_northern-sotho
+
+// *** Tables extending other language tables ***
+
 phonemetable ia eo
 include ph_interlingua
 
@@ -1725,34 +1899,28 @@ include ph_lojban
 phonemetable py eo
 include ph_pyash
 
-phonemetable nci base2
-include ph_nahuatl
+phonemetable es-la es
+include ph_spanish_la
 
-phonemetable fi base1
-include ph_finnish
+phonemetable ca es
+include ph_catalan
 
-phonemetable et base1
-include ph_estonian
+phonemetable an es
+include ph_aragon
 
-phonemetable fr base1
-include ph_french
-
-phonemetable hak base1
-include ph_hakka
-
-phonemetable nl base1
-include ph_dutch
-
-
-phonemetable hi_base base1
-include ph_hindi_base
+phonemetable ht fr
+include ph_haitian
 
 phonemetable hi hi_base
 include ph_hindi
 
-phonemetable bn hi_base
-include ph_bengali
+phonemetable bo hi
+include ph_tibetan
 
+phonemetable gd base1 // hidden dependency, imports from hi
+include ph_s_gaelic
+
+// hi_base
 phonemetable ne hi_base
 include ph_nepali
 
@@ -1780,23 +1948,36 @@ include ph_marathi
 phonemetable kok hi_base
 include ph_konkani
 
+phonemetable dv hi_base
+include ph_divehi
 
-phonemetable hu base1
-include ph_hungarian
+phonemetable te hi_base
+include ph_telugu
 
-phonemetable lt base1
-include ph_lithuanian
+phonemetable si hi_base
+include ph_sinhala
 
+phonemetable bn hi_base
+include ph_bengali
 
-phonemetable lv base1
-include ph_latvian
+phonemetable as bn
+include ph_assamese
 
-phonemetable pl base1
-include ph_polish
+phonemetable or bn
+include ph_oriya
+
+phonemetable bpy bn
+include ph_manipuri
 
 phonemetable sk pl
 include ph_slovak
 
+phonemetable bg pl
+include ph_bulgarian
+
+phonemetable sl pl
+include ph_slovenian
+
 phonemetable cs sk
 include ph_czech
 
@@ -1809,195 +1990,21 @@ include ph_macedonian
 phonemetable sr hr
 include ph_serbian
 
-phonemetable ru base1
-include ph_russian
-
 phonemetable ru-lv ru
 include ph_russian_lv
 
-phonemetable bg pl
-include ph_bulgarian
-
-
-phonemetable it base2
-include ph_italian
-
-phonemetable la base1
-include ph_latin
-
-phonemetable es base2
-include ph_spanish
-
-phonemetable es-la es
-include ph_spanish_la
-
-phonemetable ca es
-include ph_catalan
-
-phonemetable an es
-include ph_aragon
-
-phonemetable eu base2
-include ph_basque
-
-phonemetable pt base2
-include ph_pt_brazil
+phonemetable az tr
+include ph_azerbaijani
 
 phonemetable pt-pt pt
 include ph_portugal
 
-phonemetable ro base2
-include ph_romanian
-
-phonemetable el base2
-include ph_greek
-
-phonemetable grc base2
-include ph_greek_ancient
-
-phonemetable sv base1
-include ph_swedish
-
-phonemetable no base1
-include ph_norwegian
-
-phonemetable is base1
-include ph_icelandic
-
-phonemetable vi base1
-include ph_vietnam
-
 phonemetable vi-hue vi
 include ph_vietnam_hue
 
 phonemetable vi-sgn vi
 include ph_vietnam_sgn
 
-phonemetable zhy base1
-include ph_zh_yue
-
-phonemetable zh base1
-include ph_zh
-
-
-phonemetable sw base1
-include ph_swahili
-
-phonemetable tr base2
-include ph_turkish
-
-phonemetable ku base2
-include ph_kurdish
-
-phonemetable id base2
-include ph_indonesian
-
-phonemetable sq base1
-include ph_albanian
-
-phonemetable hy base1
-include ph_armenian
-
-phonemetable da base1
-include ph_danish
-
-phonemetable ka base1
-include ph_georgian
-
-phonemetable fa base1
-include ph_farsi
-
-phonemetable ar base1
-include ph_arabic
-
-phonemetable rw base2
-include ph_kinyarwanda
-
-phonemetable prs base1
-include ph_dari
-
-phonemetable quc base1
-
-phonemetable sl pl
-include ph_slovenian
-
-phonemetable gd base1
-include ph_s_gaelic
-
-phonemetable nso base1
-include ph_northern-sotho
-
-phonemetable ht fr
-include ph_haitian
-
-phonemetable az tr
-include ph_azerbaijani
-
-phonemetable ak base1
-include ph_akan
-
-phonemetable am base1
-include ph_amhari
-
-phonemetable wo base1
-include ph_wolof
-
-phonemetable dv hi_base
-include ph_divehi
-
-phonemetable te hi_base
-include ph_telugu
-
-phonemetable si hi_base
-include ph_sinhala
-
-phonemetable as bn
-include ph_assamese
-
-phonemetable or bn
-include ph_oriya
-
-phonemetable bpy bn
-include ph_manipuri
-
 phonemetable sd ur
 include ph_sindhi
 
-phonemetable tn base1
-include ph_setswana
-
-phonemetable mt base1
-include ph_maltese
-
-phonemetable bo hi
-include ph_tibetan
-
-phonemetable kk base1
-include ph_kazakh
-
-phonemetable tt base1
-include ph_tatar
-
-phonemetable ko base1
-include ph_korean
-
-phonemetable kl base1
-include ph_greenlandic
-
-phonemetable om base1
-include ph_oromo
-
-phonemetable my base1
-include ph_myanmar
-
-phonemetable gn base1
-include ph_guarani
-
-phonemetable ky base1
-include ph_kyrgyz
-
-phonemetable mi base1
-include ph_maori
-
-phonemetable shn base1
-include ph_shan