diff --git a/source/screens/demo.njk b/source/screens/demo.njk
index 5592de0..cfb684c 100644
--- a/source/screens/demo.njk
+++ b/source/screens/demo.njk
@@ -1,4 +1,4 @@
-<!-- page-index.njk -->
+<!-- index.page -->
 {% set pageId = "index" %}
 {% set pageClass = "h_full_view" %}
 
diff --git a/source/screens/demo/blank.njk b/source/screens/demo/blank.njk
index c0e87ea..91a3fdd 100644
--- a/source/screens/demo/blank.njk
+++ b/source/screens/demo/blank.njk
@@ -1,4 +1,4 @@
-<!-- page-blank.njk -->
+<!-- blank.page -->
 {% set pageId = "blank" %}
 {% set pageClass = "h_full_view" %}
 
diff --git a/source/screens/demo/elements.njk b/source/screens/demo/elements.njk
index 1390f89..7dd7575 100644
--- a/source/screens/demo/elements.njk
+++ b/source/screens/demo/elements.njk
@@ -1,6 +1,5 @@
-<!-- page-elements.njk -->
+<!-- elements.page -->
 {% set pageId = "elements" %}
-{% set pageClass = "" %}
 
 {% extends "demo/_extended.njk" %}
 
diff --git a/source/screens/demo/error/304.njk b/source/screens/demo/error/304.njk
index 1f23bdc..231880c 100644
--- a/source/screens/demo/error/304.njk
+++ b/source/screens/demo/error/304.njk
@@ -1,6 +1,6 @@
-<!-- page-error-404.njk -->
+<!-- error-404.page -->
 {% set pageId = "304" %}
-{% set pageClass = "body_status" %}
+{% set bodyClass = "body_status" %}
 
 {% extends "demo/_maintenance.njk" %}
 
diff --git a/source/screens/demo/error/400.njk b/source/screens/demo/error/400.njk
index 9780796..540a612 100644
--- a/source/screens/demo/error/400.njk
+++ b/source/screens/demo/error/400.njk
@@ -1,6 +1,6 @@
-<!-- page-error-404.njk -->
+<!-- error-404.page -->
 {% set pageId = "400" %}
-{% set pageClass = "body_status" %}
+{% set bodyClass = "body_status" %}
 
 {% extends "demo/_maintenance.njk" %}
 
diff --git a/source/screens/demo/error/403.njk b/source/screens/demo/error/403.njk
index c978ebc..647a809 100644
--- a/source/screens/demo/error/403.njk
+++ b/source/screens/demo/error/403.njk
@@ -1,6 +1,6 @@
-<!-- page-error-404.njk -->
+<!-- error-404.page -->
 {% set pageId = "403" %}
-{% set pageClass = "body_status" %}
+{% set bodyClass = "body_status" %}
 
 {% extends "demo/_maintenance.njk" %}
 
diff --git a/source/screens/demo/error/404.njk b/source/screens/demo/error/404.njk
index 6b75059..d0679b3 100644
--- a/source/screens/demo/error/404.njk
+++ b/source/screens/demo/error/404.njk
@@ -1,6 +1,6 @@
-<!-- page-error-404.njk -->
+<!-- error-404.page -->
 {% set pageId = "404" %}
-{% set pageClass = "body_status" %}
+{% set bodyClass = "body_status" %}
 
 {% extends "demo/_maintenance.njk" %}
 
diff --git a/source/screens/demo/error/500.njk b/source/screens/demo/error/500.njk
index 486d3f3..bb97298 100644
--- a/source/screens/demo/error/500.njk
+++ b/source/screens/demo/error/500.njk
@@ -1,6 +1,6 @@
-<!-- page-error-500.njk -->
+<!-- error-500.page -->
 {% set pageId = "500" %}
-{% set pageClass = "body_status" %}
+{% set bodyClass = "body_status" %}
 
 {% extends "demo/_maintenance.njk" %}
 
diff --git a/source/screens/demo/examples.njk b/source/screens/demo/examples.njk
index 90da2a8..3da3efa 100644
--- a/source/screens/demo/examples.njk
+++ b/source/screens/demo/examples.njk
@@ -1,6 +1,5 @@
-<!-- page-elements.njk -->
+<!-- elements.page -->
 {% set pageId = "examples" %}
-{% set pageClass = "" %}
 
 {% extends "demo/_extended.njk" %}
 
diff --git a/source/screens/demo/intro.njk b/source/screens/demo/intro.njk
index 0b1d036..ee582d6 100644
--- a/source/screens/demo/intro.njk
+++ b/source/screens/demo/intro.njk
@@ -1,6 +1,5 @@
-<!-- page-intro.njk -->
+<!-- intro.page -->
 {% set pageId = "intro" %}
-{% set pageClass = "" %}
 
 {% extends "demo/_extended.njk" %}
 
diff --git a/source/screens/demo/maintenance.njk b/source/screens/demo/maintenance.njk
index 1ef192e..bc14d90 100644
--- a/source/screens/demo/maintenance.njk
+++ b/source/screens/demo/maintenance.njk
@@ -1,4 +1,4 @@
-<!-- page-maintenance.njk -->
+<!-- maintenance.page -->
 {% set pageId = "blank" %}
 {% set pageClass = "h_full_view" %}
 
diff --git a/source/screens/demo/os.njk b/source/screens/demo/os.njk
index 28684b4..43baa82 100644
--- a/source/screens/demo/os.njk
+++ b/source/screens/demo/os.njk
@@ -1,6 +1,5 @@
-<!-- page-os.njk -->
+<!-- os.page -->
 {% set pageId = "os" %}
-{% set pageClass = "" %}
 
 {% extends "demo/_extended.njk" %}
 
diff --git a/source/screens/demo/tests.njk b/source/screens/demo/tests.njk
index f1e6a34..fb16bd4 100644
--- a/source/screens/demo/tests.njk
+++ b/source/screens/demo/tests.njk
@@ -1,4 +1,4 @@
-<!-- page-tests.njk -->
+<!-- tests.page -->
 {% set pageId = "tests" %}
 {% set pageClass = "h_full_view" %}
 
diff --git a/source/templates/data.json b/source/templates/data.json
deleted file mode 100644
index f97e763..0000000
--- a/source/templates/data.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "demoadditionallinks": [
-    {
-      "href": "/demo.html",
-      "text": "Index"
-    }
-  ],
-  "demolinks": [
-    {
-      "href": "demo/error/403.html",
-      "text": "403"
-    },
-    {
-      "href": "demo/error/400.html",
-      "text": "400"
-    },
-    {
-      "href": "demo/error/500.html",
-      "text": "500"
-    },
-    {
-      "href": "demo/os.html",
-      "text": "OS"
-    }
-  ]
-}
diff --git a/source/templates/demo/_default.njk b/source/templates/demo/_default.njk
index f63215a..e06c023 100644
--- a/source/templates/demo/_default.njk
+++ b/source/templates/demo/_default.njk
@@ -1,6 +1,6 @@
-<!-- template-default.njk -->
+<!-- default.template -->
 <!DOCTYPE html>
-<html lang="de">
+<html lang="de" class="{{ pageClass }}" id="{{ pageId }}">
 <head>
   <meta charset="utf-8">
 
@@ -8,21 +8,22 @@
   <title>{% block title %}{% endblock %} - HIPPIE</title>
 
   {% include "demo/partials/_meta.njk" %}
+  {% block meta %}{% endblock %}
 
-  {% block link %}{% endblock %}
+  {% include "demo/partials/_links.njk" %}
+  {% block links %}{% endblock %}
 
   <link rel="stylesheet" type="text/css" media="all" href="/css/demo.css"/>
-  <!-- <link rel="stylesheet" type="text/css" media="print" href="/css/print.css"/> -->
   {% endblock %}
 </head>
 
-<body id="{{ pageId }}" class="{{ pageClass }}">
+<body>
   {% block body %}{% endblock %}
 
   {% block script %}
   <script
-  src="https://code.jquery.com/jquery-3.2.1.min.js"
-  integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
+  src="https://code.jquery.com/jquery-3.3.1.min.js"
+  integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
   crossorigin="anonymous"></script>
   {% endblock %}
 </body>
diff --git a/source/templates/demo/_extended.njk b/source/templates/demo/_extended.njk
index 5067a60..2de34ef 100644
--- a/source/templates/demo/_extended.njk
+++ b/source/templates/demo/_extended.njk
@@ -1,6 +1,6 @@
-<!-- template-extended.njk -->
+<!-- extended.template -->
 <!DOCTYPE html>
-<html lang="de">
+<html lang="de" class="{{ pageClass }}" id="{{ pageId }}">
 <head>
   <meta charset="utf-8">
 
@@ -8,6 +8,10 @@
   <title>{% block title %}{% endblock %} - HIPPIE</title>
 
   {% include "demo/partials/_meta.njk" %}
+  {% block meta %}{% endblock %}
+
+  {% include "demo/partials/_links.njk" %}
+  {% block links %}{% endblock %}
 
   <!--[if lte IE 9]>
   <script src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script>
@@ -18,15 +22,13 @@
   <!--Local alternative: <script src="./code/html5shiv.min.js"></script>-->
   <!--Only use one of the above!-->
 
-  {% block link %}{% endblock %}
-
   <!-- <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,500italic,700' rel='stylesheet' type='text/css'> -->
   <link rel="stylesheet" type="text/css" media="all" href="/css/demo.css"/>
   <!-- <link rel="stylesheet" type="text/css" media="print" href="/css/print.css"/> -->
   {% endblock %}
 </head>
 
-<body id="{{ pageId }}" class="{{ pageClass }}">
+<body>
   {% include "hippie/partials/_body_hover.njk" %}
   <div id="root">
     {% include "hippie/partials/_header.njk" %}
@@ -40,8 +42,8 @@
 
   {% block script %}
   <script
-  src="https://code.jquery.com/jquery-3.2.1.min.js"
-  integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
+  src="https://code.jquery.com/jquery-3.3.1.min.js"
+  integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
   crossorigin="anonymous"></script>
   {# <script src="bower_components/jquery/dist/jquery.js"></script> #}
   {% endblock %}
diff --git a/source/templates/demo/_maintenance.njk b/source/templates/demo/_maintenance.njk
index 0cdf7a3..a84cf6a 100644
--- a/source/templates/demo/_maintenance.njk
+++ b/source/templates/demo/_maintenance.njk
@@ -1,6 +1,6 @@
-<!-- template-maintenance.njk -->
+<!-- maintenance.template -->
 <!DOCTYPE html>
-<html lang="de">
+<html lang="de" class="{{ pageClass }}" id="{{ pageId }}">
 <head>
   <meta charset="utf-8">
 
@@ -8,16 +8,17 @@
   <title>{% block title %}{% endblock %} - HIPPIE</title>
 
   {% include "demo/partials/_meta.njk" %}
+  {% block meta %}{% endblock %}
 
-  <link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon">
+  {% block links %}
   <link rel="shortcut icon" type="image/x-icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAH7SURBVDiNldM/aJNBGMfx71viH7TqIoLiIOoiSJRu0qE4uIiDm5OI4ODk4uYioqBuUkR0kKJNFC1mqUltlbZSqE3RYt+2SUyTppCmeU2bkiZ907z3vnfnUEU0NrXPeMd97p6H+xlaa02D0oDRYL+p4WEN9yZm8dT6dzQEQtkCuiIJxHKbBxZrLiNWmc8vRxn7lMGRanPAw0QW49Uwp8ODJEZmCCSt/wcGrCWavte44LRz7FyYnd+yxMZz2J7cGKh6kvczRUp3X9BnmFyLzHNVRpkeShNM1b+iDngUn2Oue4qLLV3cf+YST2tiLf3sj04wmypSEt76wFixwoJpcbKnh/ZMmuXK2vqdYJXLxyPMDiTpTOX/DbhK88bMMh4Y5sSZt3R2/+53aRkCzgT+oX4Kls2i49YDT+M5JkMmV+aj3BrII/+a15MuSevZEPl3UzxP5/8EMiurfO1L0hyNU27tZehL/c/zJNzsLXB+uoNySZBfFQD4tIbHHxJMfoxxu2pi7rK5fsm3FgL5MwXKQAPaMzh8JMbg61E6mn3c8B/CF5yx2L1tC/5TR4nsAS/RhlNzcR0P6TggFVoDGrYqyYMkLOybZ4fQZFZqGOHsgi4KF1tIakrhKIXj/WrBQAuJV3EQtsBbEQjbQVQEB/0HUHu3Y2wU5/XKVRqhFD8AgpYX2M9TNGcAAAAASUVORK5CYII=">
+  {% endblock %}
 
   <link rel="stylesheet" type="text/css" media="all" href="/css/demo_basic.css"/>
-  <!-- <link rel="stylesheet" type="text/css" media="print" href="/css/print.css"/> -->
   {% endblock %}
 </head>
 
-<body id="{{ pageId }}" class="{{ pageClass }}">
+<body class="{{ bodyClass }}">
   {% block main %}
 
   {% import "hippie/macros/footer-status.njk" as status %}
diff --git a/source/templates/demo/partials/_links.njk b/source/templates/demo/partials/_links.njk
new file mode 100644
index 0000000..78ad510
--- /dev/null
+++ b/source/templates/demo/partials/_links.njk
@@ -0,0 +1,4 @@
+<!-- links.partial -->
+{# <link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon"> #}
+<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
+<link rel="shortcut icon" type="image/x-icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAIBAQCbjUIABQQCAGdfKgDcxYUAiXpGABkWCgDXxnEApmxRAMGZawAIBwMArZ5PAKFydQBmIZIAoGJFAIx+QwBSSyIA1biBADlx0gBNn+0AgztQAMimcQAMCwQADAsFANS/dAB7P3EAeuH7ANb4/gBQPLwAp2pNAI6CQwCilEwAr3hdADyH5ADw/f8A////AHTU+AB6M2YA0LN4ABMRBwA/OhsAyKR2AGYvjQCf7PwA7fz/AENy2gCrclkAk4ZDAAYFAgDNtXEAjkhHAEul7QD8//8AlOn8AGk1hwDWvXsAGBYJAJaHSgCnbE4AVy6rAML0/gD7/v8AQ6vuAKx1YwCZjEQALCgTALyOZwB+NVoAZ8D0AL30/QBLULMA2sV+AB4bCwDFpm0Ak087AFArvgBv4PoAjOf7AIzm+wCN4/sAjuH7AI7h+gCP3fkAOI/sAKVvcwCfkUQAfnM6ANO2hAC3iGkAk150AI9OcACKRmkAhj9kAH84YQB9NWEAfTRgAH0zYAB6MWYAei9lAItFUADdy3wAKCQPAFtTJQB2bDIAhXk5AJKGPwCbjkQAq5xOALepWwDEtGcAzLlwAMyzcgDKrXIAx6NwALyNZgDWu4IApJZHAAcGAwANDAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3eGhpamtsbW5vcHFycwt0dXZYWVpbXF1eX2BhYmNkZWZnAktMTU5PUFFRUlNUVVZXAABDREVGJSUlJSUlR0hJSgAAADs8PT4lJSUlP0BBQgAAAAAyMzQ1NiUlJTc4OToAAAAAACorLC0lJS4vMDEAAAAAAAAAISIjJCUmJygpAAAAAAAAABkaGxwdHh8gAAAAAAAAAAAAEhMUFRYXGAAAAAAAAAAAAAANDg8QEQAAAAAAAAAAAAAACAkKCwwAAAAAAAAAAAAAAAAFBgcAAAAAAAAAAAAAAAAAAgMEAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=">
diff --git a/source/templates/demo/partials/_meta.njk b/source/templates/demo/partials/_meta.njk
index ea67cb6..38d1fb7 100644
--- a/source/templates/demo/partials/_meta.njk
+++ b/source/templates/demo/partials/_meta.njk
@@ -1,13 +1,9 @@
 <!-- meta.partial -->
 <meta name="author" content="Interaktionsweise">
-<meta name="description" content="hippie">
-<meta name="generator" content="Notepad++, Atom">
+<meta name="generator" content="Atom, Notepad++">
+<meta name="description" content="Hippie interweaves preeminent personal interface elements">
 <meta name="robots" content="noindex">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 {# <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> #}
 <meta http-equiv="X-UA-Compatible" content="IE=Edge;chrome=1" />
-
-{# <link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon"> #}
-<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
-<link rel="shortcut icon" type="image/x-icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAAAIBAQCbjUIABQQCAGdfKgDcxYUAiXpGABkWCgDXxnEApmxRAMGZawAIBwMArZ5PAKFydQBmIZIAoGJFAIx+QwBSSyIA1biBADlx0gBNn+0AgztQAMimcQAMCwQADAsFANS/dAB7P3EAeuH7ANb4/gBQPLwAp2pNAI6CQwCilEwAr3hdADyH5ADw/f8A////AHTU+AB6M2YA0LN4ABMRBwA/OhsAyKR2AGYvjQCf7PwA7fz/AENy2gCrclkAk4ZDAAYFAgDNtXEAjkhHAEul7QD8//8AlOn8AGk1hwDWvXsAGBYJAJaHSgCnbE4AVy6rAML0/gD7/v8AQ6vuAKx1YwCZjEQALCgTALyOZwB+NVoAZ8D0AL30/QBLULMA2sV+AB4bCwDFpm0Ak087AFArvgBv4PoAjOf7AIzm+wCN4/sAjuH7AI7h+gCP3fkAOI/sAKVvcwCfkUQAfnM6ANO2hAC3iGkAk150AI9OcACKRmkAhj9kAH84YQB9NWEAfTRgAH0zYAB6MWYAei9lAItFUADdy3wAKCQPAFtTJQB2bDIAhXk5AJKGPwCbjkQAq5xOALepWwDEtGcAzLlwAMyzcgDKrXIAx6NwALyNZgDWu4IApJZHAAcGAwANDAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3eGhpamtsbW5vcHFycwt0dXZYWVpbXF1eX2BhYmNkZWZnAktMTU5PUFFRUlNUVVZXAABDREVGJSUlJSUlR0hJSgAAADs8PT4lJSUlP0BBQgAAAAAyMzQ1NiUlJTc4OToAAAAAACorLC0lJS4vMDEAAAAAAAAAISIjJCUmJygpAAAAAAAAABkaGxwdHh8gAAAAAAAAAAAAEhMUFRYXGAAAAAAAAAAAAAANDg8QEQAAAAAAAAAAAAAACAkKCwwAAAAAAAAAAAAAAAAFBgcAAAAAAAAAAAAAAAAAAgMEAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=">