diff --git a/source/screens/demo/basics.liquid b/source/screens/demo/basics.liquid
index bb9e6d2..017fcfd 100644
--- a/source/screens/demo/basics.liquid
+++ b/source/screens/demo/basics.liquid
@@ -9,7 +9,6 @@ tags:
 {% block title %}Grundlagen{% endblock %}
 
 {% block main %}
-<!-- {{ page.fileSlug }}.page -->
 <div class="demo__intro">
 	Dies ist einfach nur Text.<br>Weniger wäre nichts, denn dieser Text ist nicht durch ein spezifisches Element
 	umschlossen.<br>Das ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung
diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid
index 34fb1d5..ea927c6 100644
--- a/source/screens/demo/examples/clock.liquid
+++ b/source/screens/demo/examples/clock.liquid
@@ -3,13 +3,12 @@ title: Clock
 tags:
 - demoExample
 ---
-{% assign pageBase = "../../" -%}
 {% assign bodyClass = "body_clock" -%}
-{% layout "hippie/full.liquid" %}
+{% layout "hippie/simple.liquid" %}
 
 {% block body %}
 <main>
-	<canvas id="clock" width="512" height="512"></canvas>
+	<canvas id="rings" width="512" height="512"></canvas>
 	<p>
 		<button id="tglFormat">12-Stunden-Format</button>
 	</p>
@@ -17,10 +16,9 @@ tags:
 {% endblock %}
 
 {% block script %}
-{{ block.super -}}
 <script>
 	// Page script
-	const canvas = document.getElementById('clock');
+	const canvas = document.getElementById('rings');
 	const ctx = canvas.getContext('2d');
 	let is24HourFormat = true;
 	const colorDayOfWeek = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-yellow').trim();
diff --git a/source/screens/demo/examples/start.liquid b/source/screens/demo/examples/start.liquid
index 3155921..3a42779 100644
--- a/source/screens/demo/examples/start.liquid
+++ b/source/screens/demo/examples/start.liquid
@@ -6,7 +6,7 @@ tags:
 {% assign pageBase = "../../" -%}
 {% assign pageId = page.fileSlug -%}
 {% assign bodyClass = "body_start" -%}
-{% layout "hippie/full.liquid" %}
+{% layout "hippie/simple.liquid" %}
 
 {% block body %}
 <main>
@@ -35,7 +35,6 @@ tags:
 {% endblock %}
 
 {% block script %}
-{{ block.super -}}
 <script>
 	// Page script
 	// NOTE: https://duckduckgo.com/duckduckgo-help-pages/settings/params
diff --git a/source/screens/demo/pages/blank.liquid b/source/screens/demo/pages/blank.liquid
index 5fde24f..6ef5d56 100644
--- a/source/screens/demo/pages/blank.liquid
+++ b/source/screens/demo/pages/blank.liquid
@@ -3,7 +3,7 @@ title: Blank
 ---
 {% assign pageBase = "../../" -%}
 {% assign pageId = page.fileSlug -%}
-{% layout "hippie/full.liquid" %}
+{% layout "hippie/simple.liquid" %}
 
 {% block body %}
 <!-- {{ title }} -->
diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid
index 789eb2d..7e704f7 100644
--- a/source/templates/hippie/app.liquid
+++ b/source/templates/hippie/app.liquid
@@ -8,14 +8,14 @@
 {% block links %}
 {{ block.super -}}
 <link href="/vendor/bootstrap-icons/font/bootstrap-icons.min.css" rel="stylesheet">
-<link href="{{ pageBase }}css/ui.css" media="all" rel="stylesheet"/>
+<link href="/css/ui.css" media="all" rel="stylesheet"/>
 {% endblock %}
 
 {% block script %}
 <script src="/vendor/jquery.min.js"></script>
 <script src="/vendor/hippie-script.js"></script>
-<script src="{{ pageBase }}js/globals.js"></script>
-<script src="{{ pageBase }}js/app.js"></script>
+<script src="/js/globals.js"></script>
+<script src="/js/app.js"></script>
 
 <script>
 	const frameHeader = document.querySelector('body > header.io');
diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid
index fd86906..a3bc72c 100644
--- a/source/templates/hippie/full.liquid
+++ b/source/templates/hippie/full.liquid
@@ -28,7 +28,7 @@
 	{% render "hippie/partials/links.liquid" %}
 	{% comment %}<link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/>{% endcomment %}
 	{% comment %}<link rel="stylesheet" type="text/css" media="all" href="{{ pageBase | subdir(2) }}css/demo.css"/>{% endcomment %}
-	<link rel="stylesheet" media="all" href="{{ pageBase }}css/demo.css" type="text/css"/>
+	<link rel="stylesheet" media="all" href="/css/demo.css" type="text/css"/>
 	{% endblock -%}
 	{% render "hippie/partials/log-log" with "HEAD end    :: Links parsed, starting to load." as msg -%}
 	{% endblock -%}
diff --git a/source/templates/hippie/page.liquid b/source/templates/hippie/page.liquid
index 369d930..4a17167 100644
--- a/source/templates/hippie/page.liquid
+++ b/source/templates/hippie/page.liquid
@@ -17,8 +17,7 @@
 {% endif %}
 
 {% comment %}<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,500italic,700' rel='stylesheet' type='text/css'>{% endcomment %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ pageBase }}css/demo.css"/>
-{% comment %}<link rel="stylesheet" type="text/css" media="print" href="{{ pageBase }}css/print.css"/>{% endcomment %}
+{% comment %}<link rel="stylesheet" type="text/css" media="print" href="/css/print.css"/>{% endcomment %}
 {% endblock %}
 
 {% block body %}
@@ -38,8 +37,8 @@
 {% block script %}
 <script src="/vendor/jquery.min.js"></script>
 <script src="/vendor/hippie-script.js"></script>
-<script src="{{ pageBase }}js/globals.js"></script>
-<script src="{{ pageBase }}js/app.js"></script>
+<script src="/js/globals.js"></script>
+<script src="/js/app.js"></script>
 <script>
 	// Setup global things for all screens
 	setup();