diff --git a/Gruntfile.js b/Gruntfile.js
index 3e67b9f05d841084831031749aa81c18375ce926..3b9f98e7f9f88c06b65b8f03942e6771df8550ed 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -36,19 +36,15 @@ module.exports = function(grunt) {
 				}
 			},
 			themes: {
-				files: {
-					'css/theme/black.css': 'css/theme/source/black.scss',
-					'css/theme/white.css': 'css/theme/source/white.scss',
-					'css/theme/league.css': 'css/theme/source/league.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',
-					'css/theme/simple.css': 'css/theme/source/simple.scss',
-					'css/theme/sky.css': 'css/theme/source/sky.scss',
-					'css/theme/moon.css': 'css/theme/source/moon.scss',
-					'css/theme/solarized.css': 'css/theme/source/solarized.scss',
-					'css/theme/blood.css': 'css/theme/source/blood.scss'
-				}
+				files: [
+					{
+						expand: true,
+						cwd: 'css/theme/source',
+						src: ['*.scss'],
+						dest: 'css/theme',
+						ext: '.css'
+					}
+				]
 			}
 		},
 
diff --git a/css/theme/README.md b/css/theme/README.md
index aa0b131afcaaba0fa2a5d6101466977045e0e99d..9822563f222c5d8197f2a13c08a94506878f2f24 100644
--- a/css/theme/README.md
+++ b/css/theme/README.md
@@ -17,7 +17,5 @@ Declares a set of custom variables that the template file (step 4) expects. Can
 3. **Override**
 This is where you override the default theme. Either by specifying variables (see [settings.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/settings.scss) for reference) or by adding any selectors and styles you please.
 
-4. **Include [/css/theme/template/theme.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/theme.scss)**
-The template theme file which will generate final CSS output based on the currently defined variables.
-
-When you are done, run `css-grunt themes` to compile the Sass file to CSS and you are ready to use your new theme.
+4. **Run `css-grunt themes`**
+This will compile your theme CSS. It's now ready to use.