diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
index b1f2532..8a980a4 100644
--- a/_includes/footer-scripts.html
+++ b/_includes/footer-scripts.html
@@ -1,23 +1,23 @@
-{% if page.common-ext-js %}
-  {% for js in page.common-ext-js %}
+{% if layout.common-ext-js %}
+  {% for js in layout.common-ext-js %}
 	<script src="{{ js }}"></script>
   {% endfor %}
 {% endif %}
 
-{% if page.ext-js %}
-  {% for js in page.ext-js %}
+{% if layout.ext-js %}
+  {% for js in layout.ext-js %}
 	<script src="{{ js }}"></script>
   {% endfor %}
 {% endif %}
 
-{% if page.js %}
-  {% for js in page.js %}
+{% if layout.js %}
+  {% for js in layout.js %}
 	<script src="{{ js | prepend: site.baseurl | replace: '//', '/' }}"></script>
   {% endfor %}
 {% endif %}
 
-{% if page.common-js %}
-  {% for js in page.common-js %}
+{% if layout.common-js %}
+  {% for js in layout.common-js %}
     <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
     {% if js contains 'jquery' %}
       <script>
diff --git a/_includes/head.html b/_includes/head.html
index 38b2153..155d60c 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -13,38 +13,38 @@
 
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
 
-  {% if page.common-ext-css %}
-    {% for css in page.common-ext-css %}
+  {% if layout.common-ext-css %}
+    {% for css in layout.common-ext-css %}
       <link rel="stylesheet" href="{{ css }}" />
     {% endfor %}
   {% endif %}  
   
-  {% if page.common-css %}
-    {% for css in page.common-css %}
+  {% if layout.common-css %}
+    {% for css in layout.common-css %}
       <link rel="stylesheet" href="{{ css | prepend: site.baseurl | replace: '//', '/' }}" />
     {% endfor %}
   {% endif %}
   
-  {% if page.common-googlefonts %}
-    {% for font in page.common-googlefonts %}
+  {% if layout.common-googlefonts %}
+    {% for font in layout.common-googlefonts %}
 	  <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
     {% endfor %}
   {% endif %}
 
-  {% if page.ext-css %}
-    {% for css in page.ext-css %}
+  {% if layout.ext-css %}
+    {% for css in layout.ext-css %}
       <link rel="stylesheet" href="{{ css }}" />
     {% endfor %}
   {% endif %}  
   
-  {% if page.css %}
-    {% for css in page.css %}
+  {% if layout.css %}
+    {% for css in layout.css %}
       <link rel="stylesheet" href="{{ css | prepend: site.baseurl | replace: '//', '/' }}" />
     {% endfor %}
   {% endif %}
   
-  {% if page.googlefonts %}
-    {% for font in page.googlefonts %}
+  {% if layout.googlefonts %}
+    {% for font in layout.googlefonts %}
 	  <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
     {% endfor %}
   {% endif %}