diff --git a/templates/default/publish.js b/templates/default/publish.js
index 00609f5c..ce01ee36 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -108,15 +108,13 @@ function getPathFromDoclet(doclet) {
         doclet.meta.filename;
 }
     
-function generate(title, docs, filename, opts) {
-    opts = opts || {};
+function generate(title, docs, filename, resolveLinks) {
+    resolveLinks = resolveLinks === false ? false : true;
 
     var docData = {
         title: title,
-        docs: docs,
-        opts: opts
+        docs: docs
     };
-    var resolveLinks = (opts.resolveLinks === false) ? false : true;
     
     var outpath = path.join(outdir, filename),
         html = view.render('container.tmpl', docData);
@@ -147,7 +145,7 @@ function generateSourceFiles(sourceFiles, encoding) {
         }
 
         generate('Source: ' + sourceFiles[file].shortened, [source], sourceOutfile,
-            { resolveLinks: false });
+            false);
     });
 }
 
@@ -482,25 +480,13 @@ exports.publish = function(taffyData, opts, tutorials) {
     attachModuleSymbols( find({ kind: ['class', 'function'], longname: {left: 'module:'} }),
         members.modules );
 
-    var generateOpts = {
-        // output pretty-printed source files by default
-        outputSourceFiles: (function(c) {
-            if (!c || c.outputSourceFiles !== false) {
-                return true;
-            }
-
-            return false;
-        })(conf['default'])
-    };
-
-    // generate pretty-printed source files first so other pages can link to them
-    if (generateOpts.outputSourceFiles) {
+    // output pretty-printed source files by default; do this before generating any other pages, so
+    // that the other pages can link to the source files
+    if (!conf['default'] || conf['default'].outputSourceFiles !== false) {
         generateSourceFiles(sourceFiles, opts.encoding);
     }
 
-    if (members.globals.length) {
-        generate('Global', [{kind: 'globalobj'}], globalUrl, generateOpts);
-    }
+    if (members.globals.length) { generate('Global', [{kind: 'globalobj'}], globalUrl); }
     
     // index page displays information from package.json and lists files
     var files = find({kind: 'file'}),
@@ -510,7 +496,7 @@ exports.publish = function(taffyData, opts, tutorials) {
         packages.concat(
             [{kind: 'mainpage', readme: opts.readme, longname: (opts.mainpagetitle) ? opts.mainpagetitle : 'Main Page'}]
         ).concat(files),
-    indexUrl, generateOpts);
+    indexUrl);
 
     // set up the lists that we'll use to generate pages
     var classes = taffy(members.classes);
@@ -522,32 +508,27 @@ exports.publish = function(taffyData, opts, tutorials) {
     Object.keys(helper.longnameToUrl).forEach(function(longname) {
         var myClasses = helper.find(classes, {longname: longname});
         if (myClasses.length) {
-            generate('Class: ' + myClasses[0].name, myClasses, helper.longnameToUrl[longname],
-                generateOpts);
+            generate('Class: ' + myClasses[0].name, myClasses, helper.longnameToUrl[longname]);
         }
         
         var myModules = helper.find(modules, {longname: longname});
         if (myModules.length) {
-            generate('Module: ' + myModules[0].name, myModules, helper.longnameToUrl[longname],
-                generateOpts);
+            generate('Module: ' + myModules[0].name, myModules, helper.longnameToUrl[longname]);
         }
 
         var myNamespaces = helper.find(namespaces, {longname: longname});
         if (myNamespaces.length) {
-            generate('Namespace: ' + myNamespaces[0].name, myNamespaces,
-                helper.longnameToUrl[longname], generateOpts);
+            generate('Namespace: ' + myNamespaces[0].name, myNamespaces, helper.longnameToUrl[longname]);
         }
         
         var myMixins = helper.find(mixins, {longname: longname});
         if (myMixins.length) {
-            generate('Mixin: ' + myMixins[0].name, myMixins, helper.longnameToUrl[longname],
-                generateOpts);
+            generate('Mixin: ' + myMixins[0].name, myMixins, helper.longnameToUrl[longname]);
         }
 
         var myExternals = helper.find(externals, {longname: longname});
         if (myExternals.length) {
-            generate('External: ' + myExternals[0].name, myExternals,
-                helper.longnameToUrl[longname], generateOpts);
+            generate('External: ' + myExternals[0].name, myExternals, helper.longnameToUrl[longname]);
         }
     });
 
diff --git a/templates/default/tmpl/container.tmpl b/templates/default/tmpl/container.tmpl
index 1894792e..cd3e5a65 100644
--- a/templates/default/tmpl/container.tmpl
+++ b/templates/default/tmpl/container.tmpl
@@ -1,5 +1,4 @@
 <?js
-    var data = obj;
     var self = this;
     docs.forEach(function(doc, i) {
 ?>
@@ -38,7 +37,7 @@
             <div class="description"><?js= doc.description ?></div>
         <?js } ?>
         
-        <?js= self.partial('details.tmpl', { doc: doc, opts: data.opts }) ?>
+        <?js= self.partial('details.tmpl', doc) ?>
         
         <?js if (doc.examples && doc.examples.length) { ?>
             <h3>Example<?js= doc.examples.length > 1? 's':'' ?></h3>
diff --git a/templates/default/tmpl/details.tmpl b/templates/default/tmpl/details.tmpl
index 4f160a88..13233e4b 100644
--- a/templates/default/tmpl/details.tmpl
+++ b/templates/default/tmpl/details.tmpl
@@ -1,18 +1,17 @@
 <?js
 var data = obj;
-var doc = data.doc || {};
 var self = this;
 var defaultObjectClass = '';
 
 // Check if the default value is an object, if so, apply code highlighting
-if (doc.defaultvalue && doc.defaultvaluetype === 'object') {
-    doc.defaultvalue = "<pre class=\"prettyprint\"><code>" + doc.defaultvalue + "</code></pre>";
+if (data.defaultvalue && data.defaultvaluetype === 'object') {
+    data.defaultvalue = "<pre class=\"prettyprint\"><code>" + data.defaultvalue + "</code></pre>";
     defaultObjectClass = ' class="object-value"';
 }
 ?>
 <dl class="details">
     <?js
-        var properties = doc.properties;
+        var properties = data.properties;
         if (properties && properties.length && properties.forEach) { 
     ?>
         
@@ -22,85 +21,85 @@ if (doc.defaultvalue && doc.defaultvaluetype === 'object') {
         
     <?js } ?>
         
-    <?js if (doc.version) {?>
+    <?js if (data.version) {?>
     <dt class="tag-version">Version:</dt>
-    <dd class="tag-version"><ul class="dummy"><li><?js= doc.version ?></li></ul></dd>
+    <dd class="tag-version"><ul class="dummy"><li><?js= version ?></li></ul></dd>
     <?js } ?>
     
-    <?js if (doc.since) {?>
+    <?js if (data.since) {?>
     <dt class="tag-since">Since:</dt>
-    <dd class="tag-since"><ul class="dummy"><li><?js= doc.since ?></dd>
+    <dd class="tag-since"><ul class="dummy"><li><?js= since ?></dd>
     <?js } ?>
 
-    <?js if (doc.inherited && doc.inherits) { ?>
+    <?js if (data.inherited && data.inherits) { ?>
     <dt class="inherited-from">Inherited From:</dt>
     <dd class="inherited-from"><ul class="dummy"><li>
-        <?js= this.linkto(doc.inherits, this.htmlsafe(doc.inherits)) ?>
+        <?js= this.linkto(data.inherits, this.htmlsafe(data.inherits)) ?>
     </li></dd>
     <?js } ?>
     
-    <?js if (doc.deprecated) { ?>
+    <?js if (data.deprecated) { ?>
         <dt class="important tag-deprecated">Deprecated:</dt><?js
-            if (doc.deprecated === true) { ?><dd class="yes-def tag-deprecated"><ul class="dummy"><li>Yes</li></ul></dd><?js }
-            else { ?><dd><ul class="dummy"><li><?js= doc.deprecated ?></li><ul></dd><?js }
+            if (data.deprecated === true) { ?><dd class="yes-def tag-deprecated"><ul class="dummy"><li>Yes</li></ul></dd><?js }
+            else { ?><dd><ul class="dummy"><li><?js= data.deprecated ?></li><ul></dd><?js }
         ?>
     <?js } ?>
     
-    <?js if (doc.author && doc.author.length) {?>
+    <?js if (data.author && author.length) {?>
     <dt class="tag-author">Author:</dt>
     <dd class="tag-author">
-        <ul><?js doc.author.forEach(function(a) { ?>
+        <ul><?js author.forEach(function(a) { ?>
             <li><?js= self.resolveAuthorLinks(a) ?></li>
         <?js }); ?></ul>
     </dd>
     <?js } ?>
     
-    <?js if (doc.copyright) {?>
+    <?js if (data.copyright) {?>
     <dt class="tag-copyright">Copyright:</dt>
-    <dd class="tag-copyright"><ul class="dummy"><li><?js= doc.copyright ?></li></ul></dd>
+    <dd class="tag-copyright"><ul class="dummy"><li><?js= copyright ?></li></ul></dd>
     <?js } ?>
     
-    <?js if (doc.license) {?>
+    <?js if (data.license) {?>
     <dt class="tag-license">License:</dt>
-    <dd class="tag-license"><ul class="dummy"><li><?js= doc.license ?></li></ul></dd>
+    <dd class="tag-license"><ul class="dummy"><li><?js= license ?></li></ul></dd>
     <?js } ?>
     
-    <?js if (doc.defaultvalue) {?>
+    <?js if (data.defaultvalue) {?>
     <dt class="tag-default">Default Value:</dt>
     <dd class="tag-default"><ul class="dummy">
-            <li<?js= defaultObjectClass ?>><?js= doc.defaultvalue ?></li>
+            <li<?js= defaultObjectClass ?>><?js= data.defaultvalue ?></li>
         </ul></dd>
     <?js } ?>
     
-    <?js if (doc.meta && data.opts.outputSourceFiles) {?>
+    <?js if (data.meta) {?>
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <?js= self.linkto(doc.meta.shortpath) ?>, <?js= self.linkto(doc.meta.shortpath, 'line ' + doc.meta.lineno, null, 'line' + doc.meta.lineno) ?>
+        <?js= self.linkto(meta.shortpath) ?>, <?js= self.linkto(meta.shortpath, 'line ' + meta.lineno, null, 'line' + meta.lineno) ?>
     </li></ul></dd>
     <?js } ?>
     
-    <?js if (doc.tutorials && doc.tutorials.length) {?>
+    <?js if (data.tutorials && tutorials.length) {?>
     <dt class="tag-tutorial">Tutorials:</dt>
     <dd class="tag-tutorial">
-        <ul><?js doc.tutorials.forEach(function(t) { ?>
+        <ul><?js tutorials.forEach(function(t) { ?>
             <li><?js= self.tutoriallink(t) ?></li>
         <?js }); ?></ul>
     </dd>
     <?js } ?>
     
-    <?js if (doc.see && doc.see.length) {?>
+    <?js if (data.see && see.length) {?>
     <dt class="tag-see">See:</dt>
     <dd class="tag-see">
-        <ul><?js doc.see.forEach(function(s) { ?>
+        <ul><?js see.forEach(function(s) { ?>
             <li><?js= self.linkto(s) ?></li>
         <?js }); ?></ul>
     </dd>
     <?js } ?>
     
-    <?js if (doc.todo && doc.todo.length) {?>
+    <?js if (data.todo && todo.length) {?>
     <dt class="tag-todo">To Do:</dt>
     <dd class="tag-todo">
-        <ul><?js doc.todo.forEach(function(t) { ?>
+        <ul><?js todo.forEach(function(t) { ?>
             <li><?js= t ?></li>
         <?js }); ?></ul>
     </dd>