diff --git a/lilypond-common-includes b/lilypond-common-includes
index 88f0dc9..f0ffd3f 160000
--- a/lilypond-common-includes
+++ b/lilypond-common-includes
@@ -1 +1 @@
-Subproject commit 88f0dc9f8fee1cd3f7152cd7e56798bb97699ee0
+Subproject commit f0ffd3f6305f61ab47cdae342e749c44d1f9b78f
diff --git a/lilypond-custom-includes/base_config.ly b/lilypond-custom-includes/base_config.ly
index f4d0ae6..c8469a4 100644
--- a/lilypond-custom-includes/base_config.ly
+++ b/lilypond-custom-includes/base_config.ly
@@ -3,6 +3,7 @@
 customStyleOverridesFile = "../lilypond-custom-includes/custom_style_overrides.ly"
 
 \include "categories.ly"
-\include "../lilypond-common-includes/general_include.ly"
-AUTHOR_DATA = #(resolve-inherits (call-with-input-file "../../lilypond-song-includes/data/authors.json" json->scm))
-SONG_DATA = #(resolve-inherits (call-with-input-file "../../lilypond-song-includes/data/songs.json" json->scm))
+#(ly:parser-append-to-include-path (dirname (dirname (current-filename))))
+\include "lilypond-common-includes/general_include.ly"
+AUTHOR_DATA = #(parse-yml-file "../../lilypond-song-includes/data/authors.yml")
+SONG_DATA = #(parse-yml-file "../../lilypond-song-includes/data/songs.yml")
diff --git a/lilypond-song-includes/data/authors.json b/lilypond-song-includes/data/authors.json
deleted file mode 100644
index c574120..0000000
--- a/lilypond-song-includes/data/authors.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "dude": {
-    "name": "Krasser Dude",
-    "trail_name": "dud",
-    "birth_year": "1950",
-    "organization": "Bund der krassen Dudes"
-  },
-  "kumpel": {
-    "name": "Krasser Kumpel",
-    "trail_name": "dudekumpel",
-    "death_year": "2050",
-    "organization": "Bund der krassen Kumpels"
-  },
-  "nocheiner": {
-    "name": "Jemand anderes",
-    "death_year": "2050"
-  },
-  "kumpelerbe": {
-    "inherits": "kumpel",
-    "organization": "Bund der crazy Kumpels"
-  }
-}
\ No newline at end of file
diff --git a/lilypond-song-includes/data/authors.yml b/lilypond-song-includes/data/authors.yml
new file mode 100644
index 0000000..b7e554e
--- /dev/null
+++ b/lilypond-song-includes/data/authors.yml
@@ -0,0 +1,17 @@
+dude:
+  birth_year: '1950'
+  name: Krasser Dude
+  organization: Bund der krassen Dudes
+  trail_name: dud
+kumpel:
+  death_year: '2050'
+  name: Krasser Kumpel
+  organization: Bund der krassen Kumpels
+  trail_name: dudekumpel
+kumpelerbe:
+  inherits: kumpel
+  organization: Bund der crazy Kumpels
+nocheiner:
+  death_year: '2050'
+  name: Jemand anderes
+
diff --git a/lilypond-song-includes/data/songs.json b/lilypond-song-includes/data/songs.json
deleted file mode 100644
index d46e726..0000000
--- a/lilypond-song-includes/data/songs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "a-song-id": {
-    "title": "Krasse Vorlage",
-    "composer": "kumpel",
-    "poet": "dude"
-  }
-}
\ No newline at end of file
diff --git a/lilypond-song-includes/data/songs.yml b/lilypond-song-includes/data/songs.yml
new file mode 100644
index 0000000..a449b18
--- /dev/null
+++ b/lilypond-song-includes/data/songs.yml
@@ -0,0 +1,5 @@
+a-song-id:
+  composer: kumpel
+  poet: dude
+  title: Krasse Vorlage
+