diff --git a/index.js b/index.js
index dbc6dd87c2aba7ca6e58ed096bd70a0c82d9315c..68c6a297876b392309f76bee373510b51549ef84 100755
--- a/index.js
+++ b/index.js
@@ -2,6 +2,7 @@
 var moment = require('moment');
 var cli = require('cli');
 var config = require('./sitegin/config');
+var path = require('path');
 
 cli.main(function(args, options) {
   console.log(options);
@@ -82,9 +83,12 @@ var sitegin = function(config) {
 
       var chokidar = require('chokidar');
       // article or theme reload
-      chokidar.watch([config.sourceDir,config.themeDir], {ignoreInitial: true})
+      var watches = [path.join(config.sourceDir,'articles'),config.themeDir];
+      console.log('Watching',watches,'for changes');
+      chokidar.watch(watches, {ignoreInitial: true})
       .on('all', function(event, path) {
         console.log('Content or theme changed. Rebuilding...');
+        console.log('Change event:',event,'on path:',path);
         run();
       })
 
@@ -126,7 +130,7 @@ var copyStaticFiles = function(builddir, staticdir,themedir) {
 var rendersass = function(builddir, themedir) {
   // SASS
   var sass = require('node-sass');
-  var fs = require('fs');
+  var fs = require('filendir');
 
   sass.render ({file: themedir+'/sass/style.scss'},function(err, result) {
     if(err === null) {
diff --git a/package.json b/package.json
index 0db9019861718d1642a79569962640646bed129c..dc1fa88a605cb46008ce99052559beb50f436155 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "browser-sync": "^2.11.1",
     "chokidar": "^1.4.3",
     "cli": "^0.11.2",
+    "filendir": "^1.0.0",
     "highlight.js": "^9.2.0",
     "jsesc": "^1.0.0",
     "marked": "^0.3.5",
diff --git a/sitegin/config.js b/sitegin/config.js
index e43f4ec148f02c457458ee228e45edbd5d868290..ef505e968f3d1c57d5470c6dad8496891294f93b 100644
--- a/sitegin/config.js
+++ b/sitegin/config.js
@@ -13,7 +13,7 @@ var options = cli.parse({
  uiport: [null, 'BrowserSync UI port', 'number', 'port+1'],
  httpsonly: [null, 'Converts all http://ok1kvk.cz links to https'],
  httponly: [null, 'Converts all https://ok1kvk.cz links to http'],
- contentdir: [null, 'Allows to specify arbitrary content directory.', 'string', 'static'],
+ contentdir: [null, 'Allows to specify arbitrary content directory.', 'string', 'content'],
  themedir: [null, 'Allows to specify arbitrary content directory.', 'string', 'theme'],
  builddir: [null, 'Allows to specify arbitrary content directory.', 'string', null],
  staticdir: [null, 'Allows to specify arbitrary directory for static files.', 'string', 'static']