diff --git a/composeApp/src/commonMain/composeResources/files/ews-21.txt b/composeApp/src/commonMain/composeResources/files/ews-21.txt
index b61b3ba..744989e 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-21.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-21.txt
@@ -1,9 +1,14 @@
 I0:ews-13.txt:E\d+|M0:|O:
-O1:v3:In strains of ho_ly_joy, _2in strains of ho_ly_joy _2in strains of ho_ly_joy In strains of ho__ly_joy.
 M0:|a:Fulbert of Chartres, tr: Robert Campbell|h:Thomas Jarman (1776-1861)|t:EWS 21 Sing, choirs of new Jerusalem|c:G|m:4/4
+O1:v3:In strains of ho_ly_joy, _2in strains of ho_ly_joy _2in strains of ho_ly_joy In strains of ho__ly_joy.
+O2:v3:To wake the\ im_pris_oned dead, _2To wake the\ im_pris_oned dead _2To wake the\ im_pris_oned dead To wake the\ im_pris__oned dead.
+O3:v3:Where Je_sus goes be_fore, _2Where Je_sus goes be_fore _2Where Je_sus goes be_fore Where Je_sus goes _be_fore.
+O4:v3:All saints in earth and heaven, _2All saints in earth and heaven _2All saints in earth and heaven All saints in earth _and heaven.
+O5:v3:And keep us e_ver_more, _2And keep us e_ver_more _2And keep us e_ver_more And keep us e_2ver_more.
+O6:v3:While end_less a_ges run, _2While end_less a_ges run _2While end_less a_ges run While end_less a_2ges run.
 E1:Ye choirs of new Je_ru_sa_lem,/Your sweet_est notes em_ploy,/Your sweet_est notes em_ploy,/The Pas_chal vic_to_ry to hymn/${O:1}_4In strains of ho_ly joy,/_2in strains of ho_ly joy,/_2in strains_3of ho_2ly joy.
-E2:For Judah’s Lion bursts His chains,/Crushing the serpent’s head;/And cries aloud through death’s domains/To wake the imprisoned dead.
-E3:From hell’s devouring jaws the prey/Alone our Leader bore;/His ransomed hosts pursue their way/Where Jesus goes before.
-E4:Triumphant in His glory now/To Him all power is given;/To Him in one communion bow/All saints in earth and heaven.
-E5:While we, His soldiers, praise our king,/His mercy we implore,/Within His palace bright to bring/And keep us evermore.
-E6:All glory to the Father be,/All glory to the Son,/All glory, Holy Ghost, to Thee,/While endless ages run.
+E2:For Ju_dah’s Li_on bursts His chains,/Crush_ing the ser_pent’s head;/Crush_ing the ser_pent’s head;/And cries a_loud through death’s do_mains/${O:2}_4To wake the\ im_pris_oned dead./_2To wake the\ im_pris_oned dead./_2To wake_3the\ im_pris_2oned dead.
+E3:From hell’s de_vour_ing jaws the prey/A_lone our Lea_der bore;/A_lone our Lea_der bore;/His ran_somed hosts pur_sue their way/${O:3}_4Where Je_sus goes be_fore./_2Where Je_sus goes be_fore./_2Where Je_3sus goes _be_fore.
+E4:Tri_um_phant in His glo_ry now/To Him all power is given;/To Him all power is given;/To Him in one com_mu_nion bow/${O:4}_4All saints in earth and heaven/_2All saints in earth and heaven../_2All saints_3in earth _and heaven.
+E5:While we, His sol_diers, praise our king,/His mer_cy we imp_lore,/His mer_cy we imp_lore,/With_in His pa_lace bright to bring/${O:5}_4And keep us e_ver_more./_2And keep us e_ver_more./_2And keep_3us e_2ver_more.
+E6:All glo_ry to the Fa_ther be,/All glo_ry to the Son,/All glo_ry to the Son,/All glo_ry, Ho_ly Ghost, to Thee,/${O:6}_4While end_less a_ges run./_2While end_less a_ges run./_2While end_3less a_2ges run.
diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt
index b31d363..8202450 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/POneStanzaLyrics.kt
@@ -10,7 +10,7 @@ class POneStanzaLyrics {
         while (this.lyrics.size <= stanzaNumber) {
             this.lyrics.add("")
         }
-        this.lyrics[stanzaNumber] = lyrics
+        this.lyrics[stanzaNumber] = lyrics.replace(Regex("\\$\\{[^\\}]*\\}-?"), "")
     }
     fun setAlternativeLyrics(stanzaNumber: Int, voiceNumber: Int, text: String) {
         alternativeLyrics