diff --git a/assets/styles/_bootstrap.less b/assets/styles/_bootstrap.less
deleted file mode 100644
index d592f99..0000000
--- a/assets/styles/_bootstrap.less
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Bootstrap
-//
-// Comment out any unused components
-// --------------------------------------------------
-
-// Variables
-@import "../../bower_components/bootstrap/less/variables";
-
-// Mixins: Utilities
-@import "../../bower_components/bootstrap/less/mixins/hide-text";
-@import "../../bower_components/bootstrap/less/mixins/opacity";
-@import "../../bower_components/bootstrap/less/mixins/image";
-@import "../../bower_components/bootstrap/less/mixins/labels";
-@import "../../bower_components/bootstrap/less/mixins/reset-filter";
-@import "../../bower_components/bootstrap/less/mixins/resize";
-@import "../../bower_components/bootstrap/less/mixins/responsive-visibility";
-@import "../../bower_components/bootstrap/less/mixins/size";
-@import "../../bower_components/bootstrap/less/mixins/tab-focus";
-@import "../../bower_components/bootstrap/less/mixins/text-emphasis";
-@import "../../bower_components/bootstrap/less/mixins/text-overflow";
-@import "../../bower_components/bootstrap/less/mixins/vendor-prefixes";
-
-// Mixins: Components
-@import "../../bower_components/bootstrap/less/mixins/alerts";
-@import "../../bower_components/bootstrap/less/mixins/buttons";
-@import "../../bower_components/bootstrap/less/mixins/panels";
-@import "../../bower_components/bootstrap/less/mixins/pagination";
-@import "../../bower_components/bootstrap/less/mixins/list-group";
-@import "../../bower_components/bootstrap/less/mixins/nav-divider";
-@import "../../bower_components/bootstrap/less/mixins/forms";
-@import "../../bower_components/bootstrap/less/mixins/progress-bar";
-@import "../../bower_components/bootstrap/less/mixins/table-row";
-
-// Mixins: Skins
-@import "../../bower_components/bootstrap/less/mixins/background-variant";
-@import "../../bower_components/bootstrap/less/mixins/border-radius";
-@import "../../bower_components/bootstrap/less/mixins/gradients";
-
-// Mixins: Layout
-@import "../../bower_components/bootstrap/less/mixins/clearfix";
-@import "../../bower_components/bootstrap/less/mixins/center-block";
-@import "../../bower_components/bootstrap/less/mixins/nav-vertical-align";
-@import "../../bower_components/bootstrap/less/mixins/grid-framework";
-@import "../../bower_components/bootstrap/less/mixins/grid";
-
-// Reset
-@import "../../bower_components/bootstrap/less/normalize";
-@import "../../bower_components/bootstrap/less/print";
-@import "../../bower_components/bootstrap/less/glyphicons";
-
-// Core CSS
-@import "../../bower_components/bootstrap/less/scaffolding";
-@import "../../bower_components/bootstrap/less/type";
-@import "../../bower_components/bootstrap/less/code";
-@import "../../bower_components/bootstrap/less/grid";
-@import "../../bower_components/bootstrap/less/tables";
-@import "../../bower_components/bootstrap/less/forms";
-@import "../../bower_components/bootstrap/less/buttons";
-
-// Components
-@import "../../bower_components/bootstrap/less/component-animations";
-@import "../../bower_components/bootstrap/less/dropdowns";
-@import "../../bower_components/bootstrap/less/button-groups";
-@import "../../bower_components/bootstrap/less/input-groups";
-@import "../../bower_components/bootstrap/less/navs";
-@import "../../bower_components/bootstrap/less/navbar";
-@import "../../bower_components/bootstrap/less/breadcrumbs";
-@import "../../bower_components/bootstrap/less/pagination";
-@import "../../bower_components/bootstrap/less/pager";
-@import "../../bower_components/bootstrap/less/labels";
-@import "../../bower_components/bootstrap/less/badges";
-@import "../../bower_components/bootstrap/less/jumbotron";
-@import "../../bower_components/bootstrap/less/thumbnails";
-@import "../../bower_components/bootstrap/less/alerts";
-@import "../../bower_components/bootstrap/less/progress-bars";
-@import "../../bower_components/bootstrap/less/media";
-@import "../../bower_components/bootstrap/less/list-group";
-@import "../../bower_components/bootstrap/less/panels";
-@import "../../bower_components/bootstrap/less/responsive-embed";
-@import "../../bower_components/bootstrap/less/wells";
-@import "../../bower_components/bootstrap/less/close";
-
-// Components w/ JavaScript
-@import "../../bower_components/bootstrap/less/modals";
-@import "../../bower_components/bootstrap/less/tooltip";
-@import "../../bower_components/bootstrap/less/popovers";
-@import "../../bower_components/bootstrap/less/carousel";
-
-// Utility classes
-@import "../../bower_components/bootstrap/less/utilities";
-@import "../../bower_components/bootstrap/less/responsive-utilities";
diff --git a/assets/styles/main.less b/assets/styles/main.less
index aec9850..49f61a5 100644
--- a/assets/styles/main.less
+++ b/assets/styles/main.less
@@ -1,5 +1,6 @@
-// Bootstrap
-@import "_bootstrap";
+// bower:less
+@import "../../bower_components/bootstrap/less/bootstrap.less";
+// endbower
 
 // Variable overrides and custom variables
 @import "_variables";
diff --git a/bower.json b/bower.json
index 3c6c50c..1d2d767 100644
--- a/bower.json
+++ b/bower.json
@@ -20,6 +20,7 @@
   "overrides": {
     "bootstrap": {
       "main": [
+        "./less/bootstrap.less",
         "./js/transition.js",
         "./js/alert.js",
         "./js/button.js",
diff --git a/gulpfile.js b/gulpfile.js
index 7733173..3f08b44 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -102,7 +102,7 @@ var cssTasks = function(filename) {
     .pipe(gulp.dest, path.dist + 'styles')();
 };
 
-gulp.task('styles', ['styles:editorStyle'], function() {
+gulp.task('styles', ['wiredep', 'styles:editorStyle'], function() {
   return gulp.src(globs.styles)
     .pipe(cssTasks('main.css'));
 });
@@ -173,6 +173,7 @@ gulp.task('watch', function() {
   $.livereload.listen();
   gulp.watch([path.src + 'styles/**/*', 'bower.json'], ['styles']);
   gulp.watch([path.src + 'scripts/**/*', 'bower.json'], ['jshint', 'scripts']);
+  gulp.watch(['bower.json'], ['wiredep']);
   gulp.watch('**/*.php').on('change', function(file) {
     $.livereload.changed(file.path);
   });
@@ -182,6 +183,13 @@ gulp.task('build', ['styles', 'scripts', 'fonts', 'images'], function () {
   gulp.start('version');
 });
 
+gulp.task('wiredep', function () {
+  var wiredep = require('wiredep').stream;
+  gulp.src(obj.get(manifest, 'dependencies.theme.styles'))
+    .pipe(wiredep())
+    .pipe(gulp.dest(manifest.buildPaths.src + 'styles/'));
+});
+
 gulp.task('default', ['clean'], function () {
   gulp.start('build');
 });