diff --git a/babyblotter/static_site/scss/_custom.scss b/babyblotter/static_site/scss/_custom.scss
deleted file mode 100644
index 7720f1f5..00000000
--- a/babyblotter/static_site/scss/_custom.scss
+++ /dev/null
@@ -1 +0,0 @@
-$body-bg: $white;
diff --git a/babyblotter/static_site/scss/_global.scss b/babyblotter/static_site/scss/_global.scss
new file mode 100644
index 00000000..0462b710
--- /dev/null
+++ b/babyblotter/static_site/scss/_global.scss
@@ -0,0 +1 @@
+/* Baby Blotter site-wide custom functions. */
diff --git a/babyblotter/static_site/scss/_mixins.scss b/babyblotter/static_site/scss/_mixins.scss
new file mode 100644
index 00000000..f96741fc
--- /dev/null
+++ b/babyblotter/static_site/scss/_mixins.scss
@@ -0,0 +1,3 @@
+@import "../../../node_modules/bootstrap/scss/mixins";
+
+/* Baby Blotter site-wide custom mixins. */
diff --git a/babyblotter/static_site/scss/babyblotter.scss b/babyblotter/static_site/scss/babyblotter.scss
index 0bb16b09..79855eca 100644
--- a/babyblotter/static_site/scss/babyblotter.scss
+++ b/babyblotter/static_site/scss/babyblotter.scss
@@ -1,4 +1,7 @@
 @import "functions";
 @import "variables";
-@import "custom";
+@import "mixins";
+@import "global";
 @import "../../../node_modules/bootstrap/scss/bootstrap";
+
+@import "../../../**/static/scss/*.scss";
diff --git a/gulpfile.js b/gulpfile.js
index fbd643dc..6b37129e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -4,6 +4,7 @@ var concat = require('gulp-concat');
 var csso = require('gulp-csso');
 var pump = require('pump');
 var sass = require('gulp-sass');
+var sassGlob = require('gulp-sass-glob');
 var uglify = require('gulp-uglify');
 
 /* APP FILES */
@@ -21,10 +22,8 @@ gulp.task('app:scripts', function() {
 
 gulp.task('app:styles', function (cb) {
     pump([
-            gulp.src([
-                'babyblotter/static_site/scss/babyblotter.scss',
-                '*/static/scss/*.scss'
-            ]),
+            gulp.src('babyblotter/static_site/scss/babyblotter.scss'),
+            sassGlob(),
             sass().on('error', sass.logError),
             concat('app.css'),
             gulp.dest('babyblotter/static/babyblotter/css/')
diff --git a/package.json b/package.json
index 19b77e00..ea89839e 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "gulp-concat": "^2.6.1",
     "gulp-csso": "^3.0.0",
     "gulp-sass": "^3.1.0",
+    "gulp-sass-glob": "^1.0.8",
     "gulp-uglify": "^3.0.0",
     "jquery": "^3.2.1",
     "moment": "^2.18.1",