diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 0157f4a6b9..563890125b 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -19,7 +19,7 @@ import 'package:analyzer/src/generated/source_io.dart';
 
 import 'generator.dart';
 import 'resource_loader.dart' as loader;
-import 'src/html_generator.dart';
+import 'src/html_generator.dart' show dartdocVersion, HtmlGenerator;
 import 'src/io_utils.dart';
 import 'src/model.dart';
 import 'src/model_utils.dart';
@@ -37,6 +37,7 @@ final String defaultOutDir = 'doc${Platform.pathSeparator}api';
 /// Initialize and setup the generators.
 List<Generator> initGenerators(
     String url, String headerFilePath, String footerFilePath) {
+  dartdocVersion = version;
   return [
     new HtmlGenerator(url, header: headerFilePath, footer: footerFilePath)
   ];
@@ -57,8 +58,15 @@ class DartDoc {
 
   Stopwatch _stopwatch;
 
-  DartDoc(this.rootDir, this.excludes, this.sdkDir, this.generators,
-      this.outputDir, this.packageRootDir, this.packageMeta, this.urlMappings,
+  DartDoc(
+      this.rootDir,
+      this.excludes,
+      this.sdkDir,
+      this.generators,
+      this.outputDir,
+      this.packageRootDir,
+      this.packageMeta,
+      this.urlMappings,
       this.includes);
 
   /// Generate DartDoc documentation.
@@ -178,8 +186,8 @@ class DartDoc {
     }).where((_Error error) => error.isError).toList()..sort();
 
     double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
-    print(
-        "Parsed ${libraries.length} " "file${libraries.length == 1 ? '' : 's'} in "
+    print("Parsed ${libraries.length} "
+        "file${libraries.length == 1 ? '' : 's'} in "
         "${seconds.toStringAsFixed(1)} seconds.\n");
 
     if (errors.isNotEmpty) {
diff --git a/lib/src/html_generator.dart b/lib/src/html_generator.dart
index 3c02702964..4387f99cea 100644
--- a/lib/src/html_generator.dart
+++ b/lib/src/html_generator.dart
@@ -6,6 +6,7 @@ library dartdoc.html_generator;
 
 import 'dart:async' show Future;
 import 'dart:io';
+import 'dart:typed_data' show Uint8List;
 
 import 'package:mustache4dart/mustache4dart.dart';
 import 'package:path/path.dart' as path;
@@ -17,6 +18,10 @@ import '../generator.dart';
 import '../markdown_processor.dart';
 import '../resource_loader.dart' as loader;
 
+String dartdocVersion = 'unknown';
+
+typedef String Renderer(String input);
+
 typedef String TemplateRenderer(context,
     {bool assumeNullNonExistingProperty, bool errorOnMissingProperty});
 
@@ -73,7 +78,7 @@ class Templates {
     topLevelPropertyTemplate = await _loadTemplate('top_level_property.html');
     typeDefTemplate = await _loadTemplate('typedef.html');
 
-    var partials = [
+    List<String> partials = [
       'callable',
       'callable_multiline',
       'constant',
@@ -90,15 +95,21 @@ class Templates {
       'name_link'
     ];
 
-    for (var partial in partials) {
+    for (String partial in partials) {
       _partialTemplates[partial] = await _loadPartial('_$partial.html');
     }
   }
 
-  String _partial(String name) => _partialTemplates[name];
+  String _partial(String name) {
+    String partial = _partialTemplates[name];
+    if (partial == null || partial.isEmpty) {
+      throw new StateError('Did not find partial "$name"');
+    }
+    return partial;
+  }
 
   Future<TemplateRenderer> _loadTemplate(String templatePath) async {
-    var templateContents = await _getTemplateFile(templatePath);
+    String templateContents = await _getTemplateFile(templatePath);
     return compile(templateContents, partial: _partial) as TemplateRenderer;
   }
 
@@ -110,12 +121,12 @@ class Templates {
     String template = await _getTemplateFile(templatePath);
     // TODO: revisit, not sure this is the right place for this logic
     if (templatePath.contains('_footer') && _footer != null) {
-      var footerValue = await new File(_footer).readAsString();
+      String footerValue = await new File(_footer).readAsString();
       template =
           template.replaceAll('<!-- Footer Placeholder -->', footerValue);
     }
     if (templatePath.contains('_head') && _header != null) {
-      var headerValue = await new File(_header).readAsString();
+      String headerValue = await new File(_header).readAsString();
       template =
           template.replaceAll('<!-- Header Placeholder -->', headerValue);
     }
@@ -131,7 +142,7 @@ class HtmlGenerator extends Generator {
   /// [url] can be null.
   // TODO: make url an optional parameter
   HtmlGenerator(this.url, {String header, String footer})
-      : _templates = new Templates(header, footer);
+      : _templates = new Templates(header, footer) {}
 
   Future generate(Package package, Directory out) {
     return new HtmlGeneratorInstance(url, _templates, package, out).generate();
@@ -225,27 +236,15 @@ class HtmlGeneratorInstance {
   }
 
   void generatePackage() {
-    // TODO: Should we add _this_ to the context and avoid putting stuff in the
-    // map?
-    Map data = {
-      'package': package,
-      'documentation': package.documentation,
-      'title': '${package.name} - Dart API docs',
-      'layoutTitle':
-          _layoutTitle(package.name, package.isSdk ? '' : 'package', false),
-      'metaDescription':
-          '${package.name} API docs, for the Dart programming language.',
-      'navLinks': [], // we're at the root
-      'subnavItems': _gatherSubnavForPackage(package),
-      'htmlBase': '.',
-      'self': package
-    };
+    Renderer markdown = renderMarkdown;
 
     if (package.hasDocumentationFile) {
       FileContents readme = package.documentationFile;
-      data['markdown'] = readme.isMarkdown ? renderMarkdown : renderPlainText;
+      markdown = readme.isMarkdown ? renderMarkdown : renderPlainText;
     }
 
+    TemplateData data = new PackageTemplateData(package, markdown: markdown);
+
     _build('index.html', _templates.indexTemplate, data);
   }
 
@@ -256,125 +255,35 @@ class HtmlGeneratorInstance {
       print("  warning: library '${lib.name}' has no documentation");
     }
 
-    // TODO: Should we add _this_ to the context and avoid putting stuff in the
-    // map?
-    Map data = {
-      'package': package,
-      'library': lib,
-      'markdown': renderMarkdown,
-      'documentation': lib.documentation,
-      'oneLineDoc': lib.oneLineDoc,
-      'title': '${lib.name} library - Dart API',
-      'htmlBase': '..',
-      'metaDescription':
-          '${lib.name} library API docs, for the Dart programming language.',
-      'navLinks': [package],
-      'subnavItems': _gatherSubnavForLibrary(lib),
-      'layoutTitle': _layoutTitle(lib.name, 'library', lib.isDeprecated),
-      'self': lib
-    };
+    TemplateData data = new LibraryTemplateData(package, lib);
 
     _build(path.join(lib.dirName, '${lib.fileName}'),
         _templates.libraryTemplate, data);
   }
 
-  Class get objectType {
-    if (_objectType != null) {
-      return _objectType;
-    }
-
-    Library dc = package.libraries.firstWhere((it) => it.name == "dart:core",
-        orElse: () => null);
-
-    if (dc == null) {
-      return _objectType = null;
-    }
-
-    return _objectType = dc.getClassByName("Object");
-  }
-
-  Class _objectType;
-
   void generateClass(Package package, Library lib, Class clazz) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': clazz.documentation,
-      'oneLineDoc': clazz.oneLineDoc,
-      'library': lib,
-      'class': clazz,
-      'linkedObjectType': objectType == null ? 'Object' : objectType.linkedName,
-      'title': '${clazz.name} ${clazz.kind} - ${lib.name} library - Dart API',
-      'metaDescription':
-          'API docs for the ${clazz.name} ${clazz.kind} from the ${lib.name} library, for the Dart programming language.',
-      'layoutTitle':
-          _layoutTitle(clazz.nameWithGenerics, clazz.kind, clazz.isDeprecated),
-      'navLinks': [package, lib],
-      'subnavItems': _gatherSubnavForClass(clazz),
-      'htmlBase': '..',
-      'self': clazz
-    };
+    TemplateData data = new ClassTemplateData(package, lib, clazz);
 
     _build(path.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
   void generateConstructor(
       Package package, Library lib, Class clazz, Constructor constructor) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': constructor.documentation,
-      'oneLineDoc': constructor.oneLineDoc,
-      'library': lib,
-      'class': clazz,
-      'constructor': constructor,
-      'layoutTitle': _layoutTitle(
-          constructor.name, 'constructor', constructor.isDeprecated),
-      'navLinks': [package, lib, clazz],
-      'subnavItems': _gatherSubnavForInvokable(constructor),
-      'htmlBase': '../..',
-      'self': constructor
-    };
+    TemplateData data =
+        new ConstructorTemplateData(package, lib, clazz, constructor);
 
     _build(path.joinAll(constructor.href.split('/')),
         _templates.constructorTemplate, data);
   }
 
   void generateEnum(Package package, Library lib, Class eNum) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': eNum.documentation,
-      'oneLineDoc': eNum.oneLineDoc,
-      'library': lib,
-      'class': eNum,
-      'layoutTitle': _layoutTitle(eNum.name, 'enum', eNum.isDeprecated),
-      'navLinks': [package, lib],
-      'htmlBase': '..',
-      'self': eNum
-    };
+    TemplateData data = new EnumTemplateData(package, lib, eNum);
 
     _build(path.joinAll(eNum.href.split('/')), _templates.classTemplate, data);
   }
 
   void generateFunction(Package package, Library lib, ModelFunction function) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': function.documentation,
-      'oneLineDoc': function.oneLineDoc,
-      'library': lib,
-      'function': function,
-      'title': '${function.name} function - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(function.name, 'function', function.isDeprecated),
-      'metaDescription':
-          'API docs for the ${function.name} function from the ${lib.name} library, for the Dart programming language.',
-      'navLinks': [package, lib],
-      'subnavItems': _gatherSubnavForInvokable(function),
-      'htmlBase': '..',
-      'self': function
-    };
+    TemplateData data = new FunctionTemplateData(package, lib, function);
 
     _build(path.joinAll(function.href.split('/')), _templates.functionTemplate,
         data);
@@ -382,24 +291,7 @@ class HtmlGeneratorInstance {
 
   void generateMethod(
       Package package, Library lib, Class clazz, Method method) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': method.documentation,
-      'oneLineDoc': method.oneLineDoc,
-      'library': lib,
-      'class': clazz,
-      'method': method,
-      'title':
-          '${method.name} method - ${clazz.name} class - ${lib.name} library - Dart API',
-      'layoutTitle': _layoutTitle(method.name, 'method', method.isDeprecated),
-      'metaDescription':
-          'API docs for the ${method.name} method from the ${clazz.name} class, for the Dart programming language.',
-      'navLinks': [package, lib, clazz],
-      'subnavItems': _gatherSubnavForInvokable(method),
-      'htmlBase': '../..',
-      'self': method
-    };
+    TemplateData data = new MethodTemplateData(package, lib, clazz, method);
 
     _build(
         path.joinAll(method.href.split('/')), _templates.methodTemplate, data);
@@ -407,24 +299,7 @@ class HtmlGeneratorInstance {
 
   void generateConstant(
       Package package, Library lib, Class clazz, Field property) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': property.documentation,
-      'oneLineDoc': property.oneLineDoc,
-      'library': lib,
-      'class': clazz,
-      'property': property,
-      'title':
-          '${property.name} constant - ${clazz.name} class - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(property.name, 'constant', property.isDeprecated),
-      'metaDescription':
-          'API docs for the ${property.name} constant from the ${clazz.name} class, for the Dart programming language.',
-      'navLinks': [package, lib, clazz],
-      'htmlBase': '../..',
-      'self': property
-    };
+    TemplateData data = new ConstantTemplateData(package, lib, clazz, property);
 
     _build(path.joinAll(property.href.split('/')), _templates.constantTemplate,
         data);
@@ -432,24 +307,7 @@ class HtmlGeneratorInstance {
 
   void generateProperty(
       Package package, Library lib, Class clazz, Field property) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': property.documentation,
-      'oneLineDoc': property.oneLineDoc,
-      'library': lib,
-      'class': clazz,
-      'property': property,
-      'title':
-          '${property.name} property - ${clazz.name} class - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(property.name, 'property', property.isDeprecated),
-      'metaDescription':
-          'API docs for the ${property.name} property from the ${clazz.name} class, for the Dart programming language.',
-      'navLinks': [package, lib, clazz],
-      'htmlBase': '../..',
-      'self': property
-    };
+    TemplateData data = new PropertyTemplateData(package, lib, clazz, property);
 
     _build(path.joinAll(property.href.split('/')), _templates.propertyTemplate,
         data);
@@ -457,22 +315,8 @@ class HtmlGeneratorInstance {
 
   void generateTopLevelProperty(
       Package package, Library lib, TopLevelVariable property) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': property.documentation,
-      'oneLineDoc': property.oneLineDoc,
-      'library': lib,
-      'property': property,
-      'title': '${property.name} property - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(property.name, 'property', property.isDeprecated),
-      'metaDescription':
-          'API docs for the ${property.name} property from the ${lib.name} library, for the Dart programming language.',
-      'navLinks': [package, lib],
-      'htmlBase': '..',
-      'self': property
-    };
+    TemplateData data =
+        new TopLevelPropertyTemplateData(package, lib, property);
 
     _build(path.joinAll(property.href.split('/')),
         _templates.topLevelPropertyTemplate, data);
@@ -480,44 +324,14 @@ class HtmlGeneratorInstance {
 
   void generateTopLevelConstant(
       Package package, Library lib, TopLevelVariable property) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': property.documentation,
-      'oneLineDoc': property.oneLineDoc,
-      'library': lib,
-      'property': property,
-      'title': '${property.name} property - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(property.name, 'constant', property.isDeprecated),
-      'metaDescription':
-          'API docs for the ${property.name} property from the ${lib.name} library, for the Dart programming language.',
-      'navLinks': [package, lib],
-      'htmlBase': '..',
-      'self': property
-    };
+    TemplateData data = new TopLevelConstTemplateData(package, lib, property);
 
     _build(path.joinAll(property.href.split('/')),
         _templates.topLevelConstantTemplate, data);
   }
 
   void generateTypeDef(Package package, Library lib, Typedef typeDef) {
-    Map data = {
-      'package': package,
-      'markdown': renderMarkdown,
-      'documentation': typeDef.documentation,
-      'oneLineDoc': typeDef.oneLineDoc,
-      'library': lib,
-      'typeDef': typeDef,
-      'title': '${typeDef.name} typedef - ${lib.name} library - Dart API',
-      'layoutTitle':
-          _layoutTitle(typeDef.name, 'typedef', typeDef.isDeprecated),
-      'metaDescription':
-          'API docs for the ${typeDef.name} property from the ${lib.name} library, for the Dart programming language.',
-      'navLinks': [package, lib],
-      'htmlBase': '..',
-      'self': typeDef
-    };
+    TemplateData data = new TypedefTemplateData(package, lib, typeDef);
 
     _build(path.joinAll(typeDef.href.split('/')), _templates.typeDefTemplate,
         data);
@@ -526,16 +340,16 @@ class HtmlGeneratorInstance {
   // TODO: change this to use resource_loader
   Future _copyResources() async {
     final prefix = 'package:dartdoc/resources/';
-    for (var resourcePath in resources.resource_names) {
+    for (String resourcePath in resources.resource_names) {
       if (!resourcePath.startsWith(prefix)) {
         throw new StateError(
             'Resource paths must start with $prefix, encountered $resourcePath');
       }
-      var destFileName = resourcePath.substring(prefix.length);
-      var destFile =
+      String destFileName = resourcePath.substring(prefix.length);
+      File destFile =
           new File(path.join(out.path, 'static-assets', destFileName))
-        ..createSync(recursive: true);
-      var resourceBytes = await loader.loadAsBytes(resourcePath);
+            ..createSync(recursive: true);
+      Uint8List resourceBytes = await loader.loadAsBytes(resourcePath);
       destFile.writeAsBytesSync(resourceBytes);
     }
   }
@@ -547,7 +361,7 @@ class HtmlGeneratorInstance {
     return f;
   }
 
-  void _build(String filename, TemplateRenderer template, Map data) {
+  void _build(String filename, TemplateRenderer template, TemplateData data) {
     String content = template(data,
         assumeNullNonExistingProperty: false, errorOnMissingProperty: true);
 
@@ -569,73 +383,343 @@ class Subnav {
   String toString() => name;
 }
 
-List<Subnav> _gatherSubnavForPackage(Package package) {
-  return [new Subnav('Libraries', '${package.href}#libraries')];
+/// Converts a markdown formatted string into HTML, and removes any script tags.
+/// Returns the HTML as a string.
+String renderMarkdown(String markdown) => renderMarkdownToHtml(markdown);
+
+/// Convert the given plain text into HTML.
+String renderPlainText(String text) {
+  if (text == null) return '';
+
+  return "<code class='fixed'>${text.trim()}</code>";
 }
 
-List<Subnav> _gatherSubnavForLibrary(Library lib) {
-  List<Subnav> navs = [];
-
-  if (lib.hasConstants) navs
-      .add(new Subnav('Constants', '${lib.href}#constants'));
-  if (lib.hasTypedefs) navs.add(new Subnav('Typedefs', '${lib.href}#typedefs'));
-  if (lib.hasProperties) navs
-      .add(new Subnav('Properties', '${lib.href}#properties'));
-  if (lib.hasFunctions) navs
-      .add(new Subnav('Functions', '${lib.href}#functions'));
-  if (lib.hasEnums) navs.add(new Subnav('Enums', '${lib.href}#enums'));
-  if (lib.hasClasses) navs.add(new Subnav('Classes', '${lib.href}#classes'));
-  if (lib.hasExceptions) navs
-      .add(new Subnav('Exceptions', '${lib.href}#exceptions'));
-
-  return navs;
+abstract class TemplateData {
+  Package _package;
+  Function _markdown = renderMarkdown;
+
+  TemplateData(this._package, {Renderer markdown}) : _markdown = markdown;
+
+  Package get package => _package;
+  String get documentation => self.documentation;
+  String get oneLineDoc => self.oneLineDoc;
+  String get title;
+  String get layoutTitle;
+  String get metaDescription;
+  List get navLinks;
+  List<Subnav> get subnavItems;
+  String get htmlBase;
+  dynamic get self;
+  String get version => dartdocVersion;
+  Function get markdown => _markdown;
+
+  String _layoutTitle(String name, String kind, bool isDeprecated) {
+    if (kind.isEmpty) kind =
+        '&nbsp;'; // Ugly. fixes https://github.com/dart-lang/dartdoc/issues/695
+    String str = '<div class="kind">$kind</div>';
+    if (!isDeprecated) return '${str} ${name}';
+    return '${str} <span class="deprecated">$name</span>';
+  }
+
+  List<Subnav> _gatherSubnavForInvokable(ModelElement element) {
+    if (element is SourceCodeMixin &&
+        (element as SourceCodeMixin).hasSourceCode) {
+      return [new Subnav('Source', '${element.href}#source')];
+    } else {
+      return [];
+    }
+  }
 }
 
-List<Subnav> _gatherSubnavForClass(Class clazz) {
-  List<Subnav> navs = [];
-
-  if (clazz.hasConstants) navs
-      .add(new Subnav('Constants', '${clazz.href}#constants'));
-  if (clazz.hasStaticProperties) navs
-      .add(new Subnav('Static Properties', '${clazz.href}#static-properties'));
-  if (clazz.hasStaticMethods) navs
-      .add(new Subnav('Static Methods', '${clazz.href}#static-methods'));
-  if (clazz.hasInstanceProperties) navs
-      .add(new Subnav('Properties', '${clazz.href}#instance-properties'));
-  if (clazz.hasConstructors) navs
-      .add(new Subnav('Constructors', '${clazz.href}#constructors'));
-  if (clazz.hasOperators) navs
-      .add(new Subnav('Operators', '${clazz.href}#operators'));
-  if (clazz.hasInstanceMethods) navs
-      .add(new Subnav('Methods', '${clazz.href}#instance-methods'));
-
-  return navs;
+class PackageTemplateData extends TemplateData {
+  PackageTemplateData(Package package, {Renderer markdown})
+      : super(package, markdown: markdown);
+
+  List get navLinks => [];
+  String get title => '${package.name} - Dart API docs';
+  Package get self => package;
+  String get layoutTitle =>
+      _layoutTitle(package.name, package.isSdk ? '' : 'package', false);
+  String get metaDescription =>
+      '${package.name} API docs, for the Dart programming language.';
+  List<Subnav> get subnavItems =>
+      [new Subnav('Libraries', '${package.href}#libraries')];
+  String get htmlBase => '.';
 }
 
-List<Subnav> _gatherSubnavForInvokable(ModelElement element) {
-  if (element is SourceCodeMixin &&
-      (element as SourceCodeMixin).hasSourceCode) {
-    return [new Subnav('Source', '${element.href}#source')];
-  } else {
-    return [];
+class LibraryTemplateData extends TemplateData {
+  Library _library;
+
+  LibraryTemplateData(Package package, this._library) : super(package);
+
+  String get title => '${_library.name} library - Dart API';
+  Library get library => _library;
+  String get documentation => _library.documentation;
+  String get htmlBase => '..';
+  String get metaDescription =>
+      '${_library.name} library API docs, for the Dart programming language.';
+  List get navLinks => [package];
+  List<Subnav> get subnavItems {
+    List<Subnav> navs = [];
+
+    if (_library.hasConstants) navs
+        .add(new Subnav('Constants', '${_library.href}#constants'));
+    if (_library.hasTypedefs) navs
+        .add(new Subnav('Typedefs', '${_library.href}#typedefs'));
+    if (_library.hasProperties) navs
+        .add(new Subnav('Properties', '${_library.href}#properties'));
+    if (_library.hasFunctions) navs
+        .add(new Subnav('Functions', '${_library.href}#functions'));
+    if (_library.hasEnums) navs
+        .add(new Subnav('Enums', '${_library.href}#enums'));
+    if (_library.hasClasses) navs
+        .add(new Subnav('Classes', '${_library.href}#classes'));
+    if (_library.hasExceptions) navs
+        .add(new Subnav('Exceptions', '${_library.href}#exceptions'));
+
+    return navs;
   }
+
+  String get layoutTitle =>
+      _layoutTitle(_library.name, 'library', _library.isDeprecated);
+  Library get self => _library;
 }
 
-String _layoutTitle(String name, String kind, bool isDeprecated) {
-  if (kind.isEmpty) kind =
-      '&nbsp;'; // Ugly. fixes https://github.com/dart-lang/dartdoc/issues/695
-  String str = '<div class="kind">$kind</div>';
-  if (!isDeprecated) return '${str} ${name}';
-  return '${str} <span class="deprecated">$name</span>';
+class ClassTemplateData extends TemplateData {
+  Class _clazz;
+  Library _library;
+  Class _objectType;
+
+  ClassTemplateData(Package package, this._library, this._clazz)
+      : super(package);
+
+  Class get self => _clazz;
+  Library get library => _library;
+  Class get clazz => _clazz;
+  String get linkedObjectType =>
+      objectType == null ? 'Object' : objectType.linkedName;
+  String get title =>
+      '${clazz.name} ${clazz.kind} - ${_library.name} library - Dart API';
+  String get metaDescription =>
+      'API docs for the ${clazz.name} ${clazz.kind} from the ${_library.name} library, for the Dart programming language.';
+  String get layoutTitle =>
+      _layoutTitle(clazz.nameWithGenerics, clazz.kind, clazz.isDeprecated);
+  List get navLinks => [package, _library];
+  String get htmlBase => '..';
+  List<Subnav> get subnavItems {
+    List<Subnav> navs = [];
+
+    if (clazz.hasConstants) navs
+        .add(new Subnav('Constants', '${clazz.href}#constants'));
+    if (clazz.hasStaticProperties) navs.add(
+        new Subnav('Static Properties', '${clazz.href}#static-properties'));
+    if (clazz.hasStaticMethods) navs
+        .add(new Subnav('Static Methods', '${clazz.href}#static-methods'));
+    if (clazz.hasInstanceProperties) navs
+        .add(new Subnav('Properties', '${clazz.href}#instance-properties'));
+    if (clazz.hasConstructors) navs
+        .add(new Subnav('Constructors', '${clazz.href}#constructors'));
+    if (clazz.hasOperators) navs
+        .add(new Subnav('Operators', '${clazz.href}#operators'));
+    if (clazz.hasInstanceMethods) navs
+        .add(new Subnav('Methods', '${clazz.href}#instance-methods'));
+
+    return navs;
+  }
+
+  Class get objectType {
+    if (_objectType != null) {
+      return _objectType;
+    }
+
+    Library dc = package.libraries
+        .firstWhere((it) => it.name == "dart:core", orElse: () => null);
+
+    if (dc == null) {
+      return _objectType = null;
+    }
+
+    return _objectType = dc.getClassByName("Object");
+  }
 }
 
-/// Converts a markdown formatted string into HTML, and removes any script tags.
-/// Returns the HTML as a string.
-String renderMarkdown(String markdown) => renderMarkdownToHtml(markdown);
+class ConstructorTemplateData extends TemplateData {
+  Library _library;
+  Class _class;
+  Constructor _constructor;
+
+  ConstructorTemplateData(
+      Package package, this._library, this._class, this._constructor)
+      : super(package);
+
+  Constructor get self => _constructor;
+  Library get library => _library;
+  Class get clazz => _class;
+  Constructor get constructor => _constructor;
+  String get layoutTitle =>
+      _layoutTitle(constructor.name, 'constructor', constructor.isDeprecated);
+  List get navLinks => [package, _library, clazz];
+  List<Subnav> get subnavItems => _gatherSubnavForInvokable(constructor);
+  String get htmlBase => '../..';
+  String get title =>
+      '${constructor.name} constructor - ${clazz.name} class - ${_library.name} library - Dart API';
+  String get metaDescription =>
+      'API docs for the ${constructor.name} constructor from the ${clazz} class from the ${_library.name} library, for the Dart programming language.';
+}
 
-/// Convert the given plain text into HTML.
-String renderPlainText(String text) {
-  if (text == null) return '';
+class EnumTemplateData extends TemplateData {
+  Library _library;
+  Enum _enum;
+
+  EnumTemplateData(Package package, this._library, this._enum) : super(package);
+
+  Library get library => _library;
+  Enum get clazz => _enum;
+  Enum get self => _enum;
+  String get layoutTitle =>
+      _layoutTitle(_enum.name, 'enum', _enum.isDeprecated);
+  String get title => '${self.name} enum - ${_library.name} library - Dart API';
+  String get metaDescription =>
+      'API docs for the ${_enum.name} enum from the ${_library.name} library, for the Dart programming language.';
+  List get navLinks => [package, _library];
+  String get htmlBase => '..';
+  List<Subnav> get subnavItems {
+    return [
+      new Subnav('Constants', '${_enum.href}#constants'),
+      new Subnav('Properties', '${_enum.href}#properties')
+    ];
+  }
+}
 
-  return "<code class='fixed'>${text.trim()}</code>";
+class FunctionTemplateData extends TemplateData {
+  ModelFunction _function;
+  Library _library;
+
+  FunctionTemplateData(Package package, this._library, this._function)
+      : super(package);
+
+  ModelFunction get self => _function;
+  ModelFunction get function => _function;
+  Library get library => _library;
+  String get title =>
+      '${function.name} function - ${_library.name} library - Dart API';
+  String get layoutTitle =>
+      _layoutTitle(function.name, 'function', function.isDeprecated);
+  String get metaDescription =>
+      'API docs for the ${function.name} function from the ${_library.name} library, for the Dart programming language.';
+  List get navLinks => [package, _library];
+  List<Subnav> get subnavItems => _gatherSubnavForInvokable(function);
+  String get htmlBase => '..';
+}
+
+class MethodTemplateData extends TemplateData {
+  Library _library;
+  Method _method;
+  Class _class;
+
+  MethodTemplateData(Package package, this._library, this._class, this._method)
+      : super(package);
+
+  Library get library => _library;
+  Class get clazz => _class;
+  Method get self => _method;
+  Method get method => _method;
+  String get title =>
+      '${method.name} method - ${clazz.name} class - ${_library.name} library - Dart API';
+  String get layoutTitle =>
+      _layoutTitle(method.name, 'method', method.isDeprecated);
+  String get metaDescription =>
+      'API docs for the ${method.name} method from the ${clazz.name} class, for the Dart programming language.';
+  List get navLinks => [package, _library, clazz];
+  List<Subnav> get subnavItems => _gatherSubnavForInvokable(method);
+  String get htmlBase => '../..';
+}
+
+class PropertyTemplateData extends TemplateData {
+  Library _library;
+  Class _class;
+  Field _property;
+
+  PropertyTemplateData(
+      Package package, this._library, this._class, this._property)
+      : super(package);
+
+  Library get library => _library;
+  Class get clazz => _class;
+  Field get self => _property;
+  Field get property => _property;
+
+  String get title =>
+      '${property.name} $type - ${clazz.name} class - ${_library.name} library - Dart API';
+  String get layoutTitle =>
+      _layoutTitle(property.name, type, property.isDeprecated);
+  String get metaDescription =>
+      'API docs for the ${property.name} $type from the ${clazz.name} class, for the Dart programming language.';
+  List get navLinks => [package, _library, clazz];
+  List get subnavItems => [];
+  String get htmlBase => '../..';
+
+  String get type => 'property';
+}
+
+class ConstantTemplateData extends PropertyTemplateData {
+  ConstantTemplateData(
+      Package package, Library library, Class clazz, Field property)
+      : super(package, library, clazz, property);
+
+  String get type => 'constant';
+}
+
+class TypedefTemplateData extends TemplateData {
+  Library _library;
+  Typedef _typeDef;
+
+  TypedefTemplateData(Package package, this._library, this._typeDef)
+      : super(package);
+
+  Library get library => _library;
+  Typedef get self => _typeDef;
+  Typedef get typeDef => _typeDef;
+
+  String get title =>
+      '${typeDef.name} typedef - ${library.name} library - Dart API';
+  String get layoutTitle =>
+      _layoutTitle(typeDef.name, 'typedef', typeDef.isDeprecated);
+  String get metaDescription =>
+      'API docs for the ${typeDef.name} property from the ${library.name} library, for the Dart programming language.';
+  List get navLinks => [package, library];
+  String get htmlBase => '..';
+  List get subnavItems => [];
+}
+
+class TopLevelPropertyTemplateData extends TemplateData {
+  Library _library;
+  TopLevelVariable _property;
+
+  TopLevelPropertyTemplateData(Package package, this._library, this._property)
+      : super(package);
+
+  Library get library => _library;
+  TopLevelVariable get self => _property;
+  TopLevelVariable get property => _property;
+
+  String get title =>
+      '${property.name} $_type - ${library.name} library - Dart API';
+  String get layoutTitle =>
+      _layoutTitle(property.name, _type, property.isDeprecated);
+  String get metaDescription =>
+      'API docs for the ${property.name} $_type from the ${library.name} library, for the Dart programming language.';
+  List get navLinks => [package, library];
+  String get htmlBase => '..';
+  List get subnavItems => [];
+
+  String get _type => 'property';
+}
+
+class TopLevelConstTemplateData extends TopLevelPropertyTemplateData {
+  TopLevelConstTemplateData(
+      Package package, Library library, TopLevelVariable property)
+      : super(package, library, property);
+
+  String get _type => 'constant';
 }
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 687d3a94a1..ff9c6dbec4 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -296,8 +296,8 @@ abstract class ModelElement implements Comparable {
           buf.write(' <span class="parameter-name">${p.name}</span>');
         }
         buf.write('(');
-        buf.write(p.modelType.element.linkedParams(
-            showNames: showNames, showMetadata: showMetadata));
+        buf.write(p.modelType.element
+            .linkedParams(showNames: showNames, showMetadata: showMetadata));
         buf.write(')');
       } else if (p.modelType != null && p.modelType.element != null) {
         var mt = p.modelType;
@@ -382,6 +382,9 @@ class Package {
 
   FileContents get documentationFile => packageMeta.getReadmeContents();
 
+  // TODO: make this work
+  String get oneLineDoc => '';
+
   // TODO: Clients should use [documentationFile] so they can act differently on
   // plain text or markdown.
   String get documentation {
@@ -699,8 +702,9 @@ class Library extends ModelElement {
   }
 
   List<Class> get classes {
-    return _allClasses.where((c) => !c.isErrorOrException).toList(
-        growable: false);
+    return _allClasses
+        .where((c) => !c.isErrorOrException)
+        .toList(growable: false);
   }
 
   List<Class> get allClasses => _allClasses;
@@ -797,9 +801,9 @@ class Class extends ModelElement {
   }
 
   List<TypeParameter> get _typeParameters => _cls.typeParameters.map((f) {
-    var lib = new Library(f.enclosingElement.library, package);
-    return new TypeParameter(f, lib);
-  }).toList();
+        var lib = new Library(f.enclosingElement.library, package);
+        return new TypeParameter(f, lib);
+      }).toList();
 
   String get kind => 'class';
 
@@ -1228,7 +1232,8 @@ class Enum extends Class {
 
   @override
   List<EnumField> get instanceProperties {
-    return super.instanceProperties
+    return super
+        .instanceProperties
         .map((Field p) => new EnumField(p.element, p.library))
         .toList(growable: false);
   }
@@ -1721,8 +1726,10 @@ class ElementType {
 
   ElementType get _returnType {
     var rt = (_type as FunctionType).returnType;
-    return new ElementType(rt, new ModelElement.from(
-        rt.element, new Library(_element.library.element, _element.package)));
+    return new ElementType(
+        rt,
+        new ModelElement.from(rt.element,
+            new Library(_element.library.element, _element.package)));
   }
 
   ModelElement get returnElement {
@@ -1736,9 +1743,9 @@ class ElementType {
 
   List<ElementType> get typeArguments =>
       (_type as ParameterizedType).typeArguments.map((f) {
-    var lib = new Library(f.element.library, _element.package);
-    return new ElementType(f, new ModelElement.from(f.element, lib));
-  }).toList();
+        var lib = new Library(f.element.library, _element.package);
+        return new ElementType(f, new ModelElement.from(f.element, lib));
+      }).toList();
 
   String get linkedName {
     if (_linkedName != null) return _linkedName;
diff --git a/lib/templates/_footer.html b/lib/templates/_footer.html
index 1b1fdba493..563cfbc879 100644
--- a/lib/templates/_footer.html
+++ b/lib/templates/_footer.html
@@ -26,6 +26,8 @@
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->
+
+<!-- Made with <3 by dartdoc version {{version}} -->
 </body>
 
 </html>
diff --git a/lib/templates/_sidebar_for_class.html b/lib/templates/_sidebar_for_class.html
index cdd7e7c592..f59a52bde0 100644
--- a/lib/templates/_sidebar_for_class.html
+++ b/lib/templates/_sidebar_for_class.html
@@ -1,50 +1,50 @@
 <ol>
-  {{#class.hasConstants}}
+  {{#clazz.hasConstants}}
   <li class="section-title"><a href="{{class.href}}#constants">Constants</a></li>
-  {{#class.constants}}
+  {{#clazz.constants}}
   <li>{{{linkedName}}}</li>
-  {{/class.constants}}
-  {{/class.hasConstants}}
+  {{/clazz.constants}}
+  {{/clazz.hasConstants}}
 
-  {{#class.hasStaticProperties}}
+  {{#clazz.hasStaticProperties}}
   <li class="section-title"><a href="{{class.href}}#static-properties">Static properties</a></li>
-  {{#class.staticProperties}}
+  {{#clazz.staticProperties}}
   <li><a href="{{href}}">{{name}}</a></li>
-  {{/class.staticProperties}}
-  {{/class.hasStaticProperties}}
+  {{/clazz.staticProperties}}
+  {{/clazz.hasStaticProperties}}
 
-  {{#class.hasStaticMethods}}
+  {{#clazz.hasStaticMethods}}
   <li class="section-title"><a href="{{class.href}}#static-methods">Static methods</a></li>
-  {{#class.staticMethods}}
+  {{#clazz.staticMethods}}
   <li><a href="{{href}}">{{name}}</a></li>
-  {{/class.staticMethods}}
-  {{/class.hasStaticMethods}}
+  {{/clazz.staticMethods}}
+  {{/clazz.hasStaticMethods}}
 
-  {{#class.hasInstanceProperties}}
+  {{#clazz.hasInstanceProperties}}
   <li class="section-title"><a href="{{class.href}}#instance-properties">Properties</a></li>
-  {{#class.allInstanceProperties}}
+  {{#clazz.allInstanceProperties}}
   <li>{{>name_link}}</li>
-  {{/class.allInstanceProperties}}
-  {{/class.hasInstanceProperties}}
+  {{/clazz.allInstanceProperties}}
+  {{/clazz.hasInstanceProperties}}
 
-  {{#class.hasConstructors}}
+  {{#clazz.hasConstructors}}
   <li class="section-title"><a href="{{class.href}}#constructors">Constructors</a></li>
-  {{#class.constructors}}
+  {{#clazz.constructors}}
   <li><a href="{{href}}">{{shortName}}</a></li>
-  {{/class.constructors}}
-  {{/class.hasConstructors}}
+  {{/clazz.constructors}}
+  {{/clazz.hasConstructors}}
 
-  {{#class.hasOperators}}
+  {{#clazz.hasOperators}}
   <li class="section-title"><a href="{{class.href}}#operators">Operators</a></li>
-  {{#class.allOperators}}
+  {{#clazz.allOperators}}
   <li>{{>name_link}}</li>
-  {{/class.allOperators}}
-  {{/class.hasOperators}}
+  {{/clazz.allOperators}}
+  {{/clazz.hasOperators}}
 
-  {{#class.hasMethods}}
+  {{#clazz.hasMethods}}
   <li class="section-title"><a href="{{class.href}}#methods">Methods</a></li>
-  {{#class.allInstanceMethods}}
+  {{#clazz.allInstanceMethods}}
   <li>{{>name_link}}</li>
-  {{/class.allInstanceMethods}}
-  {{/class.hasMethods}}
+  {{/clazz.allInstanceMethods}}
+  {{/clazz.hasMethods}}
 </ol>
diff --git a/lib/templates/class.html b/lib/templates/class.html
index 2485879d37..6db68c19b5 100644
--- a/lib/templates/class.html
+++ b/lib/templates/class.html
@@ -10,118 +10,118 @@ <h5><a href="{{href}}">{{name}}</a></h5>
 
   <div class="col-xs-12 col-sm-9 col-md-6 main-content">
 
-    {{#class}}
+    {{#clazz}}
     {{>documentation}}
-    {{/class}}
+    {{/clazz}}
 
-    {{#class.hasModifiers}}
+    {{#clazz.hasModifiers}}
     <section>
         <dl class="dl-horizontal">
-        {{#class.hasAnnotations}}
+        {{#clazz.hasAnnotations}}
         <dt>Annotations</dt>
-        <dd><ul class="annotation-list class-relationships">
-            {{#class.annotations}}
+        <dd><ul class="annotation-list clazz-relationships">
+            {{#clazz.annotations}}
             <li>{{{.}}}</li>
-            {{/class.annotations}}
+            {{/clazz.annotations}}
         </ul></dd>
-        {{/class.hasAnnotations}}
+        {{/clazz.hasAnnotations}}
 
-        {{#class.hasSupertype}}
+        {{#clazz.hasSupertype}}
         <dt>Extends</dt>
-        <dd><ul class="gt-separated dark class-relationships">
+        <dd><ul class="gt-separated dark clazz-relationships">
             <li>{{{linkedObjectType}}}</li>
-            {{#class.superChainReversed}}
+            {{#clazz.superChainReversed}}
             <li>{{{linkedName}}}</li>
-            {{/class.superChainReversed}}
+            {{/clazz.superChainReversed}}
             <li>{{{name}}}</li>
         </ul></dd>
-        {{/class.hasSupertype}}
+        {{/clazz.hasSupertype}}
 
-        {{#class.hasInterfaces}}
+        {{#clazz.hasInterfaces}}
         <dt>Implements</dt>
             <dd>
-                <ul class="comma-separated class-relationships">
-                    {{#class.interfaces}}
+                <ul class="comma-separated clazz-relationships">
+                    {{#clazz.interfaces}}
                     <li>{{{linkedName}}}</li>
-                    {{/class.interfaces}}
+                    {{/clazz.interfaces}}
                 </ul>
             </dd>
-        {{/class.hasInterfaces}}
+        {{/clazz.hasInterfaces}}
 
-        {{#class.hasMixins}}
+        {{#clazz.hasMixins}}
         <dt>Mixes-in</dt>
-        <dd><ul class="comma-separated class-relationships">
-            {{#class.mixins}}
+        <dd><ul class="comma-separated clazz-relationships">
+            {{#clazz.mixins}}
             <li>{{{linkedName}}}</li>
-            {{/class.mixins}}
+            {{/clazz.mixins}}
         </ul></dd>
-        {{/class.hasMixins}}
+        {{/clazz.hasMixins}}
 
-        {{#class.hasImplementors}}
+        {{#clazz.hasImplementors}}
         <dt>Implemented by</dt>
-        <dd><ul class="comma-separated class-relationships">
-            {{#class.implementors}}
+        <dd><ul class="comma-separated clazz-relationships">
+            {{#clazz.implementors}}
             <li>{{{linkedName}}}</li>
-            {{/class.implementors}}
+            {{/clazz.implementors}}
         </ul></dd>
-        {{/class.hasImplementors}}
+        {{/clazz.hasImplementors}}
         </dl>
     </section>
-    {{/class.hasModifiers}}
+    {{/clazz.hasModifiers}}
 
-    {{#class.hasConstants}}
+    {{#clazz.hasConstants}}
     <section class="summary" id="constants">
         <h2>Constants</h2>
 
         <dl class="properties">
-            {{#class.constants}}
+            {{#clazz.constants}}
             {{>constant}}
-            {{/class.constants}}
+            {{/clazz.constants}}
         </dl>
     </section>
-    {{/class.hasConstants}}
+    {{/clazz.hasConstants}}
 
-    {{#class.hasStaticProperties}}
+    {{#clazz.hasStaticProperties}}
     <section class="summary" id="static-properties">
         <h2>Static Properties</h2>
 
         <dl class="properties">
-            {{#class.staticProperties}}
+            {{#clazz.staticProperties}}
             {{>property}}
-            {{/class.staticProperties}}
+            {{/clazz.staticProperties}}
         </dl>
     </section>
-    {{/class.hasStaticProperties}}
+    {{/clazz.hasStaticProperties}}
 
-    {{#class.hasStaticMethods}}
+    {{#clazz.hasStaticMethods}}
     <section class="summary" id="static-methods">
         <h2>Static Methods</h2>
         <dl class="callables">
-            {{#class.staticMethods}}
+            {{#clazz.staticMethods}}
             {{>callable}}
-            {{/class.staticMethods}}
+            {{/clazz.staticMethods}}
         </dl>
     </section>
-    {{/class.hasStaticMethods}}
+    {{/clazz.hasStaticMethods}}
 
-    {{#class.hasProperties}}
+    {{#clazz.hasProperties}}
     <section class="summary" id="instance-properties">
         <h2>Properties</h2>
 
         <dl class="properties">
-            {{#class.allInstanceProperties}}
+            {{#clazz.allInstanceProperties}}
             {{>property}}
-            {{/class.allInstanceProperties}}
+            {{/clazz.allInstanceProperties}}
         </dl>
     </section>
-    {{/class.hasProperties}}
+    {{/clazz.hasProperties}}
 
-    {{#class.hasConstructors}}
+    {{#clazz.hasConstructors}}
     <section class="summary" id="constructors">
         <h2>Constructors</h2>
 
         <dl class="constructor-summary-list">
-            {{#class.constructors}}
+            {{#clazz.constructors}}
             <dt id="{{htmlId}}" class="callable">
                 <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
             </dt>
@@ -133,32 +133,32 @@ <h2>Constructors</h2>
                 {{/isConst}}
                 {{{ oneLineDoc }}}
             </dd>
-            {{/class.constructors}}
+            {{/clazz.constructors}}
         </dl>
       </section>
-      {{/class.hasConstructors}}
+      {{/clazz.hasConstructors}}
 
-      {{#class.hasOperators}}
+      {{#clazz.hasOperators}}
       <section class="summary" id="operators">
           <h2>Operators</h2>
           <dl class="callables">
-              {{#class.allOperators}}
+              {{#clazz.allOperators}}
               {{>callable}}
-              {{/class.allOperators}}
+              {{/clazz.allOperators}}
           </dl>
       </section>
-      {{/class.hasOperators}}
+      {{/clazz.hasOperators}}
 
-      {{#class.hasMethods}}
+      {{#clazz.hasMethods}}
       <section class="summary" id="instance-methods">
           <h2>Methods</h2>
           <dl class="callables">
-              {{#class.allInstanceMethods}}
+              {{#clazz.allInstanceMethods}}
               {{>callable}}
-              {{/class.allInstanceMethods}}
+              {{/clazz.allInstanceMethods}}
           </dl>
       </section>
-      {{/class.hasMethods}}
+      {{/clazz.hasMethods}}
 
     </div> <!-- /.main-content -->