diff --git a/default_theme/index.js b/default_theme/index.js
index 870545e..7019983 100644
--- a/default_theme/index.js
+++ b/default_theme/index.js
@@ -71,21 +71,12 @@ module.exports = function (comments, options, callback) {
       }
     }
   };
+  
+  sharedImports.imports.renderSectionList =  _.template(fs.readFileSync(path.join(__dirname, 'section_list._'), 'utf8'), sharedImports);
+  sharedImports.imports.renderSection = _.template(fs.readFileSync(path.join(__dirname, 'section._'), 'utf8'), sharedImports);
+  sharedImports.imports.renderNote = _.template(fs.readFileSync(path.join(__dirname, 'note._'), 'utf8'), sharedImports);
 
-  var pageTemplate = _.template(
-    fs.readFileSync(path.join(__dirname, 'index._'), 'utf8'), {
-      imports: _.assign({}, sharedImports.imports, {
-        renderSection: _.template(
-          fs.readFileSync(path.join(__dirname, 'section._'), 'utf8'),
-          sharedImports),
-        renderNote: _.template(
-          fs.readFileSync(path.join(__dirname, 'note._'), 'utf8'),
-          sharedImports),
-        renderSectionList: _.template(
-          fs.readFileSync(path.join(__dirname, 'section_list._'), 'utf8'),
-          sharedImports)
-      })
-    });
+  var pageTemplate = _.template(fs.readFileSync(path.join(__dirname, 'index._'), 'utf8'),  sharedImports);
 
   // push assets into the pipeline as well.
   vfs.src([__dirname + '/assets/**'], { base: __dirname })
diff --git a/lib/output/util/linker_stack.js b/lib/output/util/linker_stack.js
index b74b869..6072d78 100644
--- a/lib/output/util/linker_stack.js
+++ b/lib/output/util/linker_stack.js
@@ -67,7 +67,7 @@ function LinkerStack(config) {
  * path.
  *
  * @param {Array<Object>} comments a list of comments
- * @param {Function} a method that turns a namespace into a URL
+ * @param {Function} resolver a method that turns a namespace into a URL
  * @returns {LinkerStack} returns this
  * @private
  * @example