diff --git a/.eleventy.js b/.eleventy.js
index 48791f7..673656e 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -35,8 +35,7 @@ export default async function (eleventyConfig) {
 			name: 'Vorname Nachname',
 			address: 'Straße Nr., PLZ Ort',
 			phone: '+49 (0)101 1337 48',
-			mail: 'name@domain.tld',
-			domain: 'https://domain.tld'
+			mail: 'name@domain.tld'
 		},
 		debugMode: true,
 		legacyMode: false
@@ -47,7 +46,7 @@ export default async function (eleventyConfig) {
 	});
 
 	eleventyConfig.addShortcode('link', function (target, text, attrId, attrClass) {
-		if (!text || text === '') {
+		if (text === '') {
 			text = target;
 		}
 
diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js
index 50efe38..f0028a5 100644
--- a/source/code/hippie/app.js
+++ b/source/code/hippie/app.js
@@ -341,7 +341,6 @@ class DateDisplay {
 	}
 }
 
-// TODO: Kompatibilität für Zeiger
 function checkButtonAndTarget(event, element, button = 0) {
 	return (
 		event.button === button &&
diff --git a/source/code/windows.js b/source/code/windows.js
index 01a3c7d..8a115a9 100644
--- a/source/code/windows.js
+++ b/source/code/windows.js
@@ -21,9 +21,9 @@ class HippieTaskBar {
 
 	// TODO: Ereignisse besser delegieren
 	init() {
-		this.element.addEventListener('pointerdown', this.onDown.bind(this));
-		document.addEventListener('pointermove', this.onMove.bind(this));
-		document.addEventListener('pointerup', this.onUp.bind(this));
+		this.element.addEventListener('mousedown', this.onMouseDown.bind(this));
+		document.addEventListener('mousemove', this.onMouseMove.bind(this));
+		document.addEventListener('mouseup', this.onMouseUp.bind(this));
 
 		const dateElement = document.createElement('span');
 
@@ -34,7 +34,7 @@ class HippieTaskBar {
 		this.setOptions(this.options.position);
 	}
 
-	onDown(event) {
+	onMouseDown(event) {
 		if (checkButtonAndTarget(event, this.element, 0)) {
 			console.debug('Drag mode enabled');
 
@@ -48,7 +48,7 @@ class HippieTaskBar {
 		event.preventDefault();
 	}
 
-	onMove(event) {
+	onMouseMove(event) {
 		if (this.isDragging) {
 			this.options.position = getClosestEdgeToMouse(event);
 			const borderRadius = '4px';
@@ -116,7 +116,7 @@ class HippieTaskBar {
 		}
 	}
 
-	onUp() {
+	onMouseUp() {
 		if (event.target === this.placeholder) {
 			console.debug('Drag mode disabled');
 
diff --git a/source/screens/demo/basics.liquid b/source/screens/demo/basics.liquid
index d3c7a08..a300a21 100644
--- a/source/screens/demo/basics.liquid
+++ b/source/screens/demo/basics.liquid
@@ -2,7 +2,6 @@
 title: Basics
 tags:
 - demoIndex
-order: 2
 ---
 {% layout 'hippie/page.liquid' %}
 
diff --git a/source/screens/demo/components.liquid b/source/screens/demo/components.liquid
index ca72d3f..7070190 100644
--- a/source/screens/demo/components.liquid
+++ b/source/screens/demo/components.liquid
@@ -2,7 +2,6 @@
 title: Components
 tags:
 - demoIndex
-order: 3
 ---
 {% layout 'hippie/page.liquid' %}
 
@@ -307,7 +306,7 @@ order: 3
 				<input id="inpPass" type="password"/>
 				<span id="hintPass" style="visibility:hidden"><kbd>Shift</kbd> is pressed.</span>
 				<br>
-				<input id="inpText" type="text"/>
+				<input id ="inpText" type="text"/>
 				<span id="hintText"><kbd>CapsLock</kbd> is on.</span>
 			</form>
 		</div>
diff --git a/source/screens/demo/examples/blog.liquid b/source/screens/demo/examples/blog.liquid
deleted file mode 100644
index 59b9752..0000000
--- a/source/screens/demo/examples/blog.liquid
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: Blog
-tags:
-- demoExample
----
-{% layout 'hippie/simple.liquid' %}
-
-{% block body %}
-<div class="sec_main_center">
-	<header class="header_txt">
-		<h1>Blog</h1>
-	</header>
-	<nav role="doc-toc">
-		<h2>Inhaltsverzeichnis</h2>
-		<ul>
-			{%- for blog in collections.blog -%}
-				<li>
-					<a href="{{ blog.page.url }}">{{ blog.data.title }}</a>
-				</li>
-			{%- endfor -%}
-		</ul>
-	</nav>
-	<hr class="double dotted">
-	{%- for post in collections.article -%}
-		<article>
-			{{ post.content }}
-		</article>
-	{%- endfor -%}
-	<hr/>
-	<address>{% text hippie.placeholders.name %}</address>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/blog.njk b/source/screens/demo/examples/blog.njk
new file mode 100644
index 0000000..9573419
--- /dev/null
+++ b/source/screens/demo/examples/blog.njk
@@ -0,0 +1,51 @@
+---
+title: Blog
+tags:
+  - demoExample
+---
+{% set pageBase = "../" %}
+{% set pageId = page.fileSlug %}
+
+{% extends "demo/_default.njk" %}
+{% import "hippie/macros/_placeholder.njk" as ph %}
+{% import "hippie/macros/_song.njk" as song %}
+
+{% block title %}{{ title }}
+{% endblock %}
+
+{% block head %}
+	{{ super() }}
+{% endblock %}
+
+{% block body %}
+	<!-- {{ page.fileSlug }}.page -->
+	<div class="sec_main_center">
+		<header class="header_txt">
+			<h1>Blog</h1>
+		</header>
+		<nav role="doc-toc">
+			<h2>Inhaltsverzeichnis</h2>
+			<ul>
+				{%- for song in collections.song -%}
+					<li>
+						<a href="{{ song.page.url }}">{{ song.data.title }}</a>
+					</li>
+				{%- endfor -%}
+			</ul>
+		</nav>
+		<h2>Vorwort</h2>
+		<p>Liederbuch für
+			<em>Name</em>.</p>
+		<p>Gibt es gebunden und hier
+			{{ ph.link() }}.<br/>
+			Bestellungen bitte an
+			{{ ph.name() }}
+			richten.</p>
+		<hr class="double dotted">
+		{%- for post in collections.article -%}
+			{{ post.content }}
+		{%- endfor -%}
+		<hr/>
+		<address>{{ ph.name() }}</address>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/blog/article.md b/source/screens/demo/examples/blog/article.md
index 99b92e2..0200c08 100644
--- a/source/screens/demo/examples/blog/article.md
+++ b/source/screens/demo/examples/blog/article.md
@@ -3,7 +3,7 @@ tags:
   - blog
   - article
 title: "Artikel"
-publishDate: JJJJ
+releaseDate: JJJJ
 description: Text
 ---
 # Titel
diff --git a/source/screens/demo/examples/card.liquid b/source/screens/demo/examples/card.liquid
deleted file mode 100644
index dbe560b..0000000
--- a/source/screens/demo/examples/card.liquid
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: Card
-tags:
-- demoExample
----
-{% assign pageClass = "html_card" %}
-{% layout 'hippie/simple.liquid' %}
-
-{% block body %}
-<div class="card_bkg">
-	<div id="dither"></div>
-	{% render 'hippie/partials/placeholder-flag.liquid', type: '', id: 'flag' %}
-	{% comment %}<img id="dither" src="art/flag_dither.png" width="1920" height="1200" alt="Background flag dithered"/>{% endcomment %}
-</div>
-<div class="card_box">
-	<main>
-		<p>Titel<br/>und Beschreibung</p>
-		<h1>{% text hippie.placeholders.name %}</h1>
-		<p>
-			{% link hippie.placeholders.mail, '', '', 'card_address' %}<br/>
-			{% link hippie.placeholders.domain, 'site.tld', '', 'decent' %}
-			&middot;
-			{% text hippie.placeholders.address, '', 'decent' %}</p>
-	</main>
-</div>
-{% endblock %}
-
-{% block script %}
-<script>
-	const flag = document.getElementById('flag');
-	let colors = new Array();
-	let iId = undefined;
-	let position = 0;
-
-	for (let i = 1; i <= flag.childElementCount; i++) {
-		colors.push(document.getElementById('triangle-' + i).getAttribute('fill'));
-	}
-
-	document
-		.querySelector('main')
-		.addEventListener('mouseenter', () => {
-			iId = setInterval(() => {
-				for (let i = 1; i <= colors.length; i++) {
-					position++;
-
-					if (position >= colors.length) {
-						position = 0;
-					}
-
-					document
-						.getElementById('triangle-' + i)
-						.setAttribute('fill', colors[position]);
-				}
-
-				position++;
-
-				if (position >= colors.length) {
-					position = 0;
-				}
-			}, 600);
-		});
-
-	document
-		.querySelector('main')
-		.addEventListener('mouseleave', () => {
-			iId && clearInterval(iId);
-		});
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk
new file mode 100644
index 0000000..e05818d
--- /dev/null
+++ b/source/screens/demo/examples/card.njk
@@ -0,0 +1,83 @@
+---
+title: Card
+tags:
+  - demoExample
+---
+{% set pageId = page.fileSlug %}
+{% set pageClass = "html_card" %}
+
+{% extends "demo/_default.njk" %}
+{% import "hippie/macros/_placeholder.njk" as ph %}
+
+{% block title %}{{ title }}
+{% endblock %}
+
+{% block head %}
+	{{ super() }}
+{% endblock %}
+
+{% block body %}
+
+	<!-- {{ page.fileSlug }}.page -->
+	<div class="card_bkg">
+		<div id="dither"></div>
+		{{ ph.flag('svg', '', 'flag', '') }}
+		{# <img id="dither" src="art/flag_dither.png" width="1920" height="1200" alt="Background flag dithered"/> #}
+	</div>
+	<div class="card_box">
+		<div id="js_content">
+			<p>Titel<br/>und Beschreibung</p>
+			<h1>{{ ph.name() }}</h1>
+			<p>
+				{{ ph.email('card_address') }}<br/>
+				{{ ph.link('decent', 'site.tld') }}
+				&middot;
+				{{ ph.address('decent') }}</p>
+		</div>
+	</div>
+{% endblock %}
+
+{% block script %}
+	<script>
+		const flag = document.getElementById("flag");
+		let colors = new Array();
+		let iId = undefined;
+		let position = 0;
+
+		for (let i = 1; i <= flag.childElementCount; i++) {
+			colors.push(document.getElementById("triangle-" + i).getAttribute("fill"));
+		}
+
+		// console.log(colors);
+
+		document
+			.getElementById('js_content')
+			.addEventListener('mouseenter', () => {
+				iId = setInterval(() => {
+					for (let i = 1; i <= colors.length; i++) {
+						position++;
+
+						if (position >= colors.length) {
+							position = 0;
+						}
+
+						document
+							.getElementById("triangle-" + i)
+							.setAttribute("fill", colors[position]);
+					}
+
+					position++;
+
+					if (position >= colors.length) {
+						position = 0;
+					}
+				}, 600);
+			});
+
+		document
+			.getElementById('js_content')
+			.addEventListener('mouseleave', () => {
+				iId && clearInterval(iId);
+			});
+	</script>
+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid
index b77d12b..c55f9a9 100644
--- a/source/screens/demo/examples/clock.liquid
+++ b/source/screens/demo/examples/clock.liquid
@@ -17,13 +17,11 @@ tags:
 <main></main>
 {% endblock %}
 
-{% block assets %}
+{% block script %}
 <script src="/vendor/hippie-script.js"></script>
 <script src="/js/globals.js"></script>
 <script src="/js/app.js"></script>
-{% endblock %}
 
-{% block script %}
 <script>
 	class HippieClock {
 		constructor(element, date = new Date(), options = {}) {
diff --git a/source/screens/demo/examples/game/intro.liquid b/source/screens/demo/examples/game/intro.liquid
index ac1de27..3c4710c 100644
--- a/source/screens/demo/examples/game/intro.liquid
+++ b/source/screens/demo/examples/game/intro.liquid
@@ -3,6 +3,7 @@ title: Intro
 tags:
 - game
 ---
+
 {% assign bodyClass = 'body_intro' -%}
 {% layout 'hippie/app.liquid' %}
 
@@ -45,13 +46,9 @@ tags:
 </div>
 {% endblock %}
 
-{% block assets %}
-{{ block.super -}}
-<script src="/js/intro.js"></script>
-{% endblock %}
-
 {%- block script %}
 {{ block.super -}}
+<script src="/js/intro.js"></script>
 <script>
 	//let intro = new Intro('Intro');
 	//intro.init();
diff --git a/source/screens/demo/examples/songbook.liquid b/source/screens/demo/examples/songbook.liquid
deleted file mode 100644
index 5329c0a..0000000
--- a/source/screens/demo/examples/songbook.liquid
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Songbook
-tags:
-- demoExample
----
-{% layout 'hippie/simple.liquid' %}
-
-{% block body %}
-<div class="sec_main_center">
-	<header class="header_txt">
-		<h1>Titel</h1>
-		<p>Jahr</p>
-	</header>
-	<nav role="doc-toc">
-		<h2>Inhaltsverzeichnis</h2>
-		<ul>
-			{%- for song in collections.song -%}
-				<li>
-					<a href="{{ song.page.url }}">{{ song.data.title }}</a>
-				</li>
-			{%- endfor -%}
-		</ul>
-	</nav>
-	<h2>Vorwort</h2>
-	<p>Liederbuch für
-		<em>Name</em>.</p>
-	<p>Gibt es gebunden und hier
-		{% link hippie.placeholders.domain %}.<br/>
-		Bestellungen bitte an
-		{% text hippie.placeholders.name %}
-		richten.</p>
-	<hr class="double dotted">
-	{%- for piece in collections.song -%}
-		{% render 'hippie/partials/song.liquid', index: forloop.index0, data: piece.data, content: piece.content %}
-	{%- endfor -%}
-	<hr/>
-	<address>{% text hippie.placeholders.name %}</address>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/songbook.njk b/source/screens/demo/examples/songbook.njk
new file mode 100755
index 0000000..78a9939
--- /dev/null
+++ b/source/screens/demo/examples/songbook.njk
@@ -0,0 +1,52 @@
+---
+title: Songbook
+tags:
+  - demoExample
+---
+{% set pageBase = "../" %}
+{% set pageId = page.fileSlug %}
+
+{% extends "demo/_default.njk" %}
+{% import "hippie/macros/_placeholder.njk" as ph %}
+{% import "hippie/macros/_song.njk" as song %}
+
+{% block title %}{{ title }}
+{% endblock %}
+
+{% block head %}
+	{{ super() }}
+{% endblock %}
+
+{% block body %}
+	<!-- {{ page.fileSlug }}.page -->
+	<div class="sec_main_center">
+		<header class="header_txt">
+			<h1>Titel</h1>
+			<p>Jahr</p>
+		</header>
+		<nav role="doc-toc">
+			<h2>Inhaltsverzeichnis</h2>
+			<ul>
+				{%- for song in collections.song -%}
+					<li>
+						<a href="{{ song.page.url }}">{{ song.data.title }}</a>
+					</li>
+				{%- endfor -%}
+			</ul>
+		</nav>
+		<h2>Vorwort</h2>
+		<p>Liederbuch für
+			<em>Name</em>.</p>
+		<p>Gibt es gebunden und hier
+			{{ ph.link() }}.<br/>
+			Bestellungen bitte an
+			{{ ph.name() }}
+			richten.</p>
+		<hr class="double dotted">
+		{%- for piece in collections.song -%}
+			{{ song.simple(loop.index0, piece.data, piece.content) }}
+		{%- endfor -%}
+		<hr/>
+		<address>{{ ph.name() }}</address>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/ui/drag.liquid b/source/screens/demo/examples/ui/drag.liquid
index 1c3770f..37d806e 100755
--- a/source/screens/demo/examples/ui/drag.liquid
+++ b/source/screens/demo/examples/ui/drag.liquid
@@ -21,12 +21,9 @@ tags:
 </div>
 {% endblock %}
 
-{% block assets %}
-{{ block.super -}}
-<script src="/js/drag.js"></script>
-{% endblock %}
-
 {%- block 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/windows.liquid b/source/screens/demo/examples/ui/windows.liquid
index 15d589b..8a9c65a 100644
--- a/source/screens/demo/examples/ui/windows.liquid
+++ b/source/screens/demo/examples/ui/windows.liquid
@@ -49,13 +49,10 @@ tags:
 </div>
 {% endblock %}
 
-{% block assets %}
-{{ block.super -}}
-<script src="/js/windows.js"></script>
-{% endblock %}
-
 {%- block script %}
 {{ block.super -}}
+
+<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 684b6b3..bd3e609 100644
--- a/source/screens/demo/index.liquid
+++ b/source/screens/demo/index.liquid
@@ -1,6 +1,8 @@
 ---
 permalink: "/"
 title: Index
+tags:
+- demoIndex
 ---
 {% assign pageId = page.fileSlug -%}
 {% assign pageClass = 'h_full_view' -%}
@@ -33,8 +35,7 @@ title: Index
 		</div>
 		<nav>
 			<ul class="block link">
-				{% assign indexByOrder = collections.demoIndex | sort: 'data.order' %}
-				{% for link in indexByOrder %}
+				{% for link in collections.demoIndex %}
 					<li>
 						<a href="{{ link.page.url }}">{{ link.data.title }}</a>
 					</li>
@@ -46,6 +47,7 @@ title: Index
 				<h3>Page</h3>
 				<ul class="block link">
 					{% assign pagesByTitle = collections.demoPage | sort: 'data.title' %}
+
 					{% for link in pagesByTitle %}
 						<li>
 							<a href="{{ link.page.url }}">{{ link.data.title }}</a>
@@ -56,8 +58,7 @@ title: Index
 			<section>
 				<h3>Example</h3>
 				<ul class="block link">
-					{% assign examplesByTitle = collections.demoExample | sort: 'data.title' %}
-					{% for link in examplesByTitle %}
+					{% for link in collections.demoExample %}
 						<li>
 							<a href="{{ link.page.url }}">{{ link.data.title }}</a>
 						</li>
diff --git a/source/screens/demo/introduction.liquid b/source/screens/demo/introduction.liquid
index 21e2e52..91993cb 100644
--- a/source/screens/demo/introduction.liquid
+++ b/source/screens/demo/introduction.liquid
@@ -2,7 +2,6 @@
 title: Introduction
 tags:
 - demoIndex
-order: 1
 ---
 {% layout 'hippie/page.liquid' %}
 
@@ -29,7 +28,13 @@ order: 1
 {% block script %}
 {{ block.super -}}
 <script>
+	assetsLoaded = true;
+	logPerf('Assets loaded.', assetsLoaded);
+	// Page specific
+	// ------------------------------------------------------------------------------
 	composeMail('special', 'me', 'domain', 'tld', 'Me', 'HIPPIE')
 	composeMail('.general', 'name', 'domain', 'tld', '', '')
+
+	logPerf('Application ready... not.');
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/layouts.liquid b/source/screens/demo/layouts.liquid
index 37da17e..6a41fe5 100644
--- a/source/screens/demo/layouts.liquid
+++ b/source/screens/demo/layouts.liquid
@@ -2,7 +2,6 @@
 title: Layouts
 tags:
 - demoIndex
-order: 4
 ---
 {% layout 'hippie/page.liquid' %}
 
@@ -299,13 +298,14 @@ order: 4
 </section>
 {% endblock %}
 
-{% block assets %}
-{{ block.super -}}
-<script src="/vendor/jq-sticky-anything.min.js"></script>
-{% endblock %}
 {% block script %}
 {{ block.super -}}
+<script src="/vendor/jq-sticky-anything.min.js" type="text/javascript"></script>
 <script>
+	assetsLoaded = true;
+	logPerf('Assets loaded.', assetsLoaded);
+	// Page specific
+	// ------------------------------------------------------------------------------
 	$(document).ready(function () {
 		// jq-sticky-anything
 		$('#js_demo_fix').stickThis({pushup: '#js_demo_stop'});
diff --git a/source/style/modules/card/_card_module.scss b/source/style/modules/card/_card_module.scss
index 86ab09c..5244c7f 100644
--- a/source/style/modules/card/_card_module.scss
+++ b/source/style/modules/card/_card_module.scss
@@ -32,7 +32,7 @@
 				// text-align: center;
 			}
 
-			& > main {
+			& > div {
 				position: relative;
 				padding: 64px 64px 24px 64px;
 				border: 1px solid #FFF;
diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid
index 87db0cb..4118172 100644
--- a/source/templates/hippie/app.liquid
+++ b/source/templates/hippie/app.liquid
@@ -10,14 +10,12 @@
 <link href="/css/ui.css" media="all" rel="stylesheet"/>
 {% endblock %}
 
-{% block assets %}
+{% block script %}
 <script src="/vendor/jquery.min.js"></script>
 <script src="/vendor/hippie-script.js"></script>
 <script src="/js/globals.js"></script>
 <script src="/js/app.js"></script>
-{% endblock %}
 
-{% block script %}
 <script>
 	const frameHeader = document.querySelector('body > header.io');
 	const closeActionElements = document.querySelectorAll('[data-action=close]');
@@ -38,4 +36,4 @@
 		});
 	}
 </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/source/templates/hippie/default.liquid b/source/templates/hippie/default.liquid
index 0d6c050..b8cdbfd 100644
--- a/source/templates/hippie/default.liquid
+++ b/source/templates/hippie/default.liquid
@@ -28,7 +28,6 @@
 
 <body{{ bodyClassAttr }}>
 {%- block body %}{% endblock -%}
-{%- block assets %}{% endblock -%}
 <script>
 	// {{ title }} script using default template
 </script>
diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid
index dbbe4ae..d445469 100644
--- a/source/templates/hippie/full.liquid
+++ b/source/templates/hippie/full.liquid
@@ -36,13 +36,12 @@
 {% render 'hippie/partials/log-log' with 'BODY start' as msg -%}
 {%- block body %}{% endblock -%}
 {% render 'hippie/partials/log-log' with 'BODY        :: Loading script assets...' as msg -%}
-{%- block assets %}{% endblock -%}
-{% render 'hippie/partials/log-assets', state: true -%}
-{% render 'hippie/partials/log-log', msg: 'BODY        :: Assets loaded, running page specific script...', arg: true -%}
 <script>
 	// {{ title }} script using full template
 </script>
 {%- block script %}{% endblock -%}
+{% render 'hippie/partials/log-assets', state: true -%}
+{% render 'hippie/partials/log-log', msg: 'BODY        :: Assets loaded, running page specific script...', arg: true -%}
 {% render 'hippie/partials/log-log' with 'BODY end    :: Page script might still be loading.' as msg -%}
 {% render 'hippie/partials/log-log' with 'Application ready... or is it?' as msg -%}
 </body>
diff --git a/source/templates/hippie/page.liquid b/source/templates/hippie/page.liquid
index 5c8881f..dd6e6ed 100644
--- a/source/templates/hippie/page.liquid
+++ b/source/templates/hippie/page.liquid
@@ -34,13 +34,11 @@
 </div>
 {% endblock %}
 
-{% block assets %}
+{% block script %}
 <script src="/vendor/jquery.min.js"></script>
 <script src="/vendor/hippie-script.js"></script>
 <script src="/js/globals.js"></script>
 <script src="/js/app.js"></script>
-{% endblock %}
-{% block script %}
 <script>
 	// Setup global things for all screens
 	setup();
@@ -61,4 +59,4 @@
 		logPerf('EVENT       :: jQuery \'ready\' event fired.');
 	});
 </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/source/templates/hippie/partials/placeholder-flag.liquid b/source/templates/hippie/partials/placeholder-flag.liquid
index 6b6b048..280a48c 100644
--- a/source/templates/hippie/partials/placeholder-flag.liquid
+++ b/source/templates/hippie/partials/placeholder-flag.liquid
@@ -14,7 +14,7 @@
 		<g>
 			<use xlink:href="#triangle-5" style="filter: url(#turb3);" />
 		</g>{% endcomment %}
-		{% if desc %}
+		{% if desc != '' %}
 			<desc>{{ desc }}</desc>
 		{% endif %}
 		<rect id="triangle-5" y="0" fill="#273F8B" width="1920" height="1200"/>
diff --git a/source/templates/hippie/partials/song.liquid b/source/templates/hippie/partials/song.liquid
deleted file mode 100644
index 534da59..0000000
--- a/source/templates/hippie/partials/song.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<article class="songbook_song">
-	<header>
-		<h2>{{ data.title }}</h2>
-		<h6>{{ data.releaseDate }}</h6>
-		<p>{{ data.description }}</p>
-	</header>
-	{% comment %}<pre class="pre_code"><code>{{ content }}</code></pre>{% endcomment %}
-	{{ content }}
-	<footer>{{ index }}</footer>
-</article>
\ No newline at end of file