diff --git a/composeApp/src/commonMain/composeResources/files/config.json b/composeApp/src/commonMain/composeResources/files/config.json
index d1e0b5d..15417a4 100644
--- a/composeApp/src/commonMain/composeResources/files/config.json
+++ b/composeApp/src/commonMain/composeResources/files/config.json
@@ -2,10 +2,9 @@
   "themeMode": "DARK",
   "fontSize": 18.5,
   "playlist": [
-    "assets://ffpm-6.txt",
-    "assets://ffpm-444-2.txt",
+    "assets://ffpm-38.txt",
     "assets://ews-13.txt",
-    "assets://ffpm-194.txt",
+    "assets://ffpm-38.txt",
     "assets://ffpm-57.txt",
     "assets://ffpm-191.txt",
     "assets://ff-7.txt",
@@ -19,8 +18,7 @@
     "assets://ffpm-489.txt",
     "assets://ffpm-21.txt",
     "assets://ffpm-179.txt",
-    "assets://ff-33.txt",
-    "assets://ffpm-297.txt"
+    "assets://ff-33.txt"
   ],
   "buttonContainerColorHex": "#FFFF8855",
   "buttonContentColorHex": "#FF000055",
diff --git a/composeApp/src/commonMain/composeResources/files/ews-11.txt b/composeApp/src/commonMain/composeResources/files/ews-11.txt
index cc38c60..101ce13 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-11.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-11.txt
@@ -1,9 +1,9 @@
 M0:|t:All Glory, Laud, and Honor|c:Bb|m:4/4|a:Theodulph of Orleans, 760-821. tr. John Mason Neale (1818-1866)|h:Melchoir Teschner (1584-1635)|r:7.6.7.6.D
 U0:zC:44444(422)4/4(22)444C/44444(422)4/4(22)444C/4(22)(22)44(44)4/4444(22)C/44444(44)4/4444(22)C
 N1:d,s,s,l,t,d--dmr-ddt,dd,s,s,l,t,d--dmr-ddt,ddm-m-rdt,l,s,t,dt,l,l,-s,s,m,s,l,s,s,f,m,s,f,m,r,r,-d,
-N2:d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,m,s,-l,-l,fi,s,fi,r,s,m,s,s,fi,-s,r,d,d,d,d,r,t,,d,d,d,d,d,t,,-d,
+N2:d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,d,r,d,d,f,f,m,r,m,s,s,f,m,r,r,m,m,s,-l,-l,F ,s,F ,r,s,m,s,s,F ,-s,r,d,d,d,d,r,t,,d,d,d,d,d,t,,-d,
 N3:m,s,m,f,s,s,--s,dt,-dl,s,s,m,s,m,f,s,s,--s,dt,-dl,s,s,s,d-d-rrrdt,mdrmrdt,s,s,s,f,m,s,-s,s,l,s,s,-f,m,
-N4:d,t,,d,f,r,d,--d,ds,-l,f,s,d,d,t,,d,f,r,d,--d,ds,-l,f,s,d,d,dt,l,s,fi,r,s,r,s,m,l,,t,,d,r,-s,,t,,d,m,f,d,t,,s,,d,m,f,d,s,,s,,-d,
+N4:d,t,,d,f,r,d,--d,ds,-l,f,s,d,d,t,,d,f,r,d,--d,ds,-l,f,s,d,d,dt,l,s,F ,r,s,r,s,m,l,,t,,d,r,-s,,t,,d,m,f,d,t,,s,,d,m,f,d,s,,s,,-d,
 E1:All glo_ry, laud, and ho_nor/to you, Re_dee_mer, King,/to whom the lips of chil_dren/made sweet ho_san_nas ring./You are the King of Is_rael/and Da_vid's roy_al Son,/now in the Lord's name co_ming,/the King and Bles_sed One.
 E2:The com_pa_ny of an_gels/is prai_sing you on high;/and we with all cre_a_tion/in cho_rus make re_ply./The peo_ple of the He_brews/with palms be_fore you went;/our praise and prayer and an_thems/be_fore you we pre_sent.
 E3:To you be_fore your pas_sion/they sang their hymns of praise;/to you, now high ex_al_ted,/our me_lo_dy we raise./As you re_ceived their prai_ses,/ac_cept the prayers we bring,/for you de_light in good_ness,/O good and gra_cious King!/
diff --git a/composeApp/src/commonMain/composeResources/files/ews-12.txt b/composeApp/src/commonMain/composeResources/files/ews-12.txt
index ab48641..57645bc 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-12.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-12.txt
@@ -1,7 +1,7 @@
 M0:|t:EWS 12 All Hail the Power of Jesus’ Name|c:Bb|m:4/4|a:Theodulph of Orleans. 760-821; tr: John Mason Neale (1818-1866)|h:Melchoir Teschner (1584-1635)|r:8.6.8.6.6
 U0:zC:444444(22)4/44(22)4(22)C/444444(22)4/48888(422)/8888(44)C
 N1:s,dddrmrdrs,l,s,f,m,r,-d,s,dddrmrdrs,ddmms--smfmr-d
-N2:m,m,f,s,s,s,s,fi,s,s,f,d,-d,t,,-d,m,m,f,s,s,s,s,fi,s,s,s,m,s,ddt,l,t,s,l,s,s,f,m,
+N2:m,m,f,s,s,s,s,F ,s,s,f,d,-d,t,,-d,m,m,f,s,s,s,s,F ,s,s,s,m,s,ddt,l,t,s,l,s,s,f,m,
 N3:ds,l,s,t,drl,t,dds,l,s,s,f,m,s,s,l,s,t,drl,t,s,ds,ddmrdrdddt,-d
 N4:d,d,f,m,s,dt,l,s,m,f,m,f,s,s,,-d,d,d,f,m,s,dt,l,s,s,m,d,dl,s,--s,df,s,s,,-d,
 E1:All lands to God, in joy_ful sounds,/a_loft your voi_ces raise./Sing forth the ho_nour of his name,/and glo_rious make his praise./and glo_rious make his praise.
diff --git a/composeApp/src/commonMain/composeResources/files/ews-13.txt b/composeApp/src/commonMain/composeResources/files/ews-13.txt
index 272f7f7..22dfc10 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-13.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-13.txt
@@ -1,8 +1,8 @@
 M0:|t:EWS 13 O for a thousand tongues to sing|a:Charles Wesley (1739: 1707-1788)|h:Thomas Jarman (1776-1861)|c:G|m:4/4
 U0:z0:862(31224)4(44)(44)C/44444C/4(31224)488G/844(624)4(444)4C/444444444444444(22)(22)44444444844G
-N1:dmfslsfmfmdrt,dmfmrdrrmrmfslsfissssmrdmfmrdrz4dffffm--mrrrmfrs--s(lsf)mr-rd
+N1:dmfslsfmfmdrt,dmfmrdrrmrmfslsF ssssmrdmfmrdrz4dffffm--mrrrmfrs--s(lsf)mr-rd
 N2:s,s,s,s,----l,s,-s,-s,dt,drl,t,t,d----dt,l,t,dddd--dt,drl,t,z4dl,l,l,l,s,--s,s,t,t,drt,(dt,d)d(d-t,)ddt,-d
-N3:mdrmfmrdddmfrmssssfisss--fmmrrrmmmsfmss--fissdrmdd--ddsmdt,rs-f-mrmmfssss-fm
+N3:mdrmfmrdddmfrmssssF sss--fmmrrrmmmsfmss--F ssdrmdd--ddsmd(t,rs-)f-mrmmfssss-fm
 N4:dddd----m,s,-s,-ddrdt,l,s,s,d----l,rr,s,dddd--drdt,l,s,s,drmdf,--f,dddds,---s,-drddfmrds,-s,d,
 E1:O for a thou_sand tongues to sing/my great Re_dee_mer's praise,/my great Re_dee_mer's praise,/the glo_ries of my God and King,/_4the tri_umphs of his grace,/_2the tri_umphs of his grace,/_2the tri_3umphs of_2his grace!
 E2:My gra_cious Mas_ter and my God,/as_sist me to pro_claim,/as_sist me to pro_claim,/to spread thro' all the earth a_broad/the ho_nors of your name.
diff --git a/composeApp/src/commonMain/composeResources/files/ews-14.txt b/composeApp/src/commonMain/composeResources/files/ews-14.txt
index f5240e9..aaaf3b0 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-14.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-14.txt
@@ -2,6 +2,6 @@ M0:|c:D|m:3/4|t:EWS 14 Holy, Holy, Holy, Lord God of Hosts|h:John Camidge 1 (173
 U0:z0:848484/444(48)/8(31)8444(22)48/(44)(22)(21122)48/4(224)4CCC
 N1:ddrrmmltd'd'td'sfmsd'tl-sssls-f-ls-fmslr'd'td'ls
 N2:s,s,t,t,dddfmmrmr-drmrrdssmfm-r-fm-rdddfmrmdd
-N3:mmssssfsss-ss-ssssfi-sss-d'tlr-mfsssl-sssfm
+N3:mmssssfsss-ss-ssssF -sss-d'tlr-mfsssl-sssfm
 N4:dds,s,ddfrds,-dt,-dt,l,rr-s,s,d-d-f,--s,-s,dmf-ss,df,d
 E1:Ho_ly, ho_ly, ho_ly, Lord God of Hosts,/Heaven and earth are full of Thy glo_ry:/Glo_ry be to Thee,/O Lord Most High./A_men.
diff --git a/composeApp/src/commonMain/composeResources/files/ews-9.txt b/composeApp/src/commonMain/composeResources/files/ews-9.txt
index 57d3e1a..e8c9798 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-9.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-9.txt
@@ -1,8 +1,8 @@
 M0:|t:EWS 9 The Lord Jehovah reigns (His throne is built on high)|a:Isaac Watts (1674-1748)|c:G|m:4/4|r:6.6.6.6.8.8.
 U0:zC:(22)444(22)C/44444C/(22)4444(444)44(22)44C/48(62)888(62)C/4(44)(44)8(44)8(44)C/
 N1:s,-dddt,l,s,s,l,dt,rddrmmmms--mrd-t,l,s,s,rmrds,fsfms,l,t,drmsfmr-d
-N2:s,f,m,m,s,s,f,m,s,f,l,s,f,m,m,s,s,s,s,s,d--dt,l,-s,fi,s,s,f,s,f,m,s,s,s,-s,s,f,-m,s,s,s,l,s,s,f,m,
-N3:t,-dddd-dmffrt,ddt,ddddm--ssmfist,t,t,t,-dmrt,-ddt,mrdd-dt,-d
+N2:s,f,m,m,s,s,f,m,s,f,l,s,f,m,m,s,s,s,s,s,d--dt,l,-s,F ,s,s,f,s,f,m,s,s,s,-s,s,f,-m,s,s,s,l,s,s,f,m,
+N3:t,-dddd-dmffrt,ddt,ddddm--ssmF st,t,t,t,-dmrt,-ddt,mrdd-dt,-d
 N4:s,-d,d,m,f,-d,d,f,r,s,s,d,ds,d,d,d,d,d,m,s,drr--rs,s,s,s,-d,dt,s,-dm,f,s,l,t,dm,f,s,s,-d,
 E1:The Lord Je_ho_vah reigns;/His throne is built on high./The gar_ments He as_sumes/Are light and ma_jes_ty./His glo_ries shine with beams so bright/No mor_tal eye can bear the sight.
 E2:The thun_ders of His hand/Keep the wide world in awe;/His wrath and jus_tice stand/To guard His ho_ly law./And where His love re_solves to bless/His truth con_firms and seals the grace.
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-297.txt b/composeApp/src/commonMain/composeResources/files/ffpm-297.txt
index cd1a645..1aa52ad 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-297.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-297.txt
@@ -4,10 +4,10 @@ N1:#s,ssmfmmr/ssrmrd/dldflsm/mmrlrr-3/m-3Rmd-3d-3tdl-3/s-3dms'-3mdr-6/m-3Rmd-3d-
 N2:#r,mmslsss/fffsfm/mfllfms/sF4s-3/s-3Fsm-3l-3Slf-3/m-3sdm'-3ddtttllFs/s-3Fsm-3l-3Slf-3/m-3msf4mfrm
 N3:#s,d6t/t5d/d7/d5t-3/d4-zs4ldff-zd4/d4-zd4-zsssFfrt/d4-zs4ldff-zd4/d4-dtrrtdlSs
 N4:#d,d5ss/s5d/df4dd/dr4sfmr/d4-zd4f4-zf4/d4-z#dd4-zr3#d,r3s/d4-zd4f4-zf4/s4-s5d-3
-Y1:Ry havanay malala!/Manolo-tena\ izao./Fotoana mahafaly/Iraisan-tsika\ anio;/Fa_4ly ‘zahay_4ma\n_4dray anao_4/Hia_4ra-mano\m_4po ny Ray,_7/Je_4so anie_4ha\n_4dray anao!_4/Mba_4ho sakai_zany_tokoa.
-Y2:Hajao ny fanekena,/Adidinao efao./Ataovy tsy terena/Izay andraikitrao./Je_4reo Jeso_4ka_4matokia,_4/Fa_4Izy no_4hiahy\ anao._7/Ka_4mandrosoa_4sy_4mifalia,_4/Ha_4nefa\ izay anjaranao.
-O1:3,4:50:Faly 'zahay_3mandray anao, faly 'zahay_3mandray anao/Faly 'zahay_3mandray anao_3Hiara-manompo ny Ray/Jeso anie_3Handray anao, Jeso anie_3handray anao/Mba ho sakai_zany tokoa.
-O2:3,4:50:Jereo Jeso_3Ka matokia, Jereo Jeso_3Ka matokia/Jereo Jeso_3Ka matokia_3Fa Izy no hiahy\ anao./Ka mandrosoa_3sy mifalia, Ka mandrosoa_3sy mifalia/Hanefa\ izay _anjaranao anja
-O1:3:137:tokoa
-02:3:137:ranao
+O1:v34:Faly 'zahay_3mandray anao, faly 'zahay_3mandray anao/Faly 'zahay_3mandray anao_3Hiara-manompo ny Ray/Jeso anie_3Handray anao, Jeso anie_3handray anao/Mba ho sakai_zany tokoa${O:3}.
+O2:v34:Jereo Jeso_3Ka matokia, Jereo Jeso_3Ka matokia/Jereo Jeso_3Ka matokia_3Fa Izy no hiahy\ anao./Ka mandrosoa_3sy mifalia, Ka mandrosoa_3sy mifalia/Hanefa\ izay _anjaranao anja${O:4}
+O3:v3:tokoa
+O4:v3:ranao
+Y1:Ry havanay malala!/Manolo-tena\ izao./Fotoana mahafaly/Iraisan-tsika\ anio;/${O:1}Fa_4ly ‘zahay_4ma\n_4dray anao_4/Hia_4ra-mano\m_4po ny Ray,_7/Je_4so anie_4ha\n_4dray anao!_4/Mba_4ho sakai_zany_tokoa.
+Y2:Hajao ny fanekena,/Adid${O:7}inao efao./Ataovy tsy terena/Izay andraikitrao./${O:2}Je_4reo Jeso_4ka_4matokia,_4/Fa_4Izy no_4hiahy\ anao._7/Ka_4mandrosoa_4sy_4mifalia,_4/Ha_4nefa\ izay anjaranao.
 
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-38.txt b/composeApp/src/commonMain/composeResources/files/ffpm-38.txt
index 91bd587..39b65d7 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-38.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-38.txt
@@ -4,6 +4,6 @@ N1:d'#msmd,l5dls3/ddtddrr/#sffmmfrdtd/#rmfs(mf)s-(mf)smzrmf(rm)f-(rm)frz/t#frds-
 N2:d'smd#rf7m3/s7/ttddllsfm/#t,drm(dr)m-(dr)mdztdr(td)r-tdrtz/rfmm-zzrfmm-zz/z9/mmf4mrm
 N3:d'smd#sd10/mmrddtt/rrddrfmrd/z3d7sz4s8z/zzzs4z3s4/z9/d4lls3
 N4:d'smd#t,f5lfd3/ddfmmss/ssllfrs#s,sd/z7d5z7s5/z3ddttz3d4/z9/ddf4s'sd
-Y1:He, hosana! Isaoran’ani_e ny Mesi_a,/I\zay nalefan’ny Tompo,/Ka hosana no asandratray./I\lay nirahi_2nao _ry _Tompo_2/I\lay nirahi_2nao _ry _Tompo_2/No derainay,_4/No derainay,_4/Ka hosana no asandratray!/Ka hosana no asandratray!/
-O1:3:24:_3I\lay nirahinao, ry Tompo,_4I\lay nirahinao, ry Tompo,_4No derainay,_3No derainay;_9
-O1:4:24:_7I\lay nirahinao,_7I\lay nirahinao,_3No derainay,_3No derainay_9
\ No newline at end of file
+O1:v3:I\lay nirahinao, ry Tompo,_4I\lay nirahinao, ry Tompo,_4No derainay,_3No derainay;_9
+O1:v4:I\lay nirahinao,_7I\lay nirahinao,_3No derainay,_3No derainay_9
+Y1:He, hosana! Isaoran’ani_e ny Mesi_a,/I\zay nalefan’ny Tompo,/Ka hosana no asandratray./I\lay nira${O:1}hi_2nao _ry _Tompo_2/I\lay nirahi_2nao _ry _Tompo_2/No derainay,_4/No derainay,_4/Ka hosana no asandratray!/Ka hosana no asandratray!/