diff --git a/cms_pages/migrations/0018_auto_20170116_1050.py b/cms_pages/migrations/0018_auto_20170116_1050.py
new file mode 100644
index 0000000000000000000000000000000000000000..025bb864db8ef058001779005dbe71de1de78d31
--- /dev/null
+++ b/cms_pages/migrations/0018_auto_20170116_1050.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-01-15 23:50
+from __future__ import unicode_literals
+
+import cms_pages.models
+from django.db import migrations, models
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms_pages', '0017_auto_20160918_0945_squashed_0018_auto_20160919_0125_squashed_0018_auto_20160919_0134'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentpage',
+            name='inset_illustration',
+            field=models.CharField(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')], max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='homepage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField([('basic_content', wagtail.wagtailcore.blocks.StructBlock([(b'panel_type', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('blue_left', 'Left-aligned image, blue-filtered image BG'), ('white_right', 'Right-aligned image, white background')])), (b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'inset_illustration', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')])), (b'background_image', wagtail.wagtailimages.blocks.ImageChooserBlock(help_text="This is used as the background image of a blue-left block. It's not used for white-right.", required=False)), (b'body', wagtail.wagtailcore.blocks.RawHTMLBlock(required=True)), (b'link', wagtail.wagtailcore.blocks.StructBlock([(b'page', wagtail.wagtailcore.blocks.PageChooserBlock(help_text='You must specify either this, or the URL.', required=False)), (b'url', wagtail.wagtailcore.blocks.CharBlock(help_text='You must specify either this, or the URL.', required=False)), (b'title', wagtail.wagtailcore.blocks.CharBlock(required=True))])), (b'external_links', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.ExternalLinksBlock)), (b'compact', wagtail.wagtailcore.blocks.BooleanBlock(help_text="True if this block is to be displayed in 'compact' mode", required=False))])), ('keynotes', wagtail.wagtailcore.blocks.StructBlock([(b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'speakers', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.KeynoteSpeakerBlock))]))]),
+        ),
+    ]
diff --git a/cms_pages/migrations/0019_auto_20170116_1334.py b/cms_pages/migrations/0019_auto_20170116_1334.py
new file mode 100644
index 0000000000000000000000000000000000000000..590622f8160a6ea342f32bd616c36089bb668557
--- /dev/null
+++ b/cms_pages/migrations/0019_auto_20170116_1334.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-01-16 02:34
+from __future__ import unicode_literals
+
+import cms_pages.models
+from django.db import migrations
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms_pages', '0018_auto_20170116_1050'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='homepage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField([('basic_content', wagtail.wagtailcore.blocks.StructBlock([(b'panel_type', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('simple', 'Simple panel, no image.'), ('blue_left', 'Left-aligned image, blue-filtered image BG'), ('white_right', 'Right-aligned image, white background')])), (b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'inset_illustration', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('antarctica.svg', 'Antarctica'), ('bridge.svg', 'Bridge'), ('casino.svg', 'Casino'), ('cradle.svg', 'Cradle Mountain'), ('devil.svg', 'Tasmanian Devil'), ('falls.svg', 'Waterfall'), ('hobart.svg', 'Hobart'), ('lavender.svg', 'Lavender'), ('logo-mel.png', 'Pycon AU'), ('Python-logo-notext.svg', 'Python'), ('tuz.svg', 'Tuz'), ('wineglass.svg', 'Wineglass')])), (b'background_image', wagtail.wagtailimages.blocks.ImageChooserBlock(help_text="This is used as the background image of a blue-left block. It's not used for white-right.", required=False)), (b'body', wagtail.wagtailcore.blocks.RawHTMLBlock(required=True)), (b'link', wagtail.wagtailcore.blocks.StructBlock([(b'page', wagtail.wagtailcore.blocks.PageChooserBlock(help_text='You must specify either this, or the URL.', required=False)), (b'url', wagtail.wagtailcore.blocks.CharBlock(help_text='You must specify either this, or the URL.', required=False)), (b'title', wagtail.wagtailcore.blocks.CharBlock(required=True))])), (b'external_links', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.ExternalLinksBlock)), (b'compact', wagtail.wagtailcore.blocks.BooleanBlock(help_text="True if this block is to be displayed in 'compact' mode", required=False))])), ('keynotes', wagtail.wagtailcore.blocks.StructBlock([(b'heading', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'speakers', wagtail.wagtailcore.blocks.ListBlock(cms_pages.models.KeynoteSpeakerBlock))]))]),
+        ),
+    ]
diff --git a/cms_pages/models.py b/cms_pages/models.py
index 90e7176779c50d845af1d6f102b4b25ed5bf85b7..ba46acf35988d7220cce3f0212c2a9924499224f 100644
--- a/cms_pages/models.py
+++ b/cms_pages/models.py
@@ -106,9 +106,11 @@ class BasicContentBlock(blocks.StructBlock):
     class Meta:
         template = "cms_pages/home_page_blocks/basic_content.html"
 
+    PANEL_SIMPLE = "simple"
     PANEL_BLUE_LEFT = "blue_left"
     PANEL_WHITE_RIGHT = "white_right"
     PANEL_TYPES = (
+        (PANEL_SIMPLE, "Simple panel, no image."),
         (PANEL_BLUE_LEFT, "Left-aligned image, blue-filtered image BG"),
         (PANEL_WHITE_RIGHT, "Right-aligned image, white background"),
     )
@@ -127,7 +129,8 @@ class BasicContentBlock(blocks.StructBlock):
         help_text="This is used as the background image of a "
                   "blue-left block. It's not used for white-right."
     )
-    body = blocks.RichTextBlock(required=True)
+    #body = blocks.RichTextBlock(required=True)
+    body = blocks.RawHTMLBlock(required=True)
     link = BasicContentLink()
     external_links = blocks.ListBlock(ExternalLinksBlock)
     compact = blocks.BooleanBlock(
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 603154e310a0ddf6943d233861c8b29a848042d0..50f3cbed04665ca81680211a6723ed0550dc337d 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -6,7 +6,7 @@ PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir
 PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 BASE_DIR = PACKAGE_ROOT
 
-DEBUG = bool(int(os.environ.get("DEBUG", "1")))
+DEBUG = True #bool(int(os.environ.get("DEBUG", "1")))
 
 DATABASES = {
     "default": {
diff --git a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
index 304035b2a60d38eef868ac3f6a3a51a4a9fbbf2d..c5171b30ba88c453caa3daa7781f7ebaf0319565 100644
--- a/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
+++ b/pinaxcon/templates/cms_pages/home_page_blocks/basic_content.html
@@ -9,8 +9,15 @@
   {% define "" as compact %}
 {% endif %}
 
+{% if value.panel_type == "simple" %}
 
-{% if value.panel_type == "blue_left" %}
+<div class="panel panel__bg {{ compact }}">
+  <div class="panel--content">
+    {% include "cms_pages/home_page_blocks/basic_content_text_and_links.html" %}
+  </div>
+</div>
+
+{% elif value.panel_type == "blue_left" %}
 
 <div class="panel panel__bg {{ compact }}">
   {% image value.background_image width-2000 as background_image %}
diff --git a/pinaxcon/templates/lca2017/content_page.html b/pinaxcon/templates/lca2017/content_page.html
index cf3b8fcdd9f55255e1ecd4b719a8c2ad8ea44e7b..0f3e05b1f212dc2e424a0fed6fbd9b0523322f07 100644
--- a/pinaxcon/templates/lca2017/content_page.html
+++ b/pinaxcon/templates/lca2017/content_page.html
@@ -18,6 +18,7 @@
 
       <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
 
+      <h1>Or is it here?</h1>
       <div class="panel--content">
         <div class="panel--2-3">
           <h2>{% block header_title %}{% endblock %}</h2>
diff --git a/pinaxcon/templates/pyconau2017-homepage.html b/pinaxcon/templates/pyconau2017-homepage.html
index 03028eb1b3d3cac882b501c781d8cbba81d6c490..3c35e5b5f283bd2faa96d4677ea443a3c014951b 100644
--- a/pinaxcon/templates/pyconau2017-homepage.html
+++ b/pinaxcon/templates/pyconau2017-homepage.html
@@ -13,6 +13,9 @@
 
     <link rel="icon" type="image/png" href="http://2017.pycon-au.org/favicon.png">
     <link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
+
+    <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
+    <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
     <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
 
     <!-- Taken from site_base.html will need fixing -->
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html
index cf3b8fcdd9f55255e1ecd4b719a8c2ad8ea44e7b..7269944cc00fede2bd1bd22b36f92fac35e2e7df 100644
--- a/pinaxcon/templates/pyconau2017/content_page.html
+++ b/pinaxcon/templates/pyconau2017/content_page.html
@@ -13,31 +13,27 @@
 {% block head_title %}{% endblock %}
 
 {% block body %}
-  {% block heading_panel %}
-    <div class="panel panel__compact panel__bg">
 
-      <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
+  {% block heading_panel %}
+    <div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
 
       <div class="panel--content">
         <div class="panel--2-3">
-          <h2>{% block header_title %}{% endblock %}</h2>
+          {% block header_title %}{% endblock %}
           <p class="lede">{% block header_paragraph %}{% endblock %}</p>
         </div>
         {% block header_inset_image_base %}
-          <div class="panel--1-3">
-            <div class="portrait">
-              <div style="background-image: url('{% block header_inset_image %}{% endblock %}');" class="portrait--img"></div>
-            </div>
-          </div>
         {% endblock %}
-      </div>
-
     </div>
+
+
+  {% block topbar_base %}
+  {% endblock %}
   {% endblock %}
 
   {% block content_base %}
     <div class="l-content-page">
-      <div class="l-content-page--richtext">
+      <div class="l-content-page">
         {% block content %}
         {% endblock %}
       </div>
@@ -48,3 +44,4 @@
 {% block extra_script %}
   <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
 {% endblock %}
+
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index 2e6de97a33b5f82f880f3c82d653cad01cec2bd8..625ab6523a84f9f56e4f23238581ad60f1e4b913 100755
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -9,16 +9,25 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="description" content="">
+
+    <!-- disable browser cache (for now) -->
+    <meta http-equiv="cache-control" content="max-age=0" />
+    <meta http-equiv="cache-control" content="no-cache" />
+    <meta http-equiv="expires" content="0" />
+    <meta http-equiv="expires" content="Tue, 01 Jan 1990 12:00:00 GMT" />
+
+
 {% block viewport %}
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 {% endblock %}
     <title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
 {% block styles %}
     <link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
-    <link rel="stylesheet" href="{% static 'pycon2017/css/print.css' %}" media="print">
+    <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
+    <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
+    <link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
+
     <link rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
-    <!--FIXME: download-->
-    <link href="https://fonts.googleapis.com/css?family=Titillium+Web:700,900|Roboto:400italic,400,700,700italic" rel="stylesheet" type="text/css">
     <!--Meta tags-->
     <meta name="theme-color" content="#0c486c">
     {% block extra_style %}
@@ -34,7 +43,7 @@
     <meta name="twitter:image:alt" content="Tuz">
     <!--Open Graph-->
     <meta property="og:url" content="https://2017.pycon-au.org/">
-    <meta property="og:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria">
+    <meta property="og:title" content="Pycon AU – 3 - 8  2017 – Melbourne, Victoria">
     <meta property="og:description" content="Discover Python at Pycon AU 2017. Tickets on sale from February.">
     <meta property="og:type" content="website">
     <meta property="fb:admins" content="729577430">
@@ -43,79 +52,37 @@
             {% block extra_head %}{% endblock %}
         {% endblock %}
   </head>
-  <body class="{% block body_class %}{% endblock %}">
+  <body class="{% block body_class %}{% endblock %}"
+      style="background-image: url({% static 'pyconau2017/images/pyconau-2016-collage.jpg' %});">
 {% block topbar_base %}
-    <header role="banner" class="l-header">
-      <div class="l-header--logo">
-        {% block site_brand %}
-          <a href="/"
-            title="2017.pycon-au.org | 3-8 August, Melbourne | Python FTW!"
-          >
-            <img src="{% static 'pyconau2017/images/logo-mel-17.png' %}"
-              width="100%"
-              title="pycon-au.org | 3-8 August, Melbourne | Python FTW!"
-              />
-          </a>
-        {% endblock %}
-      </div>
+    {#
     {% block nav %}
         {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
       <a href="#" data-menu-opener="" class="l-header--menu-opener"></a>
     </header>
       {% sitetree_menu from "main" include "trunk" template "sitetree_opener.html" %}
     {% endblock %}
+    #}
 {% endblock %}
 
 {% block body_base %}
-    <div style="height: 100px;" />
+  <div style="height: 100px;" />
     <main role="main">
-<div class="l-content-page">
-        <section id="content_body">
-        <div class="container">
-            {% include "_messages.html" %}
-            <div class="row">
-                <div class="col-md-9">
     {% block body %}
       {% block content %}
       {% endblock %}
     {% endblock %}
-                </div>
-                <div class="col-md-3">
-                    {% block sidebar %}
-                        {% include "_default_sidebar.html" %}
-                    {% endblock %}
-                </div>
-            </div>
-        </div>
-    </section>
-</div>
+  </div>
 {% endblock %}
 
 {% block footer_base %}
   <!-- https://gist.github.com/geedmo/5682742-->
   <footer class="l-footer l-footer__alt">
     {% block footer %}
-      <div class="l-footer--text">
-        <h3>Sponsors</h3>
-        <p class="lede">We thank our sponsors for their
-          generous contribution to Pycon Australia 2017.</p>
-        <a href="/sponsors" class="btn btn__white">Other Sponsors</a>
-      </div>
-      <div class="l-footer--logos">
-        <div class="l-footer--logo">
-          <img src="{% static 'lca2017/images/HPE.svg' %}">
-        </div>
-        <div class="l-footer--logo">
-          <img src="{% static 'lca2017/images/IBM.svg' %}">
-        </div>
-        <br />
-      </div>
-
-      <p class="lede">©2016 Pycon Australia 2017. Linux is a registered trademark of Linus Torvalds. Site design by <a href="http://takeflight.com.au" >Takeflight</a>. Image credits can be found on our <a href="/about/colophon">Colophon</a>.</p>
-
     {% endblock %}
   </footer>
 {% endblock %}
+
     </main>
     {% block scripts %}
     {% comment%}
diff --git a/pinaxcon/templates/site_base_wagtail.html b/pinaxcon/templates/site_base_wagtail.html
index b97e4987c261cf795489ad0f913e7d3dc952cc9b..d0ff65bffa9a67f8a0f7afbd7a6c621774580f85 100644
--- a/pinaxcon/templates/site_base_wagtail.html
+++ b/pinaxcon/templates/site_base_wagtail.html
@@ -12,9 +12,10 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{% static 'lca2017/js/app.js' %}" type="text/javascript"></script>
+
+<script src="{% static 'pyconau2017/js/app.js' %}" type="text/javascript"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
-<script src="{% static 'lca2017/js/load_editors.js' %}" type="text/javascript"></script>
+<script src="{% static 'pyconau2017/js/load_editors.js' %}" type="text/javascript"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.formset.js"></script>
 
diff --git a/static/src/lca2017/css/app.css b/static/src/lca2017/css/app.css
index 1965025095207c390e349c293026ce77df7772dd..679ce47b7bc50dc8e80dd0d70148332b4567414f 100644
--- a/static/src/lca2017/css/app.css
+++ b/static/src/lca2017/css/app.css
@@ -1493,7 +1493,8 @@ table.alt tr:not(:last-of-type) {
 
 
 .l-footer__alt {
-  background-color: #0c486c;
+  /* background-color: #0c486c; */
+  background-color: transparent;
   color: white;
 }
 
diff --git a/static/src/pyconau2017/css/app.css b/static/src/pyconau2017/css/app.css
index 1965025095207c390e349c293026ce77df7772dd..74397fafb7a3e08389e9974352764eea1b17a471 100644
--- a/static/src/pyconau2017/css/app.css
+++ b/static/src/pyconau2017/css/app.css
@@ -1464,6 +1464,7 @@ table.alt tr:not(:last-of-type) {
   padding: 50px 40px;
   padding: 3.125rem 40px;
   width: 100%;
+  opacity: 0.0;
 }
 
 .l-footer--logos {
@@ -1493,7 +1494,8 @@ table.alt tr:not(:last-of-type) {
 
 
 .l-footer__alt {
-  background-color: #0c486c;
+  /*background-color: #0c486c; */
+  background-color: #420045;
   color: white;
 }
 
diff --git a/static/src/pyconau2017/css/pyconau.css b/static/src/pyconau2017/css/pyconau.css
index bac8101d0a5fd4c83606407799e3d1966b1ad6f0..93d2f33bfd0ca9c30d4784ea42f075390b31fff8 100644
--- a/static/src/pyconau2017/css/pyconau.css
+++ b/static/src/pyconau2017/css/pyconau.css
@@ -35,6 +35,7 @@ body {
 .jumbotron h1 {
     font-size: 3em;
     font-family: 'Flux Regular';
+    background-color: #000;
 }
 
 #announcements {