diff --git a/gulpfile.js b/gulpfile.js
index 291057c..7f2db4c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -4,6 +4,7 @@ var browserify = require('browserify');
 var ecstatic = require('ecstatic');
 var gulp = require('gulp');
 var gutil = require('gulp-util');
+var concat = require('gulp-concat');
 var livereload = require('gulp-livereload');
 var path = require('path');
 var source = require('vinyl-source-stream');
@@ -22,7 +23,7 @@ var config = {
     destination: './public/'
   },
   styles: {
-    source: './src/**/style.css',
+    source: './src/**/*.css',
     watch: './src/**/*.css',
     destination: './public/css/'
   },
@@ -59,6 +60,7 @@ gulp.task('templates', function() {
 
 gulp.task('styles', function() {
   return gulp.src(config.styles.source)
+  .pipe(concat('style.css'))
   .pipe(gulp.dest(config.styles.destination))
   .pipe(livereload({auto: false}));
 });
diff --git a/package.json b/package.json
index 717a770..9b66e3a 100644
--- a/package.json
+++ b/package.json
@@ -20,11 +20,12 @@
   "devDependencies": {
     "bower": "~1.3.5",
     "browserify": "~6.1.0",
-    "ecstatic": "~0.5.3",
     "deamdify": "^0.1.1",
     "debowerify": "~0.9.1",
+    "ecstatic": "~0.5.3",
     "gulp": "~3.8.1",
     "gulp-autoprefixer": "1.0.1",
+    "gulp-concat": "^2.4.3",
     "gulp-livereload": "~2.1.0",
     "gulp-minify-css": "~0.3.5",
     "gulp-streamify": "0.0.5",