diff --git a/source/pages/demo.njk b/source/pages/demo.njk
index 0dd36ca..14de17c 100644
--- a/source/pages/demo.njk
+++ b/source/pages/demo.njk
@@ -4,7 +4,7 @@
 
 {% extends "demo/default.njk" %}
 
-{% block title %}index - HIPPIE{% endblock %}
+{% block title %}Index{% endblock %}
 {% block head %}
 {{ super() }}
 <link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/>
diff --git a/source/pages/demo/blank.njk b/source/pages/demo/blank.njk
index a653c60..7f12f0e 100644
--- a/source/pages/demo/blank.njk
+++ b/source/pages/demo/blank.njk
@@ -4,7 +4,7 @@
 
 {% extends "demo/default.njk" %}
 
-{% block title %}blank - HIPPIE{% endblock %}
+{% block title %}Blank{% endblock %}
 
 {% block head %}
 {{ super() }}
diff --git a/source/pages/demo/examples.njk b/source/pages/demo/examples.njk
index fea23ee..49a8cc3 100644
--- a/source/pages/demo/examples.njk
+++ b/source/pages/demo/examples.njk
@@ -35,7 +35,7 @@
       <h2>&lt;section&gt;</h2>
       <pre class="pre_code"><code>section>div.float_space_left>img^p+p</code></pre>
       <section class="overflow">
-        <div class="float_space_left demo__avatar"><img src="./art/bullet.gif" width="256" height="256" alt="Avatar"></div>
+        <div class="float_space_left demo__avatar"><img src="../art/demo/flag_websafe_128x80.gif" width="256" height="160" alt="Fahne von interaktionsweise"></div>
         <p>Vorname Name<br>Straße 1, 01234 Stadt</p><p>+49 (0)123 1337 0000<br><a class="lineLink" href="mailto:name@domain.tld">name@domain.tld</a></p>
       </section>
       <pre class="pre_code"><code>div.space_left_fourth</code></pre>
@@ -167,8 +167,8 @@
       <h2>Gruppierung</h2>
       <pre class="pre_code"><code>ul.list_link>(li>a>img)*2+li>a</code></pre>
       <ul class="list_link">
-        <li><a href=""><img src="./art/letter.gif" alt="">name@domain.tld</a></li>
-        <li><a href=""><img src="./art/bullet.gif" alt="">Work</a></li>
+        <li><a href=""><img src="../art/letter.gif" alt="">name@domain.tld</a></li>
+        <li><a href="">Work</a></li>
         <li><a href="">Projects</a></li>
       </ul>
 
@@ -238,7 +238,7 @@
             <p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
           </blockquote>
         </div>
-        {% include "hippie/partials/footer-status.njk" %}
+        {% include "demo/partials/footer-status.njk" %}
       </section>
       <section class="sec_main_status demo__status">
         <div class="wrap_center">
@@ -249,7 +249,7 @@
             <p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
           </blockquote>
         </div>
-        {% include "hippie/partials/footer-status.njk" %}
+        {% include "demo/partials/footer-status.njk" %}
       </section>
       <section class="sec_main_status demo__status">
         <div class="wrap_center">
@@ -260,7 +260,7 @@
             <p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
           </blockquote>
         </div>
-        {% include "hippie/partials/footer-status.njk" %}
+        {% include "demo/partials/footer-status.njk" %}
       </section>
     </article>
   </section>
diff --git a/source/pages/demo/maintenance.njk b/source/pages/demo/maintenance.njk
index fee0a93..b629390 100644
--- a/source/pages/demo/maintenance.njk
+++ b/source/pages/demo/maintenance.njk
@@ -4,7 +4,7 @@
 
 {% extends "demo/maintenance.njk" %}
 
-{% block title %}Wartung{% endblock %}
+{% block title %}Maintenance{% endblock %}
 
 {% block head %}
 {{ super() }}
diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk
index c177b8d..326bc2a 100644
--- a/source/pages/demo/os.njk
+++ b/source/pages/demo/os.njk
@@ -4,7 +4,7 @@
 
 {% extends "demo/extended.njk" %}
 
-{% block title %}demo{% endblock %}
+{% block title %}OS{% endblock %}
 {% block head %}
 {{ super() }}
 {% endblock %}
diff --git a/source/pages/demo/tests.njk b/source/pages/demo/tests.njk
index 202bd43..5c4a6c4 100644
--- a/source/pages/demo/tests.njk
+++ b/source/pages/demo/tests.njk
@@ -1,10 +1,10 @@
 <!-- page-tests.njk -->
-{% set pageId = "blank" %}
+{% set pageId = "tests" %}
 {% set pageClass = "height_full" %}
 
 {% extends "demo/default.njk" %}
 
-{% block title %}tests - HIPPIE{% endblock %}
+{% block title %}Tests{% endblock %}
 {% block head %}
 {{ super() }}
 <link rel="stylesheet" type="text/css" media="all" href="../css/demo.css"/>
@@ -29,8 +29,9 @@
   <input id="txtName" type="text" /><span id="error">Caps Lock is ON.</span>
 </form>
 
+<p>Navigation</p>
 {% import "demo/macros/nav-macro.njk" as forms %}
-{{ forms.active('zubereitung') }}
+{{ forms.active('Beispiel') }}
 {% endblock %}
 
 {% block script %}
diff --git a/source/templates/demo/default.njk b/source/templates/demo/default.njk
index b285196..1a31e59 100644
--- a/source/templates/demo/default.njk
+++ b/source/templates/demo/default.njk
@@ -5,6 +5,8 @@
   <meta charset="utf-8">
 
   {% block head %}
+  <title>{% block title %}{% endblock %} - HIPPIE</title>
+  
   {% include "demo/partials/head-meta.njk" %}
 
   <link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
diff --git a/source/templates/demo/extended.njk b/source/templates/demo/extended.njk
index 4b56136..c928fe4 100644
--- a/source/templates/demo/extended.njk
+++ b/source/templates/demo/extended.njk
@@ -5,6 +5,8 @@
   <meta charset="utf-8">
 
   {% block head %}
+  <title>{% block title %}{% endblock %} - HIPPIE</title>
+
   {% include "demo/partials/head-meta.njk" %}
 
   <!--[if lte IE 9]>
diff --git a/source/templates/demo/macros/nav-macro.njk b/source/templates/demo/macros/nav-macro.njk
index f1bb73b..8888224 100644
--- a/source/templates/demo/macros/nav-macro.njk
+++ b/source/templates/demo/macros/nav-macro.njk
@@ -1,18 +1,10 @@
 {% set item = [['one', 'filename'], ['two', 'filename']] %}
 {% macro active(activePage='') %}<!-- nav.macro -->
 			<nav class="nav_site">
-				<span id="js_nav_tog" class="nav_site_toggle"><img src="./art/more.svg" width="22" height="22"/></span>
 				<ul class="nav_site_main">
 					{% for a, b in item -%}
 					<li{%if activePage == a %} class="active_txt"{% endif %}>{%if activePage == a %}{{ a }}{%else%}<a href="{{ b }}.html">{{ a }}</a>{% endif %}</li>
 					{% endfor -%}
 				</ul>
-				<ul class="nav_site_add">
-					<li><a href="dummy.html"><img src="./art/search.svg" width="22" height="22"/></a></li>
-					<li><img src="./art/cart.svg" width="22" height="22"/></li>
-				</ul>
 			</nav>
 {%- endmacro %}
-{% macro top() %}<!-- top.macro -->
-			<div id="js_top" class="overlay_btn hidden"><span class="span_solo"><img src="./art/top.svg" width="44" height="44"/></span></div>
-{%- endmacro %}
diff --git a/source/templates/demo/maintenance.njk b/source/templates/demo/maintenance.njk
index f074873..a2701d3 100644
--- a/source/templates/demo/maintenance.njk
+++ b/source/templates/demo/maintenance.njk
@@ -5,6 +5,8 @@
   <meta charset="utf-8">
 
   {% block head %}
+  <title>{% block title %}{% endblock %} - HIPPIE</title>
+
   {% include "demo/partials/head-meta.njk" %}
 
   <link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">
diff --git a/source/templates/demo/partials/head-meta.njk b/source/templates/demo/partials/head-meta.njk
index e74eb8f..f38f8ae 100644
--- a/source/templates/demo/partials/head-meta.njk
+++ b/source/templates/demo/partials/head-meta.njk
@@ -1,6 +1,4 @@
 <!-- head-meta.partial -->
-<title>{% block title %}{% endblock %} - HIPPIE</title>
-
 <meta name="author" content="Interaktionsweise">
 <meta name="description" content="hippie">
 <meta name="generator" content="Notepad++, Atom">