E Smartlyrics in DC bug (spaces doubled)

New solfa files
VerticalScrollbar for desktop, alignment bug
2025-12-07 19:22:30 +01:00 · 2025-11-29 05:02:01 +01:00 · 2025-11-29 05:01:36 +01:00 · 2025-11-28 10:53:19 +01:00 · 2025-11-28 10:06:54 +01:00 · 2025-11-28 08:31:39 +01:00
138 changed files with 1360 additions and 37763 deletions
--- a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/LaunchFilePicker.kt
+++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/LaunchFilePicker.kt
@ -0,0 +1,8 @@
 package mg.dot.feufaro
 actual fun launchFilePicker(
    mimeTypes: Array<String>,
    onFileSelected: (path: String?) -> Unit
 ): Unit {
 }
--- a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt
+++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/ui/MyVerticalScrollbar.kt
@ -0,0 +1,14 @@
 package mg.dot.feufaro.ui
 import androidx.compose.foundation.ScrollState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@Composable
 actual fun  MyVerticalScrollbar (
    scrollState: ScrollState,
    modifier: Modifier,
    content: @Composable () -> Unit
 ){
    content()
 }
--- a/composeApp/src/commonMain/composeResources/files/10-1.xml
+++ b/composeApp/src/commonMain/composeResources/files/10-1.xml
--- a/composeApp/src/commonMain/composeResources/files/10-2.xml
+++ b/composeApp/src/commonMain/composeResources/files/10-2.xml
@ -1,823 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 4.0.2 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise version="4.0.2">
  <identification>
    <encoding>
      <software>Audiveris 5.3.1</software>
      <supports type="yes" element="print" attribute="new-system" value="yes"></supports>
      <supports type="yes" element="print" attribute="new-page" value="yes"></supports>
      <software>ProxyMusic 4.0.2</software>
      <encoding-date>2025-06-28</encoding-date>
    </encoding>
    <source>/home/mahefa/Images/10-2.jpg</source>
    <miscellaneous>
      <miscellaneous-field name="source-file">/home/mahefa/Images/10-2.jpg</miscellaneous-field>
      <miscellaneous-field name="source-sheet-1">1</miscellaneous-field>
    </miscellaneous>
  </identification>
  <defaults>
    <scaling>
      <millimeters>5.7573</millimeters>
      <tenths>40</tenths>
    </scaling>
    <page-layout>
      <page-height>344</page-height>
      <page-width>1059</page-width>
      <page-margins type="both">
        <left-margin>80</left-margin>
        <right-margin>80</right-margin>
        <top-margin>80</top-margin>
        <bottom-margin>80</bottom-margin>
      </page-margins>
    </page-layout>
    <lyric-font font-family="Sans Serif" font-size="10"></lyric-font>
  </defaults>
  <part-list>
    <score-part id="P1">
      <part-name>Voice</part-name>
      <part-abbreviation>Voice</part-abbreviation>
      <score-instrument id="P1-I1">
        <instrument-name>Voice Oohs</instrument-name>
      </score-instrument>
      <midi-instrument id="P1-I1">
        <midi-channel>1</midi-channel>
        <midi-program>54</midi-program>
        <volume>78</volume>
      </midi-instrument>
    </score-part>
    <score-part id="P2">
      <part-name>Voice</part-name>
      <part-abbreviation>Voice</part-abbreviation>
      <score-instrument id="P2-I1">
        <instrument-name>Voice Oohs</instrument-name>
      </score-instrument>
      <midi-instrument id="P2-I1">
        <midi-channel>2</midi-channel>
        <midi-program>54</midi-program>
        <volume>78</volume>
      </midi-instrument>
    </score-part>
  </part-list>
  <!--= = = = = = = = = = = = = = = = = = = = = = = = = = = = =-->
  <part id="P1">
    <!--=======================================================-->
    <measure number="1" width="328">
      <print>
        <system-layout>
          <system-margins>
            <left-margin>8</left-margin>
            <right-margin>-19</right-margin>
          </system-margins>
          <top-system-distance>-22</top-system-distance>
        </system-layout>
        <measure-numbering>system</measure-numbering>
      </print>
      <attributes>
        <divisions>1</divisions>
        <key>
          <fifths>2</fifths>
        </key>
        <clef>
          <sign>G</sign>
          <line>2</line>
        </clef>
        <staff-details print-object="yes"></staff-details>
      </attributes>
      <direction placement="above">
        <direction-type>
          <words></words>
        </direction-type>
        <sound tempo="120"></sound>
      </direction>
      <note default-x="92">
        <pitch>
          <step>B</step>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="12">up</stem>
      </note>
      <note default-x="178">
        <pitch>
          <step>C</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="8">up</stem>
      </note>
      <note default-x="177">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="8">up</stem>
      </note>
      <note default-x="243">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="19">up</stem>
      </note>
      <note default-x="242">
        <chord/>
        <pitch>
          <step>D</step>
          <octave>5</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="19">up</stem>
      </note>
      <note default-x="286">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="15">up</stem>
      </note>
      <note default-x="286">
        <chord/>
        <pitch>
          <step>C</step>
          <alter>1</alter>
          <octave>5</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="15">up</stem>
      </note>
      <backup>
        <duration>6</duration>
      </backup>
      <note default-x="91">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-62">down</stem>
        <notations>
          <articulations>
            <staccato default-y="-24" placement="above"></staccato>
          </articulations>
          <slur type="start" number="1" default-x="5" default-y="-50" placement="below" bezier-x="9" bezier-y="-8"></slur>
        </notations>
      </note>
      <note default-x="134">
        <pitch>
          <step>E</step>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-68">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="-5" default-y="-55" bezier-x="-11" bezier-y="-5"></slur>
        </notations>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="2" width="275">
      <note default-x="18">
        <pitch>
          <step>B</step>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="12">up</stem>
      </note>
      <note default-x="103">
        <pitch>
          <step>A</step>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="8">up</stem>
      </note>
      <note default-x="189">
        <pitch>
          <step>B</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="4">up</stem>
        <lyric number="1" default-y="-108" placement="below">
          <syllabic>single</syllabic>
          <text>al</text>
        </lyric>
      </note>
      <note default-x="189">
        <chord/>
        <pitch>
          <step>G</step>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="4">up</stem>
      </note>
      <note default-x="233">
        <pitch>
          <step>D</step>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="1">up</stem>
        <lyric number="1" default-y="-108" placement="below">
          <syllabic>single</syllabic>
          <text>le</text>
        </lyric>
      </note>
      <note default-x="233">
        <chord/>
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="1">up</stem>
      </note>
      <backup>
        <duration>6</duration>
      </backup>
      <note default-x="16">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-62">down</stem>
        <notations>
          <articulations>
            <staccato default-y="-24" placement="above"></staccato>
          </articulations>
          <slur type="start" number="1" default-x="4" default-y="-50" placement="below" bezier-x="9" bezier-y="-8"></slur>
        </notations>
      </note>
      <note default-x="59">
        <pitch>
          <step>E</step>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-68">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="-5" default-y="-56" bezier-x="-11" bezier-y="-5"></slur>
        </notations>
      </note>
      <note default-x="102">
        <pitch>
          <step>E</step>
          <octave>4</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-68">down</stem>
        <notations>
          <articulations>
            <staccato default-y="-94" placement="below"></staccato>
          </articulations>
          <slur type="start" number="1" default-x="5" default-y="-55" placement="below" bezier-x="7" bezier-y="-11"></slur>
        </notations>
      </note>
      <note default-x="146">
        <pitch>
          <step>B</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-82">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="-5" default-y="-70" bezier-x="-13" bezier-y="-2"></slur>
        </notations>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="3" width="198">
      <note default-x="17">
        <pitch>
          <step>E</step>
          <octave>4</octave>
        </pitch>
        <duration>6</duration>
        <voice>1</voice>
        <type>whole</type>
        <dot/>
      </note>
      <note default-x="89">
        <pitch>
          <step>C</step>
          <alter>1</alter>
          <octave>4</octave>
        </pitch>
        <duration>4</duration>
        <voice>1</voice>
        <type>whole</type>
        <notations>
          <slur type="stop" number="1" default-x="8" default-y="-61" bezier-x="-16" bezier-y="-7"></slur>
        </notations>
      </note>
      <backup>
        <duration>10</duration>
      </backup>
      <note default-x="43">
        <pitch>
          <step>D</step>
          <octave>4</octave>
        </pitch>
        <duration>2</duration>
        <voice>2</voice>
        <type>half</type>
        <stem default-y="-72">down</stem>
        <notations>
          <slur type="start" number="1" default-x="4" default-y="-60" placement="below" bezier-x="16" bezier-y="-8"></slur>
        </notations>
        <lyric number="1" default-y="-109" placement="below">
          <syllabic>single</syllabic>
          <text>lu</text>
        </lyric>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="4" width="109">
      <note default-x="21">
        <pitch>
          <step>D</step>
          <octave>4</octave>
        </pitch>
        <duration>4</duration>
        <voice>1</voice>
        <type>whole</type>
        <lyric number="1" default-y="-108" placement="below">
          <syllabic>single</syllabic>
          <text>ia!</text>
        </lyric>
      </note>
      <backup>
        <duration>4</duration>
      </backup>
      <note default-x="39">
        <pitch>
          <step>D</step>
          <octave>4</octave>
        </pitch>
        <duration>4</duration>
        <voice>2</voice>
        <type>whole</type>
      </note>
      <barline location="right">
        <bar-style>light-heavy</bar-style>
      </barline>
    </measure>
  </part>
  <!--= = = = = = = = = = = = = = = = = = = = = = = = = = = = =-->
  <part id="P2">
    <!--=======================================================-->
    <measure number="1" width="328">
      <print>
        <system-layout>
          <system-margins>
            <left-margin>8</left-margin>
            <right-margin>-19</right-margin>
          </system-margins>
          <top-system-distance>-22</top-system-distance>
        </system-layout>
        <staff-layout number="1">
          <staff-distance>124</staff-distance>
        </staff-layout>
        <measure-numbering>none</measure-numbering>
      </print>
      <attributes>
        <divisions>1</divisions>
        <key>
          <fifths>2</fifths>
        </key>
        <clef>
          <sign>F</sign>
          <line>4</line>
        </clef>
        <staff-details print-object="yes"></staff-details>
      </attributes>
      <note default-x="90">
        <pitch>
          <step>D</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-51">down</stem>
      </note>
      <note default-x="90">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-51">down</stem>
        <notations>
          <slur type="start" number="1" default-x="6" default-y="12" placement="above" bezier-x="14" bezier-y="8"></slur>
        </notations>
      </note>
      <note default-x="134">
        <pitch>
          <step>E</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-47">down</stem>
      </note>
      <note default-x="134">
        <chord/>
        <pitch>
          <step>G</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <accidental>sharp</accidental>
        <stem default-y="-47">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="6" default-y="9" bezier-x="-13" bezier-y="9"></slur>
        </notations>
      </note>
      <note default-x="177">
        <pitch>
          <step>A</step>
          <octave>2</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-63">down</stem>
      </note>
      <note default-x="177">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-63">down</stem>
      </note>
      <note default-x="241">
        <pitch>
          <step>B</step>
          <octave>2</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-59">down</stem>
      </note>
      <note default-x="241">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-59">down</stem>
      </note>
      <note default-x="285">
        <pitch>
          <step>C</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-55">down</stem>
      </note>
      <note default-x="284">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-55">down</stem>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="2" width="275">
      <note default-x="14">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-44">down</stem>
        <notations>
          <slur type="start" number="1" default-x="17" default-y="6" placement="above" bezier-x="6" bezier-y="11"></slur>
        </notations>
      </note>
      <note default-x="59">
        <pitch>
          <step>E</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-47">down</stem>
      </note>
      <note default-x="59">
        <chord/>
        <pitch>
          <step>G</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-47">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="4" default-y="6" bezier-x="-6" bezier-y="11"></slur>
        </notations>
      </note>
      <note default-x="144">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-44">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="1" default-y="-1" bezier-x="-6" bezier-y="11"></slur>
        </notations>
      </note>
      <note default-x="189">
        <pitch>
          <step>E</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-47">down</stem>
      </note>
      <note default-x="189">
        <chord/>
        <pitch>
          <step>G</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-47">down</stem>
      </note>
      <note default-x="232">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-44">down</stem>
      </note>
      <note default-x="231">
        <chord/>
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>1</voice>
        <type>quarter</type>
        <stem default-y="-44">down</stem>
      </note>
      <backup>
        <duration>5</duration>
      </backup>
      <note default-x="14">
        <pitch>
          <step>D</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-54">down</stem>
      </note>
      <note default-x="102">
        <pitch>
          <step>C</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-55">down</stem>
      </note>
      <note default-x="102">
        <chord/>
        <pitch>
          <step>E</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-55">down</stem>
        <notations>
          <slur type="start" number="1" default-x="11" default-y="-1" placement="above" bezier-x="6" bezier-y="11"></slur>
        </notations>
      </note>
      <note default-x="146">
        <pitch>
          <step>D</step>
          <octave>3</octave>
        </pitch>
        <duration>1</duration>
        <voice>2</voice>
        <type>quarter</type>
        <stem default-y="-54">down</stem>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="3" width="198">
      <note default-x="17">
        <pitch>
          <step>G</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-40">down</stem>
        <notations>
          <slur type="start" number="1" default-x="6" default-y="-29" placement="below" bezier-x="32" bezier-y="-19"></slur>
        </notations>
      </note>
      <note default-x="17">
        <chord/>
        <pitch>
          <step>B</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-40">down</stem>
        <notations>
          <slur type="start" number="2" default-x="6" default-y="17" placement="above" bezier-x="32" bezier-y="24"></slur>
        </notations>
      </note>
      <note default-x="87">
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-35">down</stem>
      </note>
      <note default-x="145">
        <pitch>
          <step>A</step>
          <octave>2</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-63">down</stem>
        <notations>
          <slur type="stop" number="1" default-x="-6" default-y="-50" bezier-x="-36" bezier-y="-8"></slur>
        </notations>
      </note>
      <note default-x="145">
        <chord/>
        <pitch>
          <step>G</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>1</voice>
        <type>half</type>
        <stem default-y="-63">down</stem>
        <notations>
          <slur type="stop" number="2" default-x="6" default-y="14" bezier-x="-31" bezier-y="26"></slur>
        </notations>
      </note>
      <backup>
        <duration>6</duration>
      </backup>
      <forward>
        <duration>2</duration>
        <voice>2</voice>
      </forward>
      <note default-x="87">
        <pitch>
          <step>A</step>
          <octave>3</octave>
        </pitch>
        <duration>2</duration>
        <voice>2</voice>
        <type>half</type>
        <stem default-y="28">up</stem>
        <notations>
          <slur type="continue" number="1" default-x="-18" default-y="21" placement="above" bezier-x2="6" bezier-y2="11"></slur>
          <slur type="stop" number="1" default-x="14" default-y="21" bezier-x="-6" bezier-y="11"></slur>
        </notations>
      </note>
    </measure>
    <!--=======================================================-->
    <measure number="4" width="109">
      <note default-x="20">
        <pitch>
          <step>F</step>
          <alter>1</alter>
          <octave>3</octave>
        </pitch>
        <duration>4</duration>
        <voice>1</voice>
        <type>whole</type>
      </note>
      <backup>
        <duration>4</duration>
      </backup>
      <note default-x="20">
        <pitch>
          <step>D</step>
          <octave>3</octave>
        </pitch>
        <duration>4</duration>
        <voice>2</voice>
        <type>whole</type>
      </note>
      <barline location="right">
        <bar-style>light-heavy</bar-style>
      </barline>
    </measure>
  </part>
 </score-partwise>
--- a/composeApp/src/commonMain/composeResources/files/11.xml
+++ b/composeApp/src/commonMain/composeResources/files/11.xml
--- a/composeApp/src/commonMain/composeResources/files/12.xml
+++ b/composeApp/src/commonMain/composeResources/files/12.xml
--- a/composeApp/src/commonMain/composeResources/files/13.xml
+++ b/composeApp/src/commonMain/composeResources/files/13.xml
--- a/composeApp/src/commonMain/composeResources/files/18.xml
+++ b/composeApp/src/commonMain/composeResources/files/18.xml
--- a/composeApp/src/commonMain/composeResources/files/19-1.xml
+++ b/composeApp/src/commonMain/composeResources/files/19-1.xml
--- a/composeApp/src/commonMain/composeResources/files/20-1.xml
+++ b/composeApp/src/commonMain/composeResources/files/20-1.xml
--- a/composeApp/src/commonMain/composeResources/files/22.xml
+++ b/composeApp/src/commonMain/composeResources/files/22.xml
--- a/composeApp/src/commonMain/composeResources/files/23.xml
+++ b/composeApp/src/commonMain/composeResources/files/23.xml
--- a/composeApp/src/commonMain/composeResources/files/8.xml
+++ b/composeApp/src/commonMain/composeResources/files/8.xml
--- a/composeApp/src/commonMain/composeResources/files/9.xml
+++ b/composeApp/src/commonMain/composeResources/files/9.xml
--- a/composeApp/src/commonMain/composeResources/files/config.json
+++ b/composeApp/src/commonMain/composeResources/files/config.json
@ -2,11 +2,9 @@
  "themeMode": "DARK",
  "fontSize": 18.5,
  "playlist": [
-    "assets://ffpm-211.txt",
+    "assets://ffpm-367.txt",
-    "assets://ffpm-127.txt",
+    "assets://ews-89.txt",
    "assets://ews-15.txt",
    "assets://ews-14.txt",
    "assets://ffpm-310.txt",
    "assets://ffpm-392.txt",
    "assets://ffpm-358.txt",
    "assets://ffpm-307.txt",
--- a/composeApp/src/commonMain/composeResources/files/ews-10.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-10.txt
@ -0,0 +1,13 @@
 M0:|c:Eb|m:4/4|r:8.8.4.8.8.8.4.|t:EWS 10 All creatures worship God most high|a:St. Francis of Assisi (1225); paraphraser: William Henry Draper (1855-1933)|h:LASST UNS ERFREUEN (Geistliche Kirchengesang Költ. 1623)|u:https://hymnary.org/page/fetch/S4J1953/6/high
 U0:z0:844 4(22)44 (844)/(44)44 4444(844)/44 (44)8/44 (44)$Q8/ (44)44 4444(844)/ (44)44 4444 (4444)/44 (44)8  (44)4/22 (44)(44)8/44 (44)8/44(44)(44) 44444/G
 N1:ddrmd-mfs--/d-drmdmfs--/#r dtl-sdtl-s/d-dssfmfs--/d-dssfmfs---/#d fmr-dfmr-d/#r dtl-s/dtl--s/fmr--#d d-/dd
 N2:#s, sd-dd-dddt-/d-std5-t/s'3fmdrmrt/s'fmmmrdddt-/drmfmddddtmr/dddtddddtl/mrmrt/mmmr-l/lddt-s-/ls
 N3:mmfsm-lls--/slsfsslls--/#r ddd-dmssFs/d-dddssfrs-/s-sssdtls---/lllsslslfm/mssFs/sssf-m/fslsfm-/fm
 N4:#s, dddddtlrss'f/mfmrdtlrss'f/mmf-dltdrs/mrdtltdlss'f/mfmrd#t,lsfmrdt#r,lsf-mrmfsl/ltdr's/ltdr'tD/#d rmfss,d-/f,f
 E1:All crea_tures wor_ship God most high,/lift up your voice in earth and sky,/al_le_lu_ia, al_le_lu_ia!/Thou burn_ing sun with gol_den beam,/thou sil_ver moon with soft_er gleam,/${R=}O sing ye, O sing ye, al_le_lu_ia, al_le_lu_ia, al_le_lu_ia!
 E2:Thou rush_ing wind that art so strong,/ye clouds that sail in heav’n a_long,/al_le_lu_ia, al_le_lu_ia!/Thou ri_sing morn in praise re_joice,/ye lights of eve_ning, find a voice,/O sing ye, O sing ye, alleluia, alleluia, alleluia!
 E3:Thou flow_ing wa_ter, pure and clear,/make mu_sic for thy God to hear,/al_le_lu_ia, al_le_lu_ia!/Thou fire so mas_ter_ful and bright,/that gi_vest all both warmth and light,/O sing ye, O sing ye, alleluia, alleluia, alleluia!
 E4:Dear mo_ther earth, who day by day,/un_fol_dest bles_sings on our way,/al_le_lu_ia, al_le_lu_ia!/The flow’rs and fruits that in thee grow,/let them God’s glo_ry al_so show,/O sing ye, O sing ye, alleluia, alleluia, alleluia!
 E5:And ev’_ry_one, with ten_der heart,/for_gi_ving others, take your part,/al_le_lu_ia, al_le_lu_ia!/Ye who long pain and sor_row bear,/sing praise and cast on God your care,/O sing ye, O sing ye, alleluia, alleluia, alleluia!
 E6:And thou, most kind and gen_tle death,/wait_ing to hush our fi_nal breath,/al_le_lu_ia, al_le_lu_ia!/Thou lea_dest home the child of God,/as Christ be_fore that way hath trod,/O sing ye, O sing ye, alleluia, alleluia, alleluia!
 E7:Let all things their Cre_a_tor bless,/and wor_ship God in hum_ble_ness,/al_le_lu_ia, al_le_lu_ia!/To God all thanks and praise be_long!/Join in the e_ver_last_ing song:/O sing ye, O sing ye, alleluia, alleluia, alleluia!/
--- a/composeApp/src/commonMain/composeResources/files/ews-179.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-179.txt
@ -0,0 +1,8 @@
 I0:ews-41.txt:^(M|E)
 M0:|c:G|m:4/4|a:Thomas Kelly (1769-1855)|h:STUTTGART Christian Friedrich Witt 1660-1717|r:8787|t:EWS 179 Zion's King shall reign victorious|u:https://hymnary.org/tune/stuttgart_witt
 E1:Zi_on’s king shall reign vic_to_rious,/All the earth shall own His sway;/He will make His king_dom glo_rious,/He will reign through end_less day.
 E2:What though none on earth as_sist Him,/God re_quires not help from man;/What though all the world re_sist Him,/God will re_a_lize His plan.
 E3:Na_tions now from God es_trang_èd,/Then shall see a glo_rious light,/Night to day shall then be chang_èd,/Heaven shall tri_umph in the sight;
 E4:See the an_cient i_dols fal_ling!/Wor_shipped once, but now ab_horred;/Men on Zi_on’s king are cal_ling,/Zi_on’s king by all a_dored.
 E5:Then shall Is_rael, long dis_per_sèd,/Mourn_ing seek the Lord their God,/Look on Him whom once they pier_cèd,/Own and kiss the chas_tening rod;
 E6:Then all Is_rael shall be sa_vèd,/War and tu_mult then shall cease,/While the grea_ter Son of Da_vid/Rules a con_quered world in peace./
--- a/composeApp/src/commonMain/composeResources/files/ews-190.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-190.txt
@ -0,0 +1,6 @@
 I0:ews-42.txt:^(M|E)
 M0:|c:Ab|m:3/4|r:LM|t:EWS 190 O Lord, thy benediction give|h:ABENDS Herbert Stanley Oakley 1830-1903|a:John Armstrong (1813-1856)|u:https://hymnary.org/hymn/CP1913/page/313
 E1:O Lord, Thy be_ne_dic_tion give/On all who teach, on all who learn,/So that Thy church may ho_lier live,/And e_very lamp more bright_ly burn.
 E2:Give those who teach pure hearts of love—/Hearts filled with faith and warmed by prayer/And souls at_tuned to Thee a_bove,/That they may guide Thy peo_ple there.
 E3:Give those that learn the wil_ling ear,/The spi_rit meek, the guile_less mind./Such gifts will make the low_liest here/Far bet_ter than a king_dom find.
 E4:O bless the she_pherd, bless the sheep,/That guide and gui_ded both be one,/One in the faith_ful watch they keep,/One in the joy of work well done.
--- a/composeApp/src/commonMain/composeResources/files/ews-324.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-324.txt
@ -0,0 +1,13 @@
 M0:|c:D|m:4/4|t:EWS 48 - r:8878874848|a:Philipp Nicolai 1556-1608 tr: William Mercer 1811-1873|h:WIE SCHÖN-LEUCHTET Philipp Nicolai 1556-1608 arr. Johann Sebastian Bach 1731|u:https://hymnary.org/page/fetch/CAH2000/448/high
 U0:zC:4 4(22)(22)4 444/4 4(22)(22)4 444/4 (22)4(22)(22) (422)$Q4/4 4(22)(22)4 444/4 4(22)(22)4 444/4 (22)4(22)(22) (422)$Q8/ 
 N1:dsm-d-slls slt-d'-tlls ml-sf-m-r--d dsm-d-slls slt-d'-tlls ml-sf-m-r--d smsmfmr-mfm-rmf-mr-d d'tl-sf-m-r--d
 N2:#s, sss-l-tmrr mff-m-mmrr dd-tdrmddt-d sssl-t-mrr mff-m-mmrr dd-tdrmddt-d
 N3:mrdrmFsssF-t d'd'r'-s-ssFr sfmrl-s-s-fm mrdrmFssFtd' r'r'm'-s-ssFr sfmrl-ss-fm
 N4:#s, dtdrl-mdr-s dfmrdrmdrt df,-sltd-s--d dtdrl-mdrs dfmrdrmdrt df,-sltd-s--d 
 E1:How bright ap_pears the Mor_ning-Star,/With Grace and Truth bey_ond Com_pare,/The Roy_al root of JES_SE;/${D:O Da_vid's Son, of Ja_cob's Line!/My Soul's De_light, and Spouse Di_vine,/Thy Love can on_ly bless me./}Pre_cious, Gra_cious,/Far and Glo_rious, e'er vic_to_rious,/Thou my Trea_sure,/Far bey_ond all earth_ly Plea_sure.
 E2:My choicest Pearl, and precious Crown,/God and the Virgin Mary's Son,/Thou King of endless Glory!/Thou art compar'd to Sharon's flow'r;/Thy Gospel and its saving Pow'r/Excells what's Transitory./Lovely Lilly,/O Hosanna, Heav'nly Manna,/Thy sweet Favour/Be mine everlasting Savour.
 E3:Thy Love, so pow'rful and divine,/Dart deep into this Heart of mine,/Thou brilliant Stone and Jewel!/Confirm me more and more to be/A Branch of Thee, the living Tree,/That Self may lose its Fewel./Sighing, Dying/Is thy Creature; for in Nature/Is no Pleasure/Without Thee, my King and Treasure.
 E4:From God descends a Glance of Joy./When thou, with thy most gracious Eye,/Beholdst thy loving Creature:/Immanuel! my sov'reign Good,/Thy Word, thy Spirit, Flesh and Blood/Renew my very Nature;/Grant me sweetly/Thine Embraces, that the Graces/Of Salvation/May root out all Depravation.
 E5:Thou Father, from Eternity,/In Mercy was inclin'd to me,/Through CHRIST, thy well-beloved;/Thy son has chose me for his Bride;/In this my Spouse I can confide;/My Love shall ne'er be moved./O! this Bliss is/Of his giving, who's the Living/Bread and Manna;/Ever will I sing HOSANNA.
 E6:Tune all your Strings of Lute and Harp,/Resolve the Notes of Flat and Sharp/Into Celestial Concords,/That Nothing may disturb my Frame,/Which is wrapt up in JESUS' Name,/The sweetest of all Comforts./Ringing, Singing,/In your Praises, let the Phrases/Of your Duty/Please the Lord of Bliss and Beauty.
 E7:My Joy to all the World be known,/That my Beloved keeps his Throne,/On Hills of Light and Glory./He'll kindly bring me to that Place,/Where all the Wonders of his Grace/Shall lie disclos'd before me./Amen! Amen!/Lord my Sov'reign! come and govern/All the Nations;/Come! I wait with great Impatience./
--- a/composeApp/src/commonMain/composeResources/files/ews-34.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-34.txt
@ -0,0 +1,10 @@
 M0:|c:E|m:4/4|t:EWS 34 Lo! the heavens are breaking|a:|h:Lowell Mason 1792-1872|u:https://hymnary.org/hymn/FBL1906/page/17|r:65653
 U0:z0:${p}6244 88 / 6244 G/ 6${<}2${=}(22)(22) (4422)(22)/ ${>}6${=}244 8/ 8(44)8
 N1:mmmfsm frmmr mfsmfsld'tlsf mmrrd l,rt,d
 N2:#t, dddrmd rtddt drmdrmflsfmr ddttd #s, ll-s
 N3:s14-s-f---l- sssfm l,f-m
 N4:#f, d6 ssdds ddd-d-f---f- s4l lf-d
 E1:Lo! the heavens are break_ing,/Pure and bright a_bove;/Life and light, a_wa_king,/Mur_mur “God is love.” "God is love"
 E2:See, the stream_let bound_ing/Through the vale and wood,/There its rip_ples sound_ing,/Tell that “God is good.” "God is good"
 E3:Mu_sic now is ring_ing/Through the lea_fy grove,/Feath_ered song_sters sing_ing,/War_ble “God is love.” "God is love"
 E4:Wake, my heart, and spring_ing,/Spread thy wings a_bove;/Soar_ing still and sing_ing,/Sing_ing, “God is love.” "God is love"
--- a/composeApp/src/commonMain/composeResources/files/ews-35.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-35.txt
@ -0,0 +1,12 @@
 M0:|c:D|m:3/4|a:Lewis Hartsough 1828-1919|r:8787D|h:Lewis Hartsough 1828-1919|t:FFPM 413 Ry Mpamonjy Tompo soa|u:https://hymnary.org/tune/lead_me_to_the_rock_thats_high_hartsough
 U0:z8:y 6222 44/y 6222 8/y 6222 44/y 4422 8/y 6222 (22)4/y 6222 8/y 6222 44/y 4422 8
 N1:drmdmfss llslsmr drmdmfss d'lslmrd mfsmlssff fmrrmfs drmdmfss d'lslmrd
 N2:#s, ssdsdrmm ffmfmdt ssdsdrmm ffmddtd drmdfmmrr rdttdtd ssdsdrmm ffmddtd
 N3:#m mfsmssdd dddddss mfsmssdd ldsdsfm s4dds-s ssssd,r,m mfsmssdd ldsdsfm
 N4:#f, d8 ffdddds d8 f'f'dfssd 7s-s 7d 9f'f'dfssd
 E1:Lead me to the rock that’s high_er/Than the rock poor self can show;/Lead me to its per_fect shel_ter,/The strong tower from e_very foe./${R=}In the high_er rock I’m trust_ing,/Rest_ful, peace_ful, saved and free,/’Tis the test_ed rock of a_ges,/Its dear sha_dow shel_ters me.
 E2:Yes, the hig_her rock so tower_ing/Gives, a_mid life’s rud_est storms,/Per_fect re_fuge, sur_est safe_ty,/Sweet_est rest a_mid a_larms.
 E3:’Tis the high_er rock that gives me/Faith’s glad strength for e_very hour;/Oh to mea_sure all its glad_ness,/All its pre_cious_ness of power!
 E4:’Tis the high_er rock sus_tains me/Joy_ous_ly from day to day;/Lift_ing heart, and soul, and spi_rit,/To the pu_rer, ho_lier way.
 E5:’Tis the high_er rock that saves me,/’Tis the high_er rock I’ve found,/Where a_bide the crown_ing gra_ces/Faith and hope and love a_bound.
 E6:So will I sing prai_ses to Thee/For Thy wond_rous power to save;/Dai_ly ’neath Thy sha_dow rest_ing,/Till the vic_tor’s palm I wave.
--- a/composeApp/src/commonMain/composeResources/files/ews-36.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-36.txt
@ -0,0 +1,10 @@
 M0:|c:F|m:3/4|a:Henry Alford 1810-1871|r:7777D|h:MARTYN Simeon Butler Marsh 1798-1875|u:https://hymnary.org/tune/martyn_marsh|t:EWS 36 Come ye thankful people come|i:ews360
 U0:z0:${x2}848484C/ 8484CCO/${x0} 8484CCO/ 8484CCO/ 848484C/ 8484CCO/${x0} 
 N1:mmmdrrr mmsfmr   d mmmdrrr mmsf   mrd s4lls     5lls mmmd        rrr mmsfmrd
 N2:#t, d4t3 ddmrdt  s, d4t3 ddmr     dts, d18                       t3 ddmrdts,
 N3:s3ms6lsf         m s3ms6l         sfm 5ffm      5ffm sssm        s6lsfm
 N4:#f,d4s3 dddfss   d 5s3 dddf       ssd 5ffd      5ffd 5           s3d3fssd
 E1:Come, ye thank-_ful peo_ple, come,/raise the song of har_vest home;/all is sa_fely gath_ered in,/ere the win_ter storms be_gin./God our Ma_ker doth pro_vide/for our wants to be sup_plied;/come to God's own tem_ple, come,/raise the song of har_vest home.
 E2:All the world is God's own field,/fruit as praise to God we yield;/wheat and tares to_ge_ther sown/are to joy or sor_row grown;/first the blade and then the ear,/then the full corn shall ap_pear;/Lord of har_vest, grant that we/whole_some grain and pure may be.
 E3:For the Lord our God shall come,/and shall take the har_vest home;/from the field shall in that day/all of_fen_ses purge a_way,/gi_ving an_gels charge at last/in the fire the tares to cast;/but the fruit_ful ears to store/in the gar_ner e_ver_more.
 E4:E_ven so, Lord, quick_ly come,/bring thy fi_nal har_vest home;/ga_ther thou thy peo_ple in,/free from sor_row, free from sin,/there, for_e_ver pu_ri_fied,/in thy pre_sence to a_bide;/come, with all thine an_gels, come,/raise the glo_rious har_vest home.
--- a/composeApp/src/commonMain/composeResources/files/ews-37.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-37.txt
@ -0,0 +1,12 @@
 M0:|c:Eb|m:3/4|a:Fanny Crosby (1875)|h:John Robson Sweney 1837-1899|u:https://hymnary.org/page/fetch/GMEH1944/53/high|r:878747|t:EWS 37 I must have the Savior with me
 U0:z8:314(22)3144/y4(22)y(44)/ y4(22)y44/y4(22)y8/ y${m:4/4}4yyy4y4 y4yyy4y4/y4yyy48/y44628
 N1:mfs-md'lsm lsr-msfm- mfs-md'lsm d'd't-lsFs sss---fmrm--- d'tl---d'tls--- ssd'---mfstl frdmmrd
 N2:#t, drm-dmfmd fmt-dmrd- drm-dmfmd mmr-drrr zzzfrtrdtdddd msf---lsfm--- zzzmmmdtddd dl,s,dts,s,
 N3:zzds-zzds zzs,${s:l}s-zzd${s:s}mzzdm-zzd szzrr-r- rzzzt,rsssssss szzzd'10 z3 ssssssff lfmssfm
 N4:#d, zzdd'-zzdd' zzs,$s-zzdd'zzdd'-zzd d'zzrr-r- szzzssssssd'd'd' d'zzzf'6d'4 z3 d'4r'm'f'f' ffssssd'
 O1:v1:Then my soul_4shall fear no ill;/_3Let him lead_4me where he will,/_3I will go_4with_out a mur_mur,/And his foot_steps fol_low still.
 E1:I must have the Sa_viour with me,/For I dare not walk a_lone;/I must feel his pre_sence near me,/And his arm a_round me thrown./${R=}${O:1}_3Then my soul_shall fear no ill fear no ill;/_3Let him lead me where he will,/_3I will go with_out a mur_mur,/And his foot_steps fol_low still.
 E2:I must have the Sa_viour with me,/For my faith at best is weak;/He can whis_per words of com_fort/That no o_ther voice can speak.
 E3:I must have the Sa_viour with me/In the on_ward march of life;/Through the tem_pest and the sun_shine,/Through the bat_tle and the strife.
 E4:I must have the Sa_viour with me,/And His eye the way must guide,/Till I reach the vale of Jor_dan,/Till I gain the o_ther side.
--- a/composeApp/src/commonMain/composeResources/files/ews-38.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-38.txt
@ -0,0 +1,10 @@
 M0:|c:G|m:3/4|r:8787D|a:Robert Robinson (1774: 1735-1790)|h:AUTUMN François-Hyppolyte Barthélemon 1741-1808|t:EWS 38 Mighty God while angels bless|u:https://hymnary.org/page/fetch/GHF1968/123/high
 U0:z8:y 62y 44/y 6222 8/y 62y 44/y 62y 8/y 62y 44/y (42)222 (44)/y 62y 44/y 62y 8
 N1:drmrdl,s,m, drmrmsr drmrdl,s,m, dlsmrmd mfslsmsm drmfmrddt, drmrdl,s,m, dlsmrmd
 N2:#d, mfsmffmm sssssss mfsslfmm fld'sfsm ssd'd'd'sd's ssslslls- mfsslfmm fldsfsm
 N3:#s, ssdsltds dtdtdmt ddddddds ldmdttd drmfmdmd dtd-dfmmr ddddddds ldmdttd
 N4:#d, d8 msd'smds dddmfld'd ffssssd ddd'5d msd'-d'fFs- dddmfld's ffssssd
 E1:Migh_ty God, while an_gels bless you,/may a mor_tal sing your name?/Lord of men as well as an_gels,/you are ev'_ry crea_ture’s theme./Lord of ev'_ry land and na_tion,/an_cient of e_ter_nal days,/sound_ed through the wide cre_a_tion/be your just and law_ful praise.
 E2:For the gran_deur of your na_ture,/grand bey_ond a se_raph’s thought,/for cre_a_ted works of po_wer,/works with skill and kind_ness wrought./For Thy pro_vi_dence, that go_verns,/Through Thine em_pire’s wide do_main,/Wings an an_gel, guides a spar_row,/Bles_sèd be Thy gen_tle reign.
 E3:But your rich, your free re_demp_tion,/dark through bright_ness all a_long,/thought is poor, and poor ex_pres_sion,/who dare sing that wond_rous song?/Bright_ness of the Fa_ther’s glo_ry,/shall your praise un_ut_tered lie?/Fly, my tongue, such guil_ty si_lence,/sing the Lord who came to die.
 E4:From the high_est throne in glo_ry,/to the cross of deep_est woe,/all to ran_som guil_ty cap_tives,/flow my praise, for_e_ver flow./Go, re_turn, im_mor_tal Sa_vior!/Leave Thy foot_stool, take Thy throne;/Thence re_turn, and reign for e_ver,/Be the king_dom all Thine own./
--- a/composeApp/src/commonMain/composeResources/files/ews-39.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-39.txt
@ -0,0 +1,11 @@
 M0:|c:G|m:4/4|a:Katharina von Schlegel, b. 1967, Jane Laurie Borthwick (1813-1897) |h:FINLANDIA Jean Sibelius (1865-1957)|r:10.10.10.8|t:EWS 39 - Be still my soul
 U0:z4:444C44462(4C)z4/444C44462Gz4/444C44462(4C)z4/444C44462Gz4/444C44462(4C)z4/444C44462Gz4
 N1:mrmfmrmdrrm mrmfmrmdrm ssslmmssrrf fmrmddrrmm ssslmmssrrf fmrmddrrdd
 N2:#l, dtdtdttlttd dtdtdrdltd ddddddddttr rDrddddttt mdddddddttr rDrdddltdd
 N3:#d sssssfmmfs- sssssssffs mmmmllssssl lslsslllSS smmmllssssl lslsmsffmm
 N4:#s, dfmrdsSlssd s'fmrdtdfrd ddtlllm,m,ssr, r,m,f,smfffmm ddtlllmms's'r r,m,f,slm,f,s
 E1:Be still, my soul; the Lord is on your side;/bear pa_tient_ly the cross of grief or pain;/leave to your God to or_der and pro_vide;/in ev'_ry change he faith_ful will re_main./Be still, my soul; your best, your heav’n_ly friend/through thor_ny ways leads to a joy_ful end.
 E2:Be still, my soul; your God will un_der_take/to guide the fu_ture as he has the past;/your hope, your con_fi_dence, let no_thing shake;/all now my_ste_rious shall be bright at last./Be still, my soul; the waves and winds still know/his voice who ruled them while he lived be_low.
 E3:Be still, my soul; when dear_est friends de_part/and all is dark_ened in the vale of tears,/then you will bet_ter know his love, his heart,/who comes to soothe your sor_rows and your fears./Be still, my soul; your Je_sus can re_pay/from his own full_ness all he takes a_way.
 E4:Be still, my soul; the hour is hast'n_ing on/when we shall be for_e_ver with the Lord,/when dis_ap_point_ment, grief, and fear are gone,/sor_row for_got, love's pu_rest joys re_stored./Be still my soul; when change and tears are past,/all safe and bles_sed we shall meet at last.
 E5:Be still, my soul: be_gin the song of praise/On earth, be_liev_ing, to Thy Lord on high;/Ac_know_ledge Him in all thy words and ways,/So shall He view thee with a well pleased eye./Be still, my soul: the sun of life di_vine/Through pas_sing clouds shall but more bright_ly shine.
--- a/composeApp/src/commonMain/composeResources/files/ews-40.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-40.txt
@ -0,0 +1,10 @@
 M0:|c:C|m:2/4|r:8585D|h:Philip Paul Bliss (1873: 1838-1876)|a:Philip Paul Bliss 1838-1876|t:EWS 40 Hold the fort (Ho, my comrades, see the signal)
 U0:z0:y22 y22/ y22 8/ y22 yy/ y22 8/ ${f}y22 2222/ y22 (44)/ y22 2222 22y 8
 N1:#m slsmdrdl slsmr, slsmdrdl tdtls d5sms l3dt- d4rdtl ssltd
 N2:#t, mfmdmfmf mfmdt mfmdmfmm rmrFr m6dm f4rf m4ffsf mmffm
 N3:#f d3s4d 4ss d3s8dt s5dsd4ls- s3TllTdddlss
 N4:d11ms d7Dr4s d8f4s- d4f4s4d
 E1:Ho, my com_rades, see the sig_nal, wa_ving in the sky!/Re_in_force_ments now ap_pea_ring, vic_to_ry is nigh./${R=}“Hold the fort, for I am co_ming,” Je_sus sig_nals still;/Wave the ans_wer back to hea_ven, “By Thy grace we will.”
 E2:See the migh_ty host ad_van_cing, Sa_tan lea_ding on,/Migh_ty ones a_round us fal_ling, cou_rage al_most gone!
 E3:See the glo_rious ban_ner wa_ving, Hear the trum_pet blow!/In our Lea_der's Name we tri_umph o_ver e_very foe.
 E4:Fierce and long the bat_tle ra_ges, but our help is near,/On_ward comes our great Com_man_der, cheer, my com_rades, cheer!/
--- a/composeApp/src/commonMain/composeResources/files/ews-41.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-41.txt
@ -0,0 +1,10 @@
 M0:|c:G|m:4/4|a:Charles Wesley (1707-1788)|h:STUTTGART Christian Friedrich Witt 1660-1717|r:8787|t:EWS 41 - Come, Thou long expected Jesus|u:https://hymnary.org/tune/stuttgart_witt
 U0:z0:4444 4444/ 4444 448/ 4444 4444/ 444(22) (22)48
 N1:s,s,ddrrmd sslfrsm mmrmdrdt, dl,s,d-d-t,d
 N2:#m, ssmmlsss sd4td ddttmlss sfms-s-ss
 N3:#t, mrdddtdm dmflsss lmfmmr3 ddsm-rmfm
 N4:#r, dtlsfsdd, md,frssd lllSlFsf mfdmfs-sd,
 E1:Come, thou long ex_pec_ted Je_sus,/born to set thy peo_ple free;/from our fears and sins re_lease us,/let us find our rest in thee.
 E2:Is_rael's strength and con_so_la_tion,/hope of all the earth thou art;/dear de_sire of e_very na_tion,/joy of e_very long_ing heart.
 E3:Born thy peo_ple to de_li_ver,/born a child and yet a King,/born to reign in us for_e_ver,/now thy gra_cious king_dom bring.
 E4:By thine own e_ter_nal spi_rit/rule in all our hearts a_lone;/by thine all suf_fi_cient me_rit,/raise us to thy glo_rious throne.
--- a/composeApp/src/commonMain/composeResources/files/ews-42.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-42.txt
@ -0,0 +1,12 @@
 M0:|c:Ab|m:3/4|r:LM|t:EWS 42 Lift up your heads, ye mighty gates|h:ABENDS Herbert Stanley Oakley 1830-1903|a:Georg Weissel 1590-1635|u:https://hymnary.org/hymn/CP1913/page/313
 U0:z0:444 (44)4 (44)(22) C/444 8484 C/ 44484 (44)(22) (84)/ 444 848(22) C
 N1:#s, sdtl-lf-m-r rmfs'dtls tdrfmr-d-t- drms'fmr-d
 N2:#m, mfssfllss-s sstdssFs sssldltdFs- sfmTlss-s
 N3:#s, d4-Drtd-t tdrmdrdt fmrdsf-mrr- dtddddtfm
 N4:#d, drmf-mr-mfs fmrdmrrs #m, rdtddfsl-sf #r, mrd,mfss-d
 E1:Lift up your heads, ye migh_ty gates;/be_hold, the King of glo_ry waits;/the King of kings is draw_ing near;/the Sa_vior of the world is here!
 E2:A hel_per just He comes to thee,/His cha_riot is hu_mi_li_ty,/His king_ly crown is ho_li_ness,/His scep_ter, pi_ty in dis_tress.
 E3:O blest the land, the ci_ty blest,/Where Christ the ru_ler is con_fessed!/O hap_py hearts and hap_py homes/To whom this king in tri_umph comes!
 E4:Fling wide the por_tals of your heart;/make it a tem_ple, set a_part/from earth_ly use for heaven's emp_loy,/a_dorned with prayer and love and joy.
 E5:Re_dee_mer, come, with us a_bide;/our hearts to thee we o_pen wide;/let us thy in_ner pre_sence feel;/thy grace and love in us re_veal.
 E6:Thy Ho_ly Spi_rit lead us on/un_til our glo_rious goal is won;/e_ter_nal praise, e_ter_nal fame/be of_fered, Sa_vior, to thy name!
--- a/composeApp/src/commonMain/composeResources/files/ews-43.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-43.txt
@ -0,0 +1,9 @@
 M0:|c:C|m:4/4|t:EWS 43 O wondrous Name, by prophets|a:Frances Jane (Fanny) Crosby (1820-1915)|h:DOUGLAS Ira David Sankey 1840-1908|r:7.6.7.6.D.|u:https://hymnary.org/page/fetch/GMNO1904/26/high
 U0:zC:4 6244 624/4 6244 C/4 6244 624/4 6244 C/4 6244 624/4 4444 (84)/4 6244 444/4 6262 C
 N1:#r ssfmddtl lslsmr ssfmddtl lssltd sr'tssm'ds sf'm'r'ddt sltddr'f'm' r'ddr'dd
 N2:#t, mmrdmfff fmfmdt fmrdslsf fmmffm sfffssmm ssslls- sffmmfll lsmfmm
 N3:#s ddsssltd 5ss tdssdddd ddstss strtsdsd srdrRmr ddssdlrD rmdtdd
 N4:#s, d5fff fd4s sdddmfff fs'2ssd s'5ddd s't'd'fFs'- mfrddfrm fs'4d
 E1:O wond_rous Name, by pro_phets heard/Long years be_fore His birth;/They saw Him co_ming from a_far,/The Prince of Peace on earth./${R=}The Won_der_ful! The Coun_se_lor!/The Great and Migh_ty Lord!/The e_ver_la_sting Prince of Peace!/The King, the Son of God!
 E2:O glo_rious Name the an_gels praise/And ran_somed saints a_dore,—/The Name a_bove all o_ther names,/Our re_fuge e_ver_more.
 E3:O pre_cious Name, e_xal_ted high,/To Him all pow’r is gi_ven;/Thro’ Him we tri_umph o_ver sin,/By Him we en_ter heaven.
--- a/composeApp/src/commonMain/composeResources/files/ews-44.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-44.txt
@ -0,0 +1,10 @@
 M0:|c:F|m:4/4|r:878787|a:Thomas Kempis, tr: J.M. Neale|h:LEWES John Randall (1717-1799)|t:EWS 44 If thou hast the skill to reckon|u:https://hymnary.org/page/fetch/EH1906/362/high
 U0:z0:6244 4444/ 44444(22)(44)/62444444/ 44(22)(22)448/62(22)4 62(22)4/ 624(22) 448
 N1:#t, mfrsdrtd fmlsfmfmr mfrsdrtd fmrFslsFs mfrdrfsmrm slsfmmrd
 N2:#m, ddrrdtsf ld3td-dt ddrrdlfm sssdrdtlt dds-tlrd-d 4tddtd
 N3:slssmfrd rsfsss-s- slssmfrd rdr-rmrrr dfs-slss-s sfss-sfm 
 N4:#f, ddttlfsl tdf'mrd-s- ddttlfsl tdtltdrr,s dlt-srtd-d mf'mrdssd
 E1:If thou hast the skill to rec_kon/All the num_ber of the blest./Thou per_chance canst weigh the glad_ness/Of the e_ver_last_ing rest./Which, their earth_ly e_xile fi_nished./They for_e_ver have pos_sest.
 E2:Through the vale of la_men_ta_tion/Safe_ly passed for e_ver_more./To the Sa_viour that re_deemed them/These re_deemed ones prai_ses pour;/And the Mo_narch that re_wards them/These re_war_ded saints a_dore.
 E3:O what splen_dour, O what beau_ty/Ligh_tens round the hap_py place/Where a_midst the bles_sed le_gions/Who have tri_umphed by his grace/Stands the Lord's own Vir_gin Mo_ther/Ga_zing on her Sa_viour's face.
 E4:In that joy the An_gel co_horts/And the Saints that fill the skies,/And the A_pos_to_lic cho_rus,/And the Mar_tyrs sym_path_ize,/And all saint_ly men and wo_men/Bend on Christ a_do_ring eyes./
--- a/composeApp/src/commonMain/composeResources/files/ews-443.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-443.txt
@ -0,0 +1,6 @@
 I0:ews-41.txt:^(M|E)
 M0:|c:G|m:4/4|a:John Macleod (1840-1898)|h:STUTTGART Christian Friedrich Witt 1660-1717|r:8787|t:EWS 443 Blessed Jesus, high in glory|u:https://hymnary.org/tune/stuttgart_witt
 E1:Bles_sed Je_sus, high in glo_ry,/Seen of saints and an_gels fair,/Chil_dren's voi_ces now a_dore Thee;/Lis_ten to Thy chil_dren's prayer.
 E2:Gen_tle Je_sus, Thou dost love us;/Thou hast died u_pon the Tree,/And Thou reign_est now a_bove us,/That we too may reign with Thee.
 E3:Give us grace to trust Thee whol_ly;/Give us each a child_like heart;/Make us meek and pure and ho_ly,/Fit to see Thee as Thou art.
 E4:Fa_ther, Son, and Ho_ly Spi_rit,/Bless us all our life be_low,/Till we each that Heaven in_he_rit/Which the child_like on_ly know.
--- a/composeApp/src/commonMain/composeResources/files/ews-45.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-45.txt
@ -0,0 +1,11 @@
 M0:|c:Db|m:4/4|h:LET HIM IN Edwin Othello Excell 1851-1921|r:PM|a:Jonathan Bush Atchinson 1840-1882|t:EWS 45 There's a stranger at the door, Let him in|u:https://hymnary.org/page/fetch/WLCH1889/116/high
 U0:zC:22 4444 (48)z4 222244 22224/22 4444 (48)z4 22224(22) 2222$Q4/22 4444 C22 4444 C/22 4444 (48)z4 22224(22) 22224
 N1:mfsm'd'ls- s-4ls-4 mfsm'd'ls- s-4ltd'-4 ssld'tls mfsd'td'r' m'r'd'slls- s-4ltd-4
 N2:#t, drmssfm- fftdrzmmdrm drmssfm- fftdrzzmRffm mmflsfm drmmsFs sfmmffm- fftdrzzmRffm
 N3:#r ssd5s ssrmfzssmfs ssd5s ssrmfzzsFlls d7 ssdsslt 3d5s ssrmfzzsFlls
 N4:#s, d4mfd- s5zd5 d4mfd- s5zzd7 f4d 5rrs' 3ddffd- s5zzd5
 O1:v1:Let_5him in,_5
 E1:There's a Stran_ger at the door,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/He has been there oft be_fore,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/Let Him in, ere He is gone,/Let Him in, the Ho_ly One,/Je_sus Christ, the Fa_ther's Son,/${O:1}Let the Sa_viour in,_2let the Sa_viour in
 E2:O_pen now to Him your heart,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/If you wait He will de_part,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/Let Him in, He is your Friend;/He your soul will sure de_fend,/He will keep you to the end,/${O:1}Let the Sa_viour in,_2let the Sa_viour in
 E3:Hear you now His lo_ving voice?/${O:1}Let the Sa_viour in,_2let the Sa_viour in/Now, oh, now make Him your choice,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/He is stand_ing at your door,/Joy to you He will re_store,/And His Name you will a_dore,/${O:1}Let the Sa_viour in,_2let the Sa_viour in
 E4:Now ad_mit the heav'n_ly Guest,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/He will make for you a feast,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/He will speak your sins for_giv'n,/And when earth ties all are riv'n,/He will take you home to heav'n,/${O:1}Let the Sa_viour in,_2let the Sa_viour in/
--- a/composeApp/src/commonMain/composeResources/files/ews-46.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-46.txt
@ -0,0 +1,9 @@
 M0:|c:D|m:4/4|h:WACHET AUF Philipp Nicolai 1556-1608|r:89889866488|a:Philipp Nicolai 1556-1608 tr: Catherine Winkworth (1827-1878)|t:EWS 46 Wake awake for night is flying|u:https://hymnary.org/page/fetch/S4C1909/388/high
 U0:z0:4444 (22)(22)(422) C/(22) 4(22)(22)(22) 44(224) C/(22) (22)(22)4(22) (22)(22)8/ 4444 (22)(22)(422) C/ (22) 4(22)(22)(22) 44(224) C/(22) (22)(22)4(22) (22)(22)$Q8/ (22)4(22)4(22) C/ (22)4(22)4(22)8 448$Q4/ 4 4444 (22)(22)$Q4/ (22)4(22)(22)4 (22)(22)8 
 N1:#m d,mss s-s-l-- s/s- ds-d-m'- rdr-- r/s- d-s-lm- fmr,-d, dmsss-s-l--s /s- ds-d-m'- rdr-- r/s- d-s-lm- fmr,-d, / #d s-sf-mr-d s-sf-mr-d rmfm / sltd'd'm'-r'-d'/ s-ds-l-mf-r-d
 N2:#l, s,drrdrm-mr-m m-ms-s-s-Fss-fs     /mrmfs-ddT ld-td s,drrdrm-mr-m  / m-ms-s-s-Fss-fs     /mrmfs-ddT ld-td / m-mrdtltd t-mrddt-d lddm / mmrdfs-s-s m-ms-drmlddtd
 N3:#r mlttm'r'dtl-td d-dt-d-dtlsltdt     /d-d-dtls-fsf-m   mlttm'r'dtl-td /  d-dt-d-dtlsltdt     /d-d-dtls-fsf-m   / dtltlSFSl s-ll-llSl fllS sfflld-tf'm' d-ddTl-Sl-Sfm
 N4:   dl,s,fm-m-f--d  d'tlsfmrd-rmr--s,  /dt,l,-s,-f,d-rmfsd dl,s,fm-m-f--d/  d'tlsfmrd-rmr--s,  /dt,l,-s,-f,d-rmfsd / d-rr-mm-l, mrdr-mm-l, rl,f,d mfrlfmfs-d d'tlm-f-mr-s,-d
 E1:"Wake, a_wake, for night is fly_ing,"/the watch_men on the heights are cry_ing;/"a_wake, Je_ru_sa_lem, a_rise!"/Mid_night hears the wel_come voi_ces,/and at the thril_ling cry re_joi_ces:/"Oh, where are all you vir_gins wise?/The Bride_groom comes, a_wake!/Your lamps with glad_ness take! Al_le_lu_ia!/With bri_dal care your_selves pre_pare/to meet the Bride_groom, who is near."
 E2:Zi_on hears the watch_men sing_ing,/and all her heart with joy is spring_ing;/she wakes, she ris_es from her gloom./For her Lord comes down all-_glo_rious,/the strong in grace, in truth vic_to_rious;/her star is ris'n, her light is come./Now come, O Bles_sed One,/Christ Je_sus, God's own Son. Hail! Ho_san_na!/We en_ter all the mar_riage hall/to eat the Sup_per at your call.
 E3:Now let all the heav'ns a_dore you,/let saints and an_gels sing be_fore you/with harp and cym_bal's clear_est tone./Of one pearl each shin_ing por_tal,/where, dwel_ling with the choir im_mor_tal,/we ga_ther round your ra_diant throne./No vi_sion e_ver brought,/no ear has e_ver caught such great glo_ry;/there_fore will we in vic_to_ry/sing hymns of praise e_ter_nal_ly./
--- a/composeApp/src/commonMain/composeResources/files/ews-47.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-47.txt
@ -0,0 +1,7 @@
 M0:|c:D|m:6/4|a:Placide Cappeau de Roquemaure 1808-1877 tr: John Sullivan Dwight (1813-1893)|h:CANTIQUE DE NOEL Adolph Charles Adam, 1803-1856|t:EWS 47 O Holy night|r:PM
 U0:z0:(444)(444) (444)(444) ${$}(444)(444)/ C84 (C8)4 8484 O 8   484 C84 C84 (444) (444)(444)(444)(444)(444)    C84 (C8)4 8484 O 8   484 C84 C84 (444)(444)(444)(44) 4  CCCC 8484C8    4CCCC8484O (OC)84 (OC)(84) (O8)484 OCC (OC8)4(OC) (84) (O8)484 (OC) C(OC)C (OC)(84) OC8 4(444)(444)(444)(444)
 N1:m,ds,mds,m,ds,mds,m,ds,mds, #rmmmss sllflds smrd,mfsfrd,-17  mmmsssllflds sFmtsltdtm -5z5 sslrslsdmls sslrslsdms ddtlttttr'r'llldd dm'r'2sddtlss slsss dr'2sm'2r'-dtdr'd-11
 N2:d-5d-5d-5 #t, dddmm mffffmm mdddddtttd -17 dddmmmffffmm mmmsmmR3m tmsmt s,mtsm mffrfmmmmmm mffrfmmmmm mmmmss mmfffffmm  fsssfslsfmffffmm sssssll-sfmfmds,mds,m,ds,mds, f'''
 N3:s,-5s,-5s,-5 #r sssd5lddd dsfmssrrfm ds,mds,m,ds,mds,m,ds,mds, s3d5lddd dTTtttl3s-5z5 tttstddssdd dttstddssd ddrdttssllr'3ddddtttddd-dttttdddtttdddr'm'r'dts -11
 N4:m,-5m,-5m,-5 #s,d6ffffd 5s6d -5d--d--z6 d6f4d5 tt-t3m-5m,--m,- mrsts'dddddd drsts'ddddd l'4mmmmr5l'l'Ssfffmff-s's4 dd ms'ffmff-s'4 d-11
 E1:_6O ho_ly night! the stars are bright_ly shin_ing;/It is the night of the dear Sa_vior’s birth._5/Long lay the world in sin and er_ror pin_ing,/Till He ap_peared and the soul felt its worth._3/A thrill of hope- the wea_ry world re_joi_ces,/For yon_der breaks a new and glo_rious morn!/Fall on your knees! O hear the an_gel voi_ces!/O night di_vine, O night when Christ was born!/O night, O ho_ly night, O night di_vine!
--- a/composeApp/src/commonMain/composeResources/files/ews-48.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-48.txt
@ -0,0 +1,7 @@
 M0:|c:D|m:4/4|t:EWS 48 - r:8878874848|a:Birgitte Katerine Boye 1742-1824 tr: Carl Døving (1867-1937)|h:WIE SCHÖN-LEUCHTET Philipp Nicolai 1556-1608 arr. Johann Sebastian Bach 1731|u:https://hymnary.org/page/fetch/CAH2000/448/high
 U0:zC:4 4(22)(22)4 444/4 4(22)(22)4 444/4 (22)4(22)(22) (422)$Q4/4 4(22)(22)4 444/4 4(22)(22)4 444/4 (22)4(22)(22) (422)$Q8/ 
 N1:dsm-d-slls slt-d'-tlls ml-sf-m-r--d dsm-d-slls slt-d'-tlls ml-sf-m-r--d smsmfmr-mfm-rmf-mr-d d'tl-sf-m-r--d
 N2:#s, sss-l-tmrr mff-m-mmrr dd-tdrmddt-d sssl-t-mrr mff-m-mmrr dd-tdrmddt-d
 N3:mrdrmFsssF-t d'd'r'-s-ssFr sfmrl-s-s-fm mrdrmFssFtd' r'r'm'-s-ssFr sfmrl-ss-fm
 N4:#s, dtdrl-mdr-s dfmrdrmdrt df,-sltd-s--d dtdrl-mdrs dfmrdrmdrt df,-sltd-s--d 
 E1:Re_joice, re_joice this hap_py morn,/A Sa_vior un_to us is born,/The Christ, the Lord of glo_ry!/${D:His low_ly birth in Beth_le_hem/The ang_els from on high pro_claim/And sing re_demp_tion's sto_ry!/}My soul, ex_tol/God's great fa_vor;/Bless Him e_ver/For sal_va_tion;/Give Him praise and a_do_ra_tion!/
--- a/composeApp/src/commonMain/composeResources/files/ews-66.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-66.txt
@ -0,0 +1,9 @@
 I0:ews-44.txt:^(M|E)
 M0:|c:F|m:4/4|r:878787|a:James Montgomery 1771-1854|h:LEWES John Randall (1717-1799)|t:EWS 66 Angels from the realms of glory|u:https://hymnary.org/page/fetch/EH1906/362/high
 E1:An_gels from the realms of glo_ry,/wing your flight o'er all the earth;/ye who sang cre_a_tion's sto_ry/now pro_claim Mes_si_ah's birth:/${R=}Come and wor_ship, come and wor_ship,/wor_ship Christ, the new_born king.
 E2:She_pherds, in the field a_bi_ding,/watch_ing o'er your flocks by night,/God with us is now re_si_ding;/yon_der shines the in_fant light:
 E3:Sa_ges, leave your con_tem_pla_tions,/brigh_ter vi_sions beam a_far;/seek the great De_sire of na_tions;/ye have seen his na_tal star:
 E4:Saints, be_fore the al_tar bend_ing,/Watch_ing long in hope and fear;/Sud_den_ly the Lord, des_cend_ing,/In His tem_ple shall ap_pear.
 E5:Sin_ners, wrung with true re_pen_tance,/Doomed for guilt to end_less pains,/Jus_tice now re_vokes the sen_tence,/Mer_cy calls you; break your chains.
 E6:Though an In_fant now we view Him,/He shall fill His Fa_ther’s throne,/Ga_ther all the na_tions to Him;/E_very knee shall then bow down:
 E7:All cre_a_tion, join in prais_ing/God, the Fa_ther, Spi_rit, Son,/E_ver_more your voi_ces rais_ing/To th’e_ter_nal Three in One.
--- a/composeApp/src/commonMain/composeResources/files/ews-89.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-89.txt
@ -0,0 +1,10 @@
 M0:|c:C|m:6/4|t:EWS 89 I gave my life for thee|a:Frances Ridley Havergal (1836-1879)|h:KENOSIS Philip Paul Bliss (1873: 1838-1876)|r:66668686|u:https://hymnary.org/hymn/BH2008/page/255
 U0:zK:48484(C44)/48484K/48484(C44)/484(44)4K/484(44)4848/484(44)4K/484(44)4848/484(44)4K
 N1:sssmsld't            lssfsm          sssmsld't       lsstltd'        d'r'r'r'd'td'd's        d'tttltd'       d'r'r'r'd'td'd's        d'tttltd'
 N2:mmmdmfls             fmmrt,d         mmmdmfls        fmsf-fm         mfffmrmmm               mfff-fm         mfffmrmmm               mfff-fmm
 N3:d'd'd'sd'd'--        d'd'd'tss       d'd'd'sd'd'--   d'd'm'r'-r'd'   d'tttd'r'd'd'd'         d'r'r'r'-ss     d'tttd'r'd'd'd'         d'r'r'r'-sss
 N4:dddddf--             fssssd          dddddf--        fsss-sd         dsss-sddd               dsss-sd         dsss-sddd               dsss-sdd
 E1:I gave My life for thee,/My pre_cious blood I shed,/That thou mightst ran_somed be,/And quick_ened from the dead;/I gave, I gave My life for thee,/What hast thou done for Me?/I gave, I gave My life for thee,/What hast thou done for Me?
 E2:My Fa_ther's house of light,/My glo_ry-_circ_led throne/I left for earth_ly night,/For wan_derings sad and lone;/I left, I left it all for thee,/Hast thou left aught for Me?/I left, I left it all for thee,/Hast thou left aught for Me?
 E3:I suf_fered much for thee,/More than thy tongue can tell,/Of bit_terest a_go_ny,/To res_cue thee from hell;/I've borne, I've borne it all for thee,/What hast thou borne for Me?/I've borne, I've borne it all for thee,/What hast thou borne for Me?
 E4:And I have brought to thee,/Down from My home a_bove,/Sal_va_tion full and free,/My par_don and My love;/I bring, I bring rich gifts to thee,/What hast thou brought to Me?/I bring, I bring rich gifts to thee,/What hast thou brought to Me?/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-101.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-101.txt
@ -8,4 +8,4 @@ Y1:Ny hazo fijali_ana,/Ry Jeso Tomponay/Dia tena fahori_ana/Fa ti_anao ‘zahay.
 Y2:Ny hazo fijali_ana/Dia manambara\ izao/Fa be ny fahori_ana/Nihatra taminao.
 Y3:Ny hazo fijali_ana/No mampiseho koa/Fa tokony hari_ana/Ny ota mahavoa.
 Y4:Isaoranay dia\ isaoranay/Hianao ry Tomponay,/Fa be ny fiti_avana/Nataonao taminay.
-Q0:${N:new}N3:#m msdTllsSl/ fsss-sslsw/ mlwlsSfwfs/ ssslwfmwfm
+Q0:${N:New}N3:#m msdTllsSl/ fsss-sslsw/ mlwlsSfwfs/ ssslwfmwfm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-105.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-105.txt
@ -7,5 +7,5 @@ N4:#d, dd-dddrrs/ ss-sssd/ d4mfrm/ fs4d/ d5fr/ rs5/ fmmssd'2f/ fs4d
 Y1:Tsinjovy\ ilay havo_ana,/Ary Jerosale\ma,/Fa i_o no Golgota/Mba tadidio, ange!/Fa tao nivesatra\ ota/Ny Tompo masina;/Nijaly sy nolavina,/Ka novono_ina.
 Y2:Tsy takatra heverina/Ny entan-dehibe,/I\zay nentin’ny Mpisolo/Ka mba diniho, re!/Fa nentiny daholo/Ny heloka natao:/Fa tonga Izy hanavao/Izao tontolo\ izao.
 Y3:Ny helotsika koa izao/Dia nivesarany,/Ka manaraha Azy,/Mba ho mpi_anany,/Ra\ha tao Golgota Izy,/Ny rany nitete,/Ka vita ho antsika re,/Ny vonjy lehibe.
-Q0:${N:new}U0:z8:4 (44)4 84 84 8/4 (44)4 84 K/4 84 84 C (44)/4 84 84 K/4 84 84 C 6z2/4 84 84 K/4 84 84 84 $Q8/4 84 84 K
+Q0:${N:New}U0:z8:4 (44)4 84 84 8/4 (44)4 84 K/4 84 84 C (44)/4 84 84 K/4 84 84 C 6z2/4 84 84 K/4 84 84 84 $Q8/4 84 84 K
--- a/composeApp/src/commonMain/composeResources/files/ffpm-110.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-110.txt
@ -0,0 +1,12 @@
 M0:|c:C|m:6/4|r:66668686|a:Frances Ridley Havergal 1836-1879 Nad. C. Borchgrevink 1841-1919|h:Philip Paul Bliss (1838-1876)|t:FFPM 110 Nomeko ho anao
 U0:zK:4 8484 (C44)/4 8484 K/4 8484 (C44)/4 84(44)4 K/${$}4 84(44)4 848/4 84(44)4 G${DS}z4
 N1:#m sssmsldt lssfsm sssmsldt lsstltd drrrdtdds dtttltd
 N2:#t, mmmdmfls fmmrtd mmmdmfls fmsf-fm mfffmrmmm mfff-fm
 N3:#f dddsdd-- dddtss dddsdd-- ddmr-rd dtttdrddd ssss-ss
 N4:d5f-- fsss,s,d 6f-- fsss,-s,d dsss-sddd ds,s,s,-s,d
 Y1:Nomeko ho anao,/Ny rako masina,/Hanavotra anao,/Izay tsy marina!/${R=}Ka dia mba inona izao/No ahy taminao!/Ka dia mba inona izao/No ahy taminao!
 Y2:Nafoiko ho anao/Ny zava-tso_a be,/Mba hanatonanao/Ny Raiko lehibe.
 Y3:Izaho Tomponao/Nijaly mafy re,/Hanafaka anao/Mpanota lehibe:
 Y4:Ny vonjy lehibe/Nataoko ho anao,/Ny rako nitete/Handio ny otanao;
 Y5:Jesosy Tompo ô!/Izao no teniko;/Atolotro\ ho Anao/Ny aiko sy ny fo;/${R!}Izany no isaorako/Anao Mpamonjiko/Izany no isaorako/Anao Mpamonjiko
 Y6:Ny foko raisonao,/Oneno hatrety,/Ataovy lapanao/Na eto na arỳ;/${R!}Dia tano aho, Tompo ô!/Mba ho fanananao/Dia tano aho, Tompo ô!/Mba ho fanananao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-118.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-118.txt
@ -1,4 +1,4 @@
-M0:|c:Ab|m:4/4 Miadana|t:FFPM 118 Mba jereo ny Zanakondry|r:887887|h:H.O.C. Zinck 1746-1832|a:B.G. Sporon 1741-1796 nad. I. Stueland 1843-1930
+M0:|c:Ab|m:4/4 Miadana|t:FFPM 118 Mba jereo ny Zanakondry|r:887887|h:H.O.C. Zinck 1746-1832|a:B.G. Sporon 1741-1796 nad. L. Stueland 1843-1930
 U0:z0:${x5} 44444442z2/${x0}444(22)446z2
 N1:#l, ltddrrmm/ mdtdrdtt/ drmldltw/ mrddrrmd/ dtrrrdtt/ ltddwttl
 N2:#r, mSlllsss/ Sl6S/ lssllFsw/ sssllttl/ fflSlllS/ l4wlSl
--- a/composeApp/src/commonMain/composeResources/files/ffpm-12-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-12-1.txt
@ -0,0 +1,11 @@
 M0:|c:G|m:4/4|a:Te Deum-Latina Siekla faha-4 Nad. H. Rabeony, 1860 eo-1956|h:FINLANDIA Jean Sibelius 1865-1957 Nar. G. Malmin - G. Ruud 1920-1970|r:10.10.10.8|t:FFPM 12 (1) Jehovah ô, derainay Hianao
 U0:z4:444 C4 4462 (4C)z4/ 444 C4 4462 Gz4/ 444 C4 4462 (4C)z4/ 444 C4 88 Gz4/ 444 C4 4462 (4C)z4/ 444 C4 (86)2 Gz4
 N1:mrmfmrmdrrm mrmfmrmdrm ssslmmssrrf fmrmddrm ssslmmssrrf fmrmddrdd
 N2:#s, ssssssslss- ssssssslss ddddllssssf, lllsm,llS ddddllssssf, llls#m,mmfmm
 N3:#l, dtdtdtddttd dtdtdtddtd mmmmdddtttl rDrdddtt mmmmdddtttl rDrdddtdd
 N4:#d, dfmrdfmfrrd dfmrdfmfrd d'd'tlllmmssr rmfssffm d'd'tlllmmssr rmfsss-dd
 Y1:Jehova\h ô, derainay Hi_anao!/Ankalazainay ny Anaranao!/Izao rehetra\ izao manaja\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao manaja\ Anao,/Fa Rainay ho mandrakizay 
 Y2:Mpanjakanay sy Tompo masina/Omenay eram-po ny hasina/Izao rehetra\ izao mihoby\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao mihoby\ Anao,/Fa Rainay ho mandrakizay 
 Y3:Ry Masina manerinerina,/Jehova\h be fitia sy marina!/Izao rehetra\ izao misaotra\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao misaotra\ Anao,/Fa Rainay ho mandrakizay 
 Y4:Manerana izao tontolo\ izao/Ny laza sy ny voninahitrao/Izao rehetra\ izao hanoa Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao hanoa Anao,/Fa Rainay ho mandrakizay 
 Y5:Andri_ananahary masina\ ô/Tanteraka ny fiandri_ananao/Izao rehetra\ izao mitsaoka\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao mitsaoka\ Anao,/Fa Rainay ho mandrakizay.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-12-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-12-2.txt
@ -0,0 +1,11 @@
 M0:|c:Ab|m:4/4|a:Te Deum-Latina Siekla faha-4 Nad. H. Rabeony, 1860 eo-1956|h:E.P Parker 1836-1925|r:10.10.10.8|t:FFPM 12 (2) Jehovah ô, derainay Hianao
 U0:z0:844 628 844 G/ 844628 (44)44 G/ 844 628 844 (88)/ (44)44 C4 (44)(44) G
 N1:#s, mrddttdrsm mrtrddd-tls mrddttfmrrd mrdlsdm--rd
 N2:#m, s10 S3tllF-FFs 4f7m F-FFsms-f-m
 N3:#l, dmmfffmrrd ttm4rltdt m3r3t4d l-ldtddlt-d
 N4:#r, d3r'3dttd m3l3r-rrs d3s6Sl r-rrsls-s-d
 Y1:Jehova\h ô, derainay Hi_anao!/Ankalazainay ny Anaranao!/Izao rehetra\ izao manaja\ Anao,/Fa Rainay ho mandrakizay
 Y2:Mpanjakanay sy Tompo masina/Omenay eram-po ny hasina/Izao rehetra\ izao mihoby\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao mihoby\ Anao,/Fa Rainay ho mandrakizay 
 Y3:Ry Masina manerinerina,/Jehova\h be fitia sy marina!/Izao rehetra\ izao misaotra\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao misaotra\ Anao,/Fa Rainay ho mandrakizay 
 Y4:Manerana izao tontolo\ izao/Ny laza sy ny voninahitrao/Izao rehetra\ izao hanoa Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao hanoa Anao,/Fa Rainay ho mandrakizay 
 Y5:Andri_ananahary masina\ ô/Tanteraka ny fiandri_ananao/Izao rehetra\ izao mitsaoka\ Anao,/Fa Rainay ho mandrakizay/Izao rehetra\ izao mitsaoka\ Anao,/Fa Rainay ho mandrakizay.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-126.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-126.txt
@ -7,4 +7,4 @@ N4:#d, sd6rr-m/ rddlfssd/ d'lsfmrrdswl/ Ss4ttd/ mlllfffdd/ tltdrrrm/ rd6rwwm/ rd
 Y1:Endrey i\zato fahasambarana:/Jesosy dia velona\ indray/Ny foko mandre fitsaharana,/No\ho Izy natsangan'ny Ray/Tsy any am-pasana\ intsony,/Fa hitako velona koa;/I\lay Tompon'ny hery ambony,/Mamiratra sy mananjo/I\lay Tompon'ny hery ambony,/Mamiratra sy mananjo
 Y2:He, velona Izy! Hafarany/Izaho izao hampandre/Ireo izay tia ny Anarany/Ny fampi_ononana be./Anjely no mendri-kilaza;/Izaho, mpanompo tsy soa,/Nirahin'ny Tompo malaza,/Ka ravo sy tretrika koa!/Nirahin'ny Tompo malaza,/Ka ravo sy tretrika koa!
 Y3:Endrey i\zato fahasambarana!/Fa velona mandrakizay/Ny Tompo i\zay nifankazarana,/Ka faly ny foko indray!/Ny fasana\ izay nampisaona/No fampi_ononana koa,/Fa tao izahay tafahaona/Ka ravo dia ravo ny fo!/Fa tao izahay tafahaona/Ka ravo dia ravo ny fo!/
-Q0:${N:new}N1:#s, smdlslstwls/ sdddrtsm/ mfmrs'2fmwrd/ ddtlss#m, fm/ m4l3sm/ mdtlltlS/ mdtlslstwls/ sdddrts#t, m/ mfmrssfmwrd/ rmdddrtd
+Q0:${N:New}N1:#s, smdlslstwls/ sdddrtsm/ mfmrs'2fmwrd/ ddtlss#m, fm/ m4l3sm/ mdtlltlS/ mdtlslstwls/ sdddrts#t, m/ mfmrssfmwrd/ rmdddrtd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-130.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-130.txt
@ -0,0 +1,4 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 130 Hobio, ry olombelona|r:8878874848|a:Hans Adolf Brorson 1694-1764 Nad C. Borchgrevink 1841-1919|h:Philipp Nicolai 1556-1608
 Y1:Hobio, ry olombelona!/Jesosy di_a velona,/Ny fasana dia rava;/${D:Misokatra ny lanitra,/Ny aizina sy tahotra,/Dia resin’ny mazava,/}Jeso Kristy/No deraina sy hajaina./Fa Mpamonjy,/Tompon’aina mahavonjy.
 Y2:He! Misy làlana indray/Ho ao an-danitra, izay/Mi_andry ao, ambony;/${D:Fa vitan’ny Mpanavotra/Ny vonjy mahasambatra,/Ka sitraky ny fony/}Handray izay/Mitomany, mba ho any/Amin-dRainy;/Fa izany di_a hainy.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-132.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-132.txt
@ -1,6 +1,6 @@
 M0:|c:C|m:4/4 Matotra|t:FFPM 132 Indro fa velona|h:C. Malan 1787-1864|a:H. Smith 1896-1956 Andriamampihantona 1868-1928
 U0:z0:84488Cz4/ 84488(88)Cz4/ 8448(44)Cz4/ 8448884z4/ 62yy84z4/ 62yy84/4 6244C/4 62448z4/4 44448z4/ 4 444488Cz4
-Q0:${N:new}U0:z0:84488G/ 84488(88)G/ 8448(44)G/ 8448888/ 62yy88/ 62yy84/4 6244C/4 6244C/4 4444C/ 4 444488G
+Q0:${N:New}U0:z0:84488G/ 84488(88)G/ 8448(44)G/ 8448888/ 62yy88/ 62yy84/4 6244C/4 6244C/4 4444C/ 4 444488G
 N1:#f sssdtd/ ssslrdtd/ rrrmmwr/ tdlFlss/ #r m6sf/ r6fm/ sdddtl/ #f lrrrdt/ sdtdrm/ m,fslrdtd
 N2:#t, m4fm/ mdmffmrm/ s5ws/ rmmrdtt/ d6mr/ t6rd/ m4sf/ fF3ls/ rmfmss/ drmdfmfm
 N3:#f dddsss/ dsddlsws/ tttddwt/ ssllFss/ s8/ s6td/ s5l/ l5t/ tdsstd/ ssdlldrd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-140-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-140-2.txt
@ -1,6 +1,6 @@
 M0:|c:G|m:4/4|r:8.7.8.7.D|t:FFPM 140 (2) Haleloia, Miderà ny Tomponao|
 U0:z0:44444444/ 62(22)4448/ 62444444/ 4(22)(22)4 4(22)8/ 4444 624(22)/ 4444448/ 4462 44(22)4/ 4(22)44 8(44)G
-Q0:${N:new}U0:z0:44444444/ 62(22)4448/ 62444444/ 4(22)(22)4 4(22)8/ 4444 624(22)/ 4444448/ 4462 44(22)4/ (42)244 8(44)G
+Q0:${N:New}U0:z0:44444444/ 62(22)4448/ 62444444/ 4(22)(22)4 4(22)8/ 4444 624(22)/ 4444448/ 4462 44(22)4/ (42)244 8(44)G
 N1:#s, ddtdrsmd/ mmrwmfmr/ ddtdrsmd/ s'wfmwrdtwd/ dtldtllSw/ ltddrrm/ #t, mmllrrsfm/ mwrdrdtwd
 N2:#m, ddtdrsm'd/ ddltdtdt/ ddtdrsm'd/ tdrdtlssws/ lSlsffmmw/ mSl4t/ d4ttdts/ Sltllssws
 N3:#t, ddtdrs,md/ sslws4/ ddtdrs, md/ swsswfmrfm/ mrdmrrdtw/ lmmmllS/ ssffsssws/ mwmmfmrfm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-141.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-141.txt
@ -1,6 +1,6 @@
 M0:|c:Bb|m:4/4|t:FFPM 141 Efa resy izao|h:H. Duvernoy 1820-1906|a:Ed. Monod 1842-1898 nad. G. Mondain 1872-1954 (Dikany malalaka)|r:67666767
 U0:zC:y 844 C4 4444 84/4 6244 (444)4 4444 C/4 4444 C(22) 4444 84/4 4444 C22 4(22)44 C
-Q0:${N:new}N2:#r, ssmfsmssfllss/ rrrssswwssssFs/ s7ws4ls/ ddtlSlllsswsss
+Q0:${N:New}N2:#r, ssmfsmssfllss/ rrrssswwssssFs/ s7ws4ls/ ddtlSlllsswsss
 N1:#s, ssdrmddtlfrdt/ sllttdwwmrdtls/ stdrtdswrmfrfm/ mmrdtlfrtdwrtd
 N2:#r, ssmfsmssfllss/ rrrssswwssssFs/ s7ws6/ ddtlSlllsswsss
 N3:#s, s6dddrrmr/ tr4dwwdrmrdt/ trmfrmmdtdrtdd/ s'2fmrdrrrmwfrm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-183.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-183.txt
@ -0,0 +1,6 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 183 Midìna ry Fanahy ô|r:8878874848|a:Michael Schirmer 1606-1673 nad. L. Dahle 1843-1925 |h:Philipp Nicolai 1556-1608
 Y1:Midìna, ry Fanahy ô,/Midira ao anaty fo!/Ampi_o ny mihafy,/${D:Fa I_anao no mpanome/Ny to sy fa\hazavana be;/Ny vavanay sokafy/}Izao hanao/Saotra tsara hanambara/Ny Mpamonjy!/Fa satri_a vo_avonjy
 Y2:Ka raha re ny Teninao/Dia mba avi_a, hazavao/Ny hevitry ny Teny,/${D:Mba ambaraonao aminay/Ny fomban’ny Mpanavotray!/Lazao ny famonjeny/}I\zahay izay/Vory eto, andreheto/Jiron’aina/Hi_alàn’ny haizin-tsaina!
 Y3:Ny maizina onenanay,/Tsy mety afaka\ aminay/Ka tena mahavery,/${D:Ra\ha I_anao tsy tonga\ izao/Mitondra filazam-baovao/Sy toky mampahery!/}Ovay i\zahay,/Hamasino ny te hino,/Ampidiro/Eto aminay ny Jiro!
 Y4:Mba hafanao re izahay,/Ampi_o hiti_avanay/Indrindra ny Mpamonjy!/${D:Ny rany mba ho avotray,/Ny didiny harahinay,/Hanananay ny vonjy,/}Jeso, Jeso/No tori_o sy bitsiho/Ao an-tsainay,/Mba hamelona ny ainay!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-184.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-184.txt
@ -0,0 +1,3 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 184 Fanahy Mpanazava anay|r:8878874848|a:Michael Schirmer 1606-1673 nad. L. Dahle 1843-1925 |h:Philipp Nicolai 1556-1608
 Y1:Fanahy Mpanazava\ anay!/Midìna eto aminay,/Tarihonao ny sainay;/${D:Ny alahelonay savao,/Ny to_etray havaozinao,/Velomy re ny ainay./}Sento renao/Mba vali_o ka tahi_o/Ny mahantra/Ry Fanahin’ny Mpi_antra!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-191.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-191.txt
@ -1,5 +1,5 @@
-M0:|c:G|m:4/4|t:FFPM 191 - Ny Teny Sy Fanahinao|r:8.6.8.6.6.6.8.6|n:19|l:15|h:H.A. Brorson 1694-1764 Nad. C. Borchgrevink 1841-1919|a:P. Nilsen-Lund 1842-1914
+M0:|c:G|m:4/4|t:FFPM 191 - Ny Teny Sy Fanahinao|r:8.6.8.6.6.6.8.6|n:19|l:15|a:Hans Adolf Brorson 1694-1764 Nad. C. Borchgrevink 1841-1919|h:P. Nilsen-Lund 1842-1914
-T0:{:(S.F)|D:D!(R.S):(R.R)|M:M!F/(S.F)|M:M!F:(R.F)|D:-!${D.C.}-/(T.D)|R:(R.M)!(F.M):(R.D)|T:-!-/(R.M)|(F.M):(R.D)!T:L|S:-!-/(S.F)|D:D!(R.S):(R.T)|M:M!F/(S.F)|M:M!F:(R.F)|D:-!-}
+T0:{:(S.F)|D:D!(R.S):(R.R)|M:M!F/(S.F)|M:M!F:(R.F)|D:-!${DC}-/(T.D)|R:(R.M)!(F.M):(R.D)|T:-!-/(R.M)|(F.M):(R.D)!T:L|S:-!-/(S.F)|D:D!(R.S):(R.T)|M:M!F/(S.F)|M:M!F:(R.F)|D:-!-}
 N1:s,-ddr-r-mmfsfmmfr-d/t,drrmfmrdt,/rmfmrdt,l,s,/s,-ddr-r-mmfsfmmfr-d
 N2:s,-s,s,l,s,f-s,dt,s,-s,drt,-d/s,-s,fms,dl,-s,/s,drdt,l,s,F,s,/s,-s,s,l,s,f,-s,dt,s,-s,drt,-d
 N3:s,-s,mr-r-ddrr-mmlsfm/rdt,t,drmf,mr/rdt,drmrdt,/s,-s,mr-r-ddrr-mmlsfm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-194.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-194.txt
@ -1,5 +1,5 @@
 M0:a:P Nilsen-Lund,1842-1914|h:P Nilsen-Lund,1842-1914|c:Bb|m:3/4 Miadanadana
-T0:{:.,S|S.,S:S.,S:S.,S|M/D:D.,D|R:F:T.,T|D:${D.C.}-/D|T.,D:R:(D.,T)|D.,R:M/D|T.,D:R:(D.,T)|D.,R:${D.C.}M.:}
+T0:{:.,S|S.,S:S.,S:S.,S|M/D:D.,D|R:F:T.,T|D:${DC}-/D|T.,D:R:(D.,T)|D.,R:M/D|T.,D:R:(D.,T)|D.,R:${DC}M.:}
 N1:s,s,s,s,s,s,s,mdddrft,t,ddt,drdt,drmdt,drdt,drm
 N2:s,s,s,s,s,s,s,s,s,l,l,l,l,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,
 N3:mmmmmmmdmmmrrrrmmrmfmrmrdmrmfmrmrd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-204.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-204.txt
@ -0,0 +1,9 @@
 M0:|c:E|m:4/4|r:7777|t:FFPM 204 Mamy ny fitianao, ry Jehovah Tompo ô|a:W.E. Cousins 1840-1939|h:SEYMOUR Carl Maria von Weber 1786-1826|u:https://hymnary.org/tune/seymour_weber
 U0:z0:4444 4(22)8/ 4444 448/ 4444 4(22)8/ (22)4(22)(22) 448
 N1:mrfmlsmr/ m4ft, d/ mrfmlsmr/ mwssfmrdtd
 N2:#s, d4Rmdt/ ddtTlss/ d4Rmdt/ dwmmrlwsss
 N3:sflsFswf/ mlSsffm/ sflsFswf/ msTlwfwmrm
 N4:#f, d6ws/ dlmDrsd/ d6ws/ dwDrwfwssd,
 Y1:Mamy ny fiti_anao/Ry Jehova\h Tompo ô!/Nahafoy ny Zanakao/Hanavotanao anay.
 Y2:Maminay ny antranao,/Ry Jeso Mpamonjy ô!/Ta-hamonjy Hi_anao/Sy hanafa-keloka
 Y3:Mamy ny fitaomanao/Ry Fanahy Masina\ ô!/Ny fanahinay ovay/Hankatò ny anatrao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-209.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-209.txt
@ -0,0 +1,11 @@
 M0:|c:Eb|m:4/4|r:7676D|t:FFPM 209 Jesosy tena kiady|a:A. Razafindrakoto|h:Ira David Sankey 1840-1908|u:https://hymnary.org/hymn/JCES1893/page/40
 U0:z0:${x2} 4y44 (62)8/ 4y44G/ ${x0}4y44 (44)8/ 4y44G/ 4y44 (44)(44)/ 4y44G
 N1:#r mmrmfsls/ mmmsmr/ mmrmfsls/ FFslFs/ tttlssds/ tttlss/ mmrmfsTlw/ sssfrd,
 N2:#t, ddtdddwd/ dddmdt/ ddtdrmfm/ ddtddt/ rrrffmwm/ rrrffm/ ddtdrmsfR/ mmmrtd
 N3:s4rmfm/ sssdss/ #r s5dwd/ llsFls/ s5dsd/ sssttd/ s5dwdw/ dsssfm
 N4:d6wd/ d5s, /d6wd/ r5s, /s5dwd/ s5d/ d6mfF/ s4s, d
 Y1:Jesosy tena kiady/Sy reharehanay/Namoha vavahady/Ny tanindrazanay;/Nampiditra ny Teny/Hampahalala\ anay/Ny Ray, ny fahendreny/Mba hi_anaranay
 Y2:Na betsaka mifofo/Ny Ba_ibolinay/Mihaza sy milofo,/Moa ketraka\ izahay?/Jesosy no Mpi_aro/Ka moa ho kivy ve?/Vao mainka mihamaro/Ny mpankasitraka\ e!
 Y3:Mbola\ Izy no Filoha/Mpitarika anay,/Hitory ka hamoha/Ire_o namanay;/Vahoaka\ an-tapitr'isa/no mbola\ hasondrotray,/Hahita Paradisa/Ho zanaky ny Ray!
 Y4:Ry Jeso, hatanjaho/Ny fi_angonana,/Hijoro\ ho tena taho/Mamoa mandrakizay!/Hianao anie no sandry/'Zay tena tanjakay/No sady hany andry/'Zay hijoro_anay!
 Y5:Jesosy soa malala,/Tsy fo_inay Ianao!/Ny fonay dia handala/'Ty lova taminao/Fanahy ravoravo/Noho ny Teninao/Ry Zanaky ny Avo,/Izao misaotra\ Anao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-210.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-210.txt
@ -1,4 +1,4 @@
-M0:|c:Ab|m:4/4|t:FFPM 210 Zava-tsoa tokoa ny fitsipika|a:G. Ravelo 1886-1961|h:(Feon-kira anglisy)|r:10.7.10.7.12.10.12.10
+M0:|c:Ab|m:4/4|t:FFPM 210 Zava-tsoa tokoa ny fitsipikao|a:G. Ravelo 1886-1961|h:(Feon-kira anglisy)|r:10.7.10.7.12.10.12.10
 U0:z0:${x2} 2222422 448/ 222244G/ ${x0} 2222224 22228/ 2222(44) 22228/ 2222224 22228/ 2222(22)22 (22)(22)8
 N1:#s, mrdlsdtlds/ ddtdmdr/ mfmrdllrdt/ drs'mtls/ mwwwmwwmwmwffwwwfwfwfwm/ sFlsm, sddtrdl/ rrsfmslfmwrwd
 N2:#m, mmffmssffm/ s5Fs/ SSttlmmlFs/ Fs4Fs/ sFlsmsddtdlt/ sltdrtltlms/ z12/ s5wflswfwm
--- a/composeApp/src/commonMain/composeResources/files/ffpm-228.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-228.txt
@ -0,0 +1,3 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 228 Tafangona atỳ indray|r:8878874848|a:A. Thunem 1871-1954|h:Philipp Nicolai 1556-1608
 Y1:Tafangona atỳ indray/Ny fi_angonanao, ry Ray,/Ka di_a mba tahi_o!/${D:Iraho ny Fanahinao/Hitarika ny zanakao,/Hivavaka ani_o,/}Anao izao:/Saotra, laza, dera, haja,/fa nomena/Ho anay ny famonjena.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-249.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-249.txt
@ -0,0 +1,12 @@
 M0:|c:Bb|m:3/4 Milantolanto|r:11.10.11.10|t:FFPM 249 Tompon'ny lanitra ô! Mba tahio|a:P. Nilsen Lund 1842-1914|h:WESLEY Lowell Mason 1792-1872|u:https://hymnary.org/tune/wesley_mason
 Q0:${N:New}U0:z0:8y 444 444 48/ 8y 8y 444 C/ 8y 444 444 48/ 8y 4(22)4 444 C
 U0:z0:8y 444 444 44z4/ 8y 8y 444 8z4/ 8y 444 444 44z4/ 8y 4(22)4 444 8z4
 N1:#s, dtlsssldlls/ mrrdttlsF,s/ dtlsssffmmr/#t, smfstwdfmrd
 N2:#r, mmfmmmf4m/ sssFssmrrr/ mmfmms6/ s5fmlsfm
 N3:#s, ssd5ld3/ dr5dtlt/ ssd4ttddtmdrmrwdddtd
 N4:#d, d6fffdd/ dttlssdrrsd5mrrdss/ d'4swlfssd
 Y1:Tompon'ny lanitra ô! Mba tahio_/Izy izay ta-hanatona\ Anao,/Ka ta-handray ny batisa ani_o,/Sady maniry mba ho zanakao.
 Y2:Ampifali_o ny fony, i\zay ory/Sady mi_aiky ny ota natao,/Ary ny ratsy maniry fongory,/Ka mba ome_o ny aina vaovao.
 Y3:Izy manaiky hitana ny so_a/Sady mandà ny devoly izao;/Aoka hiseho ho mpino toko_a/Amin'ny fomba sy asa vaovao.
 Y4:Afon'ny lanitra ô! Mba avi_a,/Ka ateraho ny fony izao,/Ary tarihonao mba tsy hani_a,/Fa te-ho sambatra ao aminao.
 Y5:Andri_amanitra Ray be fiti_a,/Taomy ny maro hanatona\ Anao,/Ny Fi_angonanao, ho be mpiti_a,/Ho marobe ny ankohonanao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-250-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-250-1.txt
@ -0,0 +1,15 @@
 M0:|c:F|m:6/4 Moramora|r:9896|t:FFPM 250 (1) Atolotray hatao batisa|a:Rakotonjanahary 1986-1983|h:(Feon-kira anglisy)
 U0:z0:44484 (44)484/ 444C 4448z4/ 44484 (44)484/ 44484 Kz4
 N1:s,dmssmfsll/ lsmmdmmr/ s,dmssmfsll/ sdfmrd
 Q0:${N:New}N2:sdmd3wd3/ #s, d4s4/ sdmd3wd3/ ddrdtd
 N2:sdmd3wd3/ #s, dtddddrt/ sdmd3wd3/ ddrdtd
 Q0:${N:New}N3: s, dm3swsff/ fs3d3t, / s, dm3swsff/ smlsfm
 N3: s, dm3swsff/ frmsmr3 / s,dm3swsff/ smlsfm
 Q0:${N:New}N4: s,dmdddrmff/ fmddm,m,d,s,/ s,dmdddrmff/ ml,f,s,s,d
 N4: s,dmdddrmff,/ f,s,dm,l,F,2s,/ s,dmdddrmff,/ ml,f,s,s,d
 Y1:Atolotray hatao batisa/Ny zanakay, Jesosy ô!/Irinay izy mba ho isan'ny/Zaza tezainao.
 Y2:I\zahay izao efa nifidy/Anao handray ny zanakay:/Ka raiso izy fa voavidy/Tamin'ny ranao koa.
 Y3:Soraty izy mba handova/Ny lanitra fonenanao,/Ka ny fanahinao hanova/Ny fony ho Anao.
 Y4:Tahi_o ny fahazazany/Ho fanorena-marina;/Ampi_anaro azy\ izany,/Mivavaka\ aminao.
 Y5:Tantano izy mandra-pita,/Ho tonga ao an-danitra,/Ka aoka izy mba hahita/Anao an-dàlany.
 Y6:Ka amin'ny fotoana feno,/Handaozany\ ity tany\ ity,/Ome_o toky, iteneno:/"Nde\ha hody, anaka."/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-250-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-250-2.txt
@ -0,0 +1,7 @@
 I0:ffpm-250-1.txt:^[^Y]
 M0:|t:FFPM 250 (2) Atolotray hatao batisa|c:Eb|m:3/4 Miadana|r:9896|a:Rakotonjanahary 1896-1983|h:Rakotonjanahary 1896-1983|r:9898
 U0:z0:444 84 84 C C/ 444 84 84 C/ 444 84 84 84/ 444 C C C
 N1:#r sdtdmflsm/ d,rmfslfr/ sdtdmflsf/ mlfrmd, 
 N2:#t, mmrdddfmd/ d7t/ msfmddfrt/ d4td
 N3:#m s5ldds/ ssslsfls/ ddsssldts/ sflssm
 N4:dsfmd#f, lfdd/ mrdfm,ffs/ dmrddf'fss/ df'fssd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-251.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-251.txt
@ -0,0 +1,11 @@
 M0:|c:Eb|m:4/4 Miadanadana|t:FFPM 251 Ry Jeso Zana-Janahary|a:James Allen 1734-1804 Nad. J. Johnson 1864-1916|h:Ludwig Mathias Lindeman 1812-1887|u:https://hymnary.org/hymn/LHPN1913/page/240
 U0:zC:4 4444 (22)4(44) 8z4/4 4444 88 8z4/4 4444 44(44) 8z4/4 4444 88 C
 N1:smdmrfwmrwm/ dt,drslts/ rfmrdt,lswl/ smsd'dmrd
 N2:#s, tdddtlwslwS/ lsstddrt/ ttdllsfmwd/ tdrdddtd
 N3:#l, rmsssdrmflt/ lfmsssFr/ sfsfRrrmT'l'/ fsrmfsfm
 N4:#f, sdms'sltdfwm, / fsdf'mrrs/ srdfFstdwf'/ rdtllssd
 Y1:Ry Jeso Zana-Janahary/Sy fototry ny aim-baovao!/Mba aniraho ny Fanahy/Izao madinikao izao
 Y2:Ny fa\hafatesanao nandresy/No aoka hi_ombonany/Ny herinao tsy mety resy/No mba ho fi_arovany
 Y3:Ka ny Anaranao hajaina/Dia mba omeo ny zanakay/Ka io no hi_alany aina/Sy hitsanganany indray
 Y4:Tantano izy tsy ho osa/Ra\ha lavitra ny di_any/Fa raha fohy i\hany kosa/Mba raiso ny fanahiny/
 Y5:Ka mba soraty ao am-pony,/Ry Tompo, ny Anaranao,/Ka ny anaran'ny mpanompo/Soraty ao an-tananao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-253.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-253.txt
@ -0,0 +1,11 @@
 M0:|c:G|m:4/4 Mangingina|t:FFPM 253 Avia, ry mpanavotra|a:L. Stueland 1843-1930 M.J. Meeg 1851-1924|u:https://hymnary.org/tune/les_commandemens_de_dieu_bourgeois|h:Louis Bourgeois 1510-1561
 U0:zC:4 4444 442z2/4 6244 4(22)2z2/4 4444 4(22)2z2/4 6244 (22)44
 N1:#s, ddrmrfrd/ mfmrdtdwr/ s'fmrtdlws/ mfmrdmwrd
 N2:#m, sltdtltd/ dls5Fs/ slslssFws/ sfslmslfm
 N3:#t, mmsssffm/ dddrmrdwt/ ddmFsmrdt/ d6wtd
 Q0:${N:New}N4:#r, dlsdsrsl/ lfdtdslws/ mfdr'm'lrws/ dlsflsfsd,
 N4:#r, dlsdsrsl/ lfdtdslws/ mfd,rmlrws/ dlsflsfsd,
 Y1:Avi_a, ry mpanavotra/Tahi_o ny fandraisana/Sakafo nambo_arinao/Izao hatoninay izao
 Y2:Ire_o zava-masina/Aroso mba hohanina/Ho famelana heloka/Ho aina sy ho tanjaka
 Y3:Tsaro_anay ny di_anao/Ny ra sy fijali_anao/Ny nisolo_anao anay/Ny nitsangananao indray
 Y4:Ny tenanao natolotra,/Ny ranao dia nalatsaka,/Sakafo i_ombonanay/Ho tena sy fanahy\ iray/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-254.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-254.txt
@ -0,0 +1,9 @@
 M0:|c:F|m:3/4 Malefadefaka|r:10.10.10.10.10.10|t:FFPM 254 Avia, ry mangetaheta ô,|h:MELTON (Pilgrimssonger 1859)|u:https://hymnary.org/hymn/BoG1900/page/12|a:Johanesa, Ambato, 1880 eo ho eo-1914|
 U0:z8:(22) y4(22) y44 6z2/(22) y4(22) 2244 6${DC}z2/4 6222 6222 6z2/(22) y4(22) y44 6z2
 N1:#s, drmfmdmrrdtd/ tdrmrtrddtls/ sdddrmmfmr/ drmfmdmrrdtd
 N2:#f, dwd4wllsss/ sltdtstllsFs/ sssdtddrdt/ dtd4wllsss
 N3:mfslsmsffmrm/ rws4wmmrdt, / smmms6/ mfslsmsffmrm
 N4:#f, mrd4wffssd/ sws4wllr,2s/ sddssddtds/ mrd4wffssd 
 Y1:Avi_a, ry mangetaheta ô,/Ka aza di_a mba mamo_y fo/${D:Fa indro misy rano velona/Izay omena mba hamelona/}Anao mahantra sy vari_ana,/Ry zanak'ondry very làlana!
 Y2:Ny mofon'aina no atolony/Anao manaiky mba ho olony,/${D:Ny tenany no ho fihinana/Mba hahazo_ana fi_ainana,/}Kanefa tsy mba hovidiana\ anie/Fa tena fanomezan-dehibe!
 Y3:Jesosy Tompo no nanolotra/Ny rany masina ho avotra!/${D:Izany raiso mba ho tanjaka/Sy toky ho anao, ry reraka!/}Ry mpivahiny sasatra\ ao am-po,/Avi_a re, ka manaràna fo!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-255.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-255.txt
@ -0,0 +1,15 @@
 M0:|c:Eb|m:4/4 Miadanadana|r:10.10.10.10|t:FFPM 255 Ny ran'ny Zanak'ondry latsaka|a:Jens Marius Giverholt 1848-1916 Nad. O. Eilertsen 1860-1894|h:(Melodiboken, 218)|u:https://hymnary.org/tune/ak_lammets_blod_det_dyrebare_blod
 Q0:${N:New}U0:z8:${x3} z2222 622222 8/${x0} z2222 222244 8
 Q0:${N:New}N1:ssfmsddfmr/ rrft,rrdmrd/ ssd'trfflls/ sld'sfmrft,d
 Q0:${N:New}N2:#s, drrd4rdt/ t6lttd/ dr6dtd/ tddrrdllss
 Q0:${N:New}N3:s5mmlls/ sssffmmsfm/ mrFsttlsfs/ mmmrssfffm
 Q0:${N:New}N4:#s, mttdmllf,F,s s'frsSllssd dtlss's'fmrm mdlttdfrsd
 Y1:Ny ran'ny Zanak'ondry latsaka/Namelona\ ahy tany Golgota!/Ka io no tena vatofantsika/Maharitra ny tafio-drivotra !
 Y2:Ra\ha vo_aratra no\ho ny otako/Ka lany fo_ana ny heriko/Ny rany masina nalatsaka/No nahitako fa\hasitranana!
 Y3:I\zao hira vao izao no mamiko/Ka tonga tsy misaraka\ amiko:/Ny ran'ny Zanak'ondry no mahay/Manavotra\ ahy mba ho an'ny Ray !
 Y4:Ra\ha ketraka sy kivy re ny fo,/Velomiko indray ny hirako/Ny amin'i Jesosy sy ny ra/Ka afaka ery ny tahotra!/
 U0:z8:${x4} z2222 622222 8/${x0} 
 N1:ssfmsddfmr ffft,rrdrmd ssd'trfflls sldsdmmrrd
 N2:#s, drrd4rdt 7dttd tdmrrtrd11ts
 N3:s5llfls s,sssffmfsm s5rsffm ddrmmslrfm
 N4:#s, mttdmffrrs' strfs5d rmdrtssddd #r, mffslmfssd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-256.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-256.txt
@ -0,0 +1,12 @@
 M0:|c:Eb|m:4/4 Falifaly|r:7676D|t:FFPM 256 Mivoaka ao Golgota|h:(Feon-kira Grika)|u:https://hymnary.org/tune/whitfield_greek|
 U0:zC: (22) 4444 84/4 4444 ${DC}C/4 4444 84/4 4(22)4(22) C/(22) 4444 (44)$Q4/4 4444 C
 N1:drm5d/ drrt, t, d/ sd'd'tlsm/ mfsfmfmr/ mfs4ltd'/ lsfmrd
 N2:#s, dwd5s/ lllsss/ d7/ drmrdrdt/ dwd5wf/ ddrdtd
 N3:mfs5m/ mffrrm/ mmmsfms/ ssswssws/ sfm4fsl/ fmrsfm
 Q0:${N:New}N4:#f, dwd6/ lffssd/ d7/ dsswssws/ dwd4fwf/ fs4d
 N4:#f, dwd6/ lffssd/ d7/ dttwddws/ dwd4fwf/ fs4d
 Y1:Mivoaka ao Golgota/I\lay renirano soa,/${D:Iantsoana ny mpanota/Ho any avokoa;/}Ny ratran'ny Mpamonjy/No loharanon'io,/Ka ony mahavonjy/Sy tena mahadio !
 Y2:Mamelona ny tany/I\ty ony soa ity,/${D:Izay rehetra\ ombany/Mi_adana ery!/}Vahoaka\ an-tapitr'isa/Izay misotro ao/Mahita Paradisa/Sy fiainana vaovao !
 Y3:Ny fo izay maratra/Ka entina mankeo,/${D:Ny ory sy mahantra/Izay manatona\ eo:/}Mahita fanafody/Ka sitrana\ avokoa!/Ny ota sy ny rofy/Dia afaka tokoa!
 Y4:Fanahy be ahiana,/Avia misotro ao,/${D:Fa io no mampangina/Ny alahelonao!/}Fanahy ô, hatòny/I\ty ony soa ity/Fa io no mahatony/Ny faniriana\ atỳ.
 Y5:Hianao, ry Tompon'aina,/Isaoranay tokoa,/${D:Nanaiky horatraina/Handefa ony soa!/}Ny ranao tao Golgota/No i_ankinanay/Fa mahadio ny ota,/Mamelona\ aina\ anay!/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-257-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-257-1.txt
@ -0,0 +1,12 @@
 M0:|c:G|m:4/4|r:887887|t:FFPM 257 (1) Ry Jesosy ô! indreto|a:Salomo Franck 1659-1725 Nad. Gunerius Taraldsen Torvik 1871-1954|h:Ludwig Mathias Lindeman 1812-1887|u:https://hymnary.org/tune/dyre_bord_som_jesu_daekker_lindeman
 U0:z0:444(22) 4444/ 6244 4444/ 4444 448/ 444(22) 4444/ 6244 4444/ 4(22)44 448
 N1:#s, ddrrmfffm/ s'mfmrddt/ mrdrtls/ ltdrmfmdl/ tmddrldt// sltdfmrd
 N2:#m, sddtwltdd/ ssddllss/ mmmlsFs/ msslwlSll/ lSlllFms/ ssfmlsfm
 N3:#l, mmsswffss/ rmdsl'rrr/ ttdlrdt/ drmrdttdm/ mtdmlrdr/ ddrdddts,
 N4:#r, dlsswrrd,d/ tdlsfFss/ SSlFsrs/ sfmfmrmld/ mmlsFrls/ mfrlfssd,
 Y1:Ry Jesosy ô! indreto/Izahay nasainao eto/Amin'ny latabatrao/Mba tolory mofon'aina/O! ome_o ranon'aina/Dia ny ra\ aman-tenanao
 Y2:O! ry Loharanon'aiko/Tonga aho, fa ilaiko/Hi_anao Mpamonjiko/Raiso ka di_ovy aho/Atafio\ izay mitalaho/Ny fahamarinanao!
 Y3:Ry mpi_andry Tsara\ indrindra/Taomy aho mba hifindra/Ao am-balan'ondrinao/Mamonje ka mitahi_a/I\reto ondrinao mani_a/Ento any aminao!
 Y4:O! ry Fa\hazavan'ny saiko/Sady tanjaky ny aiko/Tonga aho, ka vonjeo/No_ana ka mitaraina/Mba vokiso mofon'aina/Rano velona omeo!
 Y5:Indro, mi_ankohoka\ aho/Tompo ô! ka mitalaho/Eto anatrehanao/Aza mba manary ahy/I\zay misento sy manahy/Mamelà ny heloko!
 Y6:Ry mpisolo ny mpanota/I\zay nandoa ny tambin'ota/Latsa-dra ny tenanao/Raisiko am-panajana/Fa nataonao fanasana/I\reto zava-masinao//
--- a/composeApp/src/commonMain/composeResources/files/ffpm-257-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-257-2.txt
@ -0,0 +1,11 @@
 I0:ffpm-257-1.txt:^[^Y]
 M0:|c:G|m:4/4|t:FFPM 257 (2) Ry Jesosy ô! indreto|r:887887|a:Salomo Franck 1659-1725 Nad. Gunerius Taraldsen Torvik 1871-1954|h:Randrianantenaina A. Rasoloson 1946-
 U0:zC:${x2} y 4444 48/${x0} y4444 (48)/ y 4444 48/ y4(22)44 48/ y 4444 C
 Q0:${N:New}N1:#l, s,s,dtdmmr/ rdtdrffm/ mrdrmssf/ fmrdtdmr/ mrdt-dmsf/ frmdrtd
 Q0:${N:New}N2:#f, s8/ tlsFssls/ sSltsTll/ lllF3ss/ stds-sTll/ llsfsfm
 Q0:${N:New}N3:#s, ssmrdddt/ fmrdtrrd/ mmmrdDrr/ rDrrrddt/ drmr-dDrr/ rrdltss
 Q0:${N:New}N4:#d, ssdrmdss/ sltlstd'd/ d'tlsdmff/ rmflrrss/ d'sls-dmff/ fFslrsd
 N1:#l, s,s,dtdmmr/ rdtdrffm/ mrdrmssf/ fmrdtdmr/ mrdt-dmsf/ drmdrtd
 N2:#m, ssmfs7/ Fssls/ sslsdTl-/ l4s4/ sfms-ssll/ llssffm
 N3:#s, s5ddt/ fmrdtrdd/ drmtddd-/ rDrmrddt/ dtdt-d8/ lts
 N4:#d, ssdrmdss/ ssslstd'd/ d'tlsd'mf-/ rmfls4/ d'slsfmdff/ ffsmfsd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-259.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-259.txt
@ -0,0 +1,11 @@
 M0:|c:G|m:4/4|a:W.E. Cousins 1840-1939|h:STUTTGART Christian Friedrich Witt 1660-1717|r:8787|t:FFPM 259 Ny latabatrao, ry Jeso
 U0:z0:4444 4444/ 4444 448/ 4444 4444/ 444(22) (22)48
 N1:s,s,ddrrmd sslfrsm mmrmdrt,s, dl,s,d-d-t,d
 N2:#m, ssmmlsss d5td s5Fs3 fms-s-ss
 N3:#t, mrdddtdm dmflsss ddttmrrt ddsm-rmfm
 N4:#r, dtlsfsdd, md,frssd d,msslrss mfdmfs-sd,
 Y1:Ny latabatrao, ry Jeso,/Dia atrehinay izao;/Ny fanahinay vokiso/Amin’ny fiti_anao!
 Y2:Tsy nitady zo sy laza/I_anao, ry Tomponay,/Fo_inao ny ainao aza/Nanavotanao anay!
 Y3:Jeso ô, ny ranao so_a/No nataonao avotray/Mba hanafaka\ avoko_a/I\zay tsy mahadio anay!
 Y4:Manomeza mofon’aina,/Tompo ô, ho tanjakay;/Mihainoa ny mitaraina/Mamalia ny hatakay!
 Y5:Ny fanahinay ry Tompo,/Raiso fa atolotray;/Faly izahay hanompo/Sy hanao ny sitrakao!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-260.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-260.txt
@ -0,0 +1,12 @@
 M0:|c:E|m:3/4 Milantolanto|t:FFPM 260 Ry Kristy ô! malalako|a:J. Andrianaivoravelona Z. 1877-1961|h:ST. VINCENT Sigismund Neukomm Adapted: James Uglow|u:https://hymnary.org/tune/st_vincent_neukomm
 U0:z8:4 (44)4 84 (422)(22) (44)/4 (44)4 (44)4 (2222)(22) (44)/4 (44)(22) (44)4 (44)(22) (44)/4 (44)4 (44)4 (224)4 (4	4)
 Q0:${N:New}U0:z8:4 (44)4 84 (422)(22) (44)/4 (44)4 (44)4 (2222)(22) (44)/4 (44)(22) (44)4 (44)(22) (44)/4 (44)4 (44)4 (224)4 (4	$Q4)
 N1:ssFsmdrwfmrrd/ dsfmd'tlswwwFlls/ srwmwsfrmsfrdt, / t, drmfslsdmrrd
 N2:#s, mmRmdddtlsttd/ dmrdmrdtdmrdwdt/ ttwDwmrtdwdlsw/ sstddwddwwttd
 N3:#t, sslsssswtdffm/ mst'd'mSlt'ld't'lFFs/ sswsllwssTlfmr/ rmfsfmRmwsffm
 N4:#m, ddwddmswwswdw/ ddwdltdrw3rwsw/ ss'f'm'-rws'dmfwsw/ sdwTlsFswwsd,w
 Y1:Ry Kristy ô! malalako/Sakafon'ny fanahiko/Manaraka ny hafatrao/Tsarovako ny tenanao
 Y2:Mangorakoraka ny fo/Fa vo_avono Hi_anao/Ka saotra no atolotray/Anao, ry\ Ilay nalatsa-dra
 Y3:Ny tenanao i\zay raisiko/Fi_ainako vaovao tokoa/Ny ranao i\zay sotro_iko/No manadio ny foko koa
 Y4:Ry Kristy ô! ampitomboy/Ny fiti_avako Anao/Ny toe-pi_ainako fenoy/Ny tena hamasinanao
 Y5:Atolotro anio indray/Mba ho Anao mandrakizay/Ny tenako, ny\ ananako/Ny heriko, ny asako/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-263.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-263.txt
@ -0,0 +1,11 @@
 M0:|c:D|m:2/4|r:CM|t:FFPM 263 Mandrenesa ry sofina|a:Maintimolaly
 U0:z4:4 (22)(22) 4(22) 4(22) 4/(22) 4(22) (22)(22) $Q4/4 (22)(22) (22)(22) (22)(22) 4/4 (22)(22) 44 $Q4
 N1:ddrmfsd'tlr'd't/ twd'sltwlws/ ssfmfswd'tlwr'd't/ #l dltdrdtd
 N2:#t, ddtdwdmwdfwr/ rwdmwrwrdt/ rmrdrmwdwdwfwf/ mdfmrmrm
 N3:#m mmfsfmswllws/ swsdlswFws/ sswdwdtlsfwlws/ sfwslsss
 N4:ddwdrmdwfrws, / sfmdwt, drws, t, dwdwdwdwfmrws, / dfrmfss, d
 Y1:Mandrenesa ry sofina/Mifali_a, ry fo/Ny feon'ny Filazantsara/Manatona anao
 Y2:Ry olon'ota rehetra/Ry ory sy noana/I\zay mameno ny kibony/Amin-java-poana
 Y3:Jehova\h no mambo_atra/Izay mofon'aina/Ho an'iza_y rehetra/Mety hihinana
 Y4:Kristy sy ny fitahiany/Izany\ mofo i\zany/Fa izy no mamelona/Ny maty mosary
 Y5:Avi_a, ry mosarena/Ka manaràna fo/Ny mofon'aina tsy lany/Fa ampy ho anao!/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-269.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-269.txt
@ -0,0 +1,13 @@
 M0:|c:F|m:4/4|r:9898D|t:FFPM 269 He! tianay ny monina eto|a:Ph. Rajohanesa 1879-1976
 U0:z8:${x2}z2222 4444 82222 4444 8/${x0} z2222 (22)22(22)22 (22)222222 (22)222222 2222/2222 4444 ${f}22222222 (22)2222 ${p}2${rit...}2 2222$Q4
 N1:#s, mRmftmrss/mrmftdrm/ #r sFstllfmm/ sFsrsFls/ sFstw4lflswwwsmrmf-4t,d,rm---/ zsFfmsdsl---ldtls----mft, d, ----
 N2:#s, dddtsttss/ dddtsstd/ dddrtfrd5trddt/ mRmf----frfm---mdtdr----sstd---/zmRrddmdd---dl's'fm----dtssslSs
 N3:#r sFssfsfmm/ sFssfsss/ mRmfftsss/ mRmstlFs/ z4stls----dtlswsw zstlsssss---/ zssssmssf---f-zzzdtlsssfmmffm
 N4:#s, dddrrssd5rfms'd/ dddssstd5r4s/ z4s4-3zd4wdwzs4fmrdlsm,d/ sltdddmfrdlf,-f,-z s7d5
 O1:v3:_3He! ti_anay_3ny monina\ e_3to/Fa maminay ny valanao_4/Tsy ti_anay fa mampise_4nto/_3Ny lavitra ny tranonao ny tranonao!
 O1:v4:_3He! ti_anay_3ny monina\ e_3to/Fa maminay ny valanao ny valanao!/Tsy ti_anay fa mampisento mampise_nto/_Ny lavitra ny tranonao ny tranonao!
 Y1:He! ti_anay ny monina\ eto/Fa maminay ny valanao/Tsy ti_anay fa mampisento/Ny lavitra ny tranonao!/${R=}${O:1}He! ti_anay_3ny monina\ e_3to/Fa maminay_4ny valanao!/_4Tsy ti_anay fa mampise_4nto/Ny lavitra_4ny tranonao!_6
 Y2:He! ti_anay fa misy aina/Ry Tomponay, ny valanao!/Tsy ti_anay fa tany maina/Ny lavitra ny tranonao!
 Y3:Fehezinao Mpi_andry ti_a/Milamina ny valanao!/Tsy misy tsy mifankati_a/Ny ondry\ izay tarihinao!
 Y4:Ny fanimban'ny fahavalo/Dia lavitra ny valanao,/Mitazan-davitra mandalo/Ny rafinao tsy tia Anao!
 Y5:Ny fototra\ izay mahatsara/Ny valanao ry Tomponay,/Dia Hi_anao Mpi_andry tsara/No miara-monina\ aminay!/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-270.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-270.txt
@ -0,0 +1,10 @@
 M0:|c:A|m:4/4 Milamindamina|r:888884|t:FFPM 270 Ry Tompo izay nanangona|a:Andriamampihantona 1868-1928|h:Erik Christian Hoff 1832-1894
 U0:zC:4 4444 (22)(22)$Q4/(22) 222244 ${DC}C/ 4 442222 C/4 (84)4 C
 N1:#m, smfsslsltd/ twrdtstls/ sf'rdtdm'r/ ms'f'rd
 N2:#d, mdrmmfwfwm/ sws5Fr/ s8/ sslfm
 N3:#s, sssdddwfrd/ rwsltdrdt/ trtdrmdt/ ddwts
 N4:#d, d5fwrwl/ sfm4rrs/ ssfmrdds/ dmfsd
 Y1:Ry Tompo I\zay nanangona/Anay ho vato velona!/${D:Hazòny tsy handao Anao/Ny vato vo_arafitrao/}Fa maro no mandronjina/Handevona
 Y2:Jesosy Fehizoro ô/Mpifehy mora sady to!/${D:Tohano mafy izahay/Mba tsy hirodana indray/}Fa indro ny mpisompatra/Mandrirotra
 Y3:Ry Vato fampiraisana!/Tariho mba hikambana/${D:Ny vato vo_apaika re/Ho tonga trano lehibe/}Tsy zakan'ny mpandevona/Harodana
 Y4:Ny Kristi_ana marobe/Mba ampiraiso tsara re/${D:Hiray am-piti_avana/Ho velona fino_ana/}Ka mba hi_araka hanao/Ny asanao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-271.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-271.txt
@ -0,0 +1,11 @@
 M0:|c:C|m:4/4|r:11.10.11.8.8.6|t:FFPM 271 Mba mivavaha raha vao maraina|a:Ranjoanina 1870-1921|h:VEILLE TOUJOURS Sophia Zuberbühler 1833-1893|u:https://hymnary.org/hymn/SDC2015/page/109
 U0:z8:z2222 6222y 42z2/z2222 442222 8/z2222 622222 42z2/z2222 6244 8/z22y 422(22)y 4224/22 4A2 8
 N1:#m slsdmsslssf/ frdtlslfsm/ slsddtdrdtl/ lrdtsFls/ msls---mdrd---/ tlsrtd
 N2:#t, mfmmd5mr/ ffmffsfrtd/ mfmmmfmrlsF/ FFlsr4/ dmfm---dmfm---/ f5m
 N3:#m d4sssfmss/ ttdrrttsss/ dddssrdtrrr/ r4tddt/ zzzdsms---dsms/ rdttss
 N4:d5mmfmf, s/ s7rrd/ dd'd's5Fsr/ rrFst, drs/ zzzd'sms---d'sms/ s4s, d
 O1:v34:_3Tsarovy re_3ny Tomponao
 Y1:Mba mivavaha raha vao maraina/Tsarovinao Ilay Mpanao anao/Izay ni_aro ny fana\hy sy aina/Mba ho salama toy izao/${R=}${O:1}Tsarovy re_3ny Tomponao_3/I\zay Mpi_aro anao
 Y2:Rehefa tonga koa ny anto_andro/O! mi_ambena tsara hi_anao/Fa manangoly saina isan'andro/Ilay devoly rafinao
 Y3:Ra\ha alina mangina, ka hatory/Tsarovy eo ny ota\ izay natao/Ka dia ifony mafy sy itsory/Fandrao maningotra anao
 Y4:Na aiza na\ aiza hi_anao mitoetra/Satana fahavalo, ao tokoa/Ka aza kivy na mba manjoretra/Fa mivavaha tsy ho voa:/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-272.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-272.txt
@ -0,0 +1,11 @@
 M0:|c:E|m:2/4 Faingampaingana|r:7777|t:FFPM 272 Faly izahay nandre|a:J.A Houlder (1844-1932)|h:INNOCENTS King Thibaut of Navarre|u:https://hymnary.org/tune/innocents_parishchoir
 U0:z0:62 44 44 8/ 62 44 44 8/ 62 44 4(22) 8/ 62 44 44 8
 N1:mfsd'tls/ drmsfmr/ mfsd'tlws/ drmfmrd
 N2:#s, drmd4/ stddtdt/ dtdmrrdt/ stdddtd
 N3:sfmlsfm/ mfs5/ sfmssFws/ mfslsfm
 N4:#f, d7/ mrdmrds/ drmdrrws/ mrdfssd
 Y1:Faly izahay nandre/Havan-tia nanao ho_e:/"Mi_araha aminay/Trano soa halehanay"
 Y2:Efa tonga izahay/Mba hivavaka\ Aminao/Ry Jehova\h Tomponay/Mitahia ny olonao!
 Y3:Mi_andrandra\ Anao i\zahay/Ka mangataka\ Aminao/Hanomezanao anay/So_a avy aminao
 Y4:Di_a sambatra\ izahay/Fa mitoky Aminao/Ka hotanterahinay/I\zay rehetra sitrakao
 Y5:Hoderainay Hi_anao/Andro amana\ alina/Mbamin'ny Anaranao/Foto-pi_adanana/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-273.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-273.txt
@ -0,0 +1,9 @@
 M0:|c:Bb|m:4/4 Faingana|r:767676767586|t:FFPM 273 He! vokatra ny tany|a:Matthias Claudius 1740-1815 Nad. Rajaonary 1850-1903|u:https://hymnary.org/tune/wir_pflugen_schulz|h:WIR PFLÜGEN Johann Abraham Peter Schulz 1747-1800
 U0:zC:4 4444 84/4 4444 C/4 4444 (44)4/4 4444 C/4 4444 84/4 4444 C/4 4444 84/4 4444 G/ 4444 448/ 6244 C/4 4(22)62 444/4 6244 C
 N1:#r, sddssm'd/ sfmrd,s/ dtls#f, mrdt/ slmrFs/ srrmm#dfr/ rssfmr/ #r, sddsslm/ mfrstd/ #l, d4rrr/ msfmr/ rmr-mrdtd/ s, lrdtd
 N2:#r, sddsssm/ sfmrd,s/ ssFsssFs/ sssFrr/ s7/ tdsr'dt/ sddsslm/ mfrsfm/ mmsmsss/ s5/ tdt-dtlSl/ sllsfm
 N3:#r, sddssds/ sfmrd,s/ #s, mrdtdtls/ rmdllt/ sttddrt/ #m ssmfss/ #r, sddsslm/ mfrsr'd/ d4t3/ #t, dmrdt/ ss-ssfm3/ dffmrd
 N4:#r, sddssdd, / sfmrd, s/ #t,, drrsdr-m/ tddrrs/ s7/ #s, s'mdtds/ sddssl#r, m/ mfrssd/ dsmd, sss/ ddtds/ sds-dslml/ mffssd, 
 Y1:He! vokatra ny tany/Jehova\h Tompo ô!/Fa be tsy mety lany/Ny haso_avanao/Ny andro fararano/No ifali_anay/Voataona ao an-trano/Ny vokatra\ azonay/${R=}Saotra tsara entinay/Ho Anao tokoa/Ny olonao rehetra\ izao/Mifaly avokoa
 Y2:Ny tany tsy misaona/Fa sambatra tokoa/Tsy tapaka\ isan-taona/Ny fanomezan-tsoa/Endrey, nahazo maina/Izao rehetra\ izao/Ny zava-manana\ aina/Mifaly aminao
 Y3:Tontosa\ izay nirina/Nahazo izahay/Fa misy taona zina/Nataonao ho anay/Tsy diso isan-taona/Ny fitahi_anao/Ny olonao mihaona/Mba hankalaza\ Anao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-274.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-274.txt
@ -0,0 +1,12 @@
 M0:|c:C|m:9/4 Faingampaingana|r:8787|t:FFPM 274 Tao an-tany karankaina|a:Rainitovo 1852-1943|h:Charles Clinton Case 1843-1918 (Consécrations et Louanges, 17)|u:https://hymnary.org/tune/jesus_lover_of_my_soul_case
 U0:zO:(44)4 K4 84CC/ (44)4 K4 84 O/ (44)4 K4 84CC/ (44)4 CC 84O
 N1:#f slsmrdttl/ dtlstlfm, / slsmrdttl/ dtlsdtrd
 N2:mRmsfmssf/ lsfmmfrd/ mRmsfmssf/ lsfmmffm
 N3:#m sFsds4d/ d-dttdtd/ sFsds4d/ d-dddrtd
 Q0:${N:New}N3:#m sFsds4d/ d-dttdtd/ sFsds4d/ d-dtdrtd
 N4:dwd4mff/ f-fssfsd/ dwd4mff/ fwfs4d
 Y1:Tao an-tany karankaina/Nisy olo-maro be/Tsy mba nampodina maina/Tao Jesosy nanome
 Y2:Na dia mofo kely aza/Tonga nahavoky\ ireo/Fa nitombo mahagaga/Samy faly izy\ ireo
 Y3:Fa ny herinao, ry Jeso/I\zay namonjy fahizay/No mi_asa lalandava/Hahavoky soa anay
 Y4:Dia tahio ny fambolena/Hahavokatra tokoa/Mi_antrà ny firenena/Tsy ho diso zava-tsoa
 Y5:Na dia voky fatratra\ aza/Mora reraka\ izahay/Ao ambony ny mateza/I_ankinan'ny ainay/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-276.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-276.txt
@ -0,0 +1,10 @@
 M0:|c:C|m:4/4|r:8787D|t:FFPM 276 Ry Jehovah, Ray Mpahary|a:Radaniela 1853-1913|h:Radaniela 1853-1913
 U0:zC:${x4} y 84y 84/y 84y C/${x0} 
 N1:#r ssdtllsm/ mmlrsfm/#f ssdttdrd/ tlsmrrd/ ssmmddrt/ ttdllts/ sslfllsd/ mmrf'trd
 N2:#t, ssmsffmd/ mmltttd/ ssmfssll/ sfmsffm/ ssSSllFs/ sslF3s/ mmfdffmm/ ssllffm
 N3:#r s4ltds/ mmlfrrs/ sssr'r'dr'l/ dddtsss/ #f ssttmmlr/rrmlllt/ dddlddds/ ddrrsss
 N4:ssd6/ mmls, 3d/ ssdrrmff/ ffsss, 2d/ ssmmllrs/ sslrrrs/ ddf4dd/ mmfrss,d
 Q0:${N:New}N4:ssd6/ mmls, 3d/ ssdrrmff/ ffsss, 2d/ ssmmllrs/ sslrrrs/ ddf4dd/ mmfrssd
 Y1:Ry Jehova\h, Ray Mpahary/Sy Mpamelona anay/Tsapanay fa tsy manary/Hi_anao Mpitondra\ anay/He, mandrotsa-pitahiana/Sesehena Hi_anao/Ka dia feno fifaliana/Izahay mpanomponao
 Y2:Noteneninao ny tany/Notarihinao i\zahay/Ka nitobaka\ aoka\ izany/I\zao ny vokatra\ azonay/Feno hika isan-taona/Ny fitiavanao anay/Ka\ a_oreno tsy ho foana/Tompo ô! ny asanay
 Y3:O! mba raiso re, ry Tompo/Izao fanatitray\ izao/Enga\ anie ka mba hitombo/Handrosoan'ny hanitrao/Raiso koa sy hamasino/Ny fonay hi_asanao/Ny fanahy ampidino/Hampahery, hanavao/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-279.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-279.txt
@ -0,0 +1,10 @@
 M0:|c:Eb|m:6/4 Milantolanto|t:FFPM 279 Raisonao, ry Tompo soa Izato asan-tananay|J. Johnson 1864-1916|h:SONATA Wolfgang Amadeus Mozart 1756-1791|u:https://hymnary.org/tune/jorgenson_mozart
 U0:z0:(62)484 (62)484/ 8484 8(22)(84)/ (62)484 (62)484/ 8484 848z4/ (62)484 (44)444z4/ (44)4(44)4 (44)4(84)/ (62)484 (62)484/ 8484 848z4
 N1:mfmssrmrff/ ddrrmsfmr/ mfmssrmrff/ drmfmrd/ slslld'tlls/ smdsfrsmdmr/ mfmssrmrff/ drmfmrd
 N2:#t, dwdddtwttt/ ddttdmrdt/ dwdddtwttt/ dtdddtd/ dwd4wd3/ dwdrwrdwddt/ dwdddtwttt/ dtdddtd
 N3: sws4ws3/ s5lwsw/ sws4ws3/ ssslsfm/ mfmfflsffm/ msmswsmwFsw/ sws4ws3/ ssslsfm
 N4: #f, drdmmtdtrr/ llttdfwss/ drdmmtdtrr/ ltdfssd/ dwd4wddd/ dwdtwtdwlsw/ drdmmtdtrr/ ltdfssd
 Y1:Raisonao, ry Tompo so_a/I\zato asan-tananay/Fa nomenao avoko_a/I\zay rehetra\ anananay/Simba izahay rehetra/Sady very hatrizay/Nefa soa tsy misy fetra/No navalinao anay
 Y2:Hi_anao nanetry tena/Tsy nitandro henatra/Be fi_antra ka onena/Ny tra-pahori_ana/Mba tsarovanay izany/Ko_a dia tahafinay/Nefa fi_asana i\hany/Ao an-tananao i\zahay
 Y3:Arosoy sy ampitaro/Aminay ny teninao/Hazavao ny olo-maro/I\zay tsy mahalala\ Anao!/Ny misaona mba vangi_o/Ny kamboty i_antrao/Izahay i\zay tonga\ ani_o/Mba ataovy irakao
 Y4:Eny, ry Mpamonjy tsara/Ambo_ary izahay/Mba ho tonga mpanambara/Ny fiti_anao anay/Ary di_a mba tahi_o/I\zato fikambananay/Hafanao, ampirisiho/Hamasino izahay/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-281.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-281.txt
@ -0,0 +1,10 @@
 M0:|c:D|m:4/4 Vonona|r:7.8.7.8.13.13.8.13|t:FFPM 281 Vory eto izahay|a:Stef. Ramaka 1874-1957|h:Gordon C. Ruud 1920-1970
 U0:z0:${x2}6244 444/4 6244 448/${x0} ${x2} 4444 4444 4444 G/${x0} 844 44(22)4 G/ 4444 4444 444(22) G
 N1:mmfmrmd/ sllsfmfr/ mmfmrmd/ sllsdmrd/ #m ssltddtsllsFs/ ssltddtsllsFs/ ssslslwtd/ rrdsllsfmf#drr-d
 N2:#s, d4ttd/ dddtrdrt/ d4ttd/ d6ts/ tddfmrrtddtdt/ rddfmrrtddtdt/ ttd4wfm/ #t,s4drrtdddtws,
 N3:#r sslsfsm/ sffrssls/ sslsfsm/ sffsmsfm/ ssffsFssmmrrr/ smffsFssmmrrr/ sssfmfwfs/ ttddlfrssflsfm
 N4:#m, d4ssl/ mffstdfs/ d4sSl/ mffmlssd/ #s, mmfrdlsmdlrrs/ tdfrdlsmdlrrs/ mmmfdfmrd/ s'fmmfrtsdlf, s-d
 Y1:Vory eto izahay/Hihevitra ny asanao/Tompo, manatre\ha anay/Ka asehoy ny sitrakao/Aoka Hi_anao no mba hitarika anay/Ary ny Fanahinao hamelona\ aina\ anay/${R=}Tompo, tahi_o izahay/Mba ho voninahitrao ny asa vitanay
 Y2:Hahavita inona/Ny saina aman-kevitray?/Tena tsinontsinona/Ry Tompo ô Ny herinay/Ko_a mba midìna eto afovo_anay/Hanana\ aina masina ny fivori_anay
 Y3:Hi_anao no nanome/Ny asa hoheverinay/Tena\ adidy lehibe/No vo_atolotra anay/Enga\ anie ny sitrakao irery no hatao!/Aoka tsy ho vanona izay tsy sitrakao!
 Y4:Areheto aminay/Ny afom-piti_avanao/Mba hahaizanay miray/Mitory ny anaranao/Hahavory marobe hanatona Anao/Hampamirapiratra ny voninahitrao!/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-29.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-29.txt
@ -0,0 +1,5 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 29 Ry foko, mitsangàna izao|r:8878874848|a:Rahajason 1897-1971|h:Philipp Nicolai 1556-1608
 Y1:Ry foko, mitsangàna\ izao/Ka miderà ny Tomponao,/Andri_amanitsika!/${D:Nasehony ny heriny/Ny fasana levoniny/Tsy hahatàna\ antsika/}Derao, hobio!/Halelo_ia sy hosana, fanjakana,/Azy Tompom-pahefana!
 Y2:He, vitanao Mpanavotra/Ny lova mahasambatra,/Ny fasana resenao;/${D:Mahazo toky fatratra/Ny mitomany sasatra!/Ny lanitra vohanao,/}Jeso Kristy,/‘Zay nitsangana maraina/Tompon’aina,/Andro paka, ara\habaina!
 Y3:Derao ny voninahiny,/Ankalazao ny heriny/Fa resy re Satana!/${D:Ry tany sy ry lanitra,/Derao Andri_amanitra/Akaro ny hosana!/}Raiso, Tompo,/Raisonao ny voninahitra\ aman-dera,/Ho Anao, ry Zanak’ondry!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-290.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-290.txt
@ -0,0 +1,5 @@
 I0:ffpm-59.txt:^(M|Y)
 M0:|c:D|m:4/4 Faingampaingana|t:FFPM 290 Indreto fa mivory izao|r:8878874848|a:Magnus Brostrup Landstad 1802-1880 Nad. M.J. Meeg 1851-1924 Nad. L. Dahle 1843-1925|h:Philipp Nicolai 1556-1608
 Y1:Indreto fa mivory\ izao/Zatovo vonon-kanavao/I\lay fanekena tsara;/${D:Mba raisonao, ry Rainay ô!/Ny fitarainanay izao,/Ome_o toky tsara;/}Henoy, fenoy/Aim-panahy mba ho sahy lalandava/Ho mpanaiky ny mazava.
 Y2:Mandà ny ratsy izy\ izao,/Manaiky fa ho zanakao/Handia ny lalan’aina;/${D:Ry Ray ô mba tsarovinao/Ire_o vo_asoratrao/Ao amim-bokin’aina;/}Tezao izao/Tsy ho resy fa handresy,/Ka ome_o/Azy hery mahale_o.
 Y3:Natsanganao ho zanakao/Sy ondry mba handrasanao,/Ka tena sarobidy;/${D:Arovy re ny ondrinao/Tantano ny malalanao,/Ry Tompo\ izay nifidy/}Anay handray/Lova so_a tsy mi_ova,/Ka hazòny/Tsy handao Anao intsony!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-315.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-315.txt
@ -0,0 +1,11 @@
 M0:|c:G|m:4/4 Matomatotra|a:C. Borchgrevink (1841-1919)|h:STUTTGART Christian Friedrich Witt 1660-1717|r:8787|t:FFPM 315 Ry Ziona, mitsangàna
 U0:z0:4444 4444/ 4444 448/ 4444 4444/ 4444 448
 N1:s,s,ddrrmd sslfrsm mmrmdrdt, dl,s,ddt,d
 N2:#m, s4ttdd rd4td 3ttlls3 fms4
 N3:s,s,mms3m smfls3 lmfmmr3 d4rrm
 N4:#d, ssmdssd'd'td'ffssd' llsSlfss mfd'mssd
 Y1:Ry Zi_ona, mitsangàna,/Ka mihazavà izao;/Andrandrao ny fa\hazavana,/I\zay miposaka\ aminao.
 Y2:Maizina ny firenena,/Amin-tany fantatrao,/Fa tsy manam-pamonjena,/Nefa ankohonanao.
 Y3:Asandrato ny fanilo/Hanazava lavitra,/Mba ho marobe no hino/An’Andri_amanitra.
 Y4:Atopazy re ny maso!/Marobe ny zanakao,/Toy ny tany feno hazo/E_o anatrehanao.
 Y5:Ry Jesosy, hotahinao/Ani_e ny lovanao;/Olo-maro i\zay irinao,/Taomy mora ho Anao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-352.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-352.txt
@ -0,0 +1,9 @@
 M0:|c:C|m:4/4|r:8787D|t:FFPM 352 Fantatrao va ny Mpamonjy|a:Ratovondrahety Rafihavanana 1919-|h:Ratovondrahety Rafihavanana 1919-|
 U0:z0:444(22)4(22)44/ 4444448/ 44444(22)44/ 4444448/ 44444444/ 444444(44)/ 44444444/ 444(22)448
 N1:#m ssddwdtwds/ mfsslls/ sltdrlwdt/ dlsmr, sd, / mFsltsdd/ rssdm'dr-/ m'ddtdlls/ ssddwdtd
 N2:#t, sssfmrrwdt/ ddtdddt/ rrrddrwrr/ ddtddtd/ dr4tdm/ ffmssFsw/ smrrddtd/ mrdfmrrm
 N3:m'r'd'lwlswsf/ sfrmfmr/ sFssFslls/ sffsffm/ slsFs4/ sr'd'5t/ d'd'lssffs/ ssslwlss
 N4:d'tlswfsfmr/ #f, dlsdffs/ #s, trs'mrmFsf/ mfrdlsd/ #t, ddtrsfmd/ ttdmslsw/ d'lfsmfrm/ #f, dtlswfsd
 Y1:Fantatrao va ny Mpamonjy,/Ilay Tompon-danitra?/Jeso, Kristy sy Mpanjaka,/Zanak'Andriamanitra,/Lay nandao ny lapan-dRainy/Feno voninahitra/Tompo tonga mba hanompo/No\ho ny fiti_avana.
 Y2:Eny, zava-mahagaga/Fi_etrena lalina:/Saro-bidy ka tsy foiny/I\sika olombelona./'Lay Mpisorona Ambony/'Zao no Jeso sorona,/Ka manolotra ny ainy/Mba ho fanavotana.
 Y3:Ao ny lanitra mivoha/Miantso\ anao hi_akatra:/Aoka tsy hiro_a saina,/Manapaha hevitra,/He mitsotra moramora/Mba handray ny tànany;/Mitodi\ha: izao no ora,/Maneke ho zanany//
--- a/composeApp/src/commonMain/composeResources/files/ffpm-353-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-353-1.txt
@ -0,0 +1,7 @@
 O1:v1234:Izay mba vitanao
 O2:v1234:Hanao ny sitrakao
 I0:ffpm-110.txt:^(M|Y|N3|N4)
 I0:ffpm-353-2.txt:^[UN]
 M0:|c:C|m:6/4|t:FFPM 353 (1) Mba sainonao ange|a:Frances Ridley Harvegal 1836-1879 Nad. Rabary 1864-1947|h:Philip Paul Bliss (1838-1876)|
 N3:#f dddsdd-- dddtss dddsdd-- ddmr-rd dtttdrddd drrr-ss
 N4:d5f-- fssssd 6f-- fsss-sd dsss-sddd dsss-sd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-353-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-353-2.txt
@ -0,0 +1,11 @@
 M0:|c:Ab|m:6/4|r:666686|t:FFPM 353 (2) Mba sainonao ange|a:Frances Ridley Harvegal 1836-1879 Nad. Rabary 1864-1947|h:Robert Lowry 1826-1899|u:https://hymnary.org/hymn/CH1894/page/244
 U0:z0:C84 84C/ C84 84C/ C84848/4 8484 Kz4/ C84 O/ C84 O/ CCCCC (44)4Kz4
 N1:#s, dmrdls mfmrlr tltdrm mrtdF,s rmrfms'mr dmlrdtltd
 N2:#r, sdlsfm dddlfl sffmss sFFFrr ssstdddt lSllss-ss
 N3:#l, msfmdd sl'sfdf rdrdtd dlrldt tdtrs4 mtdfmrdrm
 N4:#d, dsfmrd dtd'fff ssfmsd' dr4s s4d'm'd's lmffss-sd
 Y1:Mba sainonao ange,/Sao tsy mba fantatrao,/Ny zava-dehibe/Nataoko ho anao:/${R=}Hevero ka lazao, lazao/${O:1}Lazao Izay mba vitanao.
 Y2:Ny lapako tary,/Ny fahefako tao,/Nilaozako taty/Hanavotra\ aina\ anao:
 Y3:Heveronao ange,/Ny nisoloana\ anao;/Nangidy\ indrindra\ anie/Ny nahazoana\ anao:
 Y4:Endrey! Ny aiko koa/Nomeko ho anao:/Tsy misy zava-tsoa/Tsy foiko ho anao:
 Y5:Ry Tompo be fitia!/Endrey, ‘ty vitanao;/Izaho ‘zay mpania/Tsy mahavaly ‘zao:/${R!}Ny aiko no mba raisonao/${O:2}Mba raiso\ Hanao ny sitrakao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-358.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-358.txt
@ -1,4 +1,4 @@
-M0:|t:FFPM 358 He, ry namako mahantra|c:A|m:3/4|r:8.7.8.7.D|a:H. Randzavola 1873-1953|h:R. Lowry 1826-1899
+M0:|t:FFPM 358 He, ry namako mahantra|c:A|m:3/4|r:8.7.8.7.D|a:H. Randzavola 1873-1953|h:Robert Lowry 1826-1899
 U0:z8:y 6222 44/22 6222 8/y 6222 44/22 6222 8/22 6222 44/22 6222 8/22 6222 44/22 2244 8/22 6222 44/22 2244 8
 N1:#s, mmmmrdsd/dmrtdrm/mmfmrdmr/rrrltdt/lsdrdlsd/drmdfmr/mfs'mrdrd/tlsdmrm/mfs'mrdrd/tlsdmrd
 N2:#m, ssssfmmm/mssssss/sslsfmss/ssFFsls/fsmfmfmm/sssmlss/ssssssfl/sfmmsss/sssdtlll/sfmssss
--- a/composeApp/src/commonMain/composeResources/files/ffpm-367.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-367.txt
@ -0,0 +1,10 @@
 M0:|c:F|m:4/4 (dikany malalaka)|a:Horatius Bonar 1808-1889 Nad. E. Andrianjafitrimo 1884-1972|h:Ira David Sankey 1840-1908|u:https://hymnary.org/tune/in_the_land_of_strangers_sankey|t:FFPM 367 Ry zanako mania!
 U0:zC:4 6244 84/4 6244 C/4 4444 84/4 6244 C/4 4444 (44)4/4 4444 C/4 4444 (44)$Q4/4 C4 C
 N1:#l, m5s3d4m mldtls,d ms6m4sfm ml'sfmf ffrmfsd'd' dmrd
 N2:#m, d5t3l4S lflsfmm dt4d7-d dDmrDr rttdrm's'f' ddtd
 N3:s6f fm5 d8rrf${S:f}rm ms4tls l7s4T-llsfm
 N4:#m, d5s3l4m lf4d,d, dstrsd7-dl5r rs'f'm'rdm'ffssd
 Y1:Ry zanako mania!/Henoinao izao./Izaho be fitia/Mangora-po anao;/Ry zanako! Modia,/Sao maty hianao,/Fa be ny bibidia;/Modia re!
 Y2:Ny zavatry ny tany/Sao mahasimba anao/Harena mety lany/Tsy mahavonjy anao;/Izaho irery ihany/No hiadananao;/Ka mbola manontany:/Tsy hody va?
 Y3:Mamiratra jerena/Ny lalan-tsitrapo,/Fa ankoso-bolamena,/Mamitaka ny fo;/Ny sitrapon’ny tena/Mamery ny ainao,/Ario ka miverena,/Modia re!
 Y4:Izaho Tompon’aina,/Nijaly ho anao,/Ka, he, nanolotra aina/Mba hamonjena anao;/Ny rako mitaraina,/Modia hianao;/Ka aza mba malaina,/Modia re!//
--- a/composeApp/src/commonMain/composeResources/files/ffpm-381-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-381-1.txt
@ -0,0 +1,10 @@
 M0:|c:F|m:4/4|t:FFPM 381 (1) He, ny fiantsoana|a:Andriamampihantona 1868-1928|h:Nar. Henrik Rung 1807-1871|r:7777
 U0:zC:22 444(22) (44$Q4)/22 44(22)(22) 8z4/22 (44)422 (4224)/22 4444 C
 N1:#s, ssddmrdd-t strrf-mrd ddl'-fmrs'--- mmffttd
 N2:#s, s6-l-s6-s-s ddd-llls-lt ddllsss
 N3:#t, s,s,mmsfmr-- trtttrsfm ddf-lsfrm-r ddr4m
 N4:#f, ssd4-fFs 6-s-d ddflrrrtd-s llr,r,ssd,
 Y1:He, ny fi_antso_ana/Feno fiti_avana,/Teny masina sy to,/Ho anao, ry ory fo.
 Y2:Hoy ny Tomponao ho_e/«Manatòna Ahy re,»/«Ry mi_asa fatratra»/«Sy mivesatra\ entana!»
 Y3:«Fa Izaho hanome»/«Fitsaharan-dehibe»/«Sy fi_ainana vaovao»/«Hahasambatra anao».
 Y4:Ry Mpamonjy tsara ô!/Saotra no atolotro;/Ka ampi_o aho i\zao,/Fa manaiky ho Anao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-381-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-381-2.txt
@ -0,0 +1,8 @@
 M0:|c:D|m:4/4|t:FFPM 381 (2) He, ny fiantsoana|a:Andriamampihantona 1868-1928|h:Randrianjafy Abe 1912-1984|r:7777
 U0:z0:444(22) 448/${x6} 4444 448/${x0} 444(22) 448/ ${Farany}(4444) (4228)
 N1:mslf-rrm ssFstls sslsdrm mmrssFs sffmld't tsd'mrmf lssd'fsl lr'td'-mrd m-f-s---
 N2:#l, dddrddtd dmrrrdt rdddllt dddtmdt rrtddrr rrddlDr rrd5 rrrd-dtd d---dtlt
 N3:ssfl-s5 lssFs smfsllSssFsdls 5lls5l3 ffmsfmf llss-sfm s-fmr---
 N4:#s, dmfr-ssd mddtrrs tdfmffm ddrmdrs ttrmfFs' s'fmdfmr ttdTldf fFs'mfs'sd dtl-s---
 Y1:He, ny fi_antso_ana/Feno fiti_avana,/Teny masina sy to,/Ho anao, ry ory fo./Hoy ny Tomponao ho_e/«Manatòna Ahy re,»/«Ry mi_asa fatratra»/«Sy mivesatra\ entana!»
 Y2:«Fa Izaho hanome»/«Fitsaharan-dehibe»/«Sy fi_ainana vaovao»/«Hahasambatra anao»./Ry Mpamonjy tsara ô!/Saotra no atolotro;/Ka ampi_o aho i\zao,/Fa manaiky ho Anao./Ame\n
--- a/composeApp/src/commonMain/composeResources/files/ffpm-413.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-413.txt
@ -0,0 +1,12 @@
 M0:|c:D|m:3/4|a:J.H. Andrianjafy|r:8787D|h:Lewis Hartsough 1828-1919|t:FFPM 413 Ry Mpamonjy Tompo soa|u:https://hymnary.org/tune/lead_me_to_the_rock_thats_high_hartsough
 U0:z8:y 6222 44/y 6222 8/y 62y 44/y (22)4y 8/y 6222 (22)4/y 6222 8/y 6222 44/y 44y 8
 Q0:${N:New}U0:z8:y 6222 44/y 6222 8/y 6222 44/y (22)4y 8/y 6222 (22)4/y 6222 8/y 6222 44/y 44y 8
 N1:drmdmfss llslsmr drmdmfss d'ls-lmrd mfsmlssff fmrrmFs drmdmfss d'lslmrd
 N2:#l, d7m d6t d5rmm ffm-fdtd drmdddt-t rdttdlt d6mm l'fmfdtd
 Q0:${N:New}N2:#l, d7m d6t d5rmm ffm-fdtd ddmdddt-t rdttdlt d6mm l'fmfdtd
 N3:mfsmslmm ffsfs3 mfsmslmd' 4tlsfm s4fss-s t,dsssrr mfsmsld'd' ld'3sfm
 N4:#s, d8 ffmfmds d8 f,f,d-f,ssd 5fmrs6drs d5ldd f,lsf,ssd
 Y1:Ry Mpamonjy, Tompo so_a!/Avy izahay izao,/Mba hanaiky sy hano_a,/Ka hiverina\ Aminao./Hi_anao no ranon’aina/Mahavelona ny fo;/Hi_anao no antenaina/Mba hanala ny manjo.
 Y2:I\ndreto izahay mpanota/Efa diso taminao,/Mamonje sy manavota/Ny fanahinay izao./Hi_anao no mahavonjy/I\zay mi_ankina\ aminao;/Ko_a raiso, ry Mpamonjy!/Ny fifonanay izao.
 Y3:Ry Jesosy be fiti_a!/Mba tantano izahay,/Fa ho lavo sy hani_a/Raha tsy hazoninao./Tsy mba misy mety very/Eo am-pelatananao,/Fa\ aminao no misy hery/Mahatanjaka ny fo.
 Y4:Tompo ô! mba tanteraho/I\zay rehetra mahasoa,/Ka ny otanay afaho,/Fa manimba\ anay tokoa./Mampianara\ anay haniry/Mba hanao ny sitrakao,/Hahazo_anay ny hery/Eo am-pelatananao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-42-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-42-1.txt
@ -0,0 +1,7 @@
 I0:ffpm-42-2.txt:^(U|N|M)
 M0:|c:G|m:4/4|r:LM|t:FFPM 42 (1) Vohay ny varavaram-po|h:C. Ramangalahy 1925-|a:Georg Weissel 1590-1635 Nad. O. Strand 1887-1941
 U0:zC:z22 624(22) 444/z22 444(22) 444/z22 624(22) 444/4 2222(22)4 Az2
 N1:ssmdrmffm s,l,t,dsfmsr rmmfmrsmd s,l,t,dmr-rd
 N2:ssmdt,rddd m,f,s,3-s,3 t,d3t,-dds, m,f,s,3d-t,d
 N3:ssmds-lls ddrdr-ddt, sssfs-ssd ddrddrmfm
 N4:#m, s's'm'dsdffd dffmt-dms sddlsfmmm d,ffmd,s-sd
--- a/composeApp/src/commonMain/composeResources/files/ffpm-42-2.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-42-2.txt
@ -0,0 +1,13 @@
 M0:|c:Ab|m:3/4 Faingampaingana|r:LM|t:FFPM 42 (2) Vohay ny varavaram-po|h:ABENDS Herbert Stanley Oakley 1830-1903|a:Georg Weissel 1590-1635 Nad. O. Strand 1887-1941
 U0:z0:444 (44)4 ${<}(4${=}4)(22) C/${<}4${=}44 8(22)${>}(4${=}4)4 C/ ${<}4${=}4484 ${>}(4${=}4)(22) (84)/ 444 (44)(22) (44)4 C
 N1:#s, sdtl-lf-m-r rmfs'd-t-ls tdrfmr-d-t- drms'-f-m-rd
 N2:#m, mfssflltd-s sdtds-s-Fs ssslsltmFs- s4Tl-sdts
 N3:#s, d4-Dlrd-t tdrmsltrdt fmrdmf-d-r- dtdd-drms'fm
 N4:#d, drmf-mr-mfs fmrdm-r-rs #m, rdtddfsl-sf #r, mrd,m-f-s-sd
 Y1:Vohay ny varavaram-po/Ilay Mpanjaka manan-jo!/Mpamonjy\ izao tontolo\ izao/No tonga hanasoa anao!
 Y2:Ny teny fanasana\ atao/Mitondra tena aim-baovao,/Ny fahori_ana manjo/Afahan’ny famindrampo.
 Y3:Mba mihaino_a, maneke/Fa sambatra izay mandre,/Ka anjakan’ny Tompo to/I\zay feno antra, mora fo.
 Y4:Ny andron’aina mitatao/No mahafaly fo izao,/Mamiratra sy manome/Fanantenana lehibe!
 Y5:Ny vavahady mba vohay!/Finaritra izay mandray,/Fa tonga\ Ilay Mpanjaka soa/Hanao ny asany tokoa.
 Y6:Sokafanay ny fo izao/Ry Jeso, mba hidiranao!/Ny fa\haso_avanao anie/Hanananay harena be!
 Y7:Atolotray, ry Tompo ô,/Mba ha\hatamana\ Anao ny fo;/Ny famonjena vitanao/No i_ankinanay izao!
--- a/composeApp/src/commonMain/composeResources/files/ffpm-43.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-43.txt
@ -0,0 +1,10 @@
 M0:|c:F|m:4/4 Faingampaingana|r:878747|a:(Maintimolaly)|h:(St Albans)|t:FFPM 43 Manenoa ry farara
 U0:z0:6244 4444/ 4444(22)4(44)/4(22)4444(22)4/ (22)4(22)(22)(22)48/4(22)(22)4 4(22)(22)4/ 4(22)4(22) 4(22)8
 N1:#t, mfrsdrtd fmlsf-mmr m-frsdrt-d f-mrFsls-Fs m-frdrf-smrm s-lsfmmr-d
 N2:#s, ddrtdlss d4ltddt dd-ttlls-d drdrdrlltdt d-dtltr-tdtd3-dd-dt-d
 N3:slssmfrm fslmf-ss- s-lssmrr-s lssslsmr-rr m-ls-sl-ss-s mR-ml-s-fm
 N4:#f, dltslfsd ldf'mr-ds- df-sm,lFsfm ltdtltdr-r,s df-s-srs-d-d dF-sldss-d
 Y1:Maneno_a, ry farara!/Horohoroy, ry tany/Ka mi_antso_a ny maty,/Fa\ akaiky ny Mpitsara;/Indro Kristy/Indro Kristy/Avy amin-drahona!
 Y2:Ny fe_ony no hampifo\ha/Ny any am-pasana;/Ny teniny no hamory/Ny velona rehetra;/Samy handray/Samy handray/Ny valin’ny nataony.
 Y3:Ny tsy mino hilazany:/«Mi_alà voa_ozona,/Mandehana, mito_era/Ao amin’ny maizina»/Ry mpanota/Ry mpanota/Any ny anjaranao.
 Y4:Fa ny mino hilazany:/«Avi_a, notahina,/Mandroso_a, mankanesa/Ho amin’ny mazava»/Io, ry mpino/Io, ry mpino/Indro! ny anjaranao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-44.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-44.txt
@ -0,0 +1,12 @@
 M0:|c:Db|m:4/4|h:LET HIM IN Edwin Othello Excell 1851-1921|r:PM|a:Jonathan Bush Atchinson 1840-1882 Nad. Rakotovao 1880-1956|t:FFPM 44 Indro Jeso mba vohay!
 U0:zC:22 4444 (2E) 222244 22224/22 4444 (2E) 22224(22) 2222$Q4/22 4444 C22 4444 C/22 4444 (2E) 22224(22) ${Rit...}22224
 N1:mfsm'd'ls- s-4ls-4 mfsm'd'ls- s-4ltd'-4 ssld'tls mfsd'td'r' m'r'd'slls- s-4ltd-4
 N2:#t, drmssfm- rrtdrzmmdrm drmssfm- rrtdrzzmRffm mmflsfm drmmsFs sfmmffm- rrtdrzzmRffm
 N3:#r ssd5s ffrmfzssmfs ssd5s ffrmfzzsFlls d7 ssdsslt 3d5s ffrmfzzsFlls
 N4:#s, d4mfd- s5zd5 d4mfd- s5zzd7 f4d 5rrs' 3ddffd- s5zzd5
 O1:v1:Mba_5vohay!_4
 O2:v1:Ka_5vohay!_4
 Y1:Indro Jeso, mba vohay,/${O:1}Jeso mba vohay!_2Jeso mba vohay/Avy ho sakaizanao/${O:2}Jeso mba vohay!_2Jeso mba vohay!/Lay Malala fahizay/Sady sitraky ny Ray,/Tonga ho anao indray,/${O:2}Jeso mba vohay!_2Jeso mba vohay!
 Y2:Indro Jeso, mba vohay,/${O:1}Jeso mba vohay!_2Jeso mba vohay/Tompo tia ka mba hajao,/${O:1}Jeso mba vohay!_2Jeso mba vohay/Honina\ aminao etỳ,/Ho sakaiza hatrerỳ,/Ho anao mandrakizay,/${O:2}Jeso mba vohay!_2Jeso mba vohay
 Y3:Indro Jeso, mba vohay,/${O:1}Jeso mba vohay!_2Jeso mba vohay/Mbola tia ka mba vohay,/${O:2}Jeso mba vohay!_2Jeso mba vohay/Tena tia ka tsy mandao,/Raha ela sao dia lao!/Moa holavinao izao?/${O:1}Jeso mba vohay!_2Jeso mba vohay
 Y4:Eo am-baravaranao,/${O:1}Jeso mba vohay!_2Jeso mba vohay/Tsy manao an-ditra\ izao,/${O:2}Jeso mba vohay!_2Jeso mba vohay/He! mandona mora re,/Na dia Tompo lehibe!/Efa niandry ela be,/${O:2}Jeso mba vohay!_2Jeso mba vohay
--- a/composeApp/src/commonMain/composeResources/files/ffpm-444-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-444-1.txt
@ -0,0 +1,11 @@
 M0:|c:C|m:4/4|t:FFPM 444 (1) Ry Raiko feno antra|h:Ira David Sankey 1840-1908|a:R. Baron 1847-1907|r:7676D
 U0:zC:4 6244 (62)4/4 6244 C/4 6244 (62)4/4 6244 C/4 6244 (62)4/4 4444 (84)/4 6244 (44)4/4 6262 C
 N1:#r ssfmddtl lslsmr ssfmddtl lssltd sr'tssm'ds sf'm'r'ddt sltddr'f'm' r'ddr'dd
 N2:#t, mmrdmf-f fmfmdt fmrdslsf fmmffm sfffssmm ssslls- sffmmfll lsmfmm
 N3:#s ddsssltd 5ss sdssdd-d ddstss strtsdsd srdrRmr ddssdlrD rmdtdd
 N4:#s, d5f-f fd4s tdddmf-f fs'2sd s'5d-d s't'd'fFs'- mfrddfrm fs'4d
 Y1:Ry Raiko feno antra!/Inty ny zanakao,/Ny foko dia mahantra/Ra\ha lavitra\ aminao;/Fa tany karankaina/Izao tontolo\ izao/Ka reraka ny aina/Mihataka\ aminao.
 Y2:Nivezivezy aho/Nikaro-java-tsoa,/Izay rehetra hita/Nandramana\ avokoa;/Nandany taona maro/Nanaran-tsitrapo,/Kanefa tsy nahazo/Izay mahafa-po./
 Y3:Mamitaka mihitsy/Izao tontolo\ izao,/Ny mamy dia mangidy,/I\zay tena soa tsy ao;/Koa aza mba\ adalainy/Intsony re, ny fo!/Andeha mba ho hendry/Hatramin’ny anio./
 Y4:Ry Jeso, Mofon’aina/Sy ranon’aina koa/Hianao no mahatony/Izay filan’ny fo;/Hianao no mahavoky/Hianao no manome/Izay irin’ny foko,/Dia hasambaram-be/
--- a/composeApp/src/commonMain/composeResources/files/ffpm-47.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-47.txt
@ -0,0 +1,9 @@
 M0:|c:C|m:4/4|h:WACHET AUF Philipp Nicolai 1556-1608|r:89889866488|a:Philipp Nicolai 1556-1608 Nad. M.J. Meeg 1851-1924|t:FFPM 47 Ry Ziona, mihainoa
 U0:z8:44 4444 88 z4/444 4444 88 z4/444 4444 ${DC}8z4/4 6244 8z4/4 6244 844 (44)8 z4/444 8z44 448 z4/444 4444 8
 N1:#m d,mssssls sdtdm'rdrs sdslmfrd ssfmr,d, ssfmr,d, rmf-m sltddm'rd sdslmfr,d,
 N2:#l, d3td4 tdrms3Fs 3d4ts, rdddtl rdddtd tddtd 3fl'fsfm mffmmrtd
 N3:#r msmfsmfm fs3dtdlt td4lsm smfsfm rmfssm sslss mffmldtd ddr'dTlfm
 N4:#s, d3rmdf,d rmfmdrmrs' fmmfl'rsd tdf,ssl tdlssd sm,r,-d, dfrlfs'sl dltdDrsd
 Y1:Ry Zi_ona, mihaino_a!/I\njay fe_o mafy mampifoha/Ny ampakarina izao./${D:Mbola alim-be ihany,/Fa ny fotoana no lany,/Ka avy ny malalanao./}Antsoiny hi_anao,/Alao ny jironao/Ka velomy;/Dia mi_aingà hivo_aka,/Hitsena ny Mpampakatra!
 Y2:He, Zi_ona ravoravo,/Fa reny\ izao ny antso avo,/Ka velona ny hobiny:/${D:Indro, avy Kristy Tompo./Hanafaka anay mpanompo,/Halainy hampakariny./}He, faly re ny fo!/Avi_a, Tompo ô!/O, hosana!/Mihaingo\ izao hitsena\ Anao,/Ry Kristy, ny malalanao!
 Y3:Hira, hoby, fiderana/Asandratray mba hitsenana/Anao, Jesosy Tompo ô!/${D:Tsy mba misy mitomany,/Fa mirana izay mankany/Am-pampakaram-badinao/}Mahafinaritra/Ny hiran-danitra!/Halelo_ia!/Ilaozanay ny trano lay,/Mi_akatra ny di_anay.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-483.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-483.txt
@ -0,0 +1,11 @@
 M0:|c:F|m:3/4|a:Ch. Rajoelisolo 1896-1969|r:7777D|h:MARTYN Simeon Butler Marsh 1798-1875|u:https://hymnary.org/tune/martyn_marsh|t:FFPM 483 Zanahariko Tsitoha
 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
 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.
 Y3:Antenaiko,\ Hianao, Jeso/I\zay Mpitsara lehibe/Hanamarina\ ahy ao,/Na mpanota aza re./Dia hi_ezaka\ a\ho etỳ/Mba hanao i\zay mendrika/Hamindranao fo arỳ/Fa voavela heloka.
 Y4:Ray ô, ny fitiavanao/Afindrao ho toetrako,/Mba hitiavako Anao,/Ary koa ny namako./Ho mpanompo aho re!/Ho mpitory koa Anao!/Mba hanjaka\ an-tany e,/Tompo, ny fitiavanao.
--- a/composeApp/src/commonMain/composeResources/files/ffpm-52.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-52.txt
@ -0,0 +1,10 @@
 M0:|c:C|m:2/4 Matomatotra|r:8585D|h:Philip Paul Bliss (1873: 1838-1876)|a:Philip Paul Bliss 1838-1876 Nad. J. Andrianaivoravelona 1853-1897|t:FFPM 52 Efa akaiky Jeso Tompo
 U0:z0:y22 y22/ y22 8/ y22 yy/ y22 8/ ${f}y22 2222/ y22 8/ y22 2222 22y 8
 N1:#m slsmdrdl slsmr, slsmdrdl tdtls d5sms l3dt d4rdtl ssltd
 N2:#t, mfmdmfmf mfmdt mfmdmfmm rmrrt m6dm f4r m4f4 mmffm
 N3:#f d3s4d 4ss d3s4l sssFs 5d7ls 5lltd3rrd
 N4:d12s d8r4s, d10ffs d4f4s5
 Y1:Efa\ akaiky Jeso Tompo/Haka\ Anao izao,/Indro, tamy Kristy Tompo/Avy ho anao!${R=}Di_a tano mafy tsara/I\zay anananao;/Lova so_a tsara fara/Indro ho anao!
 Y2:Efa\ akaiky ny Mpitsara/I\zay hitsara\ anao;/Jeso Kristy raiso tsara/Mba ho havanao!
 Y3:Efa\ akaiky ny Mpamonjy/Ta-handray anao;/Jeso Kristy mahavonjy/No sakaizanao!
 Y4:Aza mba mangataka\ andro/Hibebahanao!/He, mazava\ anio ny andro/Mba hidiranao,
--- a/composeApp/src/commonMain/composeResources/files/ffpm-55.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-55.txt
@ -1,4 +1,4 @@
-M0:|c:C|m:4/4|r:9.8.9.8.9.8|t:FFPM 55 - Ny Andron'ny Fahasoavana|a:N.F.S. Grundtvig, 1783-1872, Nad. I G. Torvik, 1871-1954|h:C.E.F. Weyese, 1774-1842
+M0:|c:C|m:4/4|r:9.8.9.8.9.8|t:FFPM 55 - Ny Andron'ny Fahasoavana|a:N.F.S. Grundtvig, 1783-1872, Nad. Gunerius Taraldsen Torvik, 1871-1954|h:C.E.F. Weyese, 1774-1842
 T0:{:d|m:m.m!s:s.s|d:l!s/m|l:s.s!f:r|m:-!r/s|s:s.s!l:l|t:d!r/r|s:s.s!t:d|(l:f)!s/s|m:m.m!f:s|l:l!s/s|d:d.d!t:d|(r:t)!$Qd}
 N1:dmmmsssd'ls/mlssfrmr/sssslltd'r'/r'ssstd'l-s/smmmfslls/sd'd'd'td'r'-d'
 N2:ddt,ddt,t,ddd/dddddrdt,/rmmrddt,ss/FssmsssFs/rrddddddd/rmmmrsf-m
--- a/composeApp/src/commonMain/composeResources/files/ffpm-56-new.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-56-new.txt
@ -1,4 +1,4 @@
-M0:|c:F|m:4/4|t:FFPM 56 Manatona Anao izao|a:H.A. Brorson, 1694-1764 Nad. C. Borchgrevink 1841-1919|r:L.M.|h:J.A.P. Schulz, 1747-1800
+M0:|c:F|m:4/4|t:FFPM 56 Manatona Anao izao|a:Hans Adolf Brorson, 1694-1764 Nad. C. Borchgrevink 1841-1919|r:L.M.|h:J.A.P. Schulz, 1747-1800
 U0:zC:(22) 4444 624/(22) 4444 624/(22) 4444 44$Q4/4 4444 88 C
 N1:drmmffmrd/ dmssllsfm/ mrddffrrs/ mfrmdl, t, d
 N2:#m, d-sllssfm/ d-ttdrtrd/ t-l4s3/ llsmsfss
--- a/composeApp/src/commonMain/composeResources/files/ffpm-56.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-56.txt
@ -1,4 +1,4 @@
-M0:|c:F|m:4/4|t:FFPM 56 Manatona Anao izao|a:H.A. Brorson, 1694-1764 Nad. C. Borchgrevink 1841-1919|r:L.M.|h:J.A.P. Schulz, 1747-1800
+M0:|c:F|m:4/4|t:FFPM 56 Manatona Anao izao|a:Hans Adolf Brorson, 1694-1764 Nad. C. Borchgrevink 1841-1919|r:L.M.|h:J.A.P. Schulz, 1747-1800
 U0:zC:(22)4(22)44 624/44444 624/(22) 4444 44$Q4/4 4444 88 C
 N1:drmm-ffmrd/ dssllsfm/ mrddffrrs/ mfrmdl, t, d
 N2:#m, d-ss-lssfm/ d4rm'rd/ t-l4ttd/ drtdslss
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
dotmg	79cccd53ee	E Smartlyrics in DC bug (spaces doubled)	2025-12-07 19:22:30 +01:00
dotmg	2a1d0d3f18	New solfa files	2025-11-29 05:02:01 +01:00
dotmg	707d128906	VerticalScrollbar for desktop, alignment bug	2025-11-29 05:01:36 +01:00
dotmg	be1b541faa	VerticalScrollbar	2025-11-28 10:53:19 +01:00
dotmg	bba28fd7c1	Hasinjato : FilePicker	2025-11-28 10:06:54 +01:00
dotmg	dfbdb2da2c	@todo ews-47.txt	2025-11-28 08:31:39 +01:00
dotmg	3867dbc855	Midi generation enhancements	2025-11-28 07:02:42 +01:00
dotmg	a35d7c38ff	New solfa ffpm & ews	2025-11-28 06:57:41 +01:00
dotmg	4c13d5f036	New FFPM files	2025-09-22 08:16:09 +02:00
dotmg	890dc1065a	Alternative Lyrics inside Refrain	2025-09-19 10:01:56 +02:00