diff --git a/songs/bob_dylan/don_t_think_twice_it_s_all_right.sg b/songs/bob_dylan/don_t_think_twice_it_s_all_right.sg
index acc2073a..47e69528 100644
--- a/songs/bob_dylan/don_t_think_twice_it_s_all_right.sg
+++ b/songs/bob_dylan/don_t_think_twice_it_s_all_right.sg
@@ -3,6 +3,7 @@
 \beginsong{Don't think twice, it's all right}
   [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]
 
+  \cover
   \capo{4}
   \gtab{C}{X32010}
   \gtab{G7}{320001}
diff --git a/songs/hugues_aufray/celine.jpg b/songs/hugues_aufray/celine.jpg
new file mode 100644
index 00000000..8532b97c
Binary files /dev/null and b/songs/hugues_aufray/celine.jpg differ
diff --git a/songs/hugues_aufray/gold.jpg b/songs/hugues_aufray/gold.jpg
new file mode 100644
index 00000000..fbcefa28
Binary files /dev/null and b/songs/hugues_aufray/gold.jpg differ
diff --git a/songs/hugues_aufray/le_bon_dieu_s_enervait.sg b/songs/hugues_aufray/le_bon_dieu_s_enervait.sg
index 1915c526..84b3fe6b 100644
--- a/songs/hugues_aufray/le_bon_dieu_s_enervait.sg
+++ b/songs/hugues_aufray/le_bon_dieu_s_enervait.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le Bon Dieu s'énervait}
-  [by={Hugues Aufray}]
+  [by={Hugues Aufray},cov={celine},album={Céline}]
 
 
   \cover
diff --git a/songs/hugues_aufray/tu_sens_bon_la_terre.sg b/songs/hugues_aufray/tu_sens_bon_la_terre.sg
index a75d9636..b1d49a50 100644
--- a/songs/hugues_aufray/tu_sens_bon_la_terre.sg
+++ b/songs/hugues_aufray/tu_sens_bon_la_terre.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Tu sens bon la terre}
-  [by={Hugues Aufray}]
+  [by={Hugues Aufray},cov={gold},album={Gold}]
 
+  \cover
   \gtab{Dm}{5:X02210}
   \gtab{A7}{5:020100}
   \gtab{C}{3:X02220}
diff --git a/songs/joan_baez/here_s_to_you.sg b/songs/joan_baez/here_s_to_you.sg
index d955ed4a..c486c669 100644
--- a/songs/joan_baez/here_s_to_you.sg
+++ b/songs/joan_baez/here_s_to_you.sg
@@ -1,8 +1,9 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Here's to you}
-  [by={Joan Baez}]
+  [by={Joan Baez},cov={sacco_vanzetti},album={Sacco et Vanzetti}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{Am}{X02210}
diff --git a/songs/joan_baez/sacco_vanzetti.jpg b/songs/joan_baez/sacco_vanzetti.jpg
new file mode 100644
index 00000000..305fe47f
Binary files /dev/null and b/songs/joan_baez/sacco_vanzetti.jpg differ
diff --git a/songs/johk/la_reine_de_france.sg b/songs/johk/la_reine_de_france.sg
index 14293f4e..deb4b672 100644
--- a/songs/johk/la_reine_de_france.sg
+++ b/songs/johk/la_reine_de_france.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La reine de France}
-  [by={Johk}]
+  [by={Johk},cov={matiere_grise},album={0 de matière grise}]
 
+  \cover
   \gtab{A}{X02220}
   \gtab{E}{022100}
   \gtab{F#m}{1:022000}
diff --git a/songs/johk/matiere_grise.jpg b/songs/johk/matiere_grise.jpg
new file mode 100644
index 00000000..5098e467
Binary files /dev/null and b/songs/johk/matiere_grise.jpg differ
diff --git a/songs/les_vieilles_valises/emilie.sg b/songs/les_vieilles_valises/emilie.sg
index 8f2255ba..f84accad 100644
--- a/songs/les_vieilles_valises/emilie.sg
+++ b/songs/les_vieilles_valises/emilie.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Émilie}
-  [by={Les Vieilles Valises}]
+  [by={Les Vieilles Valises},cov={on-verra-bien},album={On verra bien{\dots}}]
 
+  \cover
   \gtab{Am}{X02210}
   \gtab{G}{320003}
   \gtab{Dm}{XX0231}
diff --git a/songs/les_vieilles_valises/on-verra-bien.jpg b/songs/les_vieilles_valises/on-verra-bien.jpg
new file mode 100644
index 00000000..1f3241fb
Binary files /dev/null and b/songs/les_vieilles_valises/on-verra-bien.jpg differ
diff --git a/songs/lylloo/lol_com.jpg b/songs/lylloo/lol_com.jpg
new file mode 100644
index 00000000..e87a0408
Binary files /dev/null and b/songs/lylloo/lol_com.jpg differ
diff --git a/songs/lylloo/ma_soiree_msn.sg b/songs/lylloo/ma_soiree_msn.sg
index bbcaad4c..470b2119 100644
--- a/songs/lylloo/ma_soiree_msn.sg
+++ b/songs/lylloo/ma_soiree_msn.sg
@@ -1,10 +1,10 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ma soirée MSN}
-  [by={Lylloo}]
+  [by={Lylloo},cov={lol_com},album={lol.com}]
 
-  \capo{2}
   \cover
+  \capo{2}
   \gtab{Em}{022000}
   \gtab{C}{X32010}
   \gtab{G}{320003}
diff --git a/songs/marie_laforet/ivan_boris_et_moi.sg b/songs/marie_laforet/ivan_boris_et_moi.sg
index e9ee0922..5bb1f9fb 100644
--- a/songs/marie_laforet/ivan_boris_et_moi.sg
+++ b/songs/marie_laforet/ivan_boris_et_moi.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ivan, Boris et moi}
-  [by={Marie Laforêt},cov={succes},album={Succès}]
+  [by={Marie Laforêt},cov={les_succes},album={Succès}]
 
   \cover
   \gtab{Gm}{3:022000}
diff --git a/songs/marie_laforet/les_succes.jpg b/songs/marie_laforet/les_succes.jpg
new file mode 100644
index 00000000..598a283f
Binary files /dev/null and b/songs/marie_laforet/les_succes.jpg differ
diff --git a/songs/sheepbox/devil_s_way.sg b/songs/sheepbox/devil_s_way.sg
index c3bf4daf..6be1f8d2 100644
--- a/songs/sheepbox/devil_s_way.sg
+++ b/songs/sheepbox/devil_s_way.sg
@@ -3,8 +3,6 @@
 \beginsong{Devil's Way}
   [by={Sheepbox},cov={sheepbox},album={Sheepbox}]
 
-  \cover
-
   % verse: 1.&.2.&.3.&.4.&
   % D D UD
   % Em Asus2
diff --git a/songs/soul_asylum/Grave_Dancers_Union.jpg b/songs/soul_asylum/Grave_Dancers_Union.jpg
new file mode 100644
index 00000000..ec0d414f
Binary files /dev/null and b/songs/soul_asylum/Grave_Dancers_Union.jpg differ
diff --git a/songs/soul_asylum/runaway_train.sg b/songs/soul_asylum/runaway_train.sg
index a088b089..740d1642 100644
--- a/songs/soul_asylum/runaway_train.sg
+++ b/songs/soul_asylum/runaway_train.sg
@@ -1,7 +1,7 @@
-\selectlanguage{french}
+\selectlanguage{english}
 \songcolumns{2}
 \beginsong{Runaway train}
-  [by={Soul Asylum},cov={soul-asylum}]
+  [by={Soul Asylum},cov={Grave_Dancers_Union},album={Grave dancers union}]
 
   \cover
   \gtab{C}{X32010}
diff --git a/songs/traditionnel/chevaliers_de_la_table_ronde.sg b/songs/traditionnel/chevaliers_de_la_table_ronde.sg
index 2896d4e1..77dfa869 100644
--- a/songs/traditionnel/chevaliers_de_la_table_ronde.sg
+++ b/songs/traditionnel/chevaliers_de_la_table_ronde.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Chevaliers de la table ronde}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{F}{1:022100}
diff --git a/songs/traditionnel/greensleeves.sg b/songs/traditionnel/greensleeves.sg
index 3e80bb4d..469fab99 100644
--- a/songs/traditionnel/greensleeves.sg
+++ b/songs/traditionnel/greensleeves.sg
@@ -1,8 +1,9 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Greensleeves}
-  [by={Traditionel}]
+  [by={Traditionnel},cov={traditionnel},album={Angleterre}]
 
+  \cover
   \gtab{Am}{X02210}
   \gtab{G}{320003}
   \gtab{E}{022100}
diff --git a/songs/traditionnel/l_homme_de_cromagnon.sg b/songs/traditionnel/l_homme_de_cromagnon.sg
index 54e57d28..6a52f361 100644
--- a/songs/traditionnel/l_homme_de_cromagnon.sg
+++ b/songs/traditionnel/l_homme_de_cromagnon.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'homme de Cro-Magnon}
-  [by={Traditionel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G7}{320001}
   \gtab{G}{320003}
diff --git a/songs/traditionnel/la_cucaracha.sg b/songs/traditionnel/la_cucaracha.sg
index d340a3bb..03d44cf8 100644
--- a/songs/traditionnel/la_cucaracha.sg
+++ b/songs/traditionnel/la_cucaracha.sg
@@ -1,8 +1,9 @@
 \selectlanguage{spanish}
 \songcolumns{2}
 \beginsong{La Cucaracha}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={Espagne}]
 
+  \cover
   \gtab{C}{X32010}
   \gtab{G}{320003}
 
diff --git a/songs/traditionnel/traditionnel.jpg b/songs/traditionnel/traditionnel.jpg
new file mode 100644
index 00000000..e7d441cb
Binary files /dev/null and b/songs/traditionnel/traditionnel.jpg differ
diff --git a/songs/traditionnel/v_la_l_bon_vent.sg b/songs/traditionnel/v_la_l_bon_vent.sg
index b8744a0d..66958420 100644
--- a/songs/traditionnel/v_la_l_bon_vent.sg
+++ b/songs/traditionnel/v_la_l_bon_vent.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{V'la l'bon vent}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{Am}{X02210}
   \gtab{C}{X32010}
   \gtab{E7}{020100}
diff --git a/songs/traditionnel/vent_frais.sg b/songs/traditionnel/vent_frais.sg
index f6b94567..36584ad7 100644
--- a/songs/traditionnel/vent_frais.sg
+++ b/songs/traditionnel/vent_frais.sg
@@ -1,8 +1,9 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Vent frais}
-  [by={Traditionnel}]
+  [by={Traditionnel},cov={traditionnel},album={France}]
 
+  \cover
   \gtab{Dm}{XX0231}
   \gtab{Am}{X02210}
 
diff --git a/songs/tri_yann/la_jument_de_michao.sg b/songs/tri_yann/la_jument_de_michao.sg
index 93ff32e9..48805484 100644
--- a/songs/tri_yann/la_jument_de_michao.sg
+++ b/songs/tri_yann/la_jument_de_michao.sg
@@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La jument de Michao}
-  [by={Tri Yann},cov={la-decouverte-ou-l-ignorance},album={Le meilleur de Tri Yann}]
+  [by={Tri Yann},cov={le-meilleur-de-tri-yann},album={Le meilleur de Tri Yann}]
 
   \cover
   \gtab{Am}{X02210}
diff --git a/songs/tri_yann/les_filles_de_redon.sg b/songs/tri_yann/les_filles_de_redon.sg
index b142ecb7..e4119dfd 100644
--- a/songs/tri_yann/les_filles_de_redon.sg
+++ b/songs/tri_yann/les_filles_de_redon.sg
@@ -3,6 +3,7 @@
 \beginsong{Les filles de Redon}
   [by={Tri Yann},cov={le-meilleur-de-tri-yann},album={Le meilleur de Tri Yann}]
 
+  \cover
   \capo{3}
   \gtab{G}{320003}
   \gtab{Em}{022000}
diff --git a/songs/yves_simon/diabolo_menthe.sg b/songs/yves_simon/diabolo_menthe.sg
index c7478ac8..058be7b7 100644
--- a/songs/yves_simon/diabolo_menthe.sg
+++ b/songs/yves_simon/diabolo_menthe.sg
@@ -9,6 +9,7 @@
   \gtab{Am}{X02210}
   \gtab{C}{X32010}
   \gtab{F}{1:022100}
+  \gtab{G}{320003}
 
   \begin{verse}
     \[Dm]Dans tes classeurs de \[Am]lycée