diff --git a/_sass/theme.scss b/_sass/theme.scss
index f64f026..1a3f236 100644
--- a/_sass/theme.scss
+++ b/_sass/theme.scss
@@ -1,8 +1,24 @@
 // Imports
-@import "variables";
-@import "type";
+@import "bourbon/bourbon";
+@import "base/base";
 
-// Layout
-body {
-  margin: 0;
+// Theme variables
+$color--background: #ffefc8;
+$color--foreground: #150301;
+$color--accent: #5277c3;
+
+// Theme typography
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  color: $color--foreground;
+  background: $color--background;
+}
+
+a {
+  color: $color--accent;
 }
diff --git a/_sass/type.scss b/_sass/type.scss
deleted file mode 100644
index 948429d..0000000
--- a/_sass/type.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-
-body {
-  color: $color--foreground;
-  background: $color--background;
-}
-
-a {
-  color: $color--accent;
-}
diff --git a/_sass/variables.scss b/_sass/variables.scss
deleted file mode 100644
index eddad5a..0000000
--- a/_sass/variables.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Color variables
-$color--background: #ffefc8;
-$color--foreground: #150301;
-$color--accent: #5277c3;