diff --git a/source/screens/demo/examples/10print.liquid b/source/screens/demo/examples/10print.liquid
index 8486ef3..9f2778b 100644
--- a/source/screens/demo/examples/10print.liquid
+++ b/source/screens/demo/examples/10print.liquid
@@ -3,7 +3,8 @@ title: 10print
 tags:
 - demoExample
 ---
-{% layout "hippie/simple.liquid" %}
+{% assign pageBase = "../../" -%}
+{% layout "hippie/full.liquid" %}
 
 {% block head %}
 {{ block.super -}}
@@ -15,13 +16,14 @@ tags:
 {% endblock %}
 
 {% block body %}
-<canvas id="pattern"></canvas>
+<canvas id="10print"></canvas>
 {% endblock %}
 
 {% block script %}
+{{ block.super -}}
 <script>
 	// Page script
-	const canvas = document.getElementById('pattern');
+	const canvas = document.getElementById('10print');
 	const ctx = canvas.getContext('2d');
 
 	const lineWidth = 20;
diff --git a/source/screens/demo/examples/game.liquid b/source/screens/demo/examples/game.liquid
index 19d97dd..a57b17f 100644
--- a/source/screens/demo/examples/game.liquid
+++ b/source/screens/demo/examples/game.liquid
@@ -5,7 +5,7 @@ tags:
 - gameExample
 ---
 {% assign bodyClass = "body_game" -%}
-{% layout "hippie/simple.liquid" %}
+{% layout "hippie/app.liquid" %}
 
 {% block body %}
 	<div class="sec_main_center">
diff --git a/source/screens/demo/examples/ui/index.liquid b/source/screens/demo/examples/ui/index.liquid
deleted file mode 100644
index 614beed..0000000
--- a/source/screens/demo/examples/ui/index.liquid
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: UI
-tags:
-- demoExample
-- index
----
-{% layout "hippie/simple.liquid" %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block body %}
-<div class="sec_main_center">
-	<nav role="doc-toc">
-		<h1>{{ title }}</h1>
-		<ul class="list_link">
-			{%- for ui in collections.ui -%}
-				<li>
-					<a href="{{ ui.page.url }}">{{ ui.data.title }}</a>
-				</li>
-			{%- endfor -%}
-		</ul>
-	</nav>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk
new file mode 100644
index 0000000..6c8d79f
--- /dev/null
+++ b/source/screens/demo/examples/ui/index.njk
@@ -0,0 +1,25 @@
+---
+title: UI
+tags: 
+  - demoExample
+  - index
+---
+{% extends "demo/_default.njk" %}
+{% import "hippie/macros/_placeholder.njk" as ph %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block body %}
+	<div class="sec_main_center">
+		<nav role="doc-toc">
+			<h1>{{ title }}</h1>
+			<ul class="list_link">
+				{%- for ui in collections.ui -%}
+					<li>
+						<a href="{{ ui.page.url }}">{{ ui.data.title }}</a>
+					</li>
+				{%- endfor -%}
+			</ul>
+		</nav>
+	</div>
+{% endblock %}
\ No newline at end of file
diff --git a/source/style/demo.scss b/source/style/demo.scss
index 43d9cbd..fe2b7e8 100644
--- a/source/style/demo.scss
+++ b/source/style/demo.scss
@@ -15,5 +15,4 @@
 @use "modules/demo/demo_module";
 @use "modules/start";
 @use "modules/clock";
-@use "modules/game";
 // @use "modules/YOUR-MODULE/YOUR-FILES";
diff --git a/source/style/modules/_game.scss b/source/style/modules/ui/_game_module.scss
similarity index 100%
rename from source/style/modules/_game.scss
rename to source/style/modules/ui/_game_module.scss
diff --git a/source/style/ui.scss b/source/style/ui.scss
index 8c802c7..861adf8 100644
--- a/source/style/ui.scss
+++ b/source/style/ui.scss
@@ -7,6 +7,7 @@
 @use "modules/ui/new_module";
 @use "modules/ui/drag_module";
 @use "modules/ui/form_module";
+@use "modules/ui/game_module";
 @use "modules/ui/gallery_module";
 @use "modules/ui/windows_module";
 @use "modules/ui/table_module";
diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid
index 789eb2d..7295dfc 100644
--- a/source/templates/hippie/app.liquid
+++ b/source/templates/hippie/app.liquid
@@ -12,6 +12,7 @@
 {% endblock %}
 
 {% block script %}
+{{ block.super -}}
 <script src="/vendor/jquery.min.js"></script>
 <script src="/vendor/hippie-script.js"></script>
 <script src="{{ pageBase }}js/globals.js"></script>
diff --git a/source/templates/hippie/simple.liquid b/source/templates/hippie/simple.liquid
deleted file mode 100644
index b644f9f..0000000
--- a/source/templates/hippie/simple.liquid
+++ /dev/null
@@ -1,15 +0,0 @@
-{% assign pageId = page.fileSlug -%}
-{% layout "hippie/default.liquid" %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block links %}
-{{ block.super -}}
-<link href="/css/demo.css" media="all" rel="stylesheet"/>
-{% endblock %}
-
-{% block script %}
-<script src="/vendor/hippie-script.js"></script>
-<script src="/js/globals.js"></script>
-<script src="/js/app.js"></script>
-{% endblock %}
\ No newline at end of file