diff --git a/Rakefile b/Rakefile
index a6abcd60..efe70b05 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,7 @@ task :post do
   ARGV.shift
   title = ARGV.join(' ')
 
-  path = "_src/_posts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
+  path = "_src/_drafts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
 
   if File.exist?(path)
       puts "Dude, file exists - skipping create"
@@ -19,7 +19,6 @@ task :post do
     File.open(path, "w") do |file|
       file.puts YAML.dump({
           'layout' => 'post',
-          'published' => false,
           'title' => title,
           'image' => 'REPLACEME.jpg',
           'author' => 'Matthias Kretschmann',
@@ -28,7 +27,7 @@ task :post do
       file.puts "---"
     end
   end
-  `mate #{path}`
+  `atom #{path}`
 
   exit 1
 end
@@ -42,7 +41,7 @@ task :photo do
   ARGV.shift
   title = ARGV.join(' ')
 
-  path = "_src/_posts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
+  path = "_src/_drafts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
 
   if File.exist?(path)
       puts "Dude, file exists - skipping create"
@@ -50,7 +49,6 @@ task :photo do
     File.open(path, "w") do |file|
       file.puts YAML.dump({
           'layout' => 'photo',
-          'published' => false,
           'title' => title,
           'image' => 'REPLACEME.jpg',
           'author' => 'Matthias Kretschmann',
@@ -60,7 +58,7 @@ task :photo do
       file.puts "---"
     end
   end
-  `mate #{path}`
+  `atom #{path}`
 
   exit 1
 end
@@ -74,7 +72,7 @@ task :photo do
   ARGV.shift
   title = ARGV.join(' ')
 
-  path = "_src/_posts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
+  path = "_src/_drafts/#{Date.today}-#{title.downcase.gsub(/[^[:alnum:]]+/, '-')}.md"
 
   if File.exist?(path)
       puts "Dude, file exists - skipping create"
@@ -82,7 +80,6 @@ task :photo do
     File.open(path, "w") do |file|
       file.puts YAML.dump({
           'layout' => 'link',
-          'published' => false,
           'title' => title,
           'author' => 'Matthias Kretschmann',
           'date' => Time.now
@@ -90,7 +87,7 @@ task :photo do
       file.puts "---"
     end
   end
-  `mate #{path}`
+  `atom #{path}`
 
   exit 1
 end
diff --git a/gulpfile.js b/gulpfile.js
index 5c6d3ba2..dc54cedb 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -349,7 +349,7 @@ gulp.task('watch', function() {
     gulp.watch([src + '/_assets/img/**/*.{png,jpg,jpeg,gif}'], ['images'])
     gulp.watch([src + '/_assets/img/**/*.{svg}'], ['icons'])
     gulp.watch([src + '/_media/**/*'], ['media'])
-    gulp.watch([src + '/**/*.{html,xml,json,txt,md}'], ['jekyll'])
+    gulp.watch([src + '/**/*.{html,xml,json,txt,md}'], ['build'])
 });
 
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^