diff --git a/source/screens/demo/examples/intro.njk b/source/screens/demo/examples/intro.njk
index e6ee3cd..1358739 100644
--- a/source/screens/demo/examples/intro.njk
+++ b/source/screens/demo/examples/intro.njk
@@ -7,19 +7,8 @@ tags:
{% set pageId = "init" %}
{% set bodyClass = "body_intro" %}
-{% extends "hippie/_app.njk" %}
+{% extends "hippie/_app_frame.njk" %}
{% import "hippie/macros/_placeholder.njk" as ph %}
-{% block title %}
- {{ title }}
-{% endblock %}
-
-{% block links %}
-
-{% endblock %}
-
-{% block head %}
- {{ super() }}
-{% endblock %}
{% block body %}
diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk
index ec107c2..6c8d79f 100644
--- a/source/screens/demo/examples/ui/index.njk
+++ b/source/screens/demo/examples/ui/index.njk
@@ -4,20 +4,10 @@ tags:
- demoExample
- index
---
-{% extends "hippie/_app.njk" %}
+{% extends "demo/_default.njk" %}
{% import "hippie/macros/_placeholder.njk" as ph %}
-{% block title %}
- {{ title }}
-{% endblock %}
-
-{% block links %}
-
-{% endblock %}
-
-{% block head %}
- {{ super() }}
-{% endblock %}
+{% block title %}{{ title }}{% endblock %}
{% block body %}
diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk
index 54ddd0b..df1f62a 100755
--- a/source/screens/demo/examples/ui/new.njk
+++ b/source/screens/demo/examples/ui/new.njk
@@ -6,21 +6,9 @@ tags:
{% set pageId = page.fileSlug %}
{% set bodyClass = "body_new" %}
-{% extends "hippie/_app.njk" %}
+{% extends "hippie/_app_frame.njk" %}
{% import "hippie/macros/_header.njk" as header %}
-{% block title %}{{ title }}
-{% endblock %}
-
-{% block links %}
- {{ super() }}
-
-{% endblock %}
-
-{% block head %}
- {{ super() }}
-{% endblock %}
-
{% block body %}
{{ header.status(hippie, new) }}