diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-332.txt b/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
index 5e1e857..3a47950 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-332.txt
@@ -1,6 +1,6 @@
 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
+Q0:${N:New}U0:zK:4 84(44)4 84(44)/4 84(44)4 K/  4 84(44)4 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 84(44)4 84(44)/4 84(44)4 Gz4/4 84(44)4 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/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
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-549.txt b/composeApp/src/commonMain/composeResources/files/ffpm-549.txt
index 6fbd23c..70b9287 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-549.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-549.txt
@@ -5,8 +5,8 @@ N1:drmmmrmfs/drmmmsfmr/drmmmrmsl/lsmdrmrd/ rmffmmrrd/rmlssFFs/drmmmrmsl/lsmdrmrd
 N2:d-dddt,drm/dt,drddrdt,/d-dds,s,ddd/ddddddt,d/ t,-d,ss,s,S,S,l,/t,dmrrddt,/d-dds,s,ddd/ddddddt,d/ t,drt,dddt,d/ddddrdt,d
 N3:mfsssssss/mfsSllsss/mfssdrdmf/fssmlsfm/ s-frddmmm/ssd'ttlls/mfssdrdmf/fssmlsfm/ s-sssfsss/mffslsfm
 N4:d-dmsfmrd/mrdt,l,l,t,ds,/d-dddt,l,s,f,/f,m,s,l,f,s,s,d,/ s,-l,t,ddt,t,l,/s,dl,rrrrs,/d-dddt,l,s,f,/f,m,s,l,f,s,s,d,/ s,-s,fmfmrd/dffmfss,d,
-L1:Je_so_sy _no _a_san_dra_tro/Fa _I_zy _no _Mpa_na_vo_tro !/Ny _tà_na_ny _na_na_fa_ka/Ny _ai_ko _tao _an-_da_va_ka ;/Ny _ra_fi_ko _ho _ke_tra_ka,/I_za_ho _a_fa-_ke_na_tra/Fa _ma_na_na _ny _Tom_po_ko/'zay _man_da_ko _sy _a_ro_ko! /Ry _fo_ko _ô, _an_ka_la_zao/Je_so_sy, _'zay _Mpa_mon_ji_nao !/
+L1:Je_so_sy _no _a_san_dra_tro/Fa _I_zy _no _Mpa_na_vo_tro !/Ny _tà_na_ny _na_na_fa_ka/Ny _ai_ko _tao _an-_da_va_ka ;/Ny _ra_fi_ko _ho _ke_tra_ka,/I_za_ho _a_fa-_ke_na_tra/Fa _ma_na_na _ny _Tom_po_ko/'zay _man_da_ko _sy _a_ro_ko! /${R=}Ry _fo_ko _ô, _an_ka_la_zao/Je_so_sy, _'zay _Mpa_mon_ji_nao !/
 L2:Ny _tsi_ron’_ny _fi_ai_na_na/A_na_na_ko _sa_ha_dy _re,/Fa _e_fa _mby _an-_tà_na_na/Ny _fa_mon_je_na _le_hi_be !/Ny _ra_no_n’ai_na _a_zo_ko,/Ny _mo_fo_n’ai_na _ha_ni_ko,/Sa_ka_fo _ma_ha_tan_ja_ka/Ma_me_lo_na _ny _re_ra_ka !
-L3:Ny _ra_ny _no _an_ja_ra_ko,/Ny _ai_ny _no _fa_na_na_ko ;/Ny _la_ni_tra _ho _lo_va_ko,/Ny _ta_ny _dia _hi_lao_za_ko; /Ny _o ta _tsy _ha na ra ka/Ny _a dy _dia _ho _ta pa ka,/Ny _a lo ka _ho _ta pi tra/Fa _ao _ny _te na _za va tra!
+L3:Ny _ra_ny _no _an_ja_ra_ko,/Ny _ai_ny _no _fa_na_na_ko ;/Ny _la_ni_tra _ho _lo_va_ko,/Ny _ta_ny _dia _hi_lao_za_ko; /Ny _o_ta _tsy _ha_na_ra_ka/Ny _a_dy _dia _ho _ta_pa_ka,/Ny _a_lo_ka _ho _ta_pi_tra/Fa _ao _ny _te_na _za_va_tra!
 L4:Ny _ha_ni_try _ny _la_ni_tra/Ma_me_ro_ve_ro _fa_tra_tra,/Ny _ka_lo_n’ny _vo_a_vo_tra/Ma_na_tsi_ka a_hy hi_a_ka_tra !/Ny _ta_va_n’ny _Mpa_mon_ji_ko/No _tsin_jo_n’ny _fa_na_hi_ko,/Ny _ta_va_ny _ma_na_fa_ka/Ny _hai_zi_na ao _a_na_ti_ko !
 L5:Ny _ma_so_ko _mi_ban_ji_na/Ta_ha_ka _ny _mpi_a_mbi_na/Ma_ni_ry _ny _Mpa_mon_ji_ko/Ho _ta_fa_hao_na _a_mi_ko !/I_za_ho _ho_vim_bi_ni_ny/Hi_pe_tra_ka eo _a_ni_la_ny,/Ha_nao _ny _hi_ran-_da_ni_tra/Sy _ho_ni_na _fi_na_ri_tra !/