diff --git a/Makefile b/Makefile
index e6d3e8d..5e168c7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ build_dir = build
 template_dir = templates
 config_dir = config
 .PHONY: all 
-.PRECIOUS: %.tex
 all: leadsheet_collection.pdf choir_scores.pdf print_a3.pdf clean_intermediate #print_a4.pdf
 %.pdf: build
 	$(MAKE) -C $(build_dir) $@
@@ -13,7 +12,8 @@ clean_intermediate:
 	$(MAKE) -C $(build_dir) clean_intermediate
 build: build-Makefile
 	mkdir -p $(build_dir) && \
-	cp build-Makefile $(build_dir)/Makefile
+	cp build-Makefile $(build_dir)/Makefile && \
+	cp -r library/gregorio_scores $(build_dir)
 clean:
 	$(RM) -r build
 init:
diff --git a/build-Makefile b/build-Makefile
index 0cb52f4..3831ff1 100644
--- a/build-Makefile
+++ b/build-Makefile
@@ -1,3 +1,4 @@
+.PRECIOUS: %.tex
 %.pdf: %.tex
 	lualatex --shell-escape $<
 print_a3.pdf: songsheet_a3part.pdf
diff --git a/library/gregorio_scores/.gitignore b/library/gregorio_scores/.gitignore
index ec4df9a..0d60bcc 100644
--- a/library/gregorio_scores/.gitignore
+++ b/library/gregorio_scores/.gitignore
@@ -1 +1,2 @@
 */*/*.glog
+*/*/*.gtex
diff --git a/library/gregorio_scores/agnus_dei/agnus_dei_viii/assignments.tt b/library/gregorio_scores/agnus_dei/agnus_dei_viii/assignments.tt
index 42d9efe..4048d9a 100644
--- a/library/gregorio_scores/agnus_dei/agnus_dei_viii/assignments.tt
+++ b/library/gregorio_scores/agnus_dei/agnus_dei_viii/assignments.tt
@@ -1,3 +1,3 @@
 [%
-    scores.gregorian = 'gregorio_scores/agnus_dei/agnus_viii.gabc';
+    scores.gregorian = 'agnus_dei/agnus_viii.gabc';
 -%]
diff --git a/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/alma_redemptoris_mater_simplex.gabc b/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/alma_redemptoris_mater_simplex.gabc
new file mode 100644
index 0000000..398e448
--- /dev/null
+++ b/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/alma_redemptoris_mater_simplex.gabc
@@ -0,0 +1,6 @@
+name:Alma Redemptoris (simple tone);
+office-part:Antiphona;
+book:The Liber Usualis, 1961, p. 277 & Chants of the Church, 1956, p. 83;
+transcriber:Andrew Hinkley, Leopold Fajtak;
+%%
+(c4) AL(c/ef/gh)ma(g) *() Re(g)dem(g)ptó(h)ris(i) Ma(j)ter,(g) (;) quæ(e) pér(e)vi(e)a(f) c<sp>'æ</sp>(e)li(d) por(e)ta(f) ma(h)nes,(g) (;) Et(h) stel(j)la(i) ma(h)ris,(g) (;) suc(e)cúr(f)re(e) ca(d)dén(e)ti(g) (;) súr(e)ge(f)re(g) qui(h) cu(j)rat(i) pó(k)pu(j)lo(j) :(:) Tu(j) quæ(i) ge(j)nu(j)í(k)sti,(g) (;) na(j)tú(i)ra(h) mi(g)rán(f)te,(e) (;) tu(e)um(e) san(h)ctum(g) Ge(f)ni(e)tó(de)rem(fe) :(:) Vir(j)go(i) pri(h)us(g) ac(h) po(g)sté(e)ri(f)us,(g) (;) Ga(h)bri(h)é(j)lis(h) ab(g) o(f)re(e) (;) su(f)mens(e) il(g)lud(g) A(h)ve,(g) (;) pec(j)ca(i)tó(j)rum(hg) mi(h)se(f)ré(ed)re.(c) (::)
diff --git a/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/assignments.tt b/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/assignments.tt
new file mode 100644
index 0000000..696e9af
--- /dev/null
+++ b/library/gregorio_scores/bmv/alma_redemptoris_mater_simplex/assignments.tt
@@ -0,0 +1,16 @@
+[%
+    scores.gregorian = 'bmv/alma_redemptoris_mater_simplex/alma_redemptoris_mater_simplex.gabc';
+    after_song = '
+    \\textit{
+        Erhabne Mutter des Erlösers,
+du allzeit offene Pforte des Himmels
+und Stern des Meeres,
+komm, hilf deinem Volke,
+das sich müht, vom Falle aufzustehn.
+Du hast geboren, der Natur zum Staunen,
+deinen heiligen Schöpfer.
+die du, Jungfrau davor und danach,
+aus Gabriels Mund vernahmst das selige Ave,
+o erbarme dich der Sünder. 
+        }';
+-%]
diff --git a/library/gregorio_scores/bmv/ave_regina_caelorum/assignments.tt b/library/gregorio_scores/bmv/ave_regina_caelorum/assignments.tt
index 2ec2075..6a56444 100644
--- a/library/gregorio_scores/bmv/ave_regina_caelorum/assignments.tt
+++ b/library/gregorio_scores/bmv/ave_regina_caelorum/assignments.tt
@@ -1,5 +1,5 @@
 [%
-    scores.gregorian = 'gregorio_scores/bmv/ave_regina_caelorum.gabc';
+    scores.gregorian = 'bmv/ave_regina_caelorum.gabc';
     credits = {
         lyrics = 'um 1100'
         melody = '17. Jh.'
diff --git a/library/gregorio_scores/bmv/regina_caeli/assignments.tt b/library/gregorio_scores/bmv/regina_caeli/assignments.tt
index 2cce489..b37cfc9 100644
--- a/library/gregorio_scores/bmv/regina_caeli/assignments.tt
+++ b/library/gregorio_scores/bmv/regina_caeli/assignments.tt
@@ -1,5 +1,5 @@
 [%
-    scores.gregorian = 'gregorio_scores/bmv/regina_caeli/regina_caeli.gabc';
+    scores.gregorian = 'bmv/regina_caeli/regina_caeli.gabc';
     credits = {
         lyrics = 'Rom um 1170'
         melody = '16. Jh.'
diff --git a/library/gregorio_scores/bmv/salve_regina_simplex/assignments.tt b/library/gregorio_scores/bmv/salve_regina_simplex/assignments.tt
index 8b121d1..19fb505 100644
--- a/library/gregorio_scores/bmv/salve_regina_simplex/assignments.tt
+++ b/library/gregorio_scores/bmv/salve_regina_simplex/assignments.tt
@@ -1,5 +1,5 @@
 [%
-    scores.gregorian = 'gregorio_scores/bmv/salve_regina_simplex/salve_regina_simplex.gabc';
+    scores.gregorian = 'bmv/salve_regina_simplex/salve_regina_simplex.gabc';
     credits = {
         lyrics = "11. Jh."
         melody = "17. Jh. nach Henri Du Mont"
diff --git a/library/gregorio_scores/kyrie/kyrie_viii/assignments.tt b/library/gregorio_scores/kyrie/kyrie_viii/assignments.tt
index 9878c9b..55337d5 100644
--- a/library/gregorio_scores/kyrie/kyrie_viii/assignments.tt
+++ b/library/gregorio_scores/kyrie/kyrie_viii/assignments.tt
@@ -1,5 +1,5 @@
 [%
-    scores.gregorian = 'gregorio_scores/kyrie/kyrie_viii/kyrie_viii.gabc';
+    scores.gregorian = 'kyrie/kyrie_viii/kyrie_viii.gabc';
     credits = {
         lyrics = 'Liturgie'
         melody = 'Vat. VIII'
diff --git a/library/gregorio_scores/kyrie/kyrie_xvi/assignments.tt b/library/gregorio_scores/kyrie/kyrie_xvi/assignments.tt
index 016b5e6..8ab13a9 100644
--- a/library/gregorio_scores/kyrie/kyrie_xvi/assignments.tt
+++ b/library/gregorio_scores/kyrie/kyrie_xvi/assignments.tt
@@ -1,5 +1,5 @@
 [%
-    scores.gregorian = 'gregorio_scores/kyrie/kyrie_xvi/kyrie_xvi.gabc';
+    scores.gregorian = 'kyrie/kyrie_xvi/kyrie_xvi.gabc';
     credits = {
         lyrics = 'Liturgie'
         melody = 'Vat. XVI'
diff --git a/library/gregorio_scores/kyrie/kyrie_xvi/ky--kyrie_xvi_(forma_ordinaria)--solesmes.gabc b/library/gregorio_scores/kyrie/kyrie_xvi/ky--kyrie_xvi_(forma_ordinaria)--solesmes.gabc
new file mode 100644
index 0000000..d5266bf
--- /dev/null
+++ b/library/gregorio_scores/kyrie/kyrie_xvi/ky--kyrie_xvi_(forma_ordinaria)--solesmes.gabc
@@ -0,0 +1,11 @@
+name:Kyrie XVI (forma ordinaria);
+office-part:Kyriale;
+mode:3;
+book:Graduale Romanum, 1974, p. 763 & Liber cantualis, 1983, p. 17;
+transcriber:Pierre François;
+commentary:XI-XIII. s.;
+%%
+(c4) KY(g)ri(hi)e(ii) *() e(g)lé(h_)i(i)son. (i.) <i>bis</i>(::)
+Chrí(k)ste(ij) e(h)lé(h_)i(i)son. (i.) <i>bis</i>(::)
+Ký(g)ri(hi)e(ii) e(g)lé(h_)i(i)son.(i.) (::)
+Ký(g)ri(hi)e(ii) () e(g)lé(hj)i(h)son.(ig/hvGFE.) (::)
\ No newline at end of file
diff --git a/templates/footer.tt b/templates/footer.tt
index b54383f..49bbc2f 100644
--- a/templates/footer.tt
+++ b/templates/footer.tt
@@ -1,6 +1,6 @@
 \vspace*{\fill}
 
-[% USE qr_codes = datafile("${config_dir}/qr_codes.csv", delim='|') %]
+[% USE qr_codes = datafile("${config_dir}/qr_codes.csv", delim= '|') %]
 
 [% FOREACH qr_code = qr_codes -%]
 
diff --git a/templates/musician_scores.tt b/templates/musician_scores.tt
index a4f5179..9d9d10f 100644
--- a/templates/musician_scores.tt
+++ b/templates/musician_scores.tt
@@ -75,7 +75,7 @@ RawFeature = {+ss06}
 [% subtitle %]
 \end{centering}
 
-[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim='|') %]
+[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim= '|') %]
 [% IF parts == 0 -%]
     parts = ensemble
 [% END -%]
diff --git a/templates/song_template.tt b/templates/song_template.tt
index 747dc2a..e6dfedc 100644
--- a/templates/song_template.tt
+++ b/templates/song_template.tt
@@ -11,7 +11,7 @@
         [% IF NOT gregorian -%]
         \textbf{\LARGE{Activate gregorian}}
         [% ELSE -%]
-        \gregorioscore{[% library_dir %]/[% scores.gregorian %]}
+        \gregorioscore{gregorio_scores/[% scores.gregorian %]}
         [% END -%]
     [% ELSE -%]
 \lilypondfile{[% IF parts;
diff --git a/templates/songsheet.tt b/templates/songsheet.tt
index 9b97502..fd49da5 100644
--- a/templates/songsheet.tt
+++ b/templates/songsheet.tt
@@ -4,7 +4,7 @@
 \begin{document}
 [% INCLUDE head.tt %]
 
-[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim='|') %]
+[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim= '|') %]
 
 [% FOREACH song = song_choices %]
     [% template = song.template == '' ? "song_template.tt" : song.template -%]