diff --git a/gulpfile.js b/gulpfile.js
index 49915fb..6a40d8d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -5,7 +5,7 @@ var concat       = require('gulp-concat');
 var git          = require('gulp-git');
 var gulp         = require('gulp');
 var gulpif       = require('gulp-if');
-var jade         = require('gulp-jade');
+var pug         = require('gulp-pug');
 var livereload   = require('gulp-livereload');
 var plumber      = require('gulp-plumber');
 var rename       = require('gulp-rename');
@@ -45,12 +45,12 @@ gulp.task('styles', function() {
 });
 
 
-/* Templates - Jade */
+/* Templates - Pug */
 gulp.task('templates', function() {
-    gulp.src('src/templates/**/*.jade')
+    gulp.src('src/templates/**/*.pug')
         .pipe(gulpif(enabled.failCheck, plumber()))
         .pipe(cache('templating'))
-        .pipe(jade({
+        .pipe(pug({
             pretty: enabled.prettyPug
         }))
         .pipe(gulp.dest(destination.pug))
@@ -96,7 +96,7 @@ gulp.task('watch',function() {
     }
 
     gulp.watch('src/styles/**/*.sass',['styles']);
-    gulp.watch('src/templates/**/*.jade',['templates']);
+    gulp.watch('src/templates/**/*.pug',['templates']);
     gulp.watch('src/scripts/*.js',['scripts']);
     gulp.watch('src/scripts/tutti/*.js',['scripts_tutti']);
 });
diff --git a/package.json b/package.json
index c66fb39..c802c4c 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
 		"gulp-concat": "~2.6.0",
 		"gulp-if": "^2.0.1",
 		"gulp-git": "~2.4.2",
-		"gulp-jade": "~1.1.0",
 		"gulp-livereload": "~3.8.1",
 		"gulp-plumber": "~1.1.0",
+		"gulp-pug": "~3.3.0",
 		"gulp-rename": "~1.2.2",
 		"gulp-sass": "~2.3.1",
 		"gulp-sourcemaps": "~1.6.0",
diff --git a/src/templates/attract/_notifications.jade b/src/templates/attract/_notifications.pug
similarity index 100%
rename from src/templates/attract/_notifications.jade
rename to src/templates/attract/_notifications.pug
diff --git a/src/templates/attract/assets/for_project.jade b/src/templates/attract/assets/for_project.pug
similarity index 100%
rename from src/templates/attract/assets/for_project.jade
rename to src/templates/attract/assets/for_project.pug
diff --git a/src/templates/attract/assets/view_asset_embed.jade b/src/templates/attract/assets/view_asset_embed.pug
similarity index 100%
rename from src/templates/attract/assets/view_asset_embed.jade
rename to src/templates/attract/assets/view_asset_embed.pug
diff --git a/src/templates/attract/errors/layout.jade b/src/templates/attract/errors/layout.pug
similarity index 100%
rename from src/templates/attract/errors/layout.jade
rename to src/templates/attract/errors/layout.pug
diff --git a/src/templates/attract/errors/project_not_setup.jade b/src/templates/attract/errors/project_not_setup.pug
similarity index 100%
rename from src/templates/attract/errors/project_not_setup.jade
rename to src/templates/attract/errors/project_not_setup.pug
diff --git a/src/templates/attract/help.jade b/src/templates/attract/help.pug
similarity index 100%
rename from src/templates/attract/help.jade
rename to src/templates/attract/help.pug
diff --git a/src/templates/attract/index.jade b/src/templates/attract/index.pug
similarity index 100%
rename from src/templates/attract/index.jade
rename to src/templates/attract/index.pug
diff --git a/src/templates/attract/index_anon_left_column.jade b/src/templates/attract/index_anon_left_column.pug
similarity index 100%
rename from src/templates/attract/index_anon_left_column.jade
rename to src/templates/attract/index_anon_left_column.pug
diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.pug
similarity index 100%
rename from src/templates/attract/layout.jade
rename to src/templates/attract/layout.pug
diff --git a/src/templates/attract/project.jade b/src/templates/attract/project.pug
similarity index 100%
rename from src/templates/attract/project.jade
rename to src/templates/attract/project.pug
diff --git a/src/templates/attract/project_settings/attract_layout.jade b/src/templates/attract/project_settings/attract_layout.pug
similarity index 100%
rename from src/templates/attract/project_settings/attract_layout.jade
rename to src/templates/attract/project_settings/attract_layout.pug
diff --git a/src/templates/attract/project_settings/offer_setup.jade b/src/templates/attract/project_settings/offer_setup.pug
similarity index 100%
rename from src/templates/attract/project_settings/offer_setup.jade
rename to src/templates/attract/project_settings/offer_setup.pug
diff --git a/src/templates/attract/project_settings/settings.jade b/src/templates/attract/project_settings/settings.pug
similarity index 100%
rename from src/templates/attract/project_settings/settings.jade
rename to src/templates/attract/project_settings/settings.pug
diff --git a/src/templates/attract/shots/for_project.jade b/src/templates/attract/shots/for_project.pug
similarity index 100%
rename from src/templates/attract/shots/for_project.jade
rename to src/templates/attract/shots/for_project.pug
diff --git a/src/templates/attract/shots/index.jade b/src/templates/attract/shots/index.pug
similarity index 100%
rename from src/templates/attract/shots/index.jade
rename to src/templates/attract/shots/index.pug
diff --git a/src/templates/attract/shots/view_activities_embed.jade b/src/templates/attract/shots/view_activities_embed.pug
similarity index 100%
rename from src/templates/attract/shots/view_activities_embed.jade
rename to src/templates/attract/shots/view_activities_embed.pug
diff --git a/src/templates/attract/shots/view_shot_embed.jade b/src/templates/attract/shots/view_shot_embed.pug
similarity index 100%
rename from src/templates/attract/shots/view_shot_embed.jade
rename to src/templates/attract/shots/view_shot_embed.pug
diff --git a/src/templates/attract/sidebar.jade b/src/templates/attract/sidebar.pug
similarity index 100%
rename from src/templates/attract/sidebar.jade
rename to src/templates/attract/sidebar.pug
diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.pug
similarity index 100%
rename from src/templates/attract/tasks/for_project.jade
rename to src/templates/attract/tasks/for_project.pug
diff --git a/src/templates/attract/tasks/for_user.jade b/src/templates/attract/tasks/for_user.pug
similarity index 100%
rename from src/templates/attract/tasks/for_user.jade
rename to src/templates/attract/tasks/for_user.pug
diff --git a/src/templates/attract/tasks/index.jade b/src/templates/attract/tasks/index.pug
similarity index 100%
rename from src/templates/attract/tasks/index.jade
rename to src/templates/attract/tasks/index.pug
diff --git a/src/templates/attract/tasks/task_list_for_user.jade b/src/templates/attract/tasks/task_list_for_user.pug
similarity index 100%
rename from src/templates/attract/tasks/task_list_for_user.jade
rename to src/templates/attract/tasks/task_list_for_user.pug
diff --git a/src/templates/attract/tasks/view_activities_embed.jade b/src/templates/attract/tasks/view_activities_embed.pug
similarity index 100%
rename from src/templates/attract/tasks/view_activities_embed.jade
rename to src/templates/attract/tasks/view_activities_embed.pug
diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.pug
similarity index 100%
rename from src/templates/attract/tasks/view_task_embed.jade
rename to src/templates/attract/tasks/view_task_embed.pug