diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk
index 8c6bb73..5b96681 100644
--- a/source/screens/demo/examples/portal.njk
+++ b/source/screens/demo/examples/portal.njk
@@ -7,7 +7,7 @@ tags:
 {% set bodyClass = "body_portal" %}
 
 {% extends "demo/_default.njk" %}
-{% import "demo/macros/_gates.njk" as gate %}
+{% import "hippie/macros/_gate.njk" as gate %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk
index edc4d47..c567309 100755
--- a/source/screens/demo/examples/ui/new.njk
+++ b/source/screens/demo/examples/ui/new.njk
@@ -8,7 +8,7 @@ tags:
 {% set bodyClass = "body_new" %}
 
 {% extends "demo/_app.njk" %}
-{% import "demo/macros/_states.njk" as state %}
+{% import "hippie/macros/_state.njk" as state %}
 
 {% block title %}{{ title }}
 {% endblock %}
diff --git a/source/templates/demo/macros/_gates.njk b/source/templates/hippie/macros/_gate.njk
similarity index 100%
rename from source/templates/demo/macros/_gates.njk
rename to source/templates/hippie/macros/_gate.njk
diff --git a/source/templates/demo/macros/_states.njk b/source/templates/hippie/macros/_state.njk
similarity index 100%
rename from source/templates/demo/macros/_states.njk
rename to source/templates/hippie/macros/_state.njk