diff --git a/bin/cli.js b/bin/cli.js
index f38a383..0d848b4 100755
--- a/bin/cli.js
+++ b/bin/cli.js
@@ -13,8 +13,8 @@ program
   .option('    --disable-auto-open', 'Disable auto-opening your web browser', defaults.disableAutoOpen)
   .option('    --highlight-theme <theme>', `Highlight theme [${defaults.highlightTheme}]`, defaults.highlightTheme)
   .option('    --host <host>', `Host [${defaults.host}]`, defaults.host)
-  .option('    --scripts <files>', 'Scripts to inject into the page', defaults.scripts)
-  .option('    --css <files>', 'CSS files to inject into the page', defaults.css)
+  .option('    --scripts <files>', 'Scripts to inject into the page')
+  .option('    --css <files>', 'CSS files to inject into the page')
   .option('    --preprocessor <script>', 'Markdown preprocessor script', defaults.preprocessor)
   .option('    --port <port>', `Port [${defaults.port}]`, defaults.port)
   .option('    --print [filename]', 'Print', defaults.print)
@@ -22,7 +22,7 @@ program
   .option('    --title <title>', 'Title of the presentation')
   .option('-s, --separator <separator>', 'Slide separator')
   .option('    --static [dir]', 'Export static html to directory [_static]. Incompatible with --print.', defaults.static)
-  .option('    --static-dirs <dirs>', 'Extra directories to copy into static directory. Only used in conjunction with --static.', defaults.staticDirs)
+  .option('    --static-dirs <dirs>', 'Extra directories to copy into static directory. Only used in conjunction with --static.')
   .option('-S, --vertical-separator <separator>', 'Vertical slide separator')
   .option('-w, --watch', `Watch for changes in markdown file and livereload presentation [${defaults.watch}]`, defaults.watch)
   .option('    --template <filename>', 'Template file for reveal.js', defaults.template)
diff --git a/lib/defaults.json b/lib/defaults.json
index c1b1ca4..30a47f1 100644
--- a/lib/defaults.json
+++ b/lib/defaults.json
@@ -4,12 +4,12 @@
   "host": "localhost",
   "scripts": [],
   "css": [],
-  "preprocessor": false,
+  "preprocessor": null,
   "port": 1948,
   "print": false,
   "revealOptions": {},
-  "template": "",
-  "listingTemplate": "",
+  "template": "template/reveal.html",
+  "listingTemplate": "template/listing.html",
   "theme": "black",
   "title": "reveal-md",
   "separator": "\r?\n---\r?\n",
diff --git a/lib/options.js b/lib/options.js
index 8228ffc..94ca69c 100644
--- a/lib/options.js
+++ b/lib/options.js
@@ -46,10 +46,10 @@ try {
 debug('revealOptions %O', revealOptions);
 
 defaults.base = '';
-defaults.templatePath = path.join(__dirname, 'template', 'reveal.html');
 defaults.revealBasePath = path.resolve(require.resolve('reveal.js'), '..', '..');
 defaults.highlightThemePath = path.resolve(require.resolve('highlight.js'), '..', '..', 'styles');
-defaults.templateListingPath = path.join(__dirname, 'template', 'listing.html');
+defaults.templatePath = path.join(__dirname, defaults.template);
+defaults.templateListingPath = path.join(__dirname, defaults.listingTemplate);
 defaults.templateSlides = fs.readFileSync(defaults.templatePath).toString();
 defaults.templateListing = () => fs.readFileSync(defaults.templateListingPath).toString();
 defaults.revealOptionsStr = () => JSON.stringify(defaults.revealOptions);
@@ -99,10 +99,10 @@ function parseOptions(options) {
   if (options.highlightTheme) {
     options.highlightThemeUrl = '/css/highlight/' + options.highlightTheme + '.css';
   }
-  if (options.template) {
+  if (options.template && options.template !== defaults.template) {
     options.templateSlides = fs.readFileSync(options.template).toString();
   }
-  if (options.listingTemplate) {
+  if (options.listingTemplate && options.listingTemplate !== defaults.listingTemplate) {
     options.templateListing = fs.readFileSync(options.listingTemplate).toString();
   }
   if (options.revealOptions) {