diff --git a/src/bootstrap.php b/src/bootstrap.php
index 99322d7..021711c 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -3,7 +3,7 @@ require_once(BASEPATH . '/vendor/autoload.php');
//Twig
$loader = new Twig\Loader\FilesystemLoader(BASEPATH . '/App/views/');
-$loader->addPath(BASEPATH . '/vendor/nickyeoman/nytwig/src', 'nytwig');
+$loader->addPath(BASEPATH . '/vendor/4lt/novaconium/twig', 'novaconium');
$loader->addPath(BASEPATH . '/App/templates', 'override');
$twig = new Twig\Environment($loader);
diff --git a/twig/head.html.twig b/twig/head.html.twig
new file mode 100644
index 0000000..203f27f
--- /dev/null
+++ b/twig/head.html.twig
@@ -0,0 +1,26 @@
+
+
{{ title | default('Welcome') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{# https://developers.google.com/fonts/docs/getting_started #}
+
+
+
+
+
\ No newline at end of file
diff --git a/twig/master.html.twig b/twig/master.html.twig
new file mode 100644
index 0000000..e139bb0
--- /dev/null
+++ b/twig/master.html.twig
@@ -0,0 +1,54 @@
+
+
+
+{% include '@override/mod_above_head.html.twig' ignore missing %}
+
+
+ {% include ['@override/mod_head.html.twig', '@novaconium/head.html.twig'] %}
+
+
+
+
+ {# Page Header #}
+
+ {% block headerbefore %}{% endblock %}
+ {% include ['@override/mod_nav.html.twig', '@novaconium/nav.html.twig'] %}
+ {% block headerafter %}{% endblock %}
+
+
+
+
+
+
+
+ {% if error|default is not empty %}
+ {% for key, val in error %}
+
{{ val }}
+ {% endfor %}
+ {% endif %}
+
+ {% if notice|default is not empty %}
+ {% for key, val in notice %}
+
{{ val }}
+ {% endfor %}
+ {% endif %}
+
+
+ {% include 'cms/mod_alex.html.twig' ignore missing %}
+ {% block content %}{% endblock %}
+ {% include 'cms/mod_simon.html.twig' ignore missing %}
+
+
+
+
+
+
+ {# Page Footer #}
+
+
+{% include ['@override/mod_foot.html.twig', '@novaconium/foot.html.twig'] %}
+
diff --git a/twig/nav.html.twig b/twig/nav.html.twig
new file mode 100644
index 0000000..0ddd0f3
--- /dev/null
+++ b/twig/nav.html.twig
@@ -0,0 +1,21 @@
+
+
+
+
+