+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/songbook/0_artist-title.md b/source/screens/demo/examples/songbook/0_artist-title.md
new file mode 100755
index 0000000..ccf1b5c
--- /dev/null
+++ b/source/screens/demo/examples/songbook/0_artist-title.md
@@ -0,0 +1,26 @@
+---
+tags:
+ - songbook
+ - song
+title: "Interpret - Titel"
+releaseDate: JJJJ
+description: Text
+---
+~~~
+[verse 1]
+strophe 1
+
+[chorus]
+refrain
+
+[verse 2]
+strophe 2
+
+[chorus]
+[bridge]
+überleitung
+
+[interlude]
+[chorus]
+[outro]
+~~~
diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk
index edc4d47..c567309 100755
--- a/source/screens/demo/examples/ui/new.njk
+++ b/source/screens/demo/examples/ui/new.njk
@@ -8,7 +8,7 @@ tags:
{% set bodyClass = "body_new" %}
{% extends "demo/_app.njk" %}
-{% import "demo/macros/_states.njk" as state %}
+{% import "hippie/macros/_state.njk" as state %}
{% block title %}{{ title }}
{% endblock %}
diff --git a/source/style/demo.scss b/source/style/demo.scss
index e46a622..b3d4100 100644
--- a/source/style/demo.scss
+++ b/source/style/demo.scss
@@ -11,5 +11,6 @@
// -----------------------------------------------------------------------------
@import "modules/card/card_module";
@import "modules/portal/portal_module";
+@import "modules/songbook/songbook_module";
@import "modules/demo/demo_module";
// @import "modules/YOUR-MODULE/YOUR-FILES";
diff --git a/source/style/modules/songbook/_songbook_module.scss b/source/style/modules/songbook/_songbook_module.scss
new file mode 100755
index 0000000..321f8bd
--- /dev/null
+++ b/source/style/modules/songbook/_songbook_module.scss
@@ -0,0 +1,20 @@
+.songbook_song {
+ pre {
+ @extend .pre_code
+ }
+
+ header {
+ h2 {
+ margin-bottom: $space_basic;
+ }
+
+ h6 {
+ color: $color_brightest;
+ }
+
+ h2+h6 {
+ margin-top: 0;
+ margin-bottom: $space_small;
+ }
+ }
+}
\ No newline at end of file
diff --git a/source/templates/demo/macros/_gates.njk b/source/templates/hippie/macros/_gate.njk
similarity index 100%
rename from source/templates/demo/macros/_gates.njk
rename to source/templates/hippie/macros/_gate.njk
diff --git a/source/templates/hippie/macros/_song.njk b/source/templates/hippie/macros/_song.njk
new file mode 100644
index 0000000..79083c0
--- /dev/null
+++ b/source/templates/hippie/macros/_song.njk
@@ -0,0 +1,12 @@
+{% macro simple(index, data, content) %}
+
+
+
{{ data.title }}
+
{{ data.releaseDate }}
+
{{ data.description }}
+
+ {#
{{ content }}
#}
+ {{ content | safe }}
+
+
+{% endmacro %}
\ No newline at end of file
diff --git a/source/templates/demo/macros/_states.njk b/source/templates/hippie/macros/_state.njk
similarity index 100%
rename from source/templates/demo/macros/_states.njk
rename to source/templates/hippie/macros/_state.njk