diff --git a/source/themes/opdavies/opdavies/Gemfile b/source/themes/opdavies/opdavies/Gemfile
index 4a2b383f4..2b3ec0734 100644
--- a/source/themes/opdavies/opdavies/Gemfile
+++ b/source/themes/opdavies/opdavies/Gemfile
@@ -2,9 +2,11 @@ source 'https://rubygems.org'
 
 group :development do
 
-  gem 'sass'
-  gem 'sass-globbing'
-  gem 'compass'
-  gem 'susy'
+  gem "sass", "3.3.9"
+	gem "sass-globbing", "1.1.1"
+	gem "compass", "1.0.0.alpha.20"
+	gem "susy", "2.1.2"
+	gem "breakpoint", "2.4.2"
+	gem "oily_png"
 
 end
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/Gemfile.lock b/source/themes/opdavies/opdavies/Gemfile.lock
index cd63af9d4..110e30bb1 100644
--- a/source/themes/opdavies/opdavies/Gemfile.lock
+++ b/source/themes/opdavies/opdavies/Gemfile.lock
@@ -1,14 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    breakpoint (2.4.2)
+      sass (~> 3.3.0)
+      sassy-maps (< 1.0.0)
     chunky_png (1.3.4)
-    compass (1.0.3)
+    compass (1.0.0.alpha.20)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
+      compass-core (~> 1.0.0.alpha.20)
+      compass-import-once (~> 1.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
+      sass (>= 3.3.0, < 3.5)
     compass-core (1.0.3)
       multi_json (~> 1.0)
       sass (>= 3.3.0, < 3.5)
@@ -16,20 +19,26 @@ GEM
       sass (>= 3.2, < 3.5)
     ffi (1.9.8)
     multi_json (1.11.0)
+    oily_png (1.1.2)
+      chunky_png (~> 1.3.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.4.13)
+    sass (3.3.9)
     sass-globbing (1.1.1)
       sass (>= 3.1)
-    susy (2.2.2)
-      sass (>= 3.3.0, < 3.5)
+    sassy-maps (0.4.0)
+      sass (~> 3.3)
+    susy (2.1.2)
+      sass (~> 3.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass
-  sass
-  sass-globbing
-  susy
+  breakpoint (= 2.4.2)
+  compass (= 1.0.0.alpha.20)
+  oily_png
+  sass (= 3.3.9)
+  sass-globbing (= 1.1.1)
+  susy (= 2.1.2)
diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig
index b0b930e81..40a17e694 100644
--- a/source/themes/opdavies/opdavies/_layouts/default.html.twig
+++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig
@@ -10,8 +10,11 @@
   </head>
   <body>
     {% include 'header' %}
+
     {% block content_wrapper %}
-      {% block content %}{% endblock %}
+      <div class="content">
+        {% block content %}{% endblock %}
+      </div>
     {% endblock %}
 
     {% include 'footer-scripts' %}
diff --git a/source/themes/opdavies/opdavies/_partials/header.html.twig b/source/themes/opdavies/opdavies/_partials/header.html.twig
index 6569cc834..2beed871c 100644
--- a/source/themes/opdavies/opdavies/_partials/header.html.twig
+++ b/source/themes/opdavies/opdavies/_partials/header.html.twig
@@ -1,4 +1,6 @@
 <header role="banner">
-  {{ site.title }}
-  {% include 'main-menu' %}
+  <div class="inner">
+    <div class="site-name">{{ site.title }}</div>
+    {% include 'main-menu' %}
+  </div>{# .inner #}
 </header>
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig b/source/themes/opdavies/opdavies/_partials/main-menu.html.twig
index dbaaf5027..1dca706c4 100644
--- a/source/themes/opdavies/opdavies/_partials/main-menu.html.twig
+++ b/source/themes/opdavies/opdavies/_partials/main-menu.html.twig
@@ -1,8 +1,10 @@
-<nav id="main-menu" class="menu--main" role="navigation">
-  <a href="{{ site.url }}"{% if page.nav == 'about' %} class="active"{% endif %}>About</a>
-  <a href="{{ site.url }}/work"{% if page.nav == 'work' %} class="active"{% endif %}>Work</a>
-  <a href="{{ site.url }}/services"{% if page.nav == 'services' %} class="active"{% endif %}>Services</a>
-  <a href="{{ site.url }}/talks"{% if page.nav == 'talks' %} class="active"{% endif %}>Talks</a>
-  <a href="{{ site.url }}/blog"{% if page.nav == 'blog' %} class="active"{% endif %}>Blog</a>
-  <a href="{{ site.url }}/contact"{% if page.nav == 'contact' %} class="active"{% endif %}>Contact</a>
+<nav class="main-menu" role="navigation">
+  <ul>
+    <li><a href="{{ site.url }}"{% if page.nav == 'about' %} class="active"{% endif %}>About</a></li>
+    <li><a href="{{ site.url }}/work"{% if page.nav == 'work' %} class="active"{% endif %}>Work</a></li>
+    <li><a href="{{ site.url }}/services"{% if page.nav == 'services' %} class="active"{% endif %}>Services</a></li>
+    <li><a href="{{ site.url }}/talks"{% if page.nav == 'talks' %} class="active"{% endif %}>Talks</a></li>
+    <li><a href="{{ site.url }}/blog"{% if page.nav == 'blog' %} class="active"{% endif %}>Blog</a></li>
+    <li><a href="{{ site.url }}/contact"{% if page.nav == 'contact' %} class="active"{% endif %}>Contact</a></li>
+  </ul>
 </nav>
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/css/styles.css b/source/themes/opdavies/opdavies/assets/css/styles.css
index b84938cbf..b66e7a69b 100644
--- a/source/themes/opdavies/opdavies/assets/css/styles.css
+++ b/source/themes/opdavies/opdavies/assets/css/styles.css
@@ -1,3 +1,172 @@
-@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\000031}}
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\000035}}
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000322}}
+html {
+  line-height: 1; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000324}}
+ol, ul {
+  list-style: none; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000326}}
+table {
+  border-collapse: collapse;
+  border-spacing: 0; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000328}}
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000330}}
+q, blockquote {
+  quotes: none; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\00003103}}
+  q:before, q:after, blockquote:before, blockquote:after {
+    content: "";
+    content: none; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\0000332}}
+a img {
+  border: none; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/reset\/_utilities\.scss}line{font-family:\00003116}}
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
+  display: block; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\000031}}
+.content {
+  max-width: 960px;
+  margin-left: auto;
+  margin-right: auto;
+  padding: 1em 0 2em; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/susy-2\.1\.2\/sass\/susy\/output\/support\/_clearfix\.scss}line{font-family:\0000312}}
+  .content:after {
+    content: " ";
+    display: block;
+    clear: both; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\000035}}
+  .content a {
+    text-decoration: none; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\000038}}
+    .content a:link, .content a:visited {
+      color: #0678be; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\0000313}}
+    .content a:hover, .content a:focus {
+      color: black; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000031}}
+header[role="banner"] {
+  background-color: #064771;
+  color: white;
+  padding: 1.5em 0; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000036}}
+  header[role="banner"] .inner {
+    max-width: 960px;
+    margin-left: auto;
+    margin-right: auto; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/susy-2\.1\.2\/sass\/susy\/output\/support\/_clearfix\.scss}line{font-family:\0000312}}
+    header[role="banner"] .inner:after {
+      content: " ";
+      display: block;
+      clear: both; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000039}}
+    header[role="banner"] .inner .site-name {
+      width: 23.72881%;
+      float: left;
+      margin-left: 0; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000313}}
+    header[role="banner"] .inner .main-menu {
+      width: 74.57627%;
+      float: left;
+      margin-left: 1.69492%;
+      text-align: right; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000317}}
+      header[role="banner"] .inner .main-menu a {
+        border-bottom: 1px solid #064771;
+        color: white;
+        display: block;
+        margin-left: .5em;
+        text-decoration: none; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000324}}
+        header[role="banner"] .inner .main-menu a.active {
+          border-color: white; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000332}}
+.main-menu ul {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  overflow: hidden;
+  *zoom: 1; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/typography\/lists\/_inline-block-list\.scss}line{font-family:\0000349}}
+  .main-menu ul li {
+    list-style-image: none;
+    list-style-type: none;
+    margin-left: 0;
+    display: inline-block;
+    vertical-align: middle;
+    *vertical-align: auto;
+    *zoom: 1;
+    *display: inline;
+    white-space: nowrap; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000310}}
 body {
-  background-color: red; }
+  color: #222;
+  font: 14px Arial; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000315}}
+p,
+ul,
+ol,
+pre {
+  margin-bottom: 1em; }
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000321}}
+  p:last-child,
+  ul:last-child,
+  ol:last-child,
+  pre:last-child {
+    margin-bottom: 0; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000326}}
+h1 {
+  font-size: 2em;
+  margin-bottom: .5em; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000330}}
+h2 {
+  font-size: 1.5em;
+  margin-bottom: .5em; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000335}}
+ul {
+  list-style-type: disc; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000339}}
+code {
+  font-family: "Courier New"; }
+
+@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000343}}
+dd {
+  padding-left: 1.5em; }
diff --git a/source/themes/opdavies/opdavies/assets/scss/layout/_grid.scss b/source/themes/opdavies/opdavies/assets/scss/layout/_grid.scss
new file mode 100644
index 000000000..2f0ced3b3
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/scss/layout/_grid.scss
@@ -0,0 +1,5 @@
+$susy: (
+  columns: 12,
+  gutters: 1/4,
+  gutter-position: before
+);
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/scss/modules/_content.scss b/source/themes/opdavies/opdavies/assets/scss/modules/_content.scss
new file mode 100644
index 000000000..fc4ab0f9f
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/scss/modules/_content.scss
@@ -0,0 +1,18 @@
+.content {
+	@include container(960px);
+	padding: 1em 0 2em;
+
+	a {
+		text-decoration: none;
+
+		&:link,
+		&:visited {
+	    color: #0678be;
+	  }
+
+	  &:hover,
+	  &:focus {
+	  	color: black;
+	  }
+	}
+}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/scss/modules/_header.scss b/source/themes/opdavies/opdavies/assets/scss/modules/_header.scss
new file mode 100644
index 000000000..defd799dd
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/scss/modules/_header.scss
@@ -0,0 +1,34 @@
+header[role="banner"] {
+  background-color: #064771;
+  color: white;
+  padding: 1.5em 0;
+
+  .inner {
+  	@include container(960px);
+
+  	.site-name {
+  		@include span(first 3);
+  	}
+
+  	.main-menu {
+  		@include span(9);
+  		text-align: right;
+
+  		a {
+        border-bottom: 1px solid #064771;
+  			color: white;
+        display: block;
+        margin-left: .5em;
+        text-decoration: none;
+
+        &.active {
+          border-color: white;
+        }
+  		}
+  	}
+  }
+}
+
+.main-menu ul {
+	@include inline-block-list;
+}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/scss/styles.scss b/source/themes/opdavies/opdavies/assets/scss/styles.scss
index 88cb00c52..135b21327 100644
--- a/source/themes/opdavies/opdavies/assets/scss/styles.scss
+++ b/source/themes/opdavies/opdavies/assets/scss/styles.scss
@@ -1,3 +1,45 @@
+@import 'compass';
+@import 'compass/reset';
+@import 'compass/css3';
+@import 'susy';
+
+@import "variables/**/*";
+@import "layout/**/*";
+@import "modules/**/*";
+
 body {
-  background-color: red;
+	color: #222;
+	font: 14px Arial;
+}
+
+p,
+ul,
+ol,
+pre {
+	margin-bottom: 1em;
+
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+
+h1 {
+	font-size: 2em;
+	margin-bottom: .5em;
+}
+h2 {
+	font-size: 1.5em;
+	margin-bottom: .5em;
+}
+
+ul {
+	list-style-type: disc;
+}
+
+code {
+	font-family: "Courier New";
+}
+
+dd {
+	padding-left: 1.5em;
 }
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/scss/variables/_layout.scss b/source/themes/opdavies/opdavies/assets/scss/variables/_layout.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/source/themes/opdavies/opdavies/assets/scss/variables/_legacy.scss b/source/themes/opdavies/opdavies/assets/scss/variables/_legacy.scss
new file mode 100644
index 000000000..7cae7a298
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/scss/variables/_legacy.scss
@@ -0,0 +1,4 @@
+// Legacy support.
+$legacy-support-for-ie6: false;
+$legacy-support-for-ie7: false;
+$legacy-support-for-ie8: true;
diff --git a/source/themes/opdavies/opdavies/config.rb b/source/themes/opdavies/opdavies/config.rb
index 746c0d618..8daa7e613 100644
--- a/source/themes/opdavies/opdavies/config.rb
+++ b/source/themes/opdavies/opdavies/config.rb
@@ -22,9 +22,6 @@ generated_images_dir = images_dir + "/generated"
 javascripts_dir = "assets/js"
 
 # Require any additional compass plugins installed on your system.
-# require 'compass-normalize'
-# require 'rgbapng'
-# require 'toolkit'
 require 'susy'
 require 'sass-globbing'
 
