diff --git a/source/screens/pages/card.njk b/source/screens/demo/card.njk
similarity index 93%
rename from source/screens/pages/card.njk
rename to source/screens/demo/card.njk
index 28ca934..9e8f93c 100644
--- a/source/screens/pages/card.njk
+++ b/source/screens/demo/card.njk
@@ -4,6 +4,7 @@
 {% set pageClass = "html_card" %}
 
 {% extends "demo/_default.njk" %}
+{% import "hippie/macros/_placeholder.njk" as ph %}
 
 {% block title %}Karte{% endblock %}
 
@@ -42,12 +43,12 @@
   <div class="card_box">
     <div id="jsCardHover">
       <p>Titel<br/>and description</p>
-      <h1>Prename Surname</h1>
+      <h1>{{ ph.name() }}</h1>
       <p>
-        <a class="card_address" href="">name@domain.tld</a><br/>
-        <a class="decent" href="http://site.tld">site.tld</a>
+        {{ ph.email('card_address') }}<br/>
+        {{ ph.link('decent', 'site.tld') }}
         &middot;
-        <span class="decent">Street No., Postcode City</span></p>
+        {{ ph.address('decent') }}</p>
     </div>
   </div>
 {% endblock %}
diff --git a/source/screens/pages/portal.njk b/source/screens/demo/portal.njk
similarity index 100%
rename from source/screens/pages/portal.njk
rename to source/screens/demo/portal.njk
diff --git a/source/screens/index.json b/source/screens/index.json
index e953b60..958c539 100644
--- a/source/screens/index.json
+++ b/source/screens/index.json
@@ -26,14 +26,6 @@
       "href": "pages/blank.html",
       "text": "Blank"
     },
-    {
-      "href": "pages/card.html",
-      "text": "Card"
-    },
-    {
-      "href": "pages/portal.html",
-      "text": "Portal"
-    },
     {
       "href": "pages/maintenance.html",
       "text": "Maintenance"
@@ -66,5 +58,19 @@
       "href": "pages/error/500.html",
       "text": "500"
     }
+  ],
+  "demo": [
+    {
+      "href": "demo/card.html",
+      "text": "Card"
+    },
+    {
+      "href": "demo/portal.html",
+      "text": "Portal"
+    },
+    {
+      "href": "demo/songbook.html",
+      "text": "Songbook"
+    }
   ]
 }
\ No newline at end of file
diff --git a/source/screens/index.njk b/source/screens/index.njk
index 4938f81..14a3f31 100644
--- a/source/screens/index.njk
+++ b/source/screens/index.njk
@@ -37,7 +37,6 @@
       </div>
       <nav>
         <ul class="list_link">
-          <!-- Loops through "demoadditionallinks" array -->
           {% for link in index %}
             <li>
               <a href="{{ link.href }}">{{ link.text }}</a>
@@ -47,13 +46,20 @@
       </nav>
       <h3>Pages</h3>
       <ul class="list_link">
-        <!-- Loops through "demo-links" array -->
         {% for link in pages %}
           <li>
             <a href="{{ link.href }}">{{ link.text }}</a>
           </li>
         {% endfor %}
       </ul>
+      <h3>Demo</h3>
+      <ul class="list_link">
+        {% for link in demo %}
+          <li>
+            <a href="{{ link.href }}">{{ link.text }}</a>
+          </li>
+        {% endfor %}
+      </ul>
     </div>
   </div>
 {% endblock %}
diff --git a/source/screens/pages/blank.njk b/source/screens/pages/blank.njk
index b68613e..5495640 100644
--- a/source/screens/pages/blank.njk
+++ b/source/screens/pages/blank.njk
@@ -3,7 +3,7 @@
 {% set pageId = "blank" %}
 {% set pageClass = "h_full_view" %}
 
-{% extends "demo/_default.njk" %}
+{% extends "hippie/_default.njk" %}
 
 {% block title %}Blank{% endblock %}
 
diff --git a/source/screens/pages/error/304.njk b/source/screens/pages/error/304.njk
index 9b504b6..f452801 100644
--- a/source/screens/pages/error/304.njk
+++ b/source/screens/pages/error/304.njk
@@ -3,7 +3,7 @@
 {% set pageId = "304" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/400.njk b/source/screens/pages/error/400.njk
index d0032c1..aa13f9f 100644
--- a/source/screens/pages/error/400.njk
+++ b/source/screens/pages/error/400.njk
@@ -3,7 +3,7 @@
 {% set pageId = "400" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/401.njk b/source/screens/pages/error/401.njk
index 6a18d75..7eb424e 100644
--- a/source/screens/pages/error/401.njk
+++ b/source/screens/pages/error/401.njk
@@ -3,7 +3,7 @@
 {% set pageId = "401" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/403.njk b/source/screens/pages/error/403.njk
index c3dccc2..5223278 100644
--- a/source/screens/pages/error/403.njk
+++ b/source/screens/pages/error/403.njk
@@ -3,7 +3,7 @@
 {% set pageId = "403" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/404.njk b/source/screens/pages/error/404.njk
index 95b6beb..ff03c43 100644
--- a/source/screens/pages/error/404.njk
+++ b/source/screens/pages/error/404.njk
@@ -3,7 +3,7 @@
 {% set pageId = "404" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/408.njk b/source/screens/pages/error/408.njk
index 40275ff..5845223 100644
--- a/source/screens/pages/error/408.njk
+++ b/source/screens/pages/error/408.njk
@@ -3,7 +3,7 @@
 {% set pageId = "408" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/500.njk b/source/screens/pages/error/500.njk
index 7c94558..9ea0863 100644
--- a/source/screens/pages/error/500.njk
+++ b/source/screens/pages/error/500.njk
@@ -3,7 +3,7 @@
 {% set pageId = "500" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/error/503.njk b/source/screens/pages/error/503.njk
index a036838..a4c021f 100644
--- a/source/screens/pages/error/503.njk
+++ b/source/screens/pages/error/503.njk
@@ -3,7 +3,7 @@
 {% set pageId = "503" %}
 {% set bodyClass = "body_status" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}{{ pageId }}{% endblock %}
 {% block head %}
diff --git a/source/screens/pages/maintenance.njk b/source/screens/pages/maintenance.njk
index d5914ed..5bdae82 100644
--- a/source/screens/pages/maintenance.njk
+++ b/source/screens/pages/maintenance.njk
@@ -3,7 +3,7 @@
 {% set pageId = "blank" %}
 {% set pageClass = "h_full_view" %}
 
-{% extends "demo/_maintenance.njk" %}
+{% extends "hippie/_maintenance.njk" %}
 
 {% block title %}Maintenance{% endblock %}
 
diff --git a/source/templates/demo/_default.njk b/source/templates/demo/_default.njk
index 1f67848..aac357f 100644
--- a/source/templates/demo/_default.njk
+++ b/source/templates/demo/_default.njk
@@ -21,7 +21,7 @@
         logPerf('HEAD start  :: Debugging performance...', debugOn);
       </script>
 
-      {% include "demo/partials/_links.njk" %}
+      {% include "hippie/partials/_head_links.njk" %}
       {% block links %}
         {# <link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/> #}
         {# <link rel="stylesheet" type="text/css" media="all" href="{{ pageBase | subdir(2) }}css/demo.css"/> #}
diff --git a/source/templates/demo/_extended.njk b/source/templates/demo/_extended.njk
index 39fdcb4..17aa1b0 100644
--- a/source/templates/demo/_extended.njk
+++ b/source/templates/demo/_extended.njk
@@ -21,7 +21,7 @@
         logPerf('HEAD start  :: Debugging performance...', debugOn);
       </script>
 
-      {% include "demo/partials/_links.njk" %}
+      {% include "hippie/partials/_head_links.njk" %}
       {% block links %}
         <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script> <![endif]-->
         <!--[if lte IE 9]> <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> <![endif]-->
diff --git a/source/templates/demo/_maintenance.njk b/source/templates/hippie/_maintenance.njk
similarity index 91%
rename from source/templates/demo/_maintenance.njk
rename to source/templates/hippie/_maintenance.njk
index af00cb7..0635f17 100644
--- a/source/templates/demo/_maintenance.njk
+++ b/source/templates/hippie/_maintenance.njk
@@ -6,10 +6,9 @@
 
     {% block head %}
       <title>
-        {% block title %}{% endblock %}
-        - HIPPIE</title>
+        {% block title %}{% endblock %}{{ hippie.titlePostfix }}</title>
 
-      {% include "demo/partials/_meta.njk" %}
+      {% include "hippie/partials/_head_meta.njk" %}
       {% block meta %}{% endblock %}
 
       {% block links %}
diff --git a/source/templates/hippie/macros/_nav.njk b/source/templates/hippie/macros/_nav.njk
index 0178835..4f04ad4 100644
--- a/source/templates/hippie/macros/_nav.njk
+++ b/source/templates/hippie/macros/_nav.njk
@@ -1,10 +1,13 @@
-<!-- nav.main.macro -->
-{% macro main(data, active='') %}
-<nav>
-	<ul>
-		{% for link in data %}
-		<li{%if active == link.text %} class="active_txt"{% endif %}>{%if active == link.text %}{{ link.text }}{%else%}<a href="{{ link.href }}">{{ link.text }}</a>{% endif %}</li>
-		{% endfor %}
-	</ul>
-</nav>
-{% endmacro %}
+{% macro main(data, active = '') %}
+  <nav>
+    <ul>
+      {% for link in data %}
+        <li{%if active == link.text %} class="active_txt" {% endif %}>
+          {%if active == link.text %}{{ link.text }}{%else%}
+            <a href="{{ link.href }}">{{ link.text }}</a>
+          {% endif %}
+        </li>
+      {% endfor %}
+    </ul>
+  </nav>
+{% endmacro %}
\ No newline at end of file
diff --git a/source/templates/hippie/macros/_placeholder.njk b/source/templates/hippie/macros/_placeholder.njk
new file mode 100644
index 0000000..d82e4ff
--- /dev/null
+++ b/source/templates/hippie/macros/_placeholder.njk
@@ -0,0 +1,13 @@
+{% macro email(class='', text='name@domain.tld') %}
+<a class="{{ class }}" href="">{{ text }}</a>
+{# {{ 'name@domain.tld' | urlize | safe }} #}
+{% endmacro %}
+{% macro link(class='', text='domain.tld', href='http://domain.internal') %}
+<a class="{{ class }}" href="{{ href }}">{{ text }}</a>
+{% endmacro %}
+{% macro name(class='', text='Prename Surname') %}
+<span class="{{ class }}">{{ text }}</span>
+{% endmacro %}
+{% macro address(class='', text='Street No., Postcode City') %}
+<span class="{{ class }}">{{ text }}</span>
+{% endmacro %}
diff --git a/source/templates/hippie/macros/footer-status.njk b/source/templates/hippie/macros/footer-status.njk
index 3f2e790..6668607 100644
--- a/source/templates/hippie/macros/footer-status.njk
+++ b/source/templates/hippie/macros/footer-status.njk
@@ -1,13 +1,17 @@
-<!-- footer-status.macro -->
-{% macro footer(email='admin@domain.tld', app='Application', version='ver.s.ion', system='System Name', domain='domain.tld:port', type) %}
+{% macro footer(email = 'admin@domain.tld', app = 'Application', version = 'ver.s.ion', system = 'System Name', domain = 'domain.tld:port', type) %}
 
-{% if not type or type == 'status' %}
-<footer class="pos_abs pin_bottom width_full">
-  <address class="txt_center">Kontakt: <a class="lineLink" href="mailto:{{ email }}">{{ email }}</a> * Server: {{ app }}/{{ version }} ({{ system }}) * Domain: {{ domain }}</address>
-</footer>
-{% else %}
-<footer class="pos_abs pin_bottom width_full">
-  <p>Platzhalter unten fixiert</p>
-</footer>
-{% endif %}
-{% endmacro %}
+  {% if not type or type == 'status' %}
+    <footer class="pos_abs pin_bottom width_full">
+      <address class="txt_center">Kontakt:
+        <a class="lineLink" href="mailto:{{ email }}">{{ email }}</a>
+        * Server:
+        {{ app }}/{{ version }}
+        ({{ system }}) * Domain:
+        {{ domain }}</address>
+    </footer>
+  {% else %}
+    <footer class="pos_abs pin_bottom width_full">
+      <p>Platzhalter unten fixiert</p>
+    </footer>
+  {% endif %}
+{% endmacro %}
\ No newline at end of file
diff --git a/source/templates/demo/partials/_links.njk b/source/templates/hippie/partials/_head_links.njk
similarity index 100%
rename from source/templates/demo/partials/_links.njk
rename to source/templates/hippie/partials/_head_links.njk
diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk
new file mode 100644
index 0000000..22c28a5
--- /dev/null
+++ b/source/templates/hippie/partials/_head_meta.njk
@@ -0,0 +1,7 @@
+<!-- meta.partial -->
+<meta name="author" content="">
+<meta name="generator" content="">
+<meta name="description" content="">
+<meta name="robots" content="noindex">
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">