1 files changed, 21 insertions, 30 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index 4e57152..c6132e4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -29,18 +29,12 @@ module.exports = function(grunt) {
 			}
 		},
 
-		cssmin: {
-			compress: {
-				files: {
-					'css/reveal.min.css': [ 'css/reveal.css' ]
-				}
-			}
-		},
-
 		sass: {
-			main: {
+			dist: {
 				files: {
+					'css/reveal.css': 'css/reveal.scss',
 					'css/theme/default.css': 'css/theme/source/default.scss',
+					'css/theme/black.css': 'css/theme/source/black.scss',
 					'css/theme/beige.css': 'css/theme/source/beige.scss',
 					'css/theme/night.css': 'css/theme/source/night.scss',
 					'css/theme/serif.css': 'css/theme/source/serif.scss',
@@ -53,6 +47,20 @@ module.exports = function(grunt) {
 			}
 		},
 
+		autoprefixer: {
+			dist: {
+				src: 'css/reveal.css'
+			}
+		},
+
+		cssmin: {
+			compress: {
+				files: {
+					'css/reveal.min.css': [ 'css/reveal.css' ]
+				}
+			}
+		},
+
 		jshint: {
 			options: {
 				curly: false,
@@ -78,22 +86,6 @@ module.exports = function(grunt) {
 			files: [ 'Gruntfile.js', 'js/reveal.js' ]
 		},
 
-        autoprefixer: {
-            dist: {
-                files: {
-                    'css/reveal.css': 'css/reveal.bare.css'
-                }
-            },
-            unprefix: {
-                files: {
-                    'css/reveal.clean.css': 'css/reveal.css'
-                },
-                options: {
-                    browsers: []
-                }
-            }
-        },
-
 		connect: {
 			server: {
 				options: {
@@ -129,7 +121,7 @@ module.exports = function(grunt) {
 				tasks: 'themes'
 			},
 			css: {
-				files: [ 'css/reveal.bare.css' ],
+				files: [ 'css/reveal.css' ],
 				tasks: 'css'
 			},
             html: {
@@ -145,9 +137,9 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
 	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
-	grunt.loadNpmTasks( 'grunt-contrib-sass' );
+	grunt.loadNpmTasks( 'grunt-sass' );
 	grunt.loadNpmTasks( 'grunt-contrib-connect' );
-    grunt.loadNpmTasks( 'grunt-autoprefixer' );
+	grunt.loadNpmTasks( 'grunt-autoprefixer' );
 	grunt.loadNpmTasks( 'grunt-zip' );
 
 	// Default task
@@ -157,8 +149,7 @@ module.exports = function(grunt) {
 	grunt.registerTask( 'themes', [ 'sass' ] );
 
 	// CSS task
-	grunt.registerTask( 'css', [ 'autoprefixer:dist', 'cssmin' ] );
-
+	grunt.registerTask( 'css', [ 'sass', 'autoprefixer', 'cssmin' ] );
 
 	// Package presentation to archive
 	grunt.registerTask( 'package', [ 'default', 'zip' ] );