3 files changed, 4 insertions, 3 deletions
diff --git a/lib/output/ebook/getConvertOptions.js b/lib/output/ebook/getConvertOptions.js
index bc80493..75be364 100644
--- a/lib/output/ebook/getConvertOptions.js
+++ b/lib/output/ebook/getConvertOptions.js
@@ -48,7 +48,7 @@ function getConvertOptions(output) {
             getPDFTemplate(output, 'footer')
         ])
         .spread(function(headerTpl, footerTpl) {
-            var pdfOptions = config.getValue('pdf').toJS();
+            var pdfOptions = config.getValue('pdf');
 
             return options = extend(options, {
                 '--chapter-mark':           String(pdfOptions.chapterMark),
diff --git a/lib/output/generatePage.js b/lib/output/generatePage.js
index aa3b376..30a798a 100644
--- a/lib/output/generatePage.js
+++ b/lib/output/generatePage.js
@@ -3,6 +3,7 @@ var error = require('../utils/error');
 
 var Parse = require('../parse');
 var Templating = require('../templating');
+var JSONUtils = require('../json');
 var createTemplateEngine = require('./createTemplateEngine');
 var callPageHook = require('./callPageHook');
 
@@ -22,6 +23,7 @@ function generatePage(output, page) {
         var file = resultPage.getFile();
         var filePath = file.getPath();
         var parser = file.getParser();
+        var context = JSONUtils.encodeBookWithPage(book, resultPage);
 
         if (!parser) {
             return Promise.reject(error.FileNotParsableError({
@@ -39,7 +41,7 @@ function generatePage(output, page) {
 
         // Render templating syntax
         .then(function(content) {
-            return Templating.render(engine, filePath, content);
+            return Templating.render(engine, filePath, content, context);
         })
 
         // Render page using parser (markdown -> HTML)
diff --git a/lib/output/website/onPage.js b/lib/output/website/onPage.js
index 1e9a131..dcdd95a 100644
--- a/lib/output/website/onPage.js
+++ b/lib/output/website/onPage.js
@@ -22,7 +22,6 @@ function onPage(output, page) {
     var file = page.getFile();
     var prefix = options.get('prefix');
     var book = output.getBook();
-    var config = book.getConfig();
     var plugins = output.getPlugins();
 
     var engine = createTemplateEngine(output, page.getPath());