diff --git a/Gruntfile.js b/Gruntfile.js
index 7746464..b95b9e6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,7 +5,8 @@ module.exports = function(grunt){
 	// Configurable paths
 	var config = {
 		tmp: '.tmp',
-		base: 'couchpotato'
+		base: 'couchpotato',
+		css_dest: 'couchpotato/static/style/combined.min.css'
 	};
 
 	grunt.initConfig({
@@ -29,23 +30,15 @@ module.exports = function(grunt){
 		// Compiles Sass to CSS and generates necessary files if requested
 		sass: {
 			options: {
-				compass: true
-			},
-			dist: {
-				files: [{
-					expand: true,
-					cwd: '<%= config.base %>/styles',
-					src: ['*.scss'],
-					dest: '<%= config.tmp %>/styles',
-					ext: '.css'
-				}]
+				compass: true,
+				update: true
 			},
 			server: {
 				files: [{
 					expand: true,
 					cwd: '<%= config.base %>/',
 					src: ['**/*.scss'],
-					dest: '<%= config.tmp %>/styles',
+					dest: '<%= config.tmp %>/styles/',
 					ext: '.css'
 				}]
 			}
@@ -66,13 +59,11 @@ module.exports = function(grunt){
 			}
 		},
 
-		concat: {
-			options: {
-				separator: ''
-			},
+		cssmin: {
 			dist: {
-				src: ['<%= config.tmp %>/styles/**/*.css'],
-				dest: '<%= config.tmp %>/test.css'
+				files: {
+					'<%= config.css_dest %>': ['<%= config.tmp %>/styles/**/*.css']
+				}
 			}
 		},
 
@@ -80,7 +71,7 @@ module.exports = function(grunt){
 		watch: {
 			scss: {
 				files: ['**/*.{scss,sass}'],
-				tasks: ['sass:server', 'autoprefixer', 'concat'],
+				tasks: ['sass:server', 'autoprefixer', 'cssmin'],
 				options: {
 					'livereload': true
 				}
@@ -101,7 +92,6 @@ module.exports = function(grunt){
 				files: [
 					'<%= config.base %>/{,*/}*.html',
 					'<%= config.tmp %>/styles/{,*/}*.css',
-					'<%= config.base %>/react/{,*/}*.js',
 					'<%= config.base %>/images/{,*/}*'
 				]
 			}
@@ -111,7 +101,7 @@ module.exports = function(grunt){
 			options: {
 				logConcurrentOutput: true
 			},
-			tasks: ['sass:server', 'watch']
+			tasks: ['sass:server', 'autoprefixer', 'cssmin', 'watch']
 		}
 
 	});
@@ -119,12 +109,11 @@ module.exports = function(grunt){
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	//grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-sass');
-	//grunt.loadNpmTasks('grunt-contrib-cssmin');
+	grunt.loadNpmTasks('grunt-contrib-cssmin');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-autoprefixer');
 	grunt.loadNpmTasks('grunt-concurrent');
-	grunt.loadNpmTasks('grunt-contrib-concat');
 
-	grunt.registerTask('default', ['sass', 'concurrent']);
+	grunt.registerTask('default', ['concurrent']);
 
 };
diff --git a/couchpotato/core/media/_base/search/static/search.css b/couchpotato/core/media/_base/search/static/search.scss
similarity index 100%
rename from couchpotato/core/media/_base/search/static/search.css
rename to couchpotato/core/media/_base/search/static/search.scss
diff --git a/couchpotato/core/media/movie/_base/static/movie.css b/couchpotato/core/media/movie/_base/static/movie.scss
similarity index 100%
rename from couchpotato/core/media/movie/_base/static/movie.css
rename to couchpotato/core/media/movie/_base/static/movie.scss
diff --git a/couchpotato/core/media/movie/charts/static/charts.css b/couchpotato/core/media/movie/charts/static/charts.scss
similarity index 100%
rename from couchpotato/core/media/movie/charts/static/charts.css
rename to couchpotato/core/media/movie/charts/static/charts.scss
diff --git a/couchpotato/core/media/movie/suggestion/static/suggest.css b/couchpotato/core/media/movie/suggestion/static/suggest.scss
similarity index 100%
rename from couchpotato/core/media/movie/suggestion/static/suggest.css
rename to couchpotato/core/media/movie/suggestion/static/suggest.scss
diff --git a/couchpotato/core/plugins/category/static/category.css b/couchpotato/core/plugins/category/static/category.scss
similarity index 100%
rename from couchpotato/core/plugins/category/static/category.css
rename to couchpotato/core/plugins/category/static/category.scss
diff --git a/couchpotato/core/plugins/log/static/log.css b/couchpotato/core/plugins/log/static/log.scss
similarity index 100%
rename from couchpotato/core/plugins/log/static/log.css
rename to couchpotato/core/plugins/log/static/log.scss
diff --git a/couchpotato/core/plugins/profile/static/profile.css b/couchpotato/core/plugins/profile/static/profile.scss
similarity index 100%
rename from couchpotato/core/plugins/profile/static/profile.css
rename to couchpotato/core/plugins/profile/static/profile.scss
diff --git a/couchpotato/core/plugins/quality/static/quality.css b/couchpotato/core/plugins/quality/static/quality.scss
similarity index 100%
rename from couchpotato/core/plugins/quality/static/quality.css
rename to couchpotato/core/plugins/quality/static/quality.scss
diff --git a/couchpotato/core/plugins/userscript/static/userscript.css b/couchpotato/core/plugins/userscript/static/userscript.scss
similarity index 100%
rename from couchpotato/core/plugins/userscript/static/userscript.css
rename to couchpotato/core/plugins/userscript/static/userscript.scss
diff --git a/couchpotato/core/plugins/wizard/static/wizard.css b/couchpotato/core/plugins/wizard/static/wizard.scss
similarity index 100%
rename from couchpotato/core/plugins/wizard/static/wizard.css
rename to couchpotato/core/plugins/wizard/static/wizard.scss
diff --git a/couchpotato/static/style/api.css b/couchpotato/static/style/api.scss
similarity index 100%
rename from couchpotato/static/style/api.css
rename to couchpotato/static/style/api.scss
diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main_old.scss
similarity index 100%
rename from couchpotato/static/style/main.css
rename to couchpotato/static/style/main_old.scss
diff --git a/couchpotato/static/style/settings.css b/couchpotato/static/style/settings.scss
similarity index 100%
rename from couchpotato/static/style/settings.css
rename to couchpotato/static/style/settings.scss
diff --git a/couchpotato/static/style/uniform.generic.css b/couchpotato/static/style/uniform.generic.scss
similarity index 100%
rename from couchpotato/static/style/uniform.generic.css
rename to couchpotato/static/style/uniform.generic.scss
diff --git a/couchpotato/static/style/uniform.css b/couchpotato/static/style/uniform.scss
similarity index 100%
rename from couchpotato/static/style/uniform.css
rename to couchpotato/static/style/uniform.scss