diff --git a/gulp/build.coffee b/gulp/build.coffee
index 99d54b39..62aefcea 100644
--- a/gulp/build.coffee
+++ b/gulp/build.coffee
@@ -1,4 +1,4 @@
 g = require 'gulp'
 
 g.task 'build', ->
-  g.start 'clean', 'styles', 'scripts', 'fonts'
+  g.start 'clean', 'vendor', 'styles', 'fonts'
diff --git a/gulp/clean.coffee b/gulp/clean.coffee
index ae31b1a5..eead95c6 100644
--- a/gulp/clean.coffee
+++ b/gulp/clean.coffee
@@ -1,5 +1,11 @@
 g = require 'gulp'
 
 g.task 'clean', ->
-  g.src "{output_*,source}/assets/{css,fonts,js}", read: false
+  g.src [
+    'output_*/assets/css',
+    'output_*/assets/fonts',
+    'source/assets/css',
+    'source/assets/fonts',
+    'source/assets/js',
+  ], read: false
     .pipe g.p.clean()
diff --git a/gulp/scripts.coffee b/gulp/scripts.coffee
index b35ac2dc..e69de29b 100644
--- a/gulp/scripts.coffee
+++ b/gulp/scripts.coffee
@@ -1,10 +0,0 @@
-g = require 'gulp'
-
-g.task 'scripts', =>
-  g.src ['vendor/bower/jquery/dist/jquery.js', 'vendor/bower/bootstrap-sass/assets/javascripts/bootstrap.js']
-    .pipe g.p.plumber()
-    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init()
-    .pipe g.p.concat 'all.js'
-    .pipe g.p.if g.config.production, g.p.uglify()
-    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.')
-    .pipe g.dest 'source/assets/js'
diff --git a/gulp/styles.coffee b/gulp/styles.coffee
index 283d373e..ff756e2f 100644
--- a/gulp/styles.coffee
+++ b/gulp/styles.coffee
@@ -1,11 +1,4 @@
 g = require 'gulp'
 
 g.task 'styles', ->
-  g.src ['vendor/bower/font-awesome/css/font-awesome.css', 'sass/styles.scss']
-    .pipe g.p.plumber()
-    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init()
-    .pipe g.p.sass()
-    .pipe g.p.concat 'all.css'
-    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.')
-    .pipe g.dest 'source/assets/css'
-    .pipe g.p.if g.config.livereload, g.p.livereload()
+  g.css 'sass/site.scss', 'site.css'
diff --git a/gulp/vendor.coffee b/gulp/vendor.coffee
new file mode 100644
index 00000000..83b9a4b5
--- /dev/null
+++ b/gulp/vendor.coffee
@@ -0,0 +1,15 @@
+g = require 'gulp'
+
+g.task 'vendor', -> g.start 'vendor-styles', 'vendor-scripts'
+
+g.task 'vendor-styles', ->
+  g.css [
+    'sass/vendor.scss',
+    'vendor/bower/font-awesome/css/font-awesome.css'
+  ], 'vendor.css'
+
+g.task 'vendor-scripts', =>
+  g.js [
+    'vendor/bower/jquery/dist/jquery.js',
+    'vendor/bower/bootstrap-sass/assets/javascripts/bootstrap/collapse.js',
+  ], 'vendor.js'
diff --git a/gulpfile.coffee b/gulpfile.coffee
index bdbce1e4..59c88aad 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -11,7 +11,26 @@ g.config =
   liveReload: !g.p.util.env.production
 
 g.copy = (srcFiles, outputDir) ->
-  g.src(srcFiles)
-  .pipe g.dest(outputDir)
+  g.src srcFiles
+    .pipe g.dest outputDir
+
+g.css = (srcFiles, destFile) ->
+  g.src srcFiles
+    .pipe g.p.plumber()
+    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init()
+    .pipe g.p.sass()
+    .pipe g.p.concat destFile
+    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.')
+    .pipe g.dest 'source/assets/css'
+    .pipe g.p.if g.config.livereload, g.p.livereload()
+
+g.js = (srcFiles, destFile) ->
+  g.src srcFiles
+    .pipe g.p.plumber()
+    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.init()
+    .pipe g.p.concat destFile
+    .pipe g.p.if g.config.production, g.p.uglify()
+    .pipe g.p.if g.config.sourceMaps, g.p.sourcemaps.write('.')
+    .pipe g.dest 'source/assets/js'
 
 require('fs').readdirSync('./gulp').forEach (task) -> require "./gulp/#{task}"
diff --git a/sass/styles.scss b/sass/site.scss
similarity index 78%
rename from sass/styles.scss
rename to sass/site.scss
index 69b88e1e..7648fcd8 100644
--- a/sass/styles.scss
+++ b/sass/site.scss
@@ -1,7 +1,8 @@
-@import '_variables';
-
+@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/variables';
+@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix';
 @import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint';
-@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap';
+
+@import '_variables';
 
 @import 'partials/base';
 @import 'partials/badges';
diff --git a/sass/vendor.scss b/sass/vendor.scss
new file mode 100644
index 00000000..a808a5e7
--- /dev/null
+++ b/sass/vendor.scss
@@ -0,0 +1,4 @@
+@import '_variables';
+
+@import '../vendor/bower/compass-breakpoint/stylesheets/breakpoint';
+@import '../vendor/bower/bootstrap-sass/assets/stylesheets/bootstrap';
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 10fcbd44..d736d3e3 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -18,7 +18,8 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/all.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/vendor.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
         {% block styles %}{% endblock %}
 
         {% for size in site.apple_touch_icon_sizes %}
@@ -90,7 +91,7 @@
             {% include('meetups') %}
         </footer>
 
-        <script src="{{ site.url }}/assets/js/all.js"></script>
+        <script src="{{ site.url }}/assets/js/vendor.js"></script>
 
         {% block scripts %}{% endblock %}