diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk
index 5b96681..8c6bb73 100644
--- a/source/screens/demo/examples/portal.njk
+++ b/source/screens/demo/examples/portal.njk
@@ -7,7 +7,7 @@ tags:
 {% set bodyClass = "body_portal" %}
 
 {% extends "demo/_default.njk" %}
-{% import "hippie/macros/_gate.njk" as gate %}
+{% import "demo/macros/_gates.njk" as gate %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/source/screens/demo/examples/songbook.njk b/source/screens/demo/examples/songbook.njk
deleted file mode 100755
index 0b91499..0000000
--- a/source/screens/demo/examples/songbook.njk
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: Songbook
-tags:
-  - demoExample
----
-{% set pageBase = "../" %}
-{% set pageId = page.fileSlug %}
-
-{% extends "demo/_default.njk" %}
-{% import "hippie/macros/_placeholder.njk" as ph %}
-{% import "hippie/macros/_song.njk" as song %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block head %}
-  {{ super() }}
-{% endblock %}
-
-{% block body %}
-<!-- {{ page.fileSlug }}.page -->
-  <div class="sec_main_center">
-    <header class="header_txt">
-      <h1>Titel</h1>
-      <p>Jahr</p>
-    </header>
-    <nav role="doc-toc">
-      <h2>Inhaltsverzeichnis</h2>
-      <ul>
-        {%- for song in collections.song -%}
-          <li>
-            <a href="{{ song.page.url }}">{{ song.data.title }}</a>
-          </li>
-        {%- endfor -%}
-      </ul>
-    </nav>
-    <h2>Vorwort</h2>
-    <p>Liederbuch für
-      <em>Name</em>.</p>
-    <p>Gibt es gebunden und hier
-      {{ ph.link() }}.<br/>
-      Bestellungen bitte an
-      {{ ph.name() }}
-      richten.</p>
-    <hr class="hr_double hr_dotted">
-    {%- for piece in collections.song -%}
-      {{ song.simple(loop.index0, piece.data, piece.content) }}
-    {%- endfor -%}
-    <hr/>
-    <address>{{ ph.name() }}</address>
-  </div>
-{% 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
deleted file mode 100755
index ccf1b5c..0000000
--- a/source/screens/demo/examples/songbook/0_artist-title.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-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 c567309..edc4d47 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 "hippie/macros/_state.njk" as state %}
+{% import "demo/macros/_states.njk" as state %}
 
 {% block title %}{{ title }}
 {% endblock %}
diff --git a/source/style/demo.scss b/source/style/demo.scss
index b3d4100..e46a622 100644
--- a/source/style/demo.scss
+++ b/source/style/demo.scss
@@ -11,6 +11,5 @@
 // -----------------------------------------------------------------------------
 @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
deleted file mode 100755
index 321f8bd..0000000
--- a/source/style/modules/songbook/_songbook_module.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.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/hippie/macros/_gate.njk b/source/templates/demo/macros/_gates.njk
similarity index 100%
rename from source/templates/hippie/macros/_gate.njk
rename to source/templates/demo/macros/_gates.njk
diff --git a/source/templates/hippie/macros/_state.njk b/source/templates/demo/macros/_states.njk
similarity index 100%
rename from source/templates/hippie/macros/_state.njk
rename to source/templates/demo/macros/_states.njk
diff --git a/source/templates/hippie/macros/_song.njk b/source/templates/hippie/macros/_song.njk
deleted file mode 100644
index 79083c0..0000000
--- a/source/templates/hippie/macros/_song.njk
+++ /dev/null
@@ -1,12 +0,0 @@
-{% macro simple(index, data, content) %}
-  <article class="songbook_song">
-    <header>
-      <h2>{{ data.title }}</h2>
-      <h6>{{ data.releaseDate }}</h6>
-      <p>{{ data.description }}</p>
-    </header>
-    {# <pre class="pre_code"><code>{{ content }}</code></pre> #}
-    {{ content | safe }}
-    <footer>{{ index }}</footer>
-  </article>
-{% endmacro %}
\ No newline at end of file