diff --git a/Gruntfile.js b/Gruntfile.js
index 9bde500..ec9fe05 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,9 +63,8 @@ module.exports = function(grunt) {
 
     grunt.registerTask('compileAssets', [
         'clean:dev',
-        'jst:dev',
-        'jade:templates',
         'less:dev',
+        'jade:dev',
         'copy:dev',
         'coffee:dev'
     ]);
@@ -92,7 +91,7 @@ module.exports = function(grunt) {
     // When sails is lifted in production
     grunt.registerTask('prod', [
         'clean:dev',
-        'jst:dev',
+        'jade:dev',
         'less:dev',
         'copy:dev',
         'coffee:dev',
diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee
index 67c46a6..f48f9d7 100644
--- a/assets/linker/js/app.coffee
+++ b/assets/linker/js/app.coffee
@@ -8,13 +8,13 @@ lunchApp.config ['$routeProvider',
     ($routeProvider) ->
         $routeProvider
             .when '/',
-                templateUrl: 'linker/templates/home.html',
+                templateUrl: 'templates/home.html',
                 controller: 'HomeCtrl'
             .when '/run/:id',
-                templateUrl: 'linker/templates/run.html',
+                templateUrl: 'templates/run.html',
                 controller: 'RunCtrl'
             .when '/run/:id/order/:inviteeName',
-                templateUrl: 'linker/templates/create-order.html',
+                templateUrl: 'templates/create-order.html',
                 controller: 'CreateOrderCtrl'
 ]
 
diff --git a/tasks/options/jade.js b/tasks/options/jade.js
index 88c44a5..326437c 100644
--- a/tasks/options/jade.js
+++ b/tasks/options/jade.js
@@ -1,12 +1,12 @@
 // jade
 module.exports = function(config) {
     return {
-        templates: {
+        dev: {
             files: [{
                 expand: true,
-                cwd: './assets/templates/',
+                cwd: './assets/linker/templates/',
                 src: ['*.jade'],
-                dest: './assets/templates/',
+                dest: '.tmp/public/templates/',
                 ext: '.html'
             }]
         }