diff --git a/source/themes/opdavies/opdavies/assets/css/styles.css b/source/themes/opdavies/opdavies/assets/css/styles.css
index daed08e9..8f92ebbe 100644
--- a/source/themes/opdavies/opdavies/assets/css/styles.css
+++ b/source/themes/opdavies/opdavies/assets/css/styles.css
@@ -1,3 +1,3 @@
-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}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}html{font-size:100%;line-height:1.5em}.content{max-width:95%;margin-left:auto;margin-right:auto;padding:1em 0}.content:after{content:" ";display:block;clear:both}@media (min-width: 1025px){.content{max-width:960px;margin-left:auto;margin-right:auto}.content:after{content:" ";display:block;clear:both}}.content a{text-decoration:none}.content a:link,.content a:visited{color:#0678be}.content a:hover,.content a:focus{color:black}footer[role="contentinfo"]{max-width:95%;margin-left:auto;margin-right:auto;border-top:1px solid #CCC;margin-top:1em;padding:1em 0}footer[role="contentinfo"]:after{content:" ";display:block;clear:both}@media (min-width: 1025px){footer[role="contentinfo"]{max-width:960px;margin-left:auto;margin-right:auto}footer[role="contentinfo"]:after{content:" ";display:block;clear:both}}
+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}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}html{font-size:100%;line-height:1.5em}code{font-family:"Courier New"}ul{list-style-type:disc}dt{font-weight:bold;margin-top:.5em}dt:after{content:':'}dd{padding-left:2em}body{font-size:0.875em;line-height:1.71429em;line-height:1.5em;color:#222;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif}p,ul,ol,pre{margin-bottom:1em}p:last-child,ul:last-child,ol:last-child,pre:last-child{margin-bottom:0}h1{font-size:2.14286em;line-height:0.8em;line-height:1.5em;margin-bottom:.2em}h2{font-size:1.5em;line-height:1.14286em;display:inline-block;margin:.5em 0}h1+h2{margin-top:0}.content{max-width:95%;margin-left:auto;margin-right:auto;padding:1em 0}.content:after{content:" ";display:block;clear:both}@media (min-width: 1025px){.content{max-width:960px;margin-left:auto;margin-right:auto}.content:after{content:" ";display:block;clear:both}}.content a{text-decoration:none}.content a:link,.content a:visited{color:#0678be}.content a:hover,.content a:focus{color:black}footer[role="contentinfo"]{max-width:95%;margin-left:auto;margin-right:auto;border-top:1px solid #CCC;margin-top:1em;padding:1em 0}footer[role="contentinfo"]:after{content:" ";display:block;clear:both}@media (min-width: 1025px){footer[role="contentinfo"]{max-width:960px;margin-left:auto;margin-right:auto}footer[role="contentinfo"]:after{content:" ";display:block;clear:both}}
 header[role="banner"]{line-height:1.5em;background-color:#064771;color:white;padding:1.5em 0}header[role="banner"] .inner{max-width:95%;margin-left:auto;margin-right:auto}header[role="banner"] .inner:after{content:" ";display:block;clear:both}@media (min-width: 1025px){header[role="banner"] .inner{max-width:960px;margin-left:auto;margin-right:auto}header[role="banner"] .inner:after{content:" ";display:block;clear:both}}header[role="banner"] .inner .main-menu ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}header[role="banner"] .inner .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}header[role="banner"] .inner .main-menu a{border-bottom:1px solid #064771;color:white;display:block;margin:0 .5em 0 0;text-decoration:none}header[role="banner"] .inner .main-menu a.active{border-color:white}@media (min-width: 322px){header[role="banner"] .inner .site-name{width:32.20339%;float:left;margin-left:0}header[role="banner"] .inner .main-menu{width:66.10169%;float:left;margin-left:1.69492%;text-align:right}header[role="banner"] .inner .main-menu a{margin:0 0 0 .5em}}
-body.about .main-menu a.about{border-bottom-color:white}body.work .main-menu a.work{border-bottom-color:white}body.services .main-menu a.services{border-bottom-color:white}body.talks .main-menu a.talks{border-bottom-color:white}body.blog .main-menu a.blog{border-bottom-color:white}body.contact .main-menu a.contact{border-bottom-color:white}body{font-size:0.875em;line-height:1.71429em;line-height:1.5em;color:#222;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif}p,ul,ol,pre{margin-bottom:1em}p:last-child,ul:last-child,ol:last-child,pre:last-child{margin-bottom:0}h1{font-size:2.14286em;line-height:0.8em;line-height:1.5em;margin-bottom:.2em}h2{font-size:1.5em;line-height:1.14286em;display:inline-block;margin:.5em 0}h1+h2{margin-top:0}ul{list-style-type:disc}code{font-family:"Courier New"}dt{font-weight:bold;margin-top:.5em}dt:after{content:':'}dd{padding-left:2em}
+body.about .main-menu a.about{border-bottom-color:white}body.work .main-menu a.work{border-bottom-color:white}body.services .main-menu a.services{border-bottom-color:white}body.talks .main-menu a.talks{border-bottom-color:white}body.blog .main-menu a.blog{border-bottom-color:white}body.contact .main-menu a.contact{border-bottom-color:white}
diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_code.scss b/source/themes/opdavies/opdavies/assets/sass/base/_code.scss
new file mode 100644
index 00000000..6f31ac38
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/sass/base/_code.scss
@@ -0,0 +1,3 @@
+code {
+  font-family: "Courier New";
+}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_lists.scss b/source/themes/opdavies/opdavies/assets/sass/base/_lists.scss
new file mode 100644
index 00000000..20b8e4b2
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/sass/base/_lists.scss
@@ -0,0 +1,16 @@
+ul {
+  list-style-type: disc;
+}
+
+dt {
+  font-weight: bold;
+  margin-top: .5em;
+
+  &:after {
+    content: ':';
+  }
+}
+
+dd {
+  padding-left: 2em;
+}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/sass/base/_typography.scss b/source/themes/opdavies/opdavies/assets/sass/base/_typography.scss
new file mode 100644
index 00000000..bdff5fe3
--- /dev/null
+++ b/source/themes/opdavies/opdavies/assets/sass/base/_typography.scss
@@ -0,0 +1,34 @@
+body {
+  @include adjust-font-size-to(14px);
+  @include adjust-leading-to(1);
+  color: #222;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+p,
+ul,
+ol,
+pre {
+  margin-bottom: 1em;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+h1 {
+  @include adjust-font-size-to(30px, 1, 14px);
+  @include adjust-leading-to(1);
+  margin-bottom: .2em;
+}
+
+h2 {
+  @include adjust-font-size-to(21px, 1, 14px);
+  display: inline-block;
+  margin: .5em 0;
+
+  h1 + & {
+    // Remove the top margin if the h2 is after a h1.
+    margin-top: 0;
+  }
+}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/assets/sass/styles.scss b/source/themes/opdavies/opdavies/assets/sass/styles.scss
index f3e46988..3d1f31f8 100644
--- a/source/themes/opdavies/opdavies/assets/sass/styles.scss
+++ b/source/themes/opdavies/opdavies/assets/sass/styles.scss
@@ -6,61 +6,6 @@
 @import 'breakpoint';
 
 @import "variables/**/*";
+@import "base/**/*";
 @import "layout/**/*";
-@import "modules/**/*";
-
-body {
-  @include adjust-font-size-to(14px);
-  @include adjust-leading-to(1);
-  color: #222;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-p,
-ul,
-ol,
-pre {
-  margin-bottom: 1em;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-h1 {
-  @include adjust-font-size-to(30px, 1, 14px);
-  @include adjust-leading-to(1);
-  margin-bottom: .2em;
-}
-
-h2 {
-  @include adjust-font-size-to(21px, 1, 14px);
-  display: inline-block;
-  margin: .5em 0;
-
-  h1 + & {
-    // Remove the top margin if the h2 is after a h1.
-    margin-top: 0;
-  }
-}
-
-ul {
-  list-style-type: disc;
-}
-
-code {
-  font-family: "Courier New";
-}
-
-dt {
-  font-weight: bold;
-  margin-top: .5em;
-
-  &:after {
-    content: ':';
-  }
-}
-
-dd {
-  padding-left: 2em;
-}
\ No newline at end of file
+@import "modules/**/*";
\ No newline at end of file