diff --git a/source/screens/demo/basics.liquid b/source/screens/demo/basics.liquid
index 017fcfd..8093d67 100644
--- a/source/screens/demo/basics.liquid
+++ b/source/screens/demo/basics.liquid
@@ -3,8 +3,7 @@ title: Basics
 tags:
 - demoIndex
 ---
-{% assign pageBase = "../" -%}
-{% layout "hippie/page.liquid" %}
+{% layout 'hippie/page.liquid' %}
 
 {% block title %}Grundlagen{% endblock %}
 
@@ -278,7 +277,7 @@ tags:
 		<nav class="nav_center_old">
 			<ul>
 				<li>
-					<a href="{{ pageBase }}demo.html" class="a_button">Startseite</a>
+					<a href="/demo/examples/start.html" class="a_button">Startseite</a>
 				</li>
 				<li>
 					<a href="" class="a_button a_internal">Hilfe</a>
@@ -580,7 +579,7 @@ tags:
 	</article>
 	<article>
 		<h1 id="embedded">Eingebundene Inhalte</h1>
-		{% render "hippie/partials/placeholder-flag.liquid", type: "img", width: "128", desc: "Fahne von Interaktionsweise" %}
+		{% render 'hippie/partials/placeholder-flag.liquid', type: 'img', width: '128', desc: 'Fahne von Interaktionsweise' %}
 		<p>Dies ist ein Bild. Es wird mit dem Element
 			<code>&lt;img&gt;</code>
 			eingebunden. Solch ein Bild hat üblicherweise die Attribute
@@ -599,7 +598,7 @@ tags:
 			und
 			<code>&lt;picture&gt;</code>
 			in Kombination verwendet werden.</p>
-		{% render "hippie/partials/placeholder-flag.liquid", type: "img", src: "file", width: "128", desc: "Fahne von Interaktionsweise" %}
+		{% render 'hippie/partials/placeholder-flag.liquid', type: 'img', src: 'file', width: '128', desc: 'Fahne von Interaktionsweise' %}
 	</article>
 	<article>
 		<h1>Tabellen</h1>
diff --git a/source/screens/demo/components.liquid b/source/screens/demo/components.liquid
index 02a51ff..e4faaaf 100644
--- a/source/screens/demo/components.liquid
+++ b/source/screens/demo/components.liquid
@@ -3,7 +3,7 @@ title: Components
 tags:
 - demoIndex
 ---
-{% layout "hippie/page.liquid" %}
+{% layout 'hippie/page.liquid' %}
 
 {% block title %}Komponenten{% endblock %}
 
@@ -93,7 +93,7 @@ tags:
 		<p>Bekommt üblicherweise Klassen zur Positionierung und der Abmessungen zugewiesen.</p>
 		<footer>Fußbereich</footer>
 		<div style="position:relative;height:256px;background-color:#b7e0f0;">
-			{% render "hippie/partials/footer-pinned.liquid" %}
+			{% render 'hippie/partials/footer-pinned.liquid' %}
 		</div>
 	</article>
 	<article>
diff --git a/source/screens/demo/examples/10print.liquid b/source/screens/demo/examples/10print.liquid
index 8486ef3..9ee9246 100644
--- a/source/screens/demo/examples/10print.liquid
+++ b/source/screens/demo/examples/10print.liquid
@@ -3,7 +3,7 @@ title: 10print
 tags:
 - demoExample
 ---
-{% layout "hippie/simple.liquid" %}
+{% layout 'hippie/simple.liquid' %}
 
 {% block head %}
 {{ block.super -}}
diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid
index ea927c6..7dc6998 100644
--- a/source/screens/demo/examples/clock.liquid
+++ b/source/screens/demo/examples/clock.liquid
@@ -3,8 +3,8 @@ title: Clock
 tags:
 - demoExample
 ---
-{% assign bodyClass = "body_clock" -%}
-{% layout "hippie/simple.liquid" %}
+{% assign bodyClass = 'body_clock' -%}
+{% layout 'hippie/simple.liquid' %}
 
 {% block body %}
 <main>
diff --git a/source/screens/demo/examples/game.liquid b/source/screens/demo/examples/game.liquid
index 19d97dd..734a5a6 100644
--- a/source/screens/demo/examples/game.liquid
+++ b/source/screens/demo/examples/game.liquid
@@ -4,8 +4,8 @@ tags:
 - demoExample
 - gameExample
 ---
-{% assign bodyClass = "body_game" -%}
-{% layout "hippie/simple.liquid" %}
+{% assign bodyClass = 'body_game' -%}
+{% layout 'hippie/simple.liquid' %}
 
 {% block body %}
 	<div class="sec_main_center">
diff --git a/source/screens/demo/examples/start.liquid b/source/screens/demo/examples/start.liquid
index 3a42779..e11d3f8 100644
--- a/source/screens/demo/examples/start.liquid
+++ b/source/screens/demo/examples/start.liquid
@@ -3,10 +3,9 @@ title: Start
 tags:
 - demoExample
 ---
-{% assign pageBase = "../../" -%}
 {% assign pageId = page.fileSlug -%}
-{% assign bodyClass = "body_start" -%}
-{% layout "hippie/simple.liquid" %}
+{% assign bodyClass = 'body_start' -%}
+{% layout 'hippie/simple.liquid' %}
 
 {% block body %}
 <main>
diff --git a/source/screens/demo/examples/ui/cli.liquid b/source/screens/demo/examples/ui/cli.liquid
index 18f4cd4..a87d4b8 100644
--- a/source/screens/demo/examples/ui/cli.liquid
+++ b/source/screens/demo/examples/ui/cli.liquid
@@ -3,8 +3,8 @@ title: CLI
 tags:
 - ui
 ---
-{% assign bodyClass = "body_cli" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_cli' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 <div id="cli">
diff --git a/source/screens/demo/examples/ui/drag.liquid b/source/screens/demo/examples/ui/drag.liquid
index 7b46674..37d806e 100755
--- a/source/screens/demo/examples/ui/drag.liquid
+++ b/source/screens/demo/examples/ui/drag.liquid
@@ -3,7 +3,7 @@ title: Drag
 tags:
 - ui
 ---
-{% layout "hippie/app.liquid" %}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 <header class="io pos_fix pin_top pin_right pin_left">
@@ -22,8 +22,8 @@ tags:
 {% endblock %}
 
 {%- block script %}
-<script src="{{ pageBase }}js/app.js"></script>
-<script src="{{ pageBase }}js/drag.js"></script>
+<script src="/js/app.js"></script>
+<script src="/js/drag.js"></script>
 <script>
 	// Get the space element
 	const space = document.getElementById('space');
diff --git a/source/screens/demo/examples/ui/explorer.liquid b/source/screens/demo/examples/ui/explorer.liquid
index f8e66fa..bfdd28a 100644
--- a/source/screens/demo/examples/ui/explorer.liquid
+++ b/source/screens/demo/examples/ui/explorer.liquid
@@ -3,8 +3,8 @@ title: Explorer
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/frame-header.liquid' %}
diff --git a/source/screens/demo/examples/ui/form.liquid b/source/screens/demo/examples/ui/form.liquid
index 492e191..3a7aceb 100644
--- a/source/screens/demo/examples/ui/form.liquid
+++ b/source/screens/demo/examples/ui/form.liquid
@@ -3,8 +3,8 @@ title: Form
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/frame-header.liquid' %}
diff --git a/source/screens/demo/examples/ui/gallery.liquid b/source/screens/demo/examples/ui/gallery.liquid
index 8128023..0d372d4 100755
--- a/source/screens/demo/examples/ui/gallery.liquid
+++ b/source/screens/demo/examples/ui/gallery.liquid
@@ -3,8 +3,8 @@ title: Gallery
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/frame-header.liquid' %}
diff --git a/source/screens/demo/examples/ui/index.liquid b/source/screens/demo/examples/ui/index.liquid
index 614beed..5952f16 100644
--- a/source/screens/demo/examples/ui/index.liquid
+++ b/source/screens/demo/examples/ui/index.liquid
@@ -4,7 +4,7 @@ tags:
 - demoExample
 - index
 ---
-{% layout "hippie/simple.liquid" %}
+{% layout 'hippie/simple.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/source/screens/demo/examples/ui/table.liquid b/source/screens/demo/examples/ui/table.liquid
index c0887b7..a386015 100755
--- a/source/screens/demo/examples/ui/table.liquid
+++ b/source/screens/demo/examples/ui/table.liquid
@@ -3,8 +3,8 @@ title: Table
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/frame-header.liquid' %}
diff --git a/source/screens/demo/examples/ui/tile.liquid b/source/screens/demo/examples/ui/tile.liquid
index 4bcd8c4..be51071 100644
--- a/source/screens/demo/examples/ui/tile.liquid
+++ b/source/screens/demo/examples/ui/tile.liquid
@@ -3,8 +3,8 @@ title: Tile
 tags:
 - ui
 ---
-{% assign bodyClass = "body_new" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_new' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/header-status', hippie: hippie, links: start %}
diff --git a/source/screens/demo/examples/ui/tui.liquid b/source/screens/demo/examples/ui/tui.liquid
index cb2434f..ac42d52 100644
--- a/source/screens/demo/examples/ui/tui.liquid
+++ b/source/screens/demo/examples/ui/tui.liquid
@@ -3,8 +3,8 @@ title: TUI
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 {% render 'hippie/partials/frame-header.liquid' %}
diff --git a/source/screens/demo/examples/ui/windows.liquid b/source/screens/demo/examples/ui/windows.liquid
index 02606e6..d8700cd 100644
--- a/source/screens/demo/examples/ui/windows.liquid
+++ b/source/screens/demo/examples/ui/windows.liquid
@@ -3,8 +3,8 @@ title: Windows
 tags:
 - ui
 ---
-{% assign bodyClass = "body_frame" -%}
-{% layout "hippie/app.liquid" %}
+{% assign bodyClass = 'body_frame' -%}
+{% layout 'hippie/app.liquid' %}
 
 {% block body %}
 <div id="task-bar">
@@ -50,10 +50,10 @@ tags:
 {% endblock %}
 
 {%- block script %}
-{% comment %}<script src="{{ pageBase }}js/globals.js"></script>{% endcomment %}
+{% comment %}<script src="/js/globals.js"></script>{% endcomment %}
 <script src="/vendor/hippie-script.js"></script>
-<script src="{{ pageBase }}js/app.js"></script>
-<script src="{{ pageBase }}js/windows.js"></script>
+<script src="/js/app.js"></script>
+<script src="/js/windows.js"></script>
 <script>
 	console.log(HIPPIE.brand);
 	// Get the space element
diff --git a/source/screens/demo/index.liquid b/source/screens/demo/index.liquid
index 9f4aa9e..99ba875 100644
--- a/source/screens/demo/index.liquid
+++ b/source/screens/demo/index.liquid
@@ -4,10 +4,9 @@ title: Index
 tags:
 - demoIndex
 ---
-{% assign pageBase = hippie.pageBase -%}
 {% assign pageId = page.fileSlug -%}
-{% assign pageClass = "h_full_view" -%}
-{% layout "hippie/full.liquid" %}
+{% assign pageClass = 'h_full_view' -%}
+{% layout 'hippie/full.liquid' %}
 
 {% block body %}
 <div class="wrap">
diff --git a/source/screens/demo/introduction.liquid b/source/screens/demo/introduction.liquid
index af5cf07..91993cb 100644
--- a/source/screens/demo/introduction.liquid
+++ b/source/screens/demo/introduction.liquid
@@ -3,7 +3,7 @@ title: Introduction
 tags:
 - demoIndex
 ---
-{% layout "hippie/page.liquid" %}
+{% layout 'hippie/page.liquid' %}
 
 {% block title %}Einführung{% endblock %}
 
diff --git a/source/screens/demo/layouts.liquid b/source/screens/demo/layouts.liquid
index 02f3fa3..d7dc539 100644
--- a/source/screens/demo/layouts.liquid
+++ b/source/screens/demo/layouts.liquid
@@ -3,7 +3,7 @@ title: Layouts
 tags:
 - demoIndex
 ---
-{% layout "hippie/page.liquid" %}
+{% layout 'hippie/page.liquid' %}
 
 {% block title %}Gestaltungen{% endblock %}
 
diff --git a/source/screens/demo/pages/blank.liquid b/source/screens/demo/pages/blank.liquid
index 6ef5d56..5cf5e7c 100644
--- a/source/screens/demo/pages/blank.liquid
+++ b/source/screens/demo/pages/blank.liquid
@@ -1,10 +1,5 @@
 ---
 title: Blank
 ---
-{% assign pageBase = "../../" -%}
 {% assign pageId = page.fileSlug -%}
-{% layout "hippie/simple.liquid" %}
-
-{% block body %}
-<!-- {{ title }} -->
-{% endblock %}
+{% layout 'hippie/simple.liquid' %}
diff --git a/source/screens/demo/pages/default.liquid b/source/screens/demo/pages/default.liquid
index bb44e71..9b84b78 100644
--- a/source/screens/demo/pages/default.liquid
+++ b/source/screens/demo/pages/default.liquid
@@ -1,17 +1,13 @@
 ---
 title: Default
 ---
-{% assign pageBase = "../" -%}
 {% assign pageId = page.fileSlug -%}
-{% assign pageClass = "default" -%}
-{% assign bodyClass = "default" -%}
-{% layout "hippie/default.liquid" %}
+{% assign pageClass = 'default' -%}
+{% assign bodyClass = 'default' -%}
+{% layout 'hippie/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block script %}
-<script>
-	// Page script
-	console.log("pageBase is: {{ pageBase }}");
-</script>
-{% endblock %}
\ No newline at end of file
+{% block body %}
+<!-- {{ title }} body -->
+{% endblock %}
diff --git a/source/screens/demo/pages/error/304.liquid b/source/screens/demo/pages/error/304.liquid
index 4fa65ef..75127a7 100644
--- a/source/screens/demo/pages/error/304.liquid
+++ b/source/screens/demo/pages/error/304.liquid
@@ -1,9 +1,8 @@
 ---
 title: 304
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/400.liquid b/source/screens/demo/pages/error/400.liquid
index 86cb860..ffe7d9c 100644
--- a/source/screens/demo/pages/error/400.liquid
+++ b/source/screens/demo/pages/error/400.liquid
@@ -1,9 +1,8 @@
 ---
 title: 400
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/401.liquid b/source/screens/demo/pages/error/401.liquid
index 09029d6..a2fbb39 100644
--- a/source/screens/demo/pages/error/401.liquid
+++ b/source/screens/demo/pages/error/401.liquid
@@ -1,9 +1,8 @@
 ---
 title: 401
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/403.liquid b/source/screens/demo/pages/error/403.liquid
index 31a5790..cfa9eed 100644
--- a/source/screens/demo/pages/error/403.liquid
+++ b/source/screens/demo/pages/error/403.liquid
@@ -1,9 +1,8 @@
 ---
 title: 403
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/404.liquid b/source/screens/demo/pages/error/404.liquid
index a90082a..9a00731 100644
--- a/source/screens/demo/pages/error/404.liquid
+++ b/source/screens/demo/pages/error/404.liquid
@@ -1,9 +1,8 @@
 ---
 title: 404
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/408.liquid b/source/screens/demo/pages/error/408.liquid
index 7984e61..1f0ef44 100644
--- a/source/screens/demo/pages/error/408.liquid
+++ b/source/screens/demo/pages/error/408.liquid
@@ -1,9 +1,8 @@
 ---
 title: 408
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/500.liquid b/source/screens/demo/pages/error/500.liquid
index 6d21ccc..5e6cb69 100644
--- a/source/screens/demo/pages/error/500.liquid
+++ b/source/screens/demo/pages/error/500.liquid
@@ -1,9 +1,8 @@
 ---
 title: 500
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/error/503.liquid b/source/screens/demo/pages/error/503.liquid
index 4805020..2a01f87 100644
--- a/source/screens/demo/pages/error/503.liquid
+++ b/source/screens/demo/pages/error/503.liquid
@@ -1,9 +1,8 @@
 ---
 title: 503
 ---
-{% assign pageBase = "../../../" -%}
-{% assign bodyClass = "body_status" %}
-{% layout "hippie/status.liquid" %}
+{% assign bodyClass = 'body_status' %}
+{% layout 'hippie/status.liquid' %}
 
 {% block main %}
 {{ block.super -}}
diff --git a/source/screens/demo/pages/maintenance.liquid b/source/screens/demo/pages/maintenance.liquid
index 4fa3286..fe36599 100644
--- a/source/screens/demo/pages/maintenance.liquid
+++ b/source/screens/demo/pages/maintenance.liquid
@@ -1,9 +1,8 @@
 ---
 title: Maintenance
 ---
-{% assign pageBase = "../../" -%}
-{% assign pageClass = "h_full_view" -%}
-{% layout "hippie/status.liquid" %}
+{% assign pageClass = 'h_full_view' -%}
+{% layout 'hippie/status.liquid' %}
 
 {% block body %}
 <hgroup id="root" class="txt_center">
diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid
index 7e704f7..4118172 100644
--- a/source/templates/hippie/app.liquid
+++ b/source/templates/hippie/app.liquid
@@ -1,7 +1,6 @@
-{% assign pageBase = "../../../" -%}
 {% assign pageId = page.fileSlug -%}
-{% assign pageClass = "html_ui" -%}
-{% layout "hippie/default.liquid" %}
+{% assign pageClass = 'html_ui' -%}
+{% layout 'hippie/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/source/templates/hippie/default.liquid b/source/templates/hippie/default.liquid
index bdcf341..4cb653e 100644
--- a/source/templates/hippie/default.liquid
+++ b/source/templates/hippie/default.liquid
@@ -18,10 +18,10 @@
 		{{ hippie.titlePostfix -}}
 	</title>
 	{% block meta -%}
-	{% render "hippie/partials/meta.liquid" %}
+	{% render 'hippie/partials/meta.liquid' %}
 	{% endblock -%}
 	{% block links -%}
-	{% render "hippie/partials/links.liquid" %}
+	{% render 'hippie/partials/links.liquid' %}
 	{% endblock -%}
 	{% endblock -%}
 </head>
@@ -29,7 +29,7 @@
 <body{{ bodyClassAttr }}>
 {%- block body %}{% endblock -%}
 <script>
-	// Default script
+	// {{ title }} script
 </script>
 {%- block script %}{% endblock -%}
 </body>
diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid
index a3bc72c..5b22b17 100644
--- a/source/templates/hippie/full.liquid
+++ b/source/templates/hippie/full.liquid
@@ -18,19 +18,17 @@
 		{{ hippie.titlePostfix -}}
 	</title>
 	{% block meta -%}
-	{% render "hippie/partials/meta.liquid", author: "Interaktionsweise", desc: "Hippie interweaves preeminent personal interface elements" %}
+	{% render 'hippie/partials/meta.liquid', author: 'Interaktionsweise', desc: 'Hippie interweaves preeminent personal interface elements' %}
 	{% comment %}<base href="/">{% endcomment %}
 	{% endblock -%}
-	{% render "hippie/partials/script-log.liquid" %}
-	{% render "hippie/partials/log-setup", hippie: hippie, state: true -%}
-	{% render "hippie/partials/log-start" -%}
+	{% render 'hippie/partials/script-log.liquid' %}
+	{% render 'hippie/partials/log-setup', hippie: hippie, state: true -%}
+	{% render 'hippie/partials/log-start' -%}
 	{% block links -%}
-	{% 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 %}
+	{% render 'hippie/partials/links.liquid' %}
 	<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 -%}
+	{% render 'hippie/partials/log-log' with 'HEAD end    :: Links parsed, starting to load.' as msg -%}
 	{% endblock -%}
 </head>
 
diff --git a/source/templates/hippie/page.liquid b/source/templates/hippie/page.liquid
index 4afccb7..b6edd40 100644
--- a/source/templates/hippie/page.liquid
+++ b/source/templates/hippie/page.liquid
@@ -1,5 +1,5 @@
 {% assign pageId = page.fileSlug -%}
-{% layout "hippie/full.liquid" %}
+{% layout 'hippie/full.liquid' %}
 
 {% block meta %}
 {{ block.super -}}
@@ -22,15 +22,15 @@
 
 {% block body %}
 {{ block.super -}}
-{% render "hippie/partials/nav-page.liquid" %}
+{% render 'hippie/partials/nav-page.liquid' %}
 <div id="root">
-	{% render "hippie/partials/header-page.liquid" %}
+	{% render 'hippie/partials/header-page.liquid' %}
 
 	<main class="main_site">
 		{% block main %}{% endblock %}
 	</main>
 
-	{% render "hippie/partials/footer-page.liquid" %}
+	{% render 'hippie/partials/footer-page.liquid' %}
 </div>
 {% endblock %}
 
diff --git a/source/templates/hippie/partials/links.liquid b/source/templates/hippie/partials/links.liquid
index c1a8845..32d854d 100644
--- a/source/templates/hippie/partials/links.liquid
+++ b/source/templates/hippie/partials/links.liquid
@@ -1,3 +1,3 @@
 {% comment %}<link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon">{% endcomment %}
-	<link rel="shortcut icon" type="image/x-icon" href="{{ pageBase }}favicon.ico">
+	<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/hippie/partials/nav-page.liquid b/source/templates/hippie/partials/nav-page.liquid
index 36e5184..cf52d72 100644
--- a/source/templates/hippie/partials/nav-page.liquid
+++ b/source/templates/hippie/partials/nav-page.liquid
@@ -4,7 +4,7 @@
 			<li class="js_scrolltop di_none">
 				<a href="#begin" class="a_button_meta">
 					<div class="sprite_img demo__sprite_up"></div>
-					{% comment %}<img src="{{ pageBase }}art/up.png" alt="" width="32" height="64">{% endcomment %}
+					{% comment %}<img src="/art/up.png" alt="" width="32" height="64">{% endcomment %}
 				</a>
 			</li>
 			<li>
@@ -22,7 +22,7 @@
 			<li class="js_scrolldown">
 				<a href="#end" class="a_button_meta">
 					<div class="sprite_img demo__sprite_down"></div>
-					{% comment %}<img src="{{ pageBase }}art/down.png" alt="" width="32" height="32">{% endcomment %}
+					{% comment %}<img src="/art/down.png" alt="" width="32" height="32">{% endcomment %}
 				</a>
 			</li>
 		</ul>
diff --git a/source/templates/hippie/simple.liquid b/source/templates/hippie/simple.liquid
index b644f9f..b711fe6 100644
--- a/source/templates/hippie/simple.liquid
+++ b/source/templates/hippie/simple.liquid
@@ -1,5 +1,5 @@
 {% assign pageId = page.fileSlug -%}
-{% layout "hippie/default.liquid" %}
+{% layout 'hippie/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/source/templates/hippie/status.liquid b/source/templates/hippie/status.liquid
index f2e0ce1..86499ed 100644
--- a/source/templates/hippie/status.liquid
+++ b/source/templates/hippie/status.liquid
@@ -15,12 +15,12 @@
 		{{ hippie.titlePostfix -}}
 	</title>
 	{% block meta -%}
-	{% render "hippie/partials/meta.liquid" %}
+	{% render 'hippie/partials/meta.liquid' %}
 	{% endblock -%}
 	{% 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=">
-	<link rel="stylesheet" type="text/css" media="all" href="{{ pageBase }}css/demo_basic.css"/>
+	<link rel="stylesheet" type="text/css" media="all" href="/css/demo_basic.css"/>
 	{% endblock -%}
 	{% endblock -%}
 </head>