diff --git a/Gruntfile.js b/Gruntfile.js
index d9b580abcb..998d244fd3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,6 +14,7 @@ module.exports = function(grunt) {
           'js/utils.js',
           'js/events.js',
           'js/gestures.js',
+          'js/animate.js',
           'js/viewController.js',
           'js/views/**/*.js',
           'js/controllers/**/*.js'
@@ -32,6 +33,29 @@ module.exports = function(grunt) {
           document: true
         }
       }
+    },
+    sass: {
+      dist: {
+        files: {
+          'dist/ionic.css': 'scss/ionic.scss'
+        }
+      }
+    },
+    watch: {
+      scripts: {
+        files: ['js/**/*.js'],
+        tasks: ['concat'],
+        options: {
+          spawn: false
+        }
+      },
+      sass: {
+        files: ['scss/**/*.scss'],
+        tasks: ['sass'],
+        options: {
+          spawn: false
+        }
+      }
     }
   });
 
@@ -39,6 +63,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-sass');
 
   grunt.registerTask('default', ['jshint', 'concat']);
 };
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cceb53d182..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-all: release
-
-release:
-	@sass -I scss/ scss/ionic.scss:dist/ionic.css
-
-cordova:
-	@cp -R js/ example/cordova/iOS/www/js
-	@cp dist/ionic.css example/cordova/iOS/www/css
-
-watch:
-	@sass --watch scss/ionic.scss:dist/ionic.css
-
-watch-ionicons:
-	@sass --watch ionicons/scss/ionicons.scss:dist/ionicons.css
\ No newline at end of file