diff --git a/webapp/data/languages/mi/mi_5words.txt b/webapp/data/languages/mi/mi_5words.txt
index f63267c..9c07ce8 100644
--- a/webapp/data/languages/mi/mi_5words.txt
+++ b/webapp/data/languages/mi/mi_5words.txt
@@ -1,127 +1,1178 @@
-maori
-ratou
-tenei
+aeaeā
+ahahu
+āhaku
+āhana
+āhere
+āhiki
+ahine
+ahore
+ahotu
+āhuru
+aiahi
+āinga
+aituā
+aiutu
+akahu
+ākikō
+akiri
+akitu
+akoro
+akura
+akutō
+amaia
+amaru
+āmene
+āmiki
+amiku
+amine
+amoka
+amoko
+āmuri
+anahe
+anake
+anana
+ānehu
+ānene
+ānewa
+angai
+angoa
+ānini
+anipā
+āniwa
+anuhe
+anuhē
+aoake
+aonga
+aotea
+aouru
+āpāha
+āpāia
+āpāno
+āpiti
+āpōpō
+āpure
+āpuru
+āputa
+arahi
+arara
+araro
+arawa
+arero
+arewa
+arihi
+ārika
+ariki
+aroha
+ārohi
+aropā
+arowa
+aruhe
+atahi
+ātahu
+atata
+atatu
+ātete
+atiia
+atiru
+atiti
+ātute
+auaha
+auahi
+auaka
+auara
+auare
+auere
+aumoe
+aumou
+āunga
+aurei
+auroa
+autui
+auwai
+auwhi
+āwaiā
+āwake
+awata
+aweke
+aweko
+awere
+awhai
+awheo
+āwhio
+eaoia
+ehake
+ēhara
+ehinu
+enaka
+engei
+engia
 etahi
-reira
-ranei
-ratou
-pehea
-tai’o
-ringa
+ētahi
+etehi
 haere
-whare
-tatou
-whaea
-hanga
-tango
+hahae
+hahao
+hahau
+hāhau
+haipu
+hākui
+hāmua
+hānea
 hanga
-anake
+hānga
+hāngi
+hango
+hāngū
+hāpai
+hāpua
+hapui
+harau
+hārau
+hāria
+harua
+hātai
+hātea
+haukū
+hauma
+haumi
+haupa
+haupū
+haura
+hāura
+hauru
+hautō
+hautū
+hawai
+hāwea
+hawhe
+heheu
+heipū
+henga
+hēnga
+heuea
+hiako
+hiamo
+hiapo
+hiawe
+hieke
+hiemi
+hīhue
+hīkoi
+hīnau
+hinga
+hiore
+hipae
+hīrau
+hīrea
+hirou
+hitau
+hiwai
+hīwai
+hoake
+hoata
 hoatu
+hohou
+hoiho
+hōiki
+hoipū
+hokai
+hokio
+hokoi
+homai
+honae
+honea
+honga
+hōngā
+hōngē
+hongi
+hōngī
+hōnia
+hopīi
+hōpua
+horoi
+hōrua
+hōteo
+hōtiu
+hōtoa
+houhi
+houto
+huaki
+huamo
+hūare
+huata
+hueke
+huene
+huhoe
+huhua
+huhue
+hūiki
+hūkui
+hunga
+hūnua
+hūoro
+hūrau
+hūwai
+ianei
+ikura
+inaho
+inaia
+inaka
+inake
+inana
+inapō
+inara
+inati
 ingoa
-raina
-matau
+inohi
+kāeti
+kaeto
+kahau
+kāhia
+kāhua
+kāhui
+kaiao
+kaiau
+kāika
+kaipo
+kaitā
+kaitu
+kakai
+kakao
+kakau
+kakīi
+kākoa
+kanae
+kanga
+kānga
+kanoi
+kaore
+kaoto
+kapeu
+kāpia
+kapua
+kāpui
+karae
+kārau
+karei
+kareu
+karia
+kātae
+kātao
+katau
+katea
 katoa
-ratou
-hanga
-haere
-tangi
-kitea
-upoko
-kitea
-cover
-rakau
+kātoa
+kātua
+kāuhi
+kāuki
+kauko
+kaupe
+kauri
+kāuta
+kāuto
+kautu
+kautū
+kāwai
+kawau
+kāwau
+kawiu
+kēhua
+kekeu
+kengo
+kereū
+kēroa
+keuea
+kewha
+kiaka
+kiano
+kiato
+kiatu
+kihau
+kihei
+kiore
+kirea
+kōaha
+kōaka
+kōanu
+koara
+koare
+koari
+koaru
+koata
+koawa
+koeha
+koehu
+koeka
+koeke
+koemi
+koera
+koere
+koero
+kohae
+kohai
+kohao
+kōhau
+kohea
+kohei
+kōhia
+kōhoi
+kōhua
+kōhue
+koiha
+kōihi
+koihu
+koiki
+kōina
+koipi
+koira
+koiri
+koiro
+kōiro
+koiti
+koito
+kōiwi
+kōkai
+kōkau
+kōkēi
+kokio
+kokoi
+komae
+komai
+kōmau
+konae
+kōnao
+konau
+kōnei
+konga
+kōngū
+kōnia
+koniu
+konui
+kōpae
+kōpeo
+kopia
+kōpio
+kopou
+kōpua
+korae
+kōrau
+kōrea
+koria
+kōrio
+kōroa
+koroī
+korou
+kōrua
+kotae
+kotai
+kotao
+kōtao
+kotau
+kōtea
+koteo
+kōtiu
+kōtua
+kōtui
+kouka
+kōuma
+kōumu
+kounu
+koura
+kōura
+koure
+kōuru
+koutu
+kōwao
+kōwha
+kūaha
+kūāka
+kuanu
+kuara
+kuare
+kuata
+kuawa
+kūemi
+kūene
+kueto
+kūihi
+kuika
+kuiki
+kuiti
+kuiwi
+kukau
+kumou
+kuoro
+kupae
+kurae
+kūtai
+kutao
+kūwai
+kūwao
+kuwha
+maawe
+maehe
+māeke
+maeko
+maene
+maero
+maewa
+mahau
+māhau
+mahea
+maheu
+māhia
+māhie
+māhoe
+māhoi
+mahua
 mahue
-press
-rongo
-hoiho
-rakau
-matua
-white
-haere
-tiaki
+maiao
+maiea
+maihe
+maihi
+māihi
+māika
+maiki
+maina
+māipi
+maire
+maiti
+makao
+makau
+makiu
+makoa
+mākoi
+makue
+mamae
+mamao
+mamau
+manau
+manea
+manga
+mangā
+mānga
+māngi
+mangō
 mania
-whero
-waiho
-tatau
-mangu
-whika
-pātai
-hawhe
-haere
-runga
-katoa
-inihi
-koura
-plane
-hanga
-kawea
-kawea
-peita
-kōwae
-etahi
-hinga
-arahi
-pouri
-whetu
-pauna
+mānia
+manua
+manuā
+maoho
+māoka
+maopo
+maori
+māota
+māpou
+māpua
+marae
+marau
+mārau
+marea
+mārie
+mariu
+maroī
+mārua
+mārui
+mataī
+mātai
+mātao
+matau
+mātau
+matea
+mātia
+mātie
+matoe
+matoi
+matou
+mātou
+matua
+mātua
+mauka
+mauki
+mauku
+maunu
+māunu
+maupu
+maure
+mauri
+mauru
+māuru
+maute
+mauti
+māweu
+māwhe
+meāke
+mēmea
+miere
+mikao
+mingo
+mirei
+miroi
+mōaho
 moana
-rongo
-haora
-pānga
-haere
-tekau
-puhoi
-aroha
-hutia
-matao
-pānui
-teina
-pūtau
-tatau
-reira
-tūnga
-ringa
-ana’e
-rangi
-poari
-rangi
-break
+moari
+moata
+mohio
+mohoa
+mohou
+mōhou
+mōiri
+mokai
+mōkau
+mokoā
+momoe
+mongi
+mōrea
+mōria
+morua
+mōtea
+mōtoi
+mounu
+mōunu
+mouri
+moutī
+munga
+murau
+mūrea
+mūrei
+nahau
+nāhau
+nahea
+nahui
+nanao
+nanau
+nanea
+nanīi
+nanua
+napia
+nāupe
+nāwai
+nenei
+ngaeo
+ngaha
+ngahu
+ngaio
+ngake
+ngaki
+ngako
+ngaku
+ngami
+ngana
+ngapu
+ngārā
+ngare
+ngari
 ngaro
-hinga
-taime
-kapua
-maere
-matua
-kōwae
-tuari
-rānei
+ngaru
+ngata
+ngatē
+ngāti
+ngatu
+ngaua
+ngaue
+ngāue
+ngawē
+ngehe
+ngehi
+ngene
+ngeni
+ngera
+ngere
+ngeri
 ngeru
-tārua
-roroa
-onepu
-whiua
-māori
-patua
-homai
+ngete
+ngeti
+ngiha
+ngita
+ngohi
+ngoio
+ngōki
+ngōko
+ngora
+ngore
+ngoro
+ngoru
 ngota
+ngote
+ngoto
+ngotu
+nguha
+ngunu
+ngutu
+nikau
+niwha
+nohia
+nōhou
+nonoi
+nunui
+ohaki
+ohāki
+ohere
+ōhoku
+ōhona
+okaka
+okehu
+okeke
+okewa
+ōkioi
+okiwa
+okori
+okoro
+omaki
+omeke
+onetu
+onewa
+opeti
+ōpure
+opuru
+orewa
+orite
+oroko
+orotā
+ōtāne
+otiia
+otiki
+otirā
+otoru
+oturu
+paaha
+paeke
+paeko
+pāhao
+pahau
+pāhau
+pāhia
+pahīi
+pāhua
+pāihi
+pāike
+pairi
+pāiri
+pāiru
+paitu
+pākai
+pākia
+pakoa
+panau
+panga
 pānga
-wheua
-horoi
-matua
-tukua
-ariki
-matua
-chord
-share
-aroha
-hāora
-ōrite
-kaute
-aporo
-taura
-katoa
+pango
+pāngū
+pānui
+pāohe
+paoho
+paoka
+paoke
+paoro
+paowa
+paowe
+papae
+papai
+papaī
+pāpua
+paraē
+pārae
+pārai
+pārau
+parea
+paroa
+pārua
+pātai
+pātea
+pātia
+patoa
+pātoi
+patou
+pātua
+patui
+pāuhu
+pauku
+pāuma
+paunu
+pauri
+pāuru
+pāwai
+pēnei
+perei
+pērua
+petea
+piahu
+piaka
+piako
+piari
+pieke
+piere
+pīhao
+pīhau
+pihoi
+pīkau
+pikoi
+pioka
+piori
+pioro
+pirau
+pitao
+pitau
+pītau
+pītoi
+piwai
+pōaha
+poaka
+poare
+poarū
+pohau
+pohio
+pōhoi
+pōike
+poiri
+pōito
+pokai
+ponae
+ponga
+pōnga
+pongi
+poniu
+popoa
+popoi
+pōrae
+porai
+porea
+pōria
+porou
 pōtae
+potau
+pouri
+pōuto
+poutū
+pōwhā
+puaha
+pūahi
+pūaho
+puaka
+puaki
+puano
+pūanu
+puare
+puaru
+puata
+puawe
+pūehu
+pūeku
+pūeru
+pūhoi
+pūhou
+pūhua
+puhue
+pūihi
+pūiti
+pūkio
+pūmau
+punga
+pūnga
+pūniu
+punua
+pūnui
+pūoho
+puoro
+puoru
+puoto
+pupau
+purau
+pūrou
+pūrua
+pūtao
+pūtoa
+pūtoi
+pūwai
+rahua
+rāhui
+rāihe
+rāina
+raipo
+rākau
+rākei
+ranea
+rānei
+ranga
+range
+rangi
+rango
+rāowa
+rāpoi
+rapou
+rarai
+rarau
+rarīi
+rarua
+rātau
+rātou
+rauhi
+rauoa
+raupā
+raupī
+raupo
+rauru
+rautū
+rāwai
+rawha
+rehea
+rehia
+rehua
+reira
+renga
+rerei
+rētao
+rēwai
+rewha
+riaka
+riaki
+rieki
+ringo
+rinoi
+ripoi
+ripua
+ririo
+ririu
+riroi
+rīroi
+ritua
+riuka
+riwai
+riwha
+roaka
+rohai
+rōhia
+rōiho
+rokia
+rongo
+roniu
+rōrāi
+rōrea
+roria
+roroa
+roroi
+routu
+rowau
+ruaki
+rueke
+runga
+ruwha
+<span class="foreign bold" lang="mi">Āhau</span> (i), pos. pron., pl. of tāhau
+taahu
+taaku
+taana
+tāaru
+taeka
+taeke
+tāeki
+taepu
+taera
+taere
+taero
+tāewa
+tāhae
+tāhau
+tāhei
+tāhoa
+tāhoe
+tahua
+taiao
+taiea
+tāiha
+tāihi
+tāiho
+tāika
+tāiki
+taiko
+taina
+tāina
+taipa
+taipo
+taipū
+tairi
+tāiri
+tairo
+tāiro
+taitā
+taitu
+takai
+takao
+tākau
+takeo
+takoi
+tākou
+tāmau
+tāmoe
+tāmou
+tanae
+tanga
+tānga
+tangi
 tango
+tānoa
+tanoi
+tāoki
+tāore
+tāoro
+tāoru
+tāpai
+tapau
+tāpau
+tāpia
+tāpoa
+tāpoi
+tapou
+tāpua
+tārai
+tarao
+tārau
+tarie
+tāroa
+tāroi
+tārua
+tatae
+tātai
+tatao
+tatau
+tātau
+tātāu
+tātea
+tātoe
+tātou
+tātua
+tāuhi
+tāuhu
+tauia
+tāuka
+tāuke
+taunu
+taupā
+tāupe
+taupō
+taupū
+taura
+tāura
+tauru
+tāuru
+tauta
+taute
+tautō
+tāwae
+tāwai
+tawao
+tawau
+tawhā
+tawhe
+tāwhe
+tawhi
+tēhea
+tekau
+tēnei
+tenga
+tengi
+tēure
+tiaho
+tiaka
+tiaki
+tiare
+tiari
+tiehe
+tiehu
+tieke
+tiemi
+tiepa
+tihao
+tihau
+tihei
+tihoi
+tihou
+tikai
+tikei
+tikoi
+tikou
+timor
+tinei
+tinga
+tinia
+tioho
+tioko
+tioma
+tiora
+tiori
+tioro
+tipae
+tipao
+tipau
+tipua
+tirau
+tirea
+tirua
+titei
+titoi
+tiwae
+tiwai
+tiwha
+toari
+tōeke
+toemi
+toene
+toera
+toere
+tōhau
+tōhou
+toihā
+tōihi
+tōiki
+tōine
+tōiri
+tōiti
+toitū
+toiwi
+tokai
+tōkai
+tōkia
+tokoū
+tōmau
+tōmua
+tonae
+tonga
+tōnga
+tōngā
+tongi
+tōnui
+torea
+tōrea
+toroa
+tōroa
+toroī
+tōrua
+totoa
+tōtōa
+totoe
+totoi
+tōwai
+towha
+towhe
+tūaho
+tūahu
+tūāhu
+tuaka
+tuaki
+tuapa
+tūāpō
+tuara
+tuare
+tuata
+tuatu
+tūāua
+tueke
+tuhau
+tūhea
+tūhua
+tuhui
+tuiau
+tuiri
+tukau
+tukou
+tumou
+tumua
+tunga
+tungu
+tunou
+tunui
+tūohu
+tuoma
+tuone
+tuora
+tuoro
+tuota
+tūpou
+turei
+tūria
+turoa
+turou
+turua
+tūrua
+tutae
+tutei
+tūtūā
+tuuta
+tūwhā
+uarua
+uhono
+ukura
+umere
+umiki
+unahi
+unene
+unuku
+upane
+ūpoko
+uretū
+urewa
+uruao
+uruhi
+urupā
+urupū
+urutā
+urutū
+utoka
+utoki
+uturi
+waere
+waero
+wahia
+wahie
+waihā
+waiho
+waina
+waipo
+waipū
+waitī
+wakea
+wanea
+waoko
+waoku
+warea
+wātea
+wawao
+wāwau
+werau
+whaea
+whaka
+whākā
+whaki
+whāki
+whana
+whara
+whare
+wharu
+whata
+whati
+whatu
+wheao
+wheau
+wheka
+wheke
+whēke
+wheki
+wheko
+wheku
+whena
+whēna
+wheoi
+where
+whero
+whēru
+wheta
+wheti
+wheto
+whetū
+wheua
+whioi
+whiri
+whiro
+whita
 whiti
-tīwae
-fenua
+whito
+whitu
diff --git a/webapp/data/languages/mi/mi_characters.txt b/webapp/data/languages/mi/mi_characters.txt
index 5fb0f46..ff31734 100644
--- a/webapp/data/languages/mi/mi_characters.txt
+++ b/webapp/data/languages/mi/mi_characters.txt
@@ -1,26 +1,20 @@
 a
-b
-c
-d
+ā
 e
-f
-g
+ē
 h
 i
+ī
 k
-l
 m
 n
+ng
 o
+ō
 p
 r
-s
 t
 u
-v
-w
-ā
-ī
-ō
 ū
-’
+w
+wh