diff --git a/composeApp/src/commonMain/composeResources/files/ews-351-1.txt b/composeApp/src/commonMain/composeResources/files/ews-351-1.txt
deleted file mode 100644
index 67a4dcd..0000000
--- a/composeApp/src/commonMain/composeResources/files/ews-351-1.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-M0:|c:C|m:4/4|a:Nils J. Holm (1778-1845); tr (st. 1): Carl Døving|h:Ludvig Mathias Lindeman (1812-1887)|t:EWS 351 How blessed is the little flock|r:86868886
-U0:zC:46244624/44(22)(22)(22)8z4/46244624/4444(22)8z4/44444444/44444444/46244624/444448z4
-N1:d'slsfmrmsld'-t-l-s/d'slsfmrmsld'tl-s/sltd'mfslfrmflsfmsld'ttd'm'r'md'lr'td'
-N2:msfrrdrdt,mm-r-r-r/drrmddt,drmdrr-r/ddrdddddrt,Drmrt,dmfffmmslSmflss
-N3:sd'd'ttssssssFs-Fd't/ssfmfsssssssFd't/ssfmssrSSsslmsssd'd'd'r'r'd'd'ltd'd'f'r'm'
-N4:dmfssdt,dmdl,-t,dr-s/mt,t,dl,s,s,dt,dmrr-s/mfrl,T,l,mf/rsmrDt,s,ddfllSlmfmllfsd
-E1:How bles_sed is the lit_tle flock,/Whom Je_sus calls His own!/He is their Sa_vior and their rock,/They trust in Him a_lone;/They walk by faith and hope and love,/But they shall dwell with Him a_bove,/When hope and faith shall pass a_way,/And love shall last for aye.
-E2:My Je_sus, am I in that band,/And wilt Thou call me Thine?/Do I a_mong the cho_sen stand/Whose lamps so bright_ly shine?/O let me not lie down to rest/Till this I know, my Sa_vior blest,/Till I can say, by grace re_stored:/Thou know'st I love Thee, Lord!
-E3:And e_ven if with tears it be,/That this to Thee I say,/Yet Thou in grace wilt look on me/And wipe my tears a_way;/Yea, when but Thou who all dost know,/In me canst find Thy love be_low/And own me Thine, then well is me,--/My all I have in Thee.
diff --git a/composeApp/src/commonMain/composeResources/files/ff-33.txt b/composeApp/src/commonMain/composeResources/files/ff-33.txt
index 3e293ee..62d74a5 100644
--- a/composeApp/src/commonMain/composeResources/files/ff-33.txt
+++ b/composeApp/src/commonMain/composeResources/files/ff-33.txt
@@ -5,5 +5,5 @@ N2:#s,smmrdssstssTllldddddllttr4mddt4ddt4dmd5tsmmmrddTldffmdD4z-DdrrmffmsstddTdd
 N3:#rsdtlsmrmfrmmfffmffF4frf4smmrrrfmmrfffmssF4ssddtlssmffltdsl4z-Tlsssr'r'dsmfsls-drrmsfm
 N4:#f,sd4ls4ddffld#s,ffrrrrss6dds4dds#l,sssd'ddllrr#f,ssd7f4ddD4z-Drs5df'mrdlm-f'r,s4d
 Y1:Inty a\ho Jesoa!/Mi_antso a\hy Hianao/Na dia tsy mendrika\ e/Manolo-tena\ izao/Hiana_o no nifidy/Tsy haiko ny handà/‘Ty antso sarobidy/Ry Tompo, mamelà/Ny heloko rehetra/Di_ovy a\ho, havaozy/Ho olom-ba_ovao/Hanao ny sitrakao/Ho mendrika toko_a/Ny antsonao Jesoa.
-Y2:Inty a\ho Jeso mi_antso a\hy Hianao/Ny fa\halemeko\ anie/Ry Tompo fantatrao/Hiana_o no nifidy/Sy he maniraka\ a\hy/Avy\ Ami_2nao Jesoa/Ny herin’ny fana\hy/Ho entiko mana_o/Ny asa atolotrao/Fa sarotra\ e ny dia/Ry Tompo manampia/Ho mendrika toko_a/Ny antsonao Jesoa
+Y2:Inty a\ho Jeso mi_antso a\hy Hianao/Ny fa\halemeko\ anie/Ry Tompo fantatrao/Hiana_o no nifidy/Sy he maniraka\ a\hy/Avy\ Ami_2nao Jesoa/Ny herin’ny fana\hy/Ho entiko mana_o/Ny asa\ atolotra_o/Fa sarotra\ e ny dia/Ry Tompo manampia/Ho mendrika toko_a/Ny antsonao Jesoa
 Y3:Inty a\ho Jesoa/Mi_antso a\hy Hianao/Mba ho fahazava\n’/Izao tontolo\ izao/Hiana_o no nifidy ahy\Ho fanasina/Hanefa ny adidy/Le\hibe sy masina/Koa hamasino, Tompo/Fa vonona\ a\ho hanompo/Hombay ny herinao/Hitondra aim-baovao/Ho mendrika toko_a/Ny antsonao Jesoa
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-332.txt b/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
index 38123dc..5e1e857 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
@@ -1,7 +1,7 @@
 M0:|c:G|m:6/4|r:86868886|t:FFPM 332 Finaritra ny olonao|a:N.J. Holm 1778-1845 Nad. L. Dahle 1843-1925|h:APPROACH George A. Minor 1845-1904|u:https://hymnary.org/tune/approach_my_soul_the_mercy_seat_55553
 Q0:${N:New}U0:zK:4 844(44) 84(44)/4 84(44)4 K/4 844(44) 84(44)/4 84(44)4 K/4 84(44)4 84(44)/4 84(44)4 848/4 84(44)4 84(44)/4 84(44)4 K
 U0:zK:4 844(44) 84(44)/4 84(44)4 Gz4/4 844(44) 84(44)/4 84(44)4 Cz8/4 84(44)4 84(44)/4 84(44)4 848/4 84(44)4 84(44)/4 84(44)4 Cz8
-N1:#m,msssmsdddm'dllldls/msssmsdr#l,msfmdrdtd/mffflfmmms/mrrrmddls/#m, msssmsdrm'sf'm'drdtd
+N1:#m,msssmsdddm'dllldls/msssmsdr#l,msfmdrdtd/mfffl'fmmms/mrrrmddl#m,s/ msssmsdrm's'f'm'drdtd
 N2:#d, mmmmdmsss-sffflfm/mmmmdmsss-lsmfmrm/slll-lsss-/ssss-slfm/mmmmdmsss-/lsmfmrm
 N3:#s, sddd-dddd-dddd-dd/sddd-ddtd-ddds-ss/ddddfddddm/dtttd5/sddd-ddtd-/ddds-ss
 N4:#d, dddd-dmmm-mfff-fd/dddd-dmrdmfsls-sd/dfff-fddd-dsss-mffd/dddd-dmrdmfsls-sd
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-483.txt b/composeApp/src/commonMain/composeResources/files/ffpm-483.txt
index 6f282c7..cec6394 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-483.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-483.txt
@@ -2,7 +2,7 @@ M0:|c:F|m:3/4|a:Ch. Rajoelisolo 1896-1969|r:7777D|h:MARTYN Simeon Butler Marsh 1
 U0:z0:${x8}848484C/${x0}
 N1:mmmdrrr mmsfmrd mmmdrrr mmsfmrd s4lls s4lls mmmdrrr mmsfmrd
 N2:#t, d4t3 ddmrdtd 5t3 ddmrdtd 19t3 d3rdtd
-N3:s3ms6lsfm s3ms6lsfm mfdmffm mfsmffm s3ms6lsfm
+N3:s3ms6lsfm s3ms6lsfm mfsmffm mfsmffm s3ms6lsfm
 N4:#f,d4s3 d3fssd 5s3 d3fssd drmdfld drmdfld 5s3ddmf's'sd
 Y1:Zanahariko Tsito\ha,/Tompo, Hery sy Fitia,/Ray hatramin’ny talo\ha,/A\hy anio, ka ho doria./Manjakà mandrakizay/Ao am-poko, Tompo soa;/Dera, laza,\ Anao ry Ray!/Zanaka, Fanahy koa.
 Y2:Ny fino_ako Anao,/Hatanjaho, mba hamoa/Hi_asako ny\ asanao,/Hamafazako ny voa./Aoka ny Fanahinao/Jiro mba hitarika\ a\hy/Ka apetrako\ aminao/Na ny tena na fana\hy.
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-564.txt b/composeApp/src/commonMain/composeResources/files/ffpm-564.txt
index bf7044c..3a71c3a 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-564.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-564.txt
@@ -1,9 +1,12 @@
 M0:|t:FFPM 564 Tsy hita izay androko sisa ety|c:Bb|m:6/4 Miadana 2/|r:10.10.12.8.8.8.12.8|a:J. Andrianaivoravelona 1835-1897|h:James McGranahan 1840-1907|u:https://hymnary.org/tune/i_know_not_the_hour_when_my_mcgranahan
 U0:zK:4 444444 (44)48/(22) 4448(22) 4448/22 444444 444$Q8/4 444444 K/4 444444 444444 444444 (4448)/22 444444 444$Q8/4 44444 4K
-N1:#f, ssFsmrddtls sssfm,f lllsFs sssFsmrddrmf' fm4rdr sd4rml-4 lr4dls-3 sssFsmrddrmf' f'mmms'f'rd
+N1:#f, ssFsmrddtls sssfm,f lllsFs sssFsmrddrmf' f'm4rdr sd4rml-4 lr4dls-3 sssFsmrddrmf' f'mmms'f'rd
 N2:#d, mmRmsfmlsfm mmmrDr fffmRm mmmRmsfmmfsl ls4fmf fm4fsf-4 fF6srmf ffmRmsfmmfsl ls5fm
 N3:#m, sslsd--d--d d-t--t--d-ls d-slsd--d--d dd--dtlt z6d7 rl4dt-dr rrd14ttts
 N4:#d, dd--d--d--d dms--s--d--- d-d--d--d--f fs--s--s z6df6 r6s--- ssd9f fs6d  
-Y1:Tsy hita\ izay androko sisa\ atỳ,/Ahiko fandrao tsy tonga arỳ,/Ry fanahiko! Ao ny Mpamonjy anao,/He! Jeso, Mpamonjy anao./He! Jeso, Mpamonjy anao._4/He! Jeso, Mpamonjy anao./Ry fanahiko! Ao ny Mpamonjy anao,/He! Jeso Mpamonjy anao.
-Y2:Izaho anefa tamàna\ atỳ;/Tsy hiomana va, fa\ hifindra arỳ?/Fa\ efa fantatro i\zao, fa havela ity,/He! Lanitra so_a arỳ./He! Lanitra so_a arỳ._4/He! Lanitra so_a arỳ./Fa\ efa fantatro i\zao fa havela ity,/He! Lanitra soa arỳ.
-Y3:Ilaozy ity, hadinoy, ry fo!/Afoizo izao, ry fanahiko\ ô!/Fa\ efa reko ny Tompo/Mi_antso anao,/He! Feo mahafaly izao.He! Feo mahafaly izao._3//He! Feo mahafaly izao./Fa\ efa reko ny Tompo/Mi_antso anao,/He! Feo mahafaly izao.
+O1:v34:_6He! Jeso, Mpamonjy
+O2:v34:_6He! Lanitra so_a
+O3:v34:_6He! Feo mahafaly
+Y1:Tsy hita\ izay androko sisa\ atỳ,/Ahiko fandrao tsy tonga arỳ,/Ry fanahiko! Ao ny Mpamonjy anao,/He! Jeso, Mpamonjy anao./${O:1}He! Jeso, Mpamonjy anao._4/He! Jeso, Mpamonjy anao./Ry fanahiko! Ao ny Mpamonjy anao,/He! Jeso Mpamonjy anao.
+Y2:Izaho anefa tamàna\ atỳ;/Tsy hiomana va, fa\ hifindra arỳ?/Fa\ efa fantatro i\zao, fa havela ity,/He! Lanitra so_a arỳ./${O:2}He! Lanitra so_a arỳ._4/He! Lanitra so_a arỳ./Fa\ efa fantatro i\zao fa havela ity,/He! Lanitra so_a arỳ.
+Y3:Ilaozy ity, hadinoy, ry fo!/Afoizo izao, ry fanahiko\ ô!/Fa\ efa reko ny Tompo/Mi_antso anao,/He! Feo mahafaly izao./${O:3}He! Feo mahafaly izao._3//He! Feo mahafaly izao./Fa\ efa reko ny Tompo/Mi_antso anao,/He! Feo mahafaly izao.