diff --git a/source/screens/demo/pages/default.liquid b/source/screens/demo/pages/default.liquid
new file mode 100644
index 0000000..026c6da
--- /dev/null
+++ b/source/screens/demo/pages/default.liquid
@@ -0,0 +1,18 @@
+---
+title: "Default"
+---
+{% assign pageBase = "../" -%}
+{% assign pageId = page.fileSlug -%}
+{% assign pageClass = "default" -%}
+{% assign bodyClass = "default" -%}
+{%- layout "hippie/default.liquid" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block script %}
+{{ block.super -}}
+
+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/pages/default.njk b/source/screens/demo/pages/default.njk
deleted file mode 100644
index a898098..0000000
--- a/source/screens/demo/pages/default.njk
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Default
----
-{% set pageBase = "../" %}
-{% set pageId = page.fileSlug %}
-
-{% extends "hippie/_default.njk" %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block body %}
-
-{% endblock %}
-
-{% block script %}
-{{ super() }}
-{% endblock %}
diff --git a/source/screens/hello.md b/source/screens/demo/pages/hello.md
similarity index 76%
rename from source/screens/hello.md
rename to source/screens/demo/pages/hello.md
index d6ff3be..09a9406 100644
--- a/source/screens/hello.md
+++ b/source/screens/demo/pages/hello.md
@@ -1,7 +1,5 @@
---
title: "Hello World"
-tags:
- - demoIndex
layout: hippie/world.liquid
---
diff --git a/source/templates/hippie/default.liquid b/source/templates/hippie/default.liquid
new file mode 100644
index 0000000..cfd5417
--- /dev/null
+++ b/source/templates/hippie/default.liquid
@@ -0,0 +1,37 @@
+
+{% if pageId %}
+{%- capture idAttr %} id="{{ pageId }}"{% endcapture -%}
+{% endif -%}
+{% if pageClass %}
+ {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%}
+{% endif -%}
+{% if bodyClass %}
+ {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%}
+{% endif -%}
+
+
+
+ {% block head %}
+
+ {{- hippie.titlePrefix -}}
+ {% block title %}{% endblock -%}
+ {{ hippie.titlePostfix -}}
+
+ {% block meta -%}
+ {% render "hippie/partials/meta.liquid" %}
+ {% endblock -%}
+ {% block links -%}
+ {% render "hippie/partials/links.liquid" %}
+ {% endblock -%}
+ {% endblock -%}
+
+
+
+{%- block body %}{% endblock -%}
+{% block script -%}
+
+{% endblock -%}
+
+