diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ed199d235..e656975469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.21.0-dev.0
+* Expand categories to all top level items as well as libraries.  (#1681, #1353)
+* The categoryOrder option in dartdoc_options.yaml and the command line
+  is replaced with a more generic "categories" option.  See README.md.
+
 ## 0.20.4
 * Hide pragma declarations from generated docs (#1726)
 * Fix problems with lists in markdown not being handled correctly (#172)
diff --git a/README.md b/README.md
index 82e39b4b45..f192910d48 100644
--- a/README.md
+++ b/README.md
@@ -102,15 +102,22 @@ generates docs.
 
 ```yaml
 dartdoc:
-  categoryOrder: ["First Category", "Second Category"]
+  categories: 
+    "First Category":
+      markdown: doc/First.md
+      name: Awesome
+    "Second Category":
+      markdown: doc/Second.md
+      name: Great
   linkTo:
     url: "https://my.dartdocumentationsite.org/dev/%v%"
 ```
 
 Unrecognized options will be ignored.  Supported options:
 
-  * **categoryOrder**:  Specify the order of categories, below, for display in the sidebar and
-    the package page.
+  * **categories**:  Specify the order of categories.  For APIs you'd like to document, specify
+    the markdown file with `markdown:` to use for the category page.  Optionally, rename the
+    category from the source code into a display name with 'name:'.
   * **exclude**:  Specify a list of library names to avoid generating docs for,
     overriding any specified in include.
   * **include**:  Specify a list of library names to generate docs for, ignoring all others.
@@ -144,9 +151,11 @@ as POSIX paths.  Dartdoc will convert POSIX paths automatically on Windows.
  
 ### Categories
 
-You can tag libraries in their documentation with the string `{@category YourCategory}`, and
-that will cause the library to appear in a category when showing the sidebar on the Package
-and Library pages.
+You can tag libraries or top level classes, functions, and variables in their documentation with
+the string `{@category YourCategory}`.  For libraries, that will cause the library to appear in a
+category when showing the sidebar on the Package and Library pages.  For other types of objects,
+the `{@category}` will be shown with a link to the category page if specified in
+dartdoc_options.yaml, as above.
 
 ```dart
 /// Here is my library.
@@ -155,6 +164,42 @@ and Library pages.
 library my_library;
 ```
 
+#### Other category tags and categories.json
+
+A file `categories.json` will be generated at the top level of the documentation tree with
+information about categories collected from objects in the source tree.  The directives
+`@category`, `@subCategory`, `@image`, and `@samples` are understood and saved into this json.
+Future versions of dartdoc may make direct use of the image and samples tags.
+
+As an example, if we document the class Icon in flutter using the following:
+
+```dart
+/// {@category Basics}
+/// {@category Assets, Images, and Icons}
+/// {@subCategory Information displays}
+/// {@image <image alt='' src='/images/catalog-widget-placeholder.png'>}
+class Icon extends StatelessWidget {}
+```
+
+that will result in the following json:
+
+```json
+  {
+    "name": "Icon",
+    "qualifiedName": "widgets.Icon",
+    "href": "widgets/Icon-class.html",
+    "type": "class",
+    "categories": [
+      "Assets, Images, and Icons",
+      "Basics"
+    ],
+    "subcategories": [
+      "Information displays"
+    ],
+    "image": "<image alt='' src='/images/catalog-widget-placeholder.png'>"
+  }
+```
+
 ### Animations
 
 You can specify links to videos inline that will be handled with a simple HTML5 player:
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 8a654ac5f4..234eadae55 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -11,6 +11,7 @@ analyzer:
     - 'testing/test_package_export_error/**'
 linter:
   rules:
+    - always_declare_return_types
     - annotate_overrides
     - avoid_init_to_null
     - directives_ordering
diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index fe111d99f0..ac5e2ee776 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -33,7 +33,7 @@ Future<List<DartdocOption>> createDartdocProgramOptions() async {
 
 /// Analyzes Dart files and generates a representation of included libraries,
 /// classes, and members. Uses the current directory to look for libraries.
-main(List<String> arguments) async {
+void main(List<String> arguments) async {
   DartdocOptionSet optionSet =
       await DartdocOptionSet.fromOptionGenerators('dartdoc', [
     createDartdocOptions,
diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 937d673951..747b66f129 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -66,7 +66,8 @@ class Dartdoc extends PackageBuilder {
 
   /// An asynchronous factory method that builds Dartdoc's file writers
   /// and returns a Dartdoc object with them.
-  static withDefaultGenerators(DartdocGeneratorOptionContext config) async {
+  static Future<Dartdoc> withDefaultGenerators(
+      DartdocGeneratorOptionContext config) async {
     List<Generator> generators = await initGenerators(config);
     return new Dartdoc._(config, generators);
   }
@@ -259,7 +260,7 @@ class Dartdoc extends PackageBuilder {
       } else {
         // Error messages are orphaned by design and do not appear in the search
         // index.
-        if (relativeFullPath != '__404error.html') {
+        if (<String>['__404error.html', 'categories.json'].contains(fullPath)) {
           _warn(packageGraph, PackageWarning.orphanedFile, fullPath,
               normalOrigin);
         }
diff --git a/lib/resources/styles.css b/lib/resources/styles.css
index 3ac01890db..07ac4ae0ec 100644
--- a/lib/resources/styles.css
+++ b/lib/resources/styles.css
@@ -394,6 +394,55 @@ dl dt.callable .name {
   text-decoration: line-through;
 }
 
+.category.linked {
+  font-weight: bold;
+  opacity: 1;
+}
+
+/* Colors for category based on categoryOrder in dartdoc_options.config. */
+.category.cp-0 {
+  background-color: #54b7c4
+}
+
+.category.cp-1 {
+  background-color: #54c47f
+}
+
+.category.cp-2 {
+  background-color: #c4c254
+}
+
+.category.cp-3 {
+  background-color: #c49f54
+}
+
+.category.cp-4 {
+  background-color: #c45465
+}
+
+.category.cp-5 {
+  background-color: #c454c4
+}
+
+.category a {
+  color: white;
+}
+
+.category {
+  vertical-align: text-top;
+  padding: 4px;
+  font-size: 12px;
+  border-radius: 4px;
+  background-color: #B6B6B6;
+  text-transform: uppercase;
+  color: white;
+  opacity: .5;
+}
+
+h1 .category {
+  vertical-align: middle;
+}
+
 p.firstline {
   font-weight: bold;
 }
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index fcd9dba42f..444fa6d23d 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -56,6 +56,66 @@ class DartdocFileMissing extends DartdocOptionError {
   DartdocFileMissing(String details) : super(details);
 }
 
+class CategoryDefinition {
+  /// Internal name of the category.
+  final String name;
+
+  /// Displayed name of the category in docs, or null if there is none.
+  final String _displayName;
+
+  /// Canonical path of the markdown file used to document this category
+  /// (or null if undocumented).
+  final String documentationMarkdown;
+
+  CategoryDefinition(this.name, this._displayName, this.documentationMarkdown);
+
+  /// Returns the [_displayName], if available, or else simply [name].
+  String get displayName => _displayName ?? name;
+}
+
+class CategoryConfiguration {
+  /// A map of [CategoryDefinition.name] to [CategoryDefinition] objects.
+  final Map<String, CategoryDefinition> categoryDefinitions;
+
+  /// The defined order for categories.
+  List<String> categoryOrder;
+
+  CategoryConfiguration._(this.categoryDefinitions, this.categoryOrder);
+
+  static CategoryConfiguration get empty {
+    return new CategoryConfiguration._({}, []);
+  }
+
+  static CategoryConfiguration fromYamlMap(
+      YamlMap yamlMap, pathLib.Context pathContext) {
+    List<String> categoriesInOrder = [];
+    Map<String, CategoryDefinition> newCategoryDefinitions = {};
+    for (MapEntry entry in yamlMap.entries) {
+      String name = entry.key.toString();
+      String displayName;
+      String documentationMarkdown;
+      categoriesInOrder.add(name);
+      var categoryMap = entry.value;
+      if (categoryMap is Map) {
+        displayName = categoryMap['displayName']?.toString();
+        documentationMarkdown = categoryMap['markdown']?.toString();
+        if (documentationMarkdown != null) {
+          documentationMarkdown =
+              pathContext.canonicalize(documentationMarkdown);
+          if (!new File(documentationMarkdown).existsSync()) {
+            throw new DartdocFileMissing(
+                'In categories definition for ${name}, "markdown" resolves to the missing file $documentationMarkdown');
+          }
+        }
+        newCategoryDefinitions[name] =
+            new CategoryDefinition(name, displayName, documentationMarkdown);
+      }
+    }
+    return new CategoryConfiguration._(
+        newCategoryDefinitions, categoriesInOrder);
+  }
+}
+
 /// A container class to keep track of where our yaml data came from.
 class _YamlFileData {
   /// The map from the yaml file.
@@ -102,6 +162,11 @@ class _OptionValueWithContext<T> {
           .toList() as T;
     } else if (value is String) {
       return pathContext.canonicalize(resolveTildePath(value as String)) as T;
+    } else if (value is Map<String, String>) {
+      return (value as Map<String, String>)
+          .map((String mapKey, String mapValue) => new MapEntry<String, String>(
+              mapKey, pathContext.canonicalize(resolveTildePath(mapValue))))
+          .cast<String, String>() as T;
     } else {
       throw new UnsupportedError('Type $T is not supported for resolvedValue');
     }
@@ -141,14 +206,17 @@ abstract class DartdocOption<T> {
   final bool mustExist;
 
   DartdocOption._(this.name, this.defaultsTo, this.help, this.isDir,
-      this.isFile, this.mustExist) {
+      this.isFile, this.mustExist, this._convertYamlToType) {
     assert(!(isDir && isFile));
-    if (isDir || isFile) assert(_isString || _isListString);
+    if (isDir || isFile) assert(_isString || _isListString || _isMapString);
     if (mustExist) {
       assert(isDir || isFile);
     }
   }
 
+  /// Closure to convert yaml data into some other structure.
+  T Function(YamlMap, pathLib.Context) _convertYamlToType;
+
   // The choice not to use reflection means there's some ugly type checking,
   // somewhat more ugly than we'd have to do anyway to automatically convert
   // command line arguments and yaml data to real types.
@@ -198,8 +266,10 @@ abstract class DartdocOption<T> {
     List<String> resolvedPaths;
     if (valueWithContext.value is String) {
       resolvedPaths = [valueWithContext.resolvedValue];
-    } else {
+    } else if (valueWithContext.value is List<String>) {
       resolvedPaths = valueWithContext.resolvedValue.toList();
+    } else if (valueWithContext.value is Map<String, String>) {
+      resolvedPaths = valueWithContext.resolvedValue.values.toList();
     }
     for (String path in resolvedPaths) {
       FileSystemEntity f = isDir ? new Directory(path) : new File(path);
@@ -314,8 +384,9 @@ class DartdocOptionFileSynth<T> extends DartdocOption<T>
       String help = '',
       bool isDir = false,
       bool isFile = false,
-      bool parentDirOverridesChild})
-      : super._(name, null, help, isDir, isFile, mustExist) {
+      bool parentDirOverridesChild,
+      T Function(YamlMap, pathLib.Context) convertYamlToType})
+      : super._(name, null, help, isDir, isFile, mustExist, convertYamlToType) {
     _parentDirOverridesChild = parentDirOverridesChild;
   }
 
@@ -362,7 +433,7 @@ class DartdocOptionArgSynth<T> extends DartdocOption<T>
       bool isFile = false,
       bool negatable,
       bool splitCommas})
-      : super._(name, null, help, isDir, isFile, mustExist) {
+      : super._(name, null, help, isDir, isFile, mustExist, null) {
     _hide = hide;
     _negatable = negatable;
     _splitCommas = splitCommas;
@@ -408,7 +479,7 @@ class DartdocOptionSyntheticOnly<T> extends DartdocOption<T>
       String help = '',
       bool isDir = false,
       bool isFile = false})
-      : super._(name, null, help, isDir, isFile, mustExist);
+      : super._(name, null, help, isDir, isFile, mustExist, null);
 }
 
 abstract class DartdocSyntheticOption<T> implements DartdocOption<T> {
@@ -442,7 +513,7 @@ typedef Future<List<DartdocOption>> OptionGenerator();
 /// A [DartdocOption] that only contains other [DartdocOption]s and is not an option itself.
 class DartdocOptionSet extends DartdocOption<Null> {
   DartdocOptionSet(String name)
-      : super._(name, null, null, false, false, false);
+      : super._(name, null, null, false, false, false, null);
 
   /// Asynchronous factory that is the main entry point to initialize Dartdoc
   /// options for use.
@@ -493,7 +564,7 @@ class DartdocOptionArgOnly<T> extends DartdocOption<T>
       bool isFile = false,
       bool negatable,
       bool splitCommas})
-      : super._(name, defaultsTo, help, isDir, isFile, mustExist) {
+      : super._(name, defaultsTo, help, isDir, isFile, mustExist, null) {
     _hide = hide;
     _negatable = negatable;
     _splitCommas = splitCommas;
@@ -529,7 +600,7 @@ class DartdocOptionArgFile<T> extends DartdocOption<T>
       bool negatable,
       bool parentDirOverridesChild: false,
       bool splitCommas})
-      : super._(name, defaultsTo, help, isDir, isFile, mustExist) {
+      : super._(name, defaultsTo, help, isDir, isFile, mustExist, null) {
     _abbr = abbr;
     _hide = hide;
     _negatable = negatable;
@@ -577,8 +648,10 @@ class DartdocOptionFileOnly<T> extends DartdocOption<T>
       String help: '',
       bool isDir = false,
       bool isFile = false,
-      bool parentDirOverridesChild: false})
-      : super._(name, defaultsTo, help, isDir, isFile, mustExist) {
+      bool parentDirOverridesChild: false,
+      T Function(YamlMap, pathLib.Context) convertYamlToType})
+      : super._(name, defaultsTo, help, isDir, isFile, mustExist,
+            convertYamlToType) {
     _parentDirOverridesChild = parentDirOverridesChild;
   }
 
@@ -679,13 +752,30 @@ abstract class _DartdocFileOption<T> implements DartdocOption<T> {
           returnData.add(item.toString());
         }
       }
-    } else if (_isMapString) {
-      if (yamlData is YamlMap) {
-        returnData = <String, String>{};
-        for (MapEntry entry in yamlData.entries) {
-          returnData[entry.key.toString()] = entry.value.toString();
-        }
+    } else if (yamlData is YamlMap) {
+      // TODO(jcollins-g): This special casing is unfortunate.  Consider
+      // a refactor to extract yaml data conversion into closures 100% of the
+      // time or find a cleaner way to do this.
+      //
+      // A refactor probably would integrate resolvedValue for
+      // _OptionValueWithContext into the return data here, and would not have
+      // that be separate.
+      if (_isMapString && _convertYamlToType == null) {
+        _convertYamlToType = (YamlMap yamlMap, pathLib.Context pathContext) {
+          var returnData = <String, String>{};
+          for (MapEntry entry in yamlMap.entries) {
+            returnData[entry.key.toString()] = entry.value.toString();
+          }
+          return returnData as T;
+        };
       }
+      if (_convertYamlToType == null) {
+        throw new DartdocOptionError(
+            'Unable to convert yaml to type for option: $fieldName, method not defined');
+      }
+      String canonicalDirectoryPath = pathLib.canonicalize(contextPath);
+      returnData = _convertYamlToType(
+          yamlData, new pathLib.Context(current: canonicalDirectoryPath));
     } else if (_isDouble) {
       if (yamlData is num) {
         returnData = yamlData.toDouble();
@@ -749,7 +839,7 @@ abstract class _DartdocArgOption<T> implements DartdocOption<T> {
   T valueAt(Directory dir) => _valueAtFromArgs() ?? defaultsTo;
 
   /// For passing in to [int.parse] and [double.parse] `onError'.
-  _throwErrorForTypes(String value) {
+  void _throwErrorForTypes(String value) {
     String example;
     if (defaultsTo is Map) {
       example = 'key::value';
@@ -924,7 +1014,8 @@ class DartdocOptionContext {
       optionSet['ambiguousReexportScorerMinConfidence'].valueAt(context);
   bool get autoIncludeDependencies =>
       optionSet['autoIncludeDependencies'].valueAt(context);
-  List<String> get categoryOrder => optionSet['categoryOrder'].valueAt(context);
+  CategoryConfiguration get categories =>
+      optionSet['categories'].valueAt(context);
   List<String> get dropTextFrom => optionSet['dropTextFrom'].valueAt(context);
   String get examplePathPrefix =>
       optionSet['examplePathPrefix'].valueAt(context);
@@ -955,6 +1046,8 @@ class DartdocOptionContext {
   List<String> get packageOrder => optionSet['packageOrder'].valueAt(context);
   bool get sdkDocs => optionSet['sdkDocs'].valueAt(context);
   String get sdkDir => optionSet['sdkDir'].valueAt(context);
+  bool get showUndocumentedCategories =>
+      optionSet['showUndocumentedCategories'].valueAt(context);
   bool get showWarnings => optionSet['showWarnings'].valueAt(context);
   PackageMeta get topLevelPackageMeta =>
       optionSet['topLevelPackageMeta'].valueAt(context);
@@ -975,6 +1068,7 @@ Future<List<DartdocOption>> createDartdocOptions() async {
     new DartdocOptionArgOnly<bool>('addCrossdart', false,
         help: 'Add Crossdart links to the source code pieces.',
         negatable: true),
+
     new DartdocOptionArgFile<double>(
         'ambiguousReexportScorerMinConfidence', 0.1,
         help:
@@ -983,10 +1077,11 @@ Future<List<DartdocOption>> createDartdocOptions() async {
         help:
             'Include all the used libraries into the docs, even the ones not in the current package or "include-external"',
         negatable: true),
-    new DartdocOptionArgFile<List<String>>('categoryOrder', [],
+    new DartdocOptionFileOnly<CategoryConfiguration>(
+        'categories', CategoryConfiguration.empty,
+        convertYamlToType: CategoryConfiguration.fromYamlMap,
         help:
-            "A list of categories (not package names) to place first when grouping symbols on dartdoc's sidebar. "
-            'Unmentioned categories are sorted after these.'),
+            "A list of all categories, their display names, and markdown documentation in the order they are to be displayed."),
     new DartdocOptionSyntheticOnly<List<String>>('dropTextFrom',
         (DartdocSyntheticOption<List<String>> option, Directory dir) {
       if (option.parent['hideSdkText'].valueAt(dir)) {
@@ -1128,6 +1223,8 @@ Future<List<DartdocOption>> createDartdocOptions() async {
       }
       return defaultSdkDir.absolute.path;
     }, help: 'Path to the SDK directory.', isDir: true, mustExist: true),
+    new DartdocOptionArgFile<bool>('showUndocumentedCategories', false,
+        help: "Label categories that aren't documented", negatable: true),
     new DartdocOptionArgOnly<bool>('showWarnings', false,
         help: 'Display all warnings.', negatable: false),
     new DartdocOptionSyntheticOnly<PackageMeta>('topLevelPackageMeta',
diff --git a/lib/src/debug.dart b/lib/src/debug.dart
deleted file mode 100644
index 349aefc2fa..0000000000
--- a/lib/src/debug.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library debugger_helper;
-
-import 'dart:developer' as dev;
-
-get debugger =>
-    const String.fromEnvironment('DEBUG') == null ? _nodebugger : dev.debugger;
-_nodebugger({when, message}) {}
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index ba852dd5e5..7d1a2b3b2e 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -25,7 +25,7 @@ class HtmlGeneratorInstance {
   final HtmlGeneratorOptions _options;
   final Templates _templates;
   final PackageGraph _packageGraph;
-  final List<ModelElement> _documentedElements = <ModelElement>[];
+  final List<Indexable> _indexedElements = <Indexable>[];
   final FileWriter _writer;
 
   HtmlGeneratorInstance(
@@ -35,6 +35,7 @@ class HtmlGeneratorInstance {
     if (_packageGraph != null) {
       _generateDocs();
       _generateSearchIndex();
+      _generateCategoryJson();
     }
 
     await _copyResources();
@@ -46,16 +47,48 @@ class HtmlGeneratorInstance {
     }
   }
 
+  void _generateCategoryJson() {
+    var encoder = new JsonEncoder.withIndent('  ');
+    final List<Map> indexItems = _categorizationItems.map((Categorization e) {
+      Map data = {
+        'name': e.name,
+        'qualifiedName': e.fullyQualifiedName,
+        'href': e.href,
+        'type': e.kind,
+      };
+
+      if (e.hasCategoryNames) data['categories'] = e.categoryNames;
+      if (e.hasSubCategoryNames) data['subcategories'] = e.subCategoryNames;
+      if (e.hasImage) data['image'] = e.image;
+      if (e.hasSamples) data['samples'] = e.samples;
+      return data;
+    }).toList();
+
+    indexItems.sort((a, b) {
+      var value = compareNatural(a['qualifiedName'], b['qualifiedName']);
+      if (value == 0) {
+        value = compareNatural(a['type'], b['type']);
+      }
+      return value;
+    });
+
+    String json = encoder.convert(indexItems);
+    _writer(pathLib.join('categories.json'), '${json}\n');
+  }
+
+  List<Categorization> _categorizationItems;
   void _generateSearchIndex() {
     var encoder = _options.prettyIndexJson
         ? new JsonEncoder.withIndent(' ')
         : new JsonEncoder();
+    _categorizationItems = [];
 
-    final List<Map> indexItems =
-        _documentedElements.where((e) => e.isCanonical).map((ModelElement e) {
+    final List<Map> indexItems = _indexedElements.map((Indexable e) {
+      if (e is Categorization && e.hasCategorization)
+        _categorizationItems.add(e);
       Map data = {
         'name': e.name,
-        'qualifiedName': e.name,
+        'qualifiedName': e.fullyQualifiedName,
         'href': e.href,
         'type': e.kind,
         'overriddenDepth': e.overriddenDepth,
@@ -90,6 +123,10 @@ class HtmlGeneratorInstance {
     generatePackage(_packageGraph, _packageGraph.defaultPackage);
 
     for (var package in _packageGraph.localPackages) {
+      for (var category in filterNonDocumented(package.categories)) {
+        generateCategory(_packageGraph, category);
+      }
+
       for (var lib in filterNonDocumented(package.libraries)) {
         generateLibrary(_packageGraph, lib);
 
@@ -173,6 +210,16 @@ class HtmlGeneratorInstance {
     _build('__404error.html', _templates.errorTemplate, data);
   }
 
+  void generateCategory(PackageGraph packageGraph, Category category) {
+    logInfo(
+        'Generating docs for category ${category.name} from ${category.package.fullyQualifiedName}...');
+    TemplateData data =
+        new CategoryTemplateData(_options, packageGraph, category);
+
+    _build(pathLib.joinAll(category.href.split('/')),
+        _templates.categoryTemplate, data);
+  }
+
   void generateLibrary(PackageGraph packageGraph, Library lib) {
     logInfo(
         'Generating docs for library ${lib.name} from ${lib.element.source.uri}...');
@@ -290,6 +337,6 @@ class HtmlGeneratorInstance {
         assumeNullNonExistingProperty: false, errorOnMissingProperty: true);
 
     _writer(filename, content);
-    if (data.self is ModelElement) _documentedElements.add(data.self);
+    if (data.self is Indexable) _indexedElements.add(data.self as Indexable);
   }
 }
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 290640e38e..6c7a8491b5 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -27,6 +27,7 @@ abstract class TemplateData<T extends Documentable> {
 
   TemplateData(this.htmlOptions, this.packageGraph);
 
+  List<Category> get displayedCategories => <Category>[];
   String get documentation => self.documentation;
   String get oneLineDoc => self.oneLineDoc;
   String get title;
@@ -118,6 +119,52 @@ class PackageTemplateData extends TemplateData<Package> {
   String get htmlBase => null;
 }
 
+class CategoryTemplateData extends TemplateData<Category> {
+  final Category category;
+
+  CategoryTemplateData(
+      HtmlOptions htmlOptions, PackageGraph packageGraph, this.category)
+      : super(htmlOptions, packageGraph);
+
+  @override
+  String get title => '${category.name} ${category.kind} - Dart API';
+
+  @override
+  String get htmlBase => '..';
+
+  @override
+  String get layoutTitle => _layoutTitle(category.name, category.kind, false);
+
+  @override
+  String get metaDescription =>
+      '${category.name} ${category.kind} docs, for the Dart programming language.';
+
+  @override
+  List get navLinks => [category.package];
+  @override
+  Iterable<Subnav> getSubNavItems() sync* {
+    if (category.hasPublicClasses)
+      yield new Subnav('Libraries', '${category.href}#libraries');
+    if (category.hasPublicClasses)
+      yield new Subnav('Classes', '${category.href}#classes');
+    if (category.hasPublicConstants)
+      yield new Subnav('Constants', '${category.href}#constants');
+    if (category.hasPublicProperties)
+      yield new Subnav('Properties', '${category.href}#properties');
+    if (category.hasPublicFunctions)
+      yield new Subnav('Functions', '${category.href}#functions');
+    if (category.hasPublicEnums)
+      yield new Subnav('Enums', '${category.href}#enums');
+    if (category.hasPublicTypedefs)
+      yield new Subnav('Typedefs', '${category.href}#typedefs');
+    if (category.hasPublicExceptions)
+      yield new Subnav('Exceptions', '${category.href}#exceptions');
+  }
+
+  @override
+  Category get self => category;
+}
+
 class LibraryTemplateData extends TemplateData<Library> {
   final Library library;
 
diff --git a/lib/src/html/templates.dart b/lib/src/html/templates.dart
index d5df781be0..b6627edd75 100644
--- a/lib/src/html/templates.dart
+++ b/lib/src/html/templates.dart
@@ -13,6 +13,7 @@ import 'package:dartdoc/src/third_party/pkg/mustache4dart/lib/mustache4dart.dart
 const _partials = const <String>[
   'callable',
   'callable_multiline',
+  'categorization',
   'class',
   'constant',
   'footer',
@@ -24,6 +25,7 @@ const _partials = const <String>[
   'documentation',
   'name_summary',
   'sidebar_for_class',
+  'sidebar_for_category',
   'sidebar_for_enum',
   'source_code',
   'sidebar_for_library',
@@ -79,6 +81,7 @@ Future<String> _getTemplateFile(String templateFileName) =>
     loader.loadAsString('package:dartdoc/templates/$templateFileName');
 
 class Templates {
+  final TemplateRenderer categoryTemplate;
   final TemplateRenderer classTemplate;
   final TemplateRenderer enumTemplate;
   final TemplateRenderer constantTemplate;
@@ -115,6 +118,7 @@ class Templates {
 
     var indexTemplate = await _loadTemplate('index.html');
     var libraryTemplate = await _loadTemplate('library.html');
+    var categoryTemplate = await _loadTemplate('category.html');
     var classTemplate = await _loadTemplate('class.html');
     var enumTemplate = await _loadTemplate('enum.html');
     var functionTemplate = await _loadTemplate('function.html');
@@ -131,6 +135,7 @@ class Templates {
 
     return new Templates._(
         indexTemplate,
+        categoryTemplate,
         libraryTemplate,
         classTemplate,
         enumTemplate,
@@ -147,6 +152,7 @@ class Templates {
 
   Templates._(
       this.indexTemplate,
+      this.categoryTemplate,
       this.libraryTemplate,
       this.classTemplate,
       this.enumTemplate,
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 8a9de857d7..1371e4c37a 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -12,6 +12,7 @@ import 'dart:io';
 
 import 'package:analyzer/dart/ast/ast.dart'
     show Declaration, Expression, InstanceCreationExpression;
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/file_system/file_system.dart' as fileSystem;
@@ -255,7 +256,7 @@ class Accessor extends ModelElement implements EnclosedElement {
       PackageGraph packageGraph, Member originalMember)
       : super(element, library, packageGraph, originalMember);
 
-  get linkedReturnType {
+  String get linkedReturnType {
     assert(isGetter);
     return modelType.createLinkedReturnTypeName();
   }
@@ -417,7 +418,7 @@ class Accessor extends ModelElement implements EnclosedElement {
 }
 
 class Class extends ModelElement
-    with TypeParameters
+    with TypeParameters, Categorization
     implements EnclosedElement {
   List<DefinedElementType> _mixins;
   DefinedElementType _supertype;
@@ -1168,26 +1169,126 @@ abstract class Categorization implements ModelElement {
   @override
   String _buildDocumentationLocal() {
     _rawDocs = _buildDocumentationBase();
-    _rawDocs = _stripAndSetDartdocCategory(_rawDocs);
+    _rawDocs = _stripAndSetDartdocCategories(_rawDocs);
     return _rawDocs;
   }
 
-  /// Parse {@category ...} in API comments and store the category in
-  /// the [_categoryName] variable.
-  String _stripAndSetDartdocCategory(String rawDocs) {
-    final categoryRegexp =
-        new RegExp(r'[ ]*{@category (.+?)}[ ]*\n?', multiLine: true);
-    return rawDocs.replaceAllMapped(categoryRegexp, (match) {
-      _categoryName = match[1].trim();
+  /// Parse {@category ...} and related information in API comments, stripping
+  /// out that information from the given comments and returning the stripped
+  /// version.
+  String _stripAndSetDartdocCategories(String rawDocs) {
+    Set<String> _categorySet = new Set();
+    Set<String> _subCategorySet = new Set();
+    _hasCategorization = false;
+    final categoryRegexp = new RegExp(
+        r'[ ]*{@(api|category|subCategory|image|samples) (.+?)}[ ]*\n?',
+        multiLine: true);
+    rawDocs = rawDocs.replaceAllMapped(categoryRegexp, (match) {
+      _hasCategorization = true;
+      switch (match[1]) {
+        case 'category':
+        case 'api':
+          _categorySet.add(match[2].trim());
+          break;
+        case 'subCategory':
+          _subCategorySet.add(match[2].trim());
+          break;
+        case 'image':
+          _image = match[2].trim();
+          break;
+        case 'samples':
+          _samples = match[2].trim();
+          break;
+      }
       return '';
     });
+
+    if (_categorySet.isEmpty) {
+      // All objects are in the default category if not specified.
+      _categorySet.add(null);
+    }
+    if (_subCategorySet.isEmpty) {
+      // All objects are in the default subcategory if not specified.
+      _subCategorySet.add(null);
+    }
+    _categoryNames = _categorySet.toList()..sort();
+    _subCategoryNames = _subCategorySet.toList()..sort();
+    _image ??= '';
+    _samples ??= '';
+    return rawDocs;
+  }
+
+  bool get hasSubCategoryNames =>
+      subCategoryNames.length > 1 || subCategoryNames.first != null;
+  List<String> _subCategoryNames;
+
+  /// Either a set of strings containing all declared subcategories for this symbol,
+  /// or a set containing Null if none were declared.
+  List<String> get subCategoryNames {
+    // TODO(jcollins-g): avoid side-effect dependency
+    if (_subCategoryNames == null) documentationLocal;
+    return _subCategoryNames;
+  }
+
+  @override
+  bool get hasCategoryNames =>
+      categoryNames.length > 1 || categoryNames.first != null;
+  List<String> _categoryNames;
+
+  /// Either a set of strings containing all declared categories for this symbol,
+  /// or a set containing Null if none were declared.
+  List<String> get categoryNames {
+    // TODO(jcollins-g): avoid side-effect dependency
+    if (_categoryNames == null) documentationLocal;
+    return _categoryNames;
   }
 
-  String _categoryName;
-  String get categoryName {
+  bool get hasImage => image.isNotEmpty;
+  String _image;
+
+  /// Either a URI to a defined image, or the empty string if none
+  /// was declared.
+  String get image {
     // TODO(jcollins-g): avoid side-effect dependency
-    if (_categoryName == null) documentationLocal;
-    return _categoryName;
+    if (_image == null) documentationLocal;
+    return _image;
+  }
+
+  bool get hasSamples => samples.isNotEmpty;
+  String _samples;
+
+  /// Either a URI to documentation with samples, or the empty string if none
+  /// was declared.
+  String get samples {
+    // TODO(jcollins-g): avoid side-effect dependency
+    if (_samples == null) documentationLocal;
+    return _samples;
+  }
+
+  bool _hasCategorization;
+
+  Iterable<Category> _categories;
+  Iterable<Category> get categories {
+    if (_categories == null) {
+      _categories = categoryNames
+          .map((n) => package.nameToCategory[n])
+          .where((c) => c != null)
+          .toList()
+            ..sort();
+    }
+    return _categories;
+  }
+
+  Iterable<Category> get displayedCategories {
+    if (config.showUndocumentedCategories) return categories;
+    return categories.where((c) => c.isDocumented);
+  }
+
+  /// True if categories, subcategories, a documentation icon, or samples were
+  /// declared.
+  bool get hasCategorization {
+    if (_hasCategorization == null) documentationLocal;
+    return _hasCategorization;
   }
 }
 
@@ -1730,11 +1831,7 @@ abstract class GetterSetterCombo implements ModelElement {
   Accessor get setter;
 }
 
-class Library extends ModelElement with Categorization {
-  List<Class> _classes;
-  List<Enum> _enums;
-  List<ModelFunction> _functions;
-  List<Typedef> _typeDefs;
+class Library extends ModelElement with Categorization, TopLevelContainer {
   List<TopLevelVariable> _variables;
   Namespace _exportedNamespace;
   String _name;
@@ -1794,6 +1891,7 @@ class Library extends ModelElement with Categorization {
 
   List<Class> get allClasses => _allClasses;
 
+  @override
   Iterable<Class> get classes {
     return _allClasses
         .where((c) => !c.isErrorOrException)
@@ -1825,9 +1923,7 @@ class Library extends ModelElement with Categorization {
   /// we don't count it as a candidate for canonicalization.
   bool get isSdkUndocumented => (sdkLib != null && !sdkLib.isDocumented);
 
-  Iterable<Class> get publicClasses => filterNonPublic(classes);
-
-  List<TopLevelVariable> _constants;
+  @override
   Iterable<TopLevelVariable> get constants {
     if (_constants == null) {
       // _getVariables() is already sorted.
@@ -1879,8 +1975,6 @@ class Library extends ModelElement with Categorization {
     return _importedExportedLibraries;
   }
 
-  Iterable<TopLevelVariable> get publicConstants => filterNonPublic(constants);
-
   String _dirName;
   String get dirName {
     if (_dirName == null) {
@@ -1941,7 +2035,8 @@ class Library extends ModelElement with Categorization {
   @override
   ModelElement get enclosingElement => null;
 
-  List<Class> get enums {
+  @override
+  List<Enum> get enums {
     if (_enums != null) return _enums;
     List<ClassElement> enumClasses = [];
     enumClasses.addAll(_exportedNamespace.definedNames.values
@@ -1956,8 +2051,7 @@ class Library extends ModelElement with Categorization {
     return _enums;
   }
 
-  Iterable<Class> get publicEnums => filterNonPublic(enums);
-
+  @override
   List<Class> get exceptions {
     return _allClasses
         .where((c) => c.isErrorOrException)
@@ -1965,11 +2059,10 @@ class Library extends ModelElement with Categorization {
           ..sort(byName);
   }
 
-  Iterable<Class> get publicExceptions => filterNonPublic(exceptions);
-
   @override
   String get fileName => '$dirName-library.html';
 
+  @override
   List<ModelFunction> get functions {
     if (_functions != null) return _functions;
 
@@ -1990,22 +2083,6 @@ class Library extends ModelElement with Categorization {
     return _functions;
   }
 
-  Iterable<ModelFunction> get publicFunctions => filterNonPublic(functions);
-
-  bool get hasPublicClasses => publicClasses.isNotEmpty;
-
-  bool get hasPublicConstants => publicConstants.isNotEmpty;
-
-  bool get hasPublicEnums => publicEnums.isNotEmpty;
-
-  bool get hasPublicExceptions => publicExceptions.isNotEmpty;
-
-  bool get hasPublicFunctions => publicFunctions.isNotEmpty;
-
-  bool get hasPublicProperties => publicProperties.isNotEmpty;
-
-  bool get hasPublicTypedefs => publicTypedefs.isNotEmpty;
-
   @override
   String get href {
     if (!identical(canonicalModelElement, this))
@@ -2068,9 +2145,8 @@ class Library extends ModelElement with Categorization {
 
   String get path => _libraryElement.definingCompilationUnit.name;
 
-  List<TopLevelVariable> _properties;
-
   /// All variables ("properties") except constants.
+  @override
   Iterable<TopLevelVariable> get properties {
     if (_properties == null) {
       _properties =
@@ -2079,11 +2155,9 @@ class Library extends ModelElement with Categorization {
     return _properties;
   }
 
-  Iterable<TopLevelVariable> get publicProperties =>
-      filterNonPublic(properties);
-
+  @override
   List<Typedef> get typedefs {
-    if (_typeDefs != null) return _typeDefs;
+    if (_typedefs != null) return _typedefs;
 
     Set<FunctionTypeAliasElement> elements = new Set();
     elements
@@ -2095,16 +2169,14 @@ class Library extends ModelElement with Categorization {
     elements.addAll(_exportedNamespace.definedNames.values
         .where((e) => e is FunctionTypeAliasElement)
         .cast<FunctionTypeAliasElement>());
-    _typeDefs = elements
+    _typedefs = elements
         .map((e) => new ModelElement.from(e, this, packageGraph) as Typedef)
         .toList(growable: false)
           ..sort(byName);
 
-    return _typeDefs;
+    return _typedefs;
   }
 
-  Iterable<Typedef> get publicTypedefs => filterNonPublic(typedefs);
-
   List<Class> get _allClasses {
     if (_classes != null) return _classes;
 
@@ -2226,6 +2298,12 @@ class Library extends ModelElement with Categorization {
     return name;
   }
 
+  static PackageMeta getPackageMeta(Element element) {
+    String sourcePath = element.source.fullName;
+    return new PackageMeta.fromDir(
+        new File(pathLib.canonicalize(sourcePath)).parent);
+  }
+
   static String getLibraryName(LibraryElement element) {
     String name = element.name;
     if (name == null || name.isEmpty) {
@@ -2515,7 +2593,7 @@ abstract class Privacy {
 /// from the public interface perspective.
 abstract class ModelElement extends Canonicalization
     with Privacy, Warnable, Nameable, SourceCodeMixin
-    implements Comparable, Documentable {
+    implements Comparable, Documentable, Indexable {
   final Element _element;
   // TODO(jcollins-g): This really wants a "member that has a type" class.
   final Member _originalMember;
@@ -2718,6 +2796,10 @@ abstract class ModelElement extends Canonicalization
     return newModelElement;
   }
 
+  /// Stub for mustache4dart, or it will search enclosing elements to find
+  /// names for members.
+  bool get hasCategoryNames => false;
+
   Set<Library> get exportedInLibraries {
     return library
         .packageGraph.libraryElementReexportedBy[this.element.library];
@@ -3170,6 +3252,7 @@ abstract class ModelElement extends Canonicalization
   }
 
   /// A human-friendly name for the kind of element this is.
+  @override
   String get kind;
 
   @override
@@ -3234,6 +3317,7 @@ abstract class ModelElement extends Canonicalization
   ModelElement get overriddenElement => null;
 
   int _overriddenDepth;
+  @override
   int get overriddenDepth {
     if (_overriddenDepth == null) {
       _overriddenDepth = 0;
@@ -3858,7 +3942,7 @@ abstract class ModelElement extends Canonicalization
 }
 
 /// A [ModelElement] for a [FunctionElement] that isn't part of a type definition.
-class ModelFunction extends ModelFunctionTyped {
+class ModelFunction extends ModelFunctionTyped with Categorization {
   ModelFunction(
       FunctionElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph);
@@ -3971,6 +4055,14 @@ abstract class Nameable {
   }
 }
 
+/// Something able to be indexed.
+abstract class Indexable implements Nameable {
+  String get fullyQualifiedName => name;
+  String get href;
+  String get kind;
+  int get overriddenDepth => 0;
+}
+
 class Operator extends Method {
   static const Map<String, String> friendlyNames = const {
     "[]": "get",
@@ -4407,13 +4499,13 @@ class PackageGraph {
       assert(allLibrariesAdded);
       // Help the user if they pass us a package that doesn't exist.
       for (String packageName in config.packageOrder) {
-        if (!packageMap.containsKey(packageName))
+        if (!packages.map((p) => p.name).contains(packageName))
           warnOnElement(
               null, PackageWarning.packageOrderGivesMissingPackageName,
               message:
-                  "${packageName}, packages: ${packageMap.keys.join(',')}");
+                  "${packageName}, packages: ${packages.map((p) => p.name).join(',')}");
       }
-      _publicPackages = filterNonPublic(packages).toList()..sort();
+      _publicPackages = packages.where((p) => p.isPublic).toList()..sort();
     }
     return _publicPackages;
   }
@@ -4428,8 +4520,7 @@ class PackageGraph {
 
   Map<LibraryElement, Set<Library>> _libraryElementReexportedBy = new Map();
   void _tagReexportsFor(
-      final Library topLevelLibrary,
-      final LibraryElement libraryElement,
+      final Library topLevelLibrary, final LibraryElement libraryElement,
       [ExportElement lastExportedElement]) {
     if (libraryElement == null) {
       // The first call to _tagReexportFor should not have a null libraryElement.
@@ -4445,9 +4536,7 @@ class PackageGraph {
     _libraryElementReexportedBy[libraryElement].add(topLevelLibrary);
     for (ExportElement exportedElement in libraryElement.exports) {
       _tagReexportsFor(
-          topLevelLibrary,
-          exportedElement.exportedLibrary,
-          exportedElement);
+          topLevelLibrary, exportedElement.exportedLibrary, exportedElement);
     }
   }
 
@@ -4820,19 +4909,70 @@ class PackageGraph {
   }
 }
 
+/// A set of [Class]es, [Enum]s, [TopLevelVariable]s, [ModelFunction]s,
+/// [Property]s, and [Typedef]s, possibly initialized after construction by
+/// accessing private member variables.  Do not call any methods or members
+/// excepting [name] and the private Lists below before finishing initialization
+/// of a [TopLevelContainer].
+abstract class TopLevelContainer extends Nameable {
+  List<Class> _classes;
+  List<Enum> _enums;
+  List<Class> _exceptions;
+  List<TopLevelVariable> _constants;
+  List<TopLevelVariable> _properties;
+  List<ModelFunction> _functions;
+  List<Typedef> _typedefs;
+
+  Iterable<Class> get classes => _classes;
+  Iterable<Enum> get enums => _enums;
+  Iterable<Class> get exceptions => _exceptions;
+  Iterable<TopLevelVariable> get constants => _constants;
+  Iterable<TopLevelVariable> get properties => _properties;
+  Iterable<ModelFunction> get functions => _functions;
+  Iterable<Typedef> get typedefs => _typedefs;
+
+  bool get hasPublicClasses => publicClasses.isNotEmpty;
+  bool get hasPublicConstants => publicConstants.isNotEmpty;
+  bool get hasPublicEnums => publicEnums.isNotEmpty;
+  bool get hasPublicExceptions => publicExceptions.isNotEmpty;
+  bool get hasPublicFunctions => publicFunctions.isNotEmpty;
+  bool get hasPublicProperties => publicProperties.isNotEmpty;
+  bool get hasPublicTypedefs => publicTypedefs.isNotEmpty;
+
+  Iterable<Class> get publicClasses => filterNonPublic(classes);
+  Iterable<TopLevelVariable> get publicConstants => filterNonPublic(constants);
+  Iterable<Class> get publicEnums => filterNonPublic(enums);
+  Iterable<Class> get publicExceptions => filterNonPublic(exceptions);
+  Iterable<ModelFunction> get publicFunctions => filterNonPublic(functions);
+  Iterable<TopLevelVariable> get publicProperties =>
+      filterNonPublic(properties);
+  Iterable<Typedef> get publicTypedefs => filterNonPublic(typedefs);
+
+  @override
+  String toString() => name;
+}
+
 /// A set of libraries, initialized after construction by accessing [_libraries].
 /// Do not cache return values of any methods or members excepting [_libraries]
 /// and [name] before finishing initialization of a [LibraryContainer].
 abstract class LibraryContainer extends Nameable
     implements Comparable<LibraryContainer> {
   final List<Library> _libraries = [];
+  List<Library> get libraries => _libraries;
+
+  PackageGraph get packageGraph;
+  Iterable<Library> get publicLibraries => filterNonPublic(libraries);
+  bool get hasPublicLibraries => publicLibraries.isNotEmpty;
 
   /// The name of the container or object that this LibraryContainer is a part
   /// of.  Used for sorting in [containerOrder].
   String get enclosingName;
 
-  List<Library> get libraries => _libraries;
-  Iterable<Library> get publicLibraries => filterNonPublic(libraries);
+  /// Order by which this container should be sorted.
+  List<String> get containerOrder;
+
+  /// Sorting key.  [containerOrder] should contain these.
+  String get sortKey => name;
 
   @override
   String toString() => name;
@@ -4841,9 +4981,6 @@ abstract class LibraryContainer extends Nameable
   /// that only represent a part of the SDK.
   bool get isSdk => false;
 
-  /// Order by which this container should be sorted.
-  List<String> get containerOrder;
-
   /// Returns:
   /// -1 if this container is listed in [containerOrder].
   /// 0 if this container is named the same as the [enclosingName].
@@ -4851,10 +4988,10 @@ abstract class LibraryContainer extends Nameable
   /// 2 if this group has a name that contains the name [enclosingName].
   /// 3 otherwise.
   int get _group {
-    if (containerOrder.contains(name)) return -1;
-    if (equalsIgnoreAsciiCase(name, enclosingName)) return 0;
+    if (containerOrder.contains(sortKey)) return -1;
+    if (equalsIgnoreAsciiCase(sortKey, enclosingName)) return 0;
     if (isSdk) return 1;
-    if (name.toLowerCase().contains(enclosingName.toLowerCase())) return 2;
+    if (sortKey.toLowerCase().contains(enclosingName.toLowerCase())) return 2;
     return 3;
   }
 
@@ -4862,38 +4999,214 @@ abstract class LibraryContainer extends Nameable
   int compareTo(LibraryContainer other) {
     if (_group == other._group) {
       if (_group == -1) {
-        return Comparable.compare(
-            containerOrder.indexOf(name), containerOrder.indexOf(other.name));
+        return Comparable.compare(containerOrder.indexOf(sortKey),
+            containerOrder.indexOf(other.sortKey));
       } else {
-        return name.toLowerCase().compareTo(other.name.toLowerCase());
+        return sortKey.toLowerCase().compareTo(other.sortKey.toLowerCase());
       }
     }
     return Comparable.compare(_group, other._group);
   }
 }
 
-/// A category is a subcategory of a package, containing libraries tagged
-/// with a @category identifier.  Comparable so it can be sorted according to
-/// [DartdocOptionContext.categoryOrder].
-class Category extends LibraryContainer {
-  final String _name;
+abstract class MarkdownFileDocumentation
+    implements Documentable, Canonicalization {
+  DocumentLocation get documentedWhere;
+
+  @override
+  String get documentation => documentationFile?.contents;
+
+  Documentation __documentation;
+  Documentation get _documentation {
+    if (__documentation != null) return __documentation;
+    __documentation = new Documentation.forElement(this);
+    return __documentation;
+  }
+
+  @override
+  String get documentationAsHtml => _documentation.asHtml;
+
+  @override
+  bool get hasDocumentation =>
+      documentationFile != null && documentationFile.contents.isNotEmpty;
+
+  @override
+  bool get hasExtendedDocumentation =>
+      documentation != null && documentation.isNotEmpty;
+
+  @override
+  bool get isDocumented;
+
+  @override
+  String get oneLineDoc => __documentation.asOneLiner;
+
+  FileContents get documentationFile;
 
+  @override
+  String get location => pathLib.toUri(documentationFile.file.path).toString();
+
+  @override
+  Set<String> get locationPieces => new Set.from(<String>[location]);
+}
+
+/// A category is a subcategory of a package, containing libraries tagged
+/// with a @category identifier.
+class Category extends Nameable
+    with
+        Warnable,
+        Canonicalization,
+        MarkdownFileDocumentation,
+        LibraryContainer,
+        TopLevelContainer,
+        Indexable
+    implements Documentable {
   /// All libraries in [libraries] must come from [package].
-  final Package package;
-  final DartdocOptionContext config;
+  Package package;
+  String _name;
+  @override
+  DartdocOptionContext config;
+  final Set<Categorization> _allItems = new Set();
+
+  Category(this._name, this.package, this.config) {
+    _enums = [];
+    _exceptions = [];
+    _classes = [];
+    _constants = [];
+    _properties = [];
+    _functions = [];
+    _typedefs = [];
+  }
+
+  void addItem(Categorization c) {
+    if (_allItems.contains(c)) return;
+    _allItems.add(c);
+    if (c is Library) {
+      _libraries.add(c);
+    } else if (c is Enum) {
+      _enums.add(c);
+    } else if (c is Class) {
+      if (c.isErrorOrException) {
+        _exceptions.add(c);
+      } else {
+        _classes.add(c);
+      }
+    } else if (c is TopLevelVariable) {
+      if (c.isConst) {
+        _constants.add(c);
+      } else {
+        _properties.add(c);
+      }
+    } else if (c is ModelFunction) {
+      _functions.add(c);
+    } else if (c is Typedef) {
+      _typedefs.add(c);
+    } else {
+      throw UnimplementedError("Unrecognized element");
+    }
+  }
 
-  Category(this._name, this.package, this.config);
+  @override
+  // TODO(jcollins-g): make [Category] a [Warnable]?
+  Warnable get enclosingElement => null;
 
   @override
-  String get name => _name;
+  Element get element => null;
+
+  @override
+  String get name => categoryDefinition?.displayName ?? _name;
 
   @override
-  List<String> get containerOrder => config.categoryOrder;
+  String get sortKey => _name;
+
+  @override
+  List<String> get containerOrder => config.categories.categoryOrder;
 
   @override
   String get enclosingName => package.name;
 
+  @override
   PackageGraph get packageGraph => package.packageGraph;
+
+  @override
+  Library get canonicalLibrary => null;
+
+  @override
+  List<Locatable> get documentationFrom => [this];
+
+  @override
+  DocumentLocation get documentedWhere => package.documentedWhere;
+
+  bool _isDocumented;
+  @override
+  bool get isDocumented {
+    if (_isDocumented == null) {
+      _isDocumented = documentedWhere != DocumentLocation.missing &&
+          documentationFile != null;
+    }
+    return _isDocumented;
+  }
+
+  @override
+  String get fullyQualifiedName => name;
+
+  @override
+  String get href =>
+      isCanonical ? '${package.baseHref}topics/${name}-topic.html' : null;
+
+  String get linkedName {
+    String unbrokenCategoryName = name.replaceAll(' ', '&nbsp;');
+    if (isDocumented) {
+      return '<a href="$href">$unbrokenCategoryName</a>';
+    } else {
+      return unbrokenCategoryName;
+    }
+  }
+
+  String _categoryNumberClass;
+
+  /// The position in the container order for this category.
+  String get categoryNumberClass {
+    if (_categoryNumberClass == null) {
+      _categoryNumberClass = "cp-${package.categories.indexOf(this)}";
+    }
+    return _categoryNumberClass;
+  }
+
+  /// Category name used in template as part of the class.
+  String get spanClass => name.split(' ').join('-').toLowerCase();
+
+  CategoryDefinition get categoryDefinition =>
+      config.categories.categoryDefinitions[sortKey];
+
+  @override
+  bool get isCanonical => categoryDefinition != null;
+
+  @override
+  // TODO(jcollins-g): Category?  Topic?  Group?  Stuff?  Find a better name.
+  String get kind => 'Topic';
+
+  FileContents _documentationFile;
+  @override
+  FileContents get documentationFile {
+    if (_documentationFile == null) {
+      if (categoryDefinition?.documentationMarkdown != null) {
+        _documentationFile = new FileContents(
+            new File(categoryDefinition.documentationMarkdown));
+      }
+    }
+    return _documentationFile;
+  }
+
+  @override
+  void warn(PackageWarning kind,
+      {String message,
+      Iterable<Locatable> referredFrom,
+      Iterable<String> extendedDebug}) {
+    packageGraph.warnOnElement(this, kind,
+        message: message,
+        referredFrom: referredFrom,
+        extendedDebug: extendedDebug);
+  }
 }
 
 /// For a given package, indicate with this enum whether it should be documented
@@ -4971,9 +5284,6 @@ class Package extends LibraryContainer
   /// in this package.
   bool get hasCategories => categories.isNotEmpty;
 
-  @override
-  List<String> get containerOrder => packageGraph.config.packageOrder;
-
   LibraryContainer get defaultCategory => nameToCategory[null];
 
   String _documentationAsHtml;
@@ -5100,19 +5410,27 @@ class Package extends LibraryContainer
   /// A map of category name to the category itself.
   Map<String, Category> get nameToCategory {
     if (_nameToCategory.isEmpty) {
-      _nameToCategory[null] = new Category(null, this, config);
-      for (Library lib in libraries) {
-        String category = lib.categoryName;
+      Category categoryFor(String category) {
         _nameToCategory.putIfAbsent(
             category, () => new Category(category, this, config));
-        _nameToCategory[category]._libraries.add(lib);
+        return _nameToCategory[category];
+      }
+
+      _nameToCategory[null] = new Category(null, this, config);
+      for (Categorization c in libraries.expand((l) => l
+          .allCanonicalModelElements
+          .where((e) => e is Categorization)
+          .cast<Categorization>())) {
+        for (String category in c.categoryNames) {
+          categoryFor(category).addItem(c);
+        }
       }
     }
     return _nameToCategory;
   }
 
-  List<LibraryContainer> _categories;
-  List<LibraryContainer> get categories {
+  List<Category> _categories;
+  List<Category> get categories {
     if (_categories == null) {
       _categories = nameToCategory.values.where((c) => c.name != null).toList()
         ..sort();
@@ -5120,6 +5438,13 @@ class Package extends LibraryContainer
     return _categories;
   }
 
+  Iterable<LibraryContainer> get categoriesWithPublicLibraries =>
+      categories.where((c) => c.publicLibraries.isNotEmpty);
+
+  Iterable<Category> get documentedCategories =>
+      categories.where((c) => c.isDocumented);
+  bool get hasDocumentedCategories => documentedCategories.isNotEmpty;
+
   DartdocOptionContext _config;
   @override
   DartdocOptionContext get config {
@@ -5166,6 +5491,9 @@ class Package extends LibraryContainer
 
   @override
   Element get element => null;
+
+  @override
+  List<String> get containerOrder => config.packageOrder;
 }
 
 class Parameter extends ModelElement implements EnclosedElement {
@@ -5356,7 +5684,7 @@ abstract class TypeParameters implements ModelElement {
 
 /// Top-level variables. But also picks up getters and setters?
 class TopLevelVariable extends ModelElement
-    with GetterSetterCombo
+    with GetterSetterCombo, SourceCodeMixin, Categorization
     implements EnclosedElement {
   @override
   final Accessor getter;
@@ -5437,7 +5765,7 @@ class TopLevelVariable extends ModelElement
 }
 
 class Typedef extends ModelElement
-    with TypeParameters
+    with SourceCodeMixin, TypeParameters, Categorization
     implements EnclosedElement {
   Typedef(FunctionTypeAliasElement element, Library library,
       PackageGraph packageGraph)
diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart
index f54d33ca2f..a9432c50b3 100644
--- a/lib/src/model_utils.dart
+++ b/lib/src/model_utils.dart
@@ -201,7 +201,7 @@ class _HashableList {
   }
 
   @override
-  get hashCode => _hashCache ??= hashObjects(_source);
+  int get hashCode => _hashCache ??= hashObjects(_source);
 }
 
 /// Like [Memoizer], except in checked mode will validate that the value of the
diff --git a/lib/src/version.dart b/lib/src/version.dart
index a18bd98644..43e65405cd 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '0.20.4';
+const packageVersion = '0.21.0-dev.0';
diff --git a/lib/templates/_callable.html b/lib/templates/_callable.html
index 08ebd5f2a0..967230cde9 100644
--- a/lib/templates/_callable.html
+++ b/lib/templates/_callable.html
@@ -2,6 +2,7 @@
   <span class="name{{#isDeprecated}} deprecated{{/isDeprecated}}">{{{linkedName}}}</span>{{{linkedGenericParameters}}}<span class="signature">(<wbr>{{{ linkedParamsNoMetadata }}})
     <span class="returntype parameter">&#8594; {{{ linkedReturnType }}}</span>
   </span>
+  {{>categorization}}
 </dt>
 <dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
   {{{ oneLineDoc }}}
diff --git a/lib/templates/_categorization.html b/lib/templates/_categorization.html
new file mode 100644
index 0000000000..6f098cf80a
--- /dev/null
+++ b/lib/templates/_categorization.html
@@ -0,0 +1,5 @@
+{{#hasCategoryNames}}
+  {{#displayedCategories}}
+  <span class="category {{spanClass}} {{categoryNumberClass}} {{#isDocumented}}linked{{/isDocumented}}" title="This is part of the {{name}} {{kind}}.">{{{linkedName}}}</span>
+  {{/displayedCategories}}
+{{/hasCategoryNames}}
diff --git a/lib/templates/_class.html b/lib/templates/_class.html
index 11d3d823f7..883309d075 100644
--- a/lib/templates/_class.html
+++ b/lib/templates/_class.html
@@ -1,5 +1,5 @@
 <dt id="{{htmlId}}">
-  <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span>
+  <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span> {{>categorization}}
 </dt>
 <dd>
   {{{ oneLineDoc }}}
diff --git a/lib/templates/_constant.html b/lib/templates/_constant.html
index 353a3be8ae..41b7faf683 100644
--- a/lib/templates/_constant.html
+++ b/lib/templates/_constant.html
@@ -1,6 +1,7 @@
 <dt id="{{htmlId}}" class="constant">
   <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{ linkedName }}}</span>
   <span class="signature">&#8594; const {{{ linkedReturnType }}}</span>
+  {{>categorization}}
 </dt>
 <dd>
   {{{ oneLineDoc }}}
diff --git a/lib/templates/_library.html b/lib/templates/_library.html
index 6ef3a260d4..5513d2799f 100644
--- a/lib/templates/_library.html
+++ b/lib/templates/_library.html
@@ -1,5 +1,5 @@
 <dt id="{{htmlId}}">
-  <span class="name">{{{ linkedName }}}</span>
+  <span class="name">{{{ linkedName }}}</span> {{>categorization}}
 </dt>
 <dd>
   {{#isDocumented}}{{{ oneLineDoc }}}{{/isDocumented}}
diff --git a/lib/templates/_packages.html b/lib/templates/_packages.html
index 7b8b8a1150..f7ae798cfa 100644
--- a/lib/templates/_packages.html
+++ b/lib/templates/_packages.html
@@ -1,6 +1,12 @@
 <ol>
   {{#packageGraph.localPackages}}
     {{#isFirstPackage}}
+      {{#hasDocumentedCategories}}
+      <li class="section-title">Topics</li>
+        {{#documentedCategories}}
+        <li>{{{linkedName}}}</li>
+        {{/documentedCategories}}
+      {{/hasDocumentedCategories}}
       <li class="section-title">Libraries</li>
     {{/isFirstPackage}}
     {{^isFirstPackage}}
@@ -9,11 +15,11 @@
     {{#defaultCategory.publicLibraries}}
       <li>{{{linkedName}}}</li>
     {{/defaultCategory.publicLibraries}}
-    {{#categories}}
+    {{#categoriesWithPublicLibraries}}
       <li class="section-subtitle">{{name}}</li>
       {{#publicLibraries}}
         <li class="section-subitem">{{{linkedName}}}</li>
       {{/publicLibraries}}
-    {{/categories}}
+    {{/categoriesWithPublicLibraries}}
   {{/packageGraph.localPackages}}
 </ol>
diff --git a/lib/templates/_property.html b/lib/templates/_property.html
index 184be87084..6921029b47 100644
--- a/lib/templates/_property.html
+++ b/lib/templates/_property.html
@@ -1,6 +1,6 @@
 <dt id="{{htmlId}}" class="property{{ #isInherited }} inherited{{ /isInherited}}">
   <span class="name">{{{linkedName}}}</span>
-  <span class="signature">{{{ arrow }}} {{{ linkedReturnType }}}</span>
+  <span class="signature">{{{ arrow }}} {{{ linkedReturnType }}}</span> {{>categorization}}
 </dt>
 <dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
   {{{ oneLineDoc }}}
diff --git a/lib/templates/_sidebar_for_category.html b/lib/templates/_sidebar_for_category.html
new file mode 100644
index 0000000000..4be63996ab
--- /dev/null
+++ b/lib/templates/_sidebar_for_category.html
@@ -0,0 +1,57 @@
+<ol>
+  {{#self.hasPublicLibraries}}
+  <li class="section-title"><a href="{{self.href}}#libraries">Libraries</a></li>
+  {{#self.publicLibraries}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicLibraries}}
+  {{/self.hasPublicLibraries}}
+
+  {{#self.hasPublicClasses}}
+  <li class="section-title"><a href="{{self.href}}#classes">Classes</a></li>
+  {{#self.publicClasses}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicClasses}}
+  {{/self.hasPublicClasses}}
+
+  {{#self.hasPublicConstants}}
+  <li class="section-title"><a href="{{self.href}}#constants">Constants</a></li>
+  {{#self.publicConstants}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicConstants}}
+  {{/self.hasPublicConstants}}
+
+  {{#self.hasPublicProperties}}
+  <li class="section-title"><a href="{{self.href}}#properties">Properties</a></li>
+  {{#self.publicProperties}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicProperties}}
+  {{/self.hasPublicProperties}}
+
+  {{#self.hasPublicFunctions}}
+  <li class="section-title"><a href="{{self.href}}#functions">Functions</a></li>
+  {{#self.publicFunctions}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicFunctions}}
+  {{/self.hasPublicFunctions}}
+
+  {{#self.hasPublicEnums}}
+  <li class="section-title"><a href="{{self.href}}#enums">Enums</a></li>
+  {{#self.publicEnums}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicEnums}}
+  {{/self.hasPublicEnums}}
+
+  {{#self.hasPublicTypedefs}}
+  <li class="section-title"><a href="{{self.href}}#typedefs">Typedefs</a></li>
+  {{#self.publicTypedefs}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicTypedefs}}
+  {{/self.hasPublicTypedefs}}
+
+  {{#self.hasPublicExceptions}}
+  <li class="section-title"><a href="{{self.href}}#exceptions">Exceptions</a></li>
+  {{#self.publicExceptions}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicExceptions}}
+  {{/self.hasPublicExceptions}}
+</ol>
diff --git a/lib/templates/category.html b/lib/templates/category.html
new file mode 100644
index 0000000000..69a6ccf6f1
--- /dev/null
+++ b/lib/templates/category.html
@@ -0,0 +1,115 @@
+{{>head}}
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
+    {{>packages}}
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    {{#self}}
+      <h1>{{name}} {{kind}}</h1>
+      {{>documentation}}
+
+      {{#hasPublicLibraries}}
+        <section class="summary offset-anchor" id="libraries">
+        <h2>Libraries</h2>
+
+        <dl>
+          {{#publicLibraries}}
+            {{>library}}
+          {{/publicLibraries}}
+        </dl>
+        </section>
+      {{/hasPublicLibraries}}
+
+      {{#hasPublicClasses}}
+        <section class="summary offset-anchor" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+          {{#publicClasses}}
+            {{>class}}
+          {{/publicClasses}}
+        </dl>
+      </section>
+      {{/hasPublicClasses}}
+
+      {{#hasPublicConstants}}
+      <section class="summary offset-anchor" id="constants">
+        <h2>Constants</h2>
+
+        <dl class="properties">
+          {{#publicConstants}}
+            {{>constant}}
+          {{/publicConstants}}
+        </dl>
+      </section>
+      {{/hasPublicConstants}}
+
+      {{#hasPublicProperties}}
+      <section class="summary offset-anchor" id="properties">
+        <h2>Properties</h2>
+
+        <dl class="properties">
+          {{#publicProperties}}
+            {{>property}}
+          {{/publicProperties}}
+        </dl>
+      </section>
+      {{/hasPublicProperties}}
+
+      {{#hasPublicFunctions}}
+      <section class="summary offset-anchor" id="functions">
+        <h2>Functions</h2>
+
+        <dl class="callables">
+          {{#publicFunctions}}
+            {{>callable}}
+          {{/publicFunctions}}
+        </dl>
+      </section>
+      {{/hasPublicFunctions}}
+
+      {{#hasPublicEnums}}
+      <section class="summary offset-anchor" id="enums">
+        <h2>Enums</h2>
+
+        <dl>
+          {{#publicEnums}}
+            {{>class}}
+          {{/publicEnums}}
+        </dl>
+      </section>
+      {{/hasPublicEnums}}
+
+      {{#hasPublicTypedefs}}
+      <section class="summary offset-anchor" id="typedefs">
+        <h2>Typedefs</h2>
+
+        <dl class="callables">
+          {{#publicTypedefs}}
+            {{>callable}}
+          {{/publicTypedefs}}
+        </dl>
+      </section>
+      {{/hasPublicTypedefs}}
+
+      {{#hasPublicExceptions}}
+      <section class="summary offset-anchor" id="exceptions">
+        <h2>Exceptions / Errors</h2>
+
+        <dl>
+          {{#publicExceptions}}
+            {{>class}}
+          {{/publicExceptions}}
+        </dl>
+      </section>
+      {{/hasPublicExceptions}}
+    {{/self}}
+
+  </div> <!-- /.main-content -->
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>{{self.name}} {{self.kind}}</h5>
+    {{>sidebar_for_category}}
+  </div><!--/sidebar-offcanvas-right-->
+{{>footer}}
diff --git a/lib/templates/class.html b/lib/templates/class.html
index a3aab8fb53..0bb21dc499 100644
--- a/lib/templates/class.html
+++ b/lib/templates/class.html
@@ -6,7 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
+    {{#self}}
+      <h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
 
     {{#clazz}}
     {{>documentation}}
diff --git a/lib/templates/enum.html b/lib/templates/enum.html
index d0c13a50c5..73678fa2f7 100644
--- a/lib/templates/enum.html
+++ b/lib/templates/enum.html
@@ -6,7 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{self.name}} {{self.kind}}</h1>
+    {{#self}}
+    <h1>{{{name}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
 
     {{#eNum}}
     {{>documentation}}
diff --git a/lib/templates/function.html b/lib/templates/function.html
index 4b6f826f2a..b15a512388 100644
--- a/lib/templates/function.html
+++ b/lib/templates/function.html
@@ -6,7 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
+    {{#self}}
+    <h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
 
     {{#function}}
     <section class="multi-line-signature">
diff --git a/lib/templates/index.html b/lib/templates/index.html
index 41a041fab4..389c31e6d3 100644
--- a/lib/templates/index.html
+++ b/lib/templates/index.html
@@ -23,12 +23,12 @@ <h2>{{name}}</h2>
           {{#defaultCategory.publicLibraries}}
             {{>library}}
           {{/defaultCategory.publicLibraries}}
-          {{#categories}}
+          {{#categoriesWithPublicLibraries}}
             <h3>{{name}}</h3>
             {{#publicLibraries}}
               {{>library}}
             {{/publicLibraries}}
-          {{/categories}}
+          {{/categoriesWithPublicLibraries}}
           </dl>
         </section>
       {{/localPackages}}
diff --git a/lib/templates/library.html b/lib/templates/library.html
index e735a4ded4..de8b414f95 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -6,7 +6,9 @@ <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind"
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{self.name}} {{self.kind}}</h1>
+    {{#self}}
+    <h1>{{{name}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
 
     {{#library}}
     {{>documentation}}
diff --git a/lib/templates/top_level_constant.html b/lib/templates/top_level_constant.html
index 74c5b14774..278dfeef6c 100644
--- a/lib/templates/top_level_constant.html
+++ b/lib/templates/top_level_constant.html
@@ -6,9 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{self.name}} {{self.kind}}</h1>
-
     {{#self}}
+    <h1>{{{name}}} {{kind}} {{>categorization}}</h1>
+
     <section class="multi-line-signature">
       {{>name_summary}}
       =
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index c441796110..3ee370dab9 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -6,9 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{self.name}} {{self.kind}}</h1>
-
     {{#self}}
+    <h1>{{{name}}} {{kind}} {{>categorization}}</h1>
+
     {{#hasNoGetterSetter}}
     <section class="multi-line-signature">
       <span class="returntype">{{{ linkedReturnType }}}</span>
diff --git a/lib/templates/typedef.html b/lib/templates/typedef.html
index a642d7e723..ac77da7e7e 100644
--- a/lib/templates/typedef.html
+++ b/lib/templates/typedef.html
@@ -6,7 +6,9 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>{{{self.nameWithGenerics}}} {{self.kind}}</h1>
+    {{#self}}
+    <h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
 
     <section class="multi-line-signature">
       {{#typeDef}}
diff --git a/pubspec.yaml b/pubspec.yaml
index 12b65af9b5..1a279a7f19 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.20.4
+version: 0.21.0-dev.0
 author: Dart Team <misc@dartlang.org>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index 5244c7bf6c..6076df0773 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -9,6 +9,33 @@ import 'dart:io';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
+import 'package:yaml/yaml.dart';
+
+class ConvertedOption {
+  final String param1;
+  final String param2;
+  final String myContextPath;
+
+  ConvertedOption._(this.param1, this.param2, this.myContextPath);
+
+  static ConvertedOption fromYamlMap(YamlMap yamlMap, pathLib.Context context) {
+    String p1;
+    String p2;
+    String contextPath = context.current;
+
+    for (MapEntry entry in yamlMap.entries) {
+      switch (entry.key.toString()) {
+        case 'param1':
+          p1 = entry.value.toString();
+          break;
+        case 'param2':
+          p2 = entry.value.toString();
+          break;
+      }
+    }
+    return new ConvertedOption._(p1, p2, contextPath);
+  }
+}
 
 void main() {
   DartdocOptionSet dartdocOptionSetFiles;
@@ -82,6 +109,11 @@ void main() {
     dartdocOptionSetFiles.add(new DartdocOptionFileOnly<String>(
         'nonCriticalDirOption', null,
         isDir: true));
+    dartdocOptionSetFiles.add(new DartdocOptionFileOnly<ConvertedOption>(
+      'convertThisMap',
+      null,
+      convertYamlToType: ConvertedOption.fromYamlMap,
+    ));
 
     dartdocOptionSetArgs = new DartdocOptionSet('dartdoc');
     dartdocOptionSetArgs
@@ -159,6 +191,9 @@ dartdoc:
   dirOption: "notHere"
   nonCriticalFileOption: "whatever"
   double: 3.3
+  convertThisMap:
+    param1: value1
+    param2: value2
         ''');
     dartdocOptionsTwo.writeAsStringSync('''
 dartdoc:
@@ -487,6 +522,18 @@ dartdoc:
   });
 
   group('new style dartdoc file-only options', () {
+    test('DartdocOptionSetFile can convert YamlMaps to structured data', () {
+      ConvertedOption converted =
+          dartdocOptionSetFiles['convertThisMap'].valueAt(firstDir);
+
+      expect(converted.param1, equals('value1'));
+      expect(converted.param2, equals('value2'));
+      expect(
+          converted.myContextPath, equals(pathLib.canonicalize(firstDir.path)));
+      expect(
+          dartdocOptionSetFiles['convertThisMap'].valueAt(secondDir), isNull);
+    });
+
     test('DartdocOptionSetFile checks file existence when appropriate', () {
       String errorMessage;
       try {
diff --git a/test/model_test.dart b/test/model_test.dart
index 2c73fb9fba..b877c55a02 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -25,6 +25,8 @@ class TestLibraryContainer extends LibraryContainer {
   final String name;
   @override
   bool get isSdk => false;
+  @override
+  final PackageGraph packageGraph = null;
 
   TestLibraryContainer(
       this.name, this.containerOrder, LibraryContainer enclosingContainer) {
@@ -113,22 +115,106 @@ void main() {
   });
 
   group('Category', () {
+    test(
+        'Verify auto-included dependencies do not use default package category definitions',
+        () {
+      Class IAmAClassWithCategories = ginormousPackageGraph.localPackages
+          .firstWhere((Package p) => p.name == 'test_package_imported')
+          .publicLibraries
+          .firstWhere((Library l) => l.name == 'categoriesExported')
+          .publicClasses
+          .firstWhere((Class c) => c.name == 'IAmAClassWithCategories');
+      expect(IAmAClassWithCategories.hasCategoryNames, isTrue);
+      expect(IAmAClassWithCategories.categories.length, equals(1));
+      expect(
+          IAmAClassWithCategories.categories.first.name, equals('Excellent'));
+      expect(IAmAClassWithCategories.displayedCategories, isEmpty);
+    });
+
+    // For flutter, we allow reexports to pick up categories from the package
+    // they are exposed in.
+    test('Verify that reexported classes pick up categories', () {
+      Class IAmAClassWithCategoriesReexport = ginormousPackageGraph
+          .localPackages
+          .firstWhere((Package p) => p.name == 'test_package')
+          .publicLibraries
+          .firstWhere((Library l) => l.name == 'fake')
+          .publicClasses
+          .firstWhere((Class c) => c.name == 'IAmAClassWithCategories');
+      expect(IAmAClassWithCategoriesReexport.hasCategoryNames, isTrue);
+      expect(IAmAClassWithCategoriesReexport.categories.length, equals(1));
+      expect(IAmAClassWithCategoriesReexport.categories.first.name,
+          equals('Superb'));
+      expect(IAmAClassWithCategoriesReexport.displayedCategories, isNotEmpty);
+      Category category =
+          IAmAClassWithCategoriesReexport.displayedCategories.first;
+      expect(category.spanClass, equals('superb'));
+      expect(category.categoryNumberClass, equals('cp-0'));
+      expect(category.isDocumented, isTrue);
+    });
+
+    test('Verify that multiple categories work correctly', () {
+      Library fakeLibrary = ginormousPackageGraph.localPackages
+          .firstWhere((Package p) => p.name == 'test_package')
+          .publicLibraries
+          .firstWhere((Library l) => l.name == 'fake');
+      Class BaseForDocComments = fakeLibrary.publicClasses
+          .firstWhere((Class c) => c.name == 'BaseForDocComments');
+      Class SubForDocComments = fakeLibrary.publicClasses
+          .firstWhere((Class c) => c.name == 'SubForDocComments');
+      expect(BaseForDocComments.hasCategoryNames, isTrue);
+      // Display both, with the correct order and display name.
+      expect(BaseForDocComments.displayedCategories.length, equals(2));
+      expect(
+          BaseForDocComments.displayedCategories.first.name, equals('Superb'));
+      expect(
+          BaseForDocComments.displayedCategories.last.name, equals('Unreal'));
+      // Subclasses do not inherit category information.
+      expect(SubForDocComments.hasCategoryNames, isTrue);
+      expect(SubForDocComments.categories, hasLength(1));
+      expect(SubForDocComments.categories.first.isDocumented, isFalse);
+      expect(SubForDocComments.displayedCategories, isEmpty);
+    });
+
     test('Verify categories for test_package', () {
       expect(packageGraph.localPackages.length, equals(1));
       expect(packageGraph.localPackages.first.hasCategories, isTrue);
       List<Category> packageCategories =
           packageGraph.localPackages.first.categories;
-      expect(packageCategories.length, equals(3));
-      expect(packageCategories.map((c) => c.name).toList(),
-          orderedEquals(['Real Libraries', 'Unreal', 'Misc']));
+      expect(packageCategories.length, equals(6));
+      expect(
+          packageGraph.localPackages.first.categoriesWithPublicLibraries.length,
+          equals(3));
+      expect(
+          packageCategories.map((c) => c.name).toList(),
+          orderedEquals([
+            'Superb',
+            'Real Libraries',
+            'Unreal',
+            'Misc',
+            'More Excellence',
+            'NotSoExcellent'
+          ]));
       expect(packageCategories.map((c) => c.libraries.length).toList(),
-          orderedEquals([2, 2, 1]));
+          orderedEquals([0, 3, 2, 1, 0, 0]));
       expect(
           packageGraph
               .localPackages.first.defaultCategory.publicLibraries.length,
           equals(3));
     });
 
+    test('Verify libraries with multiple categories show up in multiple places',
+        () {
+      List<Category> packageCategories =
+          packageGraph.publicPackages.first.categories;
+      Category realLibraries =
+          packageCategories.firstWhere((c) => c.name == 'Real Libraries');
+      Category misc = packageCategories.firstWhere((c) => c.name == 'Misc');
+      expect(
+          realLibraries.libraries.map((l) => l.name), contains('two_exports'));
+      expect(misc.libraries.map((l) => l.name), contains('two_exports'));
+    });
+
     test('Verify that packages without categories get handled', () {
       expect(packageGraphSmall.localPackages.length, equals(1));
       expect(packageGraphSmall.localPackages.first.hasCategories, isFalse);
diff --git a/test/src/utils.dart b/test/src/utils.dart
index c96c47d196..e177d72c28 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -56,7 +56,7 @@ void delete(Directory dir) {
   if (dir.existsSync()) dir.deleteSync(recursive: true);
 }
 
-init() async {
+void init() async {
   sdkDir = defaultSdkDir;
   sdkPackageMeta = new PackageMeta.fromDir(sdkDir);
 
diff --git a/test/utils_test.dart b/test/utils_test.dart
index ee6b30a2e2..59539c2876 100644
--- a/test/utils_test.dart
+++ b/test/utils_test.dart
@@ -15,7 +15,7 @@ void main() {
   // is the length of that left margin.
   var multilineStringMargin = ' ' * 6;
 
-  trimMargin(s) => s
+  String trimMargin(s) => s
       // Trim the left margin of the first line.
       .replaceFirst('$multilineStringMargin  ', '')
       // Trim the left margin of every following line.
@@ -23,7 +23,7 @@ void main() {
       // Trim the last line.
       .replaceFirst(new RegExp('\n$multilineStringMargin\$'), '');
 
-  expectCorrectDocumentation() =>
+  void expectCorrectDocumentation() =>
       expect(stripComments(trimMargin(comment)), trimMargin(documentation));
 
   group('///-style', () {
diff --git a/testing/test_package/Excellent.md b/testing/test_package/Excellent.md
new file mode 100644
index 0000000000..cdba3d4a70
--- /dev/null
+++ b/testing/test_package/Excellent.md
@@ -0,0 +1,3 @@
+This is the documentation for our category.
+
+Wheee!
diff --git a/testing/test_package/Unreal.md b/testing/test_package/Unreal.md
new file mode 100644
index 0000000000..e1e126050f
--- /dev/null
+++ b/testing/test_package/Unreal.md
@@ -0,0 +1,3 @@
+This is the documentation for the Unreal category,
+not to be confused with [Real Libraries].  Unreal holds
+more than just libraries.
diff --git a/testing/test_package/dartdoc_options.yaml b/testing/test_package/dartdoc_options.yaml
index 83ad422ac3..1971efc25e 100644
--- a/testing/test_package/dartdoc_options.yaml
+++ b/testing/test_package/dartdoc_options.yaml
@@ -1,2 +1,8 @@
 dartdoc:
-  categoryOrder: ["Real Libraries", "Unreal"]
+  categories:
+    Excellent:
+      markdown: "Excellent.md"
+      displayName: "Superb"
+    Real Libraries:
+    Unreal:
+      markdown: "Unreal.md"
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 9a50230415..b4791759ad 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -53,6 +53,10 @@ import 'css.dart' as css;
 import 'example.dart';
 import 'two_exports.dart' show BaseClass;
 
+// ignore: uri_does_not_exist
+export 'package:test_package_imported/categoryExporting.dart'
+    show IAmAClassWithCategories;
+
 abstract class ImplementingThingy implements BaseThingy {}
 
 abstract class BaseThingy {
@@ -708,6 +712,14 @@ class SpecialList<E> extends ListBase<E> {
 /// This inherits operators.
 class ExtraSpecialList<E> extends SpecialList {}
 
+/// Category information should not follow inheritance.
+///
+/// {@category Excellent}
+/// {@category Unreal}
+/// {@category More Excellence}
+/// {@subCategory Things and Such}
+/// {@image https://flutter.io/images/catalog-widget-placeholder.png}
+/// {@samples https://flutter.io}
 class BaseForDocComments {
   /// Takes a [value] and returns a String.
   ///
@@ -756,6 +768,7 @@ class BaseForDocComments {
 }
 
 /// Testing if docs for inherited method are correct.
+/// {@category NotSoExcellent}
 class SubForDocComments extends BaseForDocComments {
   /// Reference to [foo] and [bar]
   void localMethod(String foo, bar) {}
diff --git a/testing/test_package/lib/two_exports.dart b/testing/test_package/lib/two_exports.dart
index c3e26f3b70..7ce33c2500 100644
--- a/testing/test_package/lib/two_exports.dart
+++ b/testing/test_package/lib/two_exports.dart
@@ -1,3 +1,4 @@
+/// {@category Real Libraries}
 /// {@category Misc}
 library two_exports;
 
diff --git a/testing/test_package_docs/__404error.html b/testing/test_package_docs/__404error.html
index f536a6bef0..938d312a29 100644
--- a/testing/test_package_docs/__404error.html
+++ b/testing/test_package_docs/__404error.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.20.4">
+  <meta name="generator" content="made with love by dartdoc 0.21.0-dev.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
@@ -34,6 +34,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -42,6 +45,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -50,6 +54,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
index 88f41e9451..9d0bd847eb 100644
--- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>anonymous_library library</h1>
+    <h1>anonymous_library library </h1>
 
     
 
@@ -72,7 +77,7 @@ <h2>Functions</h2>
           <span class="name"><a href="anonymous_library/doesStuff.html">doesStuff</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/anonymous_library/doesStuff.html b/testing/test_package_docs/anonymous_library/doesStuff.html
index f840ef0a38..1a498697cb 100644
--- a/testing/test_package_docs/anonymous_library/doesStuff.html
+++ b/testing/test_package_docs/anonymous_library/doesStuff.html
@@ -50,7 +50,7 @@ <h5>anonymous_library library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>doesStuff function</h1>
+    <h1>doesStuff function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
index df4fbbef68..a5e48ab82f 100644
--- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>another_anonymous_lib library</h1>
+    <h1>another_anonymous_lib library </h1>
 
     
 
@@ -72,7 +77,7 @@ <h2>Functions</h2>
           <span class="name"><a href="another_anonymous_lib/greeting.html">greeting</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/another_anonymous_lib/greeting.html b/testing/test_package_docs/another_anonymous_lib/greeting.html
index 470b025961..c07f32a6fd 100644
--- a/testing/test_package_docs/another_anonymous_lib/greeting.html
+++ b/testing/test_package_docs/another_anonymous_lib/greeting.html
@@ -50,7 +50,7 @@ <h5>another_anonymous_lib library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greeting function</h1>
+    <h1>greeting function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/categories.json b/testing/test_package_docs/categories.json
new file mode 100644
index 0000000000..81c00db5bd
--- /dev/null
+++ b/testing/test_package_docs/categories.json
@@ -0,0 +1,91 @@
+[
+  {
+    "name": "IAmAClassWithCategories",
+    "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+    "href": "categoriesExported/IAmAClassWithCategories-class.html",
+    "type": "class",
+    "categories": [
+      "Excellent"
+    ]
+  },
+  {
+    "name": "css",
+    "qualifiedName": "css",
+    "href": "css/css-library.html",
+    "type": "library",
+    "categories": [
+      "Other"
+    ]
+  },
+  {
+    "name": "ex",
+    "qualifiedName": "ex",
+    "href": "ex/ex-library.html",
+    "type": "library",
+    "categories": [
+      "Real Libraries"
+    ]
+  },
+  {
+    "name": "fake",
+    "qualifiedName": "fake",
+    "href": "fake/fake-library.html",
+    "type": "library",
+    "categories": [
+      "Real Libraries"
+    ]
+  },
+  {
+    "name": "BaseForDocComments",
+    "qualifiedName": "fake.BaseForDocComments",
+    "href": "fake/BaseForDocComments-class.html",
+    "type": "class",
+    "categories": [
+      "Excellent",
+      "More Excellence",
+      "Unreal"
+    ],
+    "subcategories": [
+      "Things and Such"
+    ],
+    "image": "https://flutter.io/images/catalog-widget-placeholder.png",
+    "samples": "https://flutter.io"
+  },
+  {
+    "name": "SubForDocComments",
+    "qualifiedName": "fake.SubForDocComments",
+    "href": "fake/SubForDocComments-class.html",
+    "type": "class",
+    "categories": [
+      "NotSoExcellent"
+    ]
+  },
+  {
+    "name": "reexport_one",
+    "qualifiedName": "reexport_one",
+    "href": "reexport_one/reexport_one-library.html",
+    "type": "library",
+    "categories": [
+      "Unreal"
+    ]
+  },
+  {
+    "name": "reexport_two",
+    "qualifiedName": "reexport_two",
+    "href": "reexport_two/reexport_two-library.html",
+    "type": "library",
+    "categories": [
+      "Unreal"
+    ]
+  },
+  {
+    "name": "two_exports",
+    "qualifiedName": "two_exports",
+    "href": "two_exports/two_exports-library.html",
+    "type": "library",
+    "categories": [
+      "Misc",
+      "Real Libraries"
+    ]
+  }
+]
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html
new file mode 100644
index 0000000000..eec9c6368a
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the IAmAClassWithCategories class from the categoriesExported library, for the Dart programming language.">
+  <title>IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li class="self-crumb">IAmAClassWithCategories class</li>
+  </ol>
+  <div class="self-name">IAmAClassWithCategories</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>categoriesExported library</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/categoriesExported-library.html#classes">Classes</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>IAmAClassWithCategories class </h1>
+
+    <section class="desc markdown">
+      <p>Categories test for auto-include-dependencies (Flutter).</p>
+    </section>
+    
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="IAmAClassWithCategories" class="callable">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html
new file mode 100644
index 0000000000..7a6b985569
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the IAmAClassWithCategories constructor from the Class IAmAClassWithCategories class from the categoriesExported library, for the Dart programming language.">
+  <title>IAmAClassWithCategories constructor - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">IAmAClassWithCategories constructor</li>
+  </ol>
+  <div class="self-name">IAmAClassWithCategories</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>IAmAClassWithCategories constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">IAmAClassWithCategories</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/hashCode.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/hashCode.html
new file mode 100644
index 0000000000..253d785e04
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/hashCode.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the hashCode property from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>hashCode property - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">hashCode property</li>
+  </ol>
+  <div class="self-name">hashCode</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/noSuchMethod.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/noSuchMethod.html
new file mode 100644
index 0000000000..cbb992dd0b
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/noSuchMethod.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the noSuchMethod method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>noSuchMethod method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">noSuchMethod method</li>
+  </ol>
+  <div class="self-name">noSuchMethod</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">noSuchMethod</span>
+(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/operator_equals.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/operator_equals.html
new file mode 100644
index 0000000000..4dcf9dd573
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/operator_equals.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the operator == method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>operator == method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">operator == method</li>
+  </ol>
+  <div class="self-name">operator ==</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">operator ==</span>
+(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/runtimeType.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/runtimeType.html
new file mode 100644
index 0000000000..7eebb5036b
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/runtimeType.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the runtimeType property from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>runtimeType property - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">runtimeType property</li>
+  </ol>
+  <div class="self-name">runtimeType</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/toString.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/toString.html
new file mode 100644
index 0000000000..0bc29acc3c
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories/toString.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the toString method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>toString method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">toString method</li>
+  </ol>
+  <div class="self-name">toString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">toString</span>
+(<wbr>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/categoriesExported/categoriesExported-library.html b/testing/test_package_docs/categoriesExported/categoriesExported-library.html
new file mode 100644
index 0000000000..308a9664f6
--- /dev/null
+++ b/testing/test_package_docs/categoriesExported/categoriesExported-library.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="categoriesExported library API docs, for the Dart programming language.">
+  <title>categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">categoriesExported library</li>
+  </ol>
+  <div class="self-name">categoriesExported</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>categoriesExported library </h1>
+
+    
+    <section class="summary offset-anchor" id="classes">
+      <h2>Classes</h2>
+
+      <dl>
+        <dt id="IAmAClassWithCategories">
+          <span class="name "><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></span> 
+        </dt>
+        <dd>
+          Categories test for auto-include-dependencies (Flutter).
+        </dd>
+      </dl>
+    </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>categoriesExported library</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/categoriesExported-library.html#classes">Classes</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
index e212de3b2d..4d4df09a03 100644
--- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>code_in_comments library</h1>
+    <h1>code_in_comments library </h1>
 
     <section class="desc markdown">
       <pre class="language-dart"><code class="language-dart">void main() {
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index ff38dcce76..4560937206 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>css library</h1>
+    <h1>css library </h1>
 
     <section class="desc markdown">
       <p>Testing that a library name doesn't conflict
@@ -73,7 +78,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="theOnlyThingInTheLibrary" class="property">
           <span class="name"><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
index 43a261bbe3..7671e69e71 100644
--- a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
@@ -50,7 +50,7 @@ <h5>css library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>theOnlyThingInTheLibrary top-level property</h1>
+    <h1>theOnlyThingInTheLibrary top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html
index a58ab32dae..9d24ddeb30 100644
--- a/testing/test_package_docs/ex/Animal-class.html
+++ b/testing/test_package_docs/ex/Animal-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Animal enum</h1>
+    <h1>Animal enum </h1>
 
     <section class="desc markdown">
       <p>Referencing <a href="ex/processMessage.html">processMessage</a> (or other things) here should not break
@@ -122,7 +122,7 @@ <h2>Constants</h2>
         <dt id="CAT" class="constant">
           <span class="name ">CAT</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Single line docs.</p>
           
@@ -133,7 +133,7 @@ <h2>Constants</h2>
         <dt id="DOG" class="constant">
           <span class="name ">DOG</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Multi line docs.</p>
 <p><a href="ex/Dog-class.html">Dog</a> needs lots of docs.</p>
@@ -145,7 +145,7 @@ <h2>Constants</h2>
         <dt id="HORSE" class="constant">
           <span class="name ">HORSE</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -156,7 +156,7 @@ <h2>Constants</h2>
         <dt id="values" class="constant">
           <span class="name ">values</span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Animal-class.html">Animal</a></span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
@@ -174,7 +174,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name">index</span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           <p>The integer index of this enum.</p>
@@ -182,7 +182,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Animal/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +190,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Animal/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +206,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -215,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +230,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Animal/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
index 2df64ea5dd..904a00a79b 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; class</h1>
+      <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/AnotherParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/AnotherParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -178,7 +178,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html
index 4a2378fd20..6f5e8268c3 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Apple class</h1>
+      <h1>Apple class </h1>
 
     <section class="desc markdown">
       <p>Sample class <code>String</code></p><pre class="language-dart">  A
@@ -154,7 +154,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="fieldWithTypedef" class="property">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span> 
         </dt>
         <dd>
           fieldWithTypedef docs here
@@ -162,7 +162,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="m" class="property">
           <span class="name"><a href="ex/Apple/m.html">m</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           The read-write field <code>m</code>.
@@ -170,7 +170,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="s" class="property">
           <span class="name"><a href="ex/Apple/s.html">s</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for <code>s</code>
@@ -178,7 +178,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Apple/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -186,7 +186,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Apple/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/isGreaterThan.html">isGreaterThan</a></span><span class="signature">(<wbr><span class="parameter" id="isGreaterThan-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, {</span> <span class="parameter" id="isGreaterThan-param-check"><span class="type-annotation">int</span> <span class="parameter-name">check</span>: <span class="default-value">5</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/m1.html">m1</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This is a method. <a href="ex/Apple/m1.html">[...]</a>
           
@@ -220,7 +220,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/methodWithTypedefParam.html">methodWithTypedefParam</a></span><span class="signature">(<wbr><span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -229,7 +229,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/paramFromExportLib.html">paramFromExportLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromExportLib-param-helper"><span class="type-annotation"><a href="ex/Helper-class.html">Helper</a></span> <span class="parameter-name">helper</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -238,7 +238,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/printMsg.html">printMsg</a></span><span class="signature">(<wbr><span class="parameter" id="printMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="printMsg-param-linebreak"><span class="type-annotation">bool</span> <span class="parameter-name">linebreak</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -247,7 +247,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Apple docs for whataclass
           
@@ -256,7 +256,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -265,7 +265,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -280,7 +280,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -289,7 +289,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -303,7 +303,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="string" class="property">
           <span class="name"><a href="ex/Apple/string.html">string</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -320,7 +320,7 @@ <h2>Constants</h2>
         <dt id="n" class="constant">
           <span class="name "><a href="ex/Apple/n-constant.html">n</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html
index 5a3e870241..627b374201 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>B class</h1>
+      <h1>B class </h1>
 
     <section class="desc markdown">
       <p>Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a></p><pre class="language-dart"> B extends A
@@ -153,7 +153,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="autoCompress" class="property">
           <span class="name"><a href="ex/B/autoCompress.html">autoCompress</a></span>
-          <span class="signature">&#8596; bool</span>
+          <span class="signature">&#8596; bool</span> 
         </dt>
         <dd>
           The default value is <code>false</code> (compression disabled).
@@ -162,7 +162,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/B/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -170,7 +170,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="list" class="property">
           <span class="name"><a href="ex/B/list.html">list</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           A list of Strings
@@ -178,7 +178,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="s" class="property">
           <span class="name"><a href="ex/B/s.html">s</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for <code>s</code>
@@ -186,7 +186,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="fieldWithTypedef" class="property inherited">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           fieldWithTypedef docs here
@@ -194,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Apple/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +202,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="m" class="property inherited">
           <span class="name"><a href="ex/Apple/m.html">m</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           The read-write field <code>m</code>.
@@ -210,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Apple/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +226,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -235,7 +235,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/B/doNothing.html">doNothing</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +244,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/m1.html">m1</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This is a method. <a href="ex/B/m1.html">[...]</a>
           
@@ -253,7 +253,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/writeMsg.html">writeMsg</a></span><span class="signature">(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation">String</span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span>, </span> <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -262,7 +262,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/isGreaterThan.html">isGreaterThan</a></span><span class="signature">(<wbr><span class="parameter" id="isGreaterThan-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, {</span> <span class="parameter" id="isGreaterThan-param-check"><span class="type-annotation">int</span> <span class="parameter-name">check</span>: <span class="default-value">5</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -271,7 +271,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/methodWithTypedefParam.html">methodWithTypedefParam</a></span><span class="signature">(<wbr><span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -280,7 +280,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -289,7 +289,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/paramFromExportLib.html">paramFromExportLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromExportLib-param-helper"><span class="type-annotation"><a href="ex/Helper-class.html">Helper</a></span> <span class="parameter-name">helper</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -298,7 +298,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/printMsg.html">printMsg</a></span><span class="signature">(<wbr><span class="parameter" id="printMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="printMsg-param-linebreak"><span class="type-annotation">bool</span> <span class="parameter-name">linebreak</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -307,7 +307,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -316,7 +316,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Apple docs for whataclass
           <div class="features">inherited</div>
@@ -331,7 +331,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -340,7 +340,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html
index ebe03e2f83..b83cc9113b 100644
--- a/testing/test_package_docs/ex/COLOR-constant.html
+++ b/testing/test_package_docs/ex/COLOR-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR top-level constant</h1>
+    <h1>COLOR top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR</span>
diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
index 3b7477a395..92612213d6 100644
--- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR_GREEN top-level constant</h1>
+    <h1>COLOR_GREEN top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR_GREEN</span>
diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
index 8f7ae7bd33..154ae2d942 100644
--- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR_ORANGE top-level constant</h1>
+    <h1>COLOR_ORANGE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR_ORANGE</span>
diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
index a2be8e01f9..4522aff681 100644
--- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COMPLEX_COLOR top-level constant</h1>
+    <h1>COMPLEX_COLOR top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COMPLEX_COLOR</span>
diff --git a/testing/test_package_docs/ex/Cat-class.html b/testing/test_package_docs/ex/Cat-class.html
index adc874cacf..b0249ec9c7 100644
--- a/testing/test_package_docs/ex/Cat-class.html
+++ b/testing/test_package_docs/ex/Cat-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Cat class</h1>
+      <h1>Cat class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/Cat/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Cat/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Cat/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -209,7 +209,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Cat/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/CatString-class.html b/testing/test_package_docs/ex/CatString-class.html
index a2f91cc5a1..cd86728741 100644
--- a/testing/test_package_docs/ex/CatString-class.html
+++ b/testing/test_package_docs/ex/CatString-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CatString class</h1>
+      <h1>CatString class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/CatString/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="ex/CatString/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="ex/CatString/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="length" class="property inherited">
           <span class="name"><a href="ex/CatString/length.html">length</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/CatString/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -192,7 +192,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -201,7 +201,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -210,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -219,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/write.html">write</a></span><span class="signature">(<wbr><span class="parameter" id="write-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeAll.html">writeAll</a></span><span class="signature">(<wbr><span class="parameter" id="writeAll-param-objects"><span class="type-annotation">Iterable</span> <span class="parameter-name">objects</span>, [</span> <span class="parameter" id="writeAll-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeCharCode.html">writeCharCode</a></span><span class="signature">(<wbr><span class="parameter" id="writeCharCode-param-charCode"><span class="type-annotation">int</span> <span class="parameter-name">charCode</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeln.html">writeln</a></span><span class="signature">(<wbr>[<span class="parameter" id="writeln-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -261,7 +261,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/CatString/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html
index 04b10c717b..f7d3273a15 100644
--- a/testing/test_package_docs/ex/ConstantCat-class.html
+++ b/testing/test_package_docs/ex/ConstantCat-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstantCat class</h1>
+      <h1>ConstantCat class </h1>
 
     
     <section>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/ConstantCat/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property">
           <span class="name"><a href="ex/ConstantCat/name.html">name</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Cat/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -169,7 +169,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Cat/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ConstantCat/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -203,7 +203,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +218,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Cat/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/Deprecated-class.html b/testing/test_package_docs/ex/Deprecated-class.html
index 47c832c3da..b343154b86 100644
--- a/testing/test_package_docs/ex/Deprecated-class.html
+++ b/testing/test_package_docs/ex/Deprecated-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Deprecated class</h1>
+      <h1>Deprecated class </h1>
 
     
 
@@ -131,7 +131,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="expires" class="property">
           <span class="name"><a href="ex/Deprecated/expires.html">expires</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -139,7 +139,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Deprecated/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -147,7 +147,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Deprecated/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Deprecated/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Deprecated/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Deprecated/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index a433669b44..243ebec08b 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Dog class</h1>
+      <h1>Dog class </h1>
 
     <section class="desc markdown">
       <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a></p>
@@ -166,7 +166,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aFinalField" class="property">
           <span class="name"><a href="ex/Dog/aFinalField.html">aFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -174,7 +174,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetterReturningRandomThings" class="property">
           <span class="name"><a href="ex/Dog/aGetterReturningRandomThings.html">aGetterReturningRandomThings</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -182,7 +182,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aProtectedFinalField" class="property">
           <span class="name"><a href="ex/Dog/aProtectedFinalField.html">aProtectedFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -190,7 +190,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedField" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -198,7 +198,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -206,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           
@@ -214,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/Dog/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -222,7 +222,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property">
           <span class="name"><a href="ex/Dog/name.html">name</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -230,7 +230,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -238,7 +238,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -254,7 +254,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -263,7 +263,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/foo.html">foo</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -272,7 +272,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;)</div>
@@ -281,7 +281,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -290,7 +290,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -299,7 +299,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -308,7 +308,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testMethod.html">testMethod</a></span><span class="signature">(<wbr><span class="parameter" id="testMethod-param-it"><span class="type-annotation">Iterable</span> <span class="parameter-name">it</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -317,7 +317,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimation.html">withAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method <a href="ex/Dog/withAnimation.html">[...]</a>
           
@@ -326,7 +326,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadHeight.html">withAnimationBadHeight</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with non-integer height <a href="ex/Dog/withAnimationBadHeight.html">[...]</a>
           
@@ -335,7 +335,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadWidth.html">withAnimationBadWidth</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with non-integer width <a href="ex/Dog/withAnimationBadWidth.html">[...]</a>
           
@@ -344,7 +344,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInline.html">withAnimationInline</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation inline in text. <a href="ex/Dog/withAnimationInline.html">[...]</a>
           
@@ -353,7 +353,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInOneLineDoc.html">withAnimationInOneLineDoc</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation in one line doc  <a href="ex/Dog/withAnimationInOneLineDoc.html">[...]</a>
           
@@ -362,7 +362,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUnique.html">withAnimationNonUnique</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Non-Unique Animation method (between methods) <a href="ex/Dog/withAnimationNonUnique.html">[...]</a>
           
@@ -371,7 +371,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUniqueDeprecated.html">withAnimationNonUniqueDeprecated</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Non-Unique deprecated Animation method (between methods) <a href="ex/Dog/withAnimationNonUniqueDeprecated.html">[...]</a>
           
@@ -380,7 +380,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationOutOfOrder.html">withAnimationOutOfOrder</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation with out-of-order id argument. <a href="ex/Dog/withAnimationOutOfOrder.html">[...]</a>
           
@@ -389,7 +389,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationUnknownArg.html">withAnimationUnknownArg</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation with an argument that is not the id. <a href="ex/Dog/withAnimationUnknownArg.html">[...]</a>
           
@@ -398,7 +398,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationWrongParams.html">withAnimationWrongParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with wrong parameters <a href="ex/Dog/withAnimationWrongParams.html">[...]</a>
           
@@ -407,7 +407,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withDeprecatedAnimation.html">withDeprecatedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Deprecated animation method format. <a href="ex/Dog/withDeprecatedAnimation.html">[...]</a>
           
@@ -416,7 +416,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withInvalidNamedAnimation.html">withInvalidNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with invalid name <a href="ex/Dog/withInvalidNamedAnimation.html">[...]</a>
           
@@ -425,7 +425,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro.html">withMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Macro method <a href="ex/Dog/withMacro.html">[...]</a>
           
@@ -434,7 +434,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro2.html">withMacro2</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Foo macro content
           
@@ -443,7 +443,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withNamedAnimation.html">withNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with name <a href="ex/Dog/withNamedAnimation.html">[...]</a>
           
@@ -452,7 +452,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withPrivateMacro.html">withPrivateMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Use a privately defined macro: Private macro content
           
@@ -461,7 +461,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withQuotedNamedAnimation.html">withQuotedNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with quoted name <a href="ex/Dog/withQuotedNamedAnimation.html">[...]</a>
           
@@ -470,7 +470,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withUndefinedMacro.html">withUndefinedMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Don't define this:  null
           
@@ -479,7 +479,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -488,7 +488,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -503,7 +503,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Dog/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -517,7 +517,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="somethingTasty" class="property">
           <span class="name"><a href="ex/Dog/somethingTasty.html">somethingTasty</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           A tasty static + final property.
@@ -525,7 +525,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticGetterSetter" class="property">
           <span class="name"><a href="ex/Dog/staticGetterSetter.html">staticGetterSetter</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -541,7 +541,7 @@ <h2>Static Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/createDog.html">createDog</a></span><span class="signature">(<wbr><span class="parameter" id="createDog-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/Dog-class.html">Dog</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&quot;Internal use&quot;)</div>
@@ -556,7 +556,7 @@ <h2>Constants</h2>
         <dt id="aName" class="constant">
           <span class="name "><a href="ex/Dog/aName-constant.html">aName</a></span>
           <span class="signature">&#8594; const <a href="ex/ShortName-class.html">ShortName</a></span>
-        </dt>
+          </dt>
         <dd>
           Verify link substitution in constants (#1535)
           
@@ -567,7 +567,7 @@ <h2>Constants</h2>
         <dt id="aStaticConstField" class="constant">
           <span class="name "><a href="ex/Dog/aStaticConstField-constant.html">aStaticConstField</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/ex/E-class.html b/testing/test_package_docs/ex/E-class.html
index cf6d194c24..a2a1c36a35 100644
--- a/testing/test_package_docs/ex/E-class.html
+++ b/testing/test_package_docs/ex/E-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>E class</h1>
+      <h1>E class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -190,7 +190,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/E/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/ExtendedShortName-class.html b/testing/test_package_docs/ex/ExtendedShortName-class.html
index 9e3242a925..57078ab5b2 100644
--- a/testing/test_package_docs/ex/ExtendedShortName-class.html
+++ b/testing/test_package_docs/ex/ExtendedShortName-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendedShortName class</h1>
+      <h1>ExtendedShortName class </h1>
 
     
     <section>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aParameter" class="property inherited">
           <span class="name"><a href="ex/ShortName/aParameter.html">aParameter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShortName/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShortName/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -186,7 +186,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -201,7 +201,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShortName/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index 4cc965292d..f9e79ea76d 100644
--- a/testing/test_package_docs/ex/F-class.html
+++ b/testing/test_package_docs/ex/F-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; class</h1>
+      <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aFinalField" class="property inherited">
           <span class="name"><a href="ex/Dog/aFinalField.html">aFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetterReturningRandomThings" class="property inherited">
           <span class="name"><a href="ex/Dog/aGetterReturningRandomThings.html">aGetterReturningRandomThings</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aProtectedFinalField" class="property inherited">
           <span class="name"><a href="ex/Dog/aProtectedFinalField.html">aProtectedFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedField" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -184,7 +184,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd class="inherited">
           
@@ -192,7 +192,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -200,7 +200,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property inherited">
           <span class="name"><a href="ex/Dog/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property inherited">
           <span class="name"><a href="ex/Dog/name.html">name</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +216,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/F/methodWithGenericParam.html">methodWithGenericParam</a></span><span class="signature">(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -241,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +250,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/foo.html">foo</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +259,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;), inherited</div>
@@ -268,7 +268,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -277,7 +277,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -286,7 +286,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/F/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -295,7 +295,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -304,7 +304,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -313,7 +313,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testMethod.html">testMethod</a></span><span class="signature">(<wbr><span class="parameter" id="testMethod-param-it"><span class="type-annotation">Iterable</span> <span class="parameter-name">it</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -322,7 +322,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -331,7 +331,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimation.html">withAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method <a href="ex/Dog/withAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -340,7 +340,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadHeight.html">withAnimationBadHeight</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with non-integer height <a href="ex/Dog/withAnimationBadHeight.html">[...]</a>
           <div class="features">inherited</div>
@@ -349,7 +349,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadWidth.html">withAnimationBadWidth</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with non-integer width <a href="ex/Dog/withAnimationBadWidth.html">[...]</a>
           <div class="features">inherited</div>
@@ -358,7 +358,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInline.html">withAnimationInline</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation inline in text. <a href="ex/Dog/withAnimationInline.html">[...]</a>
           <div class="features">inherited</div>
@@ -367,7 +367,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInOneLineDoc.html">withAnimationInOneLineDoc</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation in one line doc  <a href="ex/Dog/withAnimationInOneLineDoc.html">[...]</a>
           <div class="features">inherited</div>
@@ -376,7 +376,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUnique.html">withAnimationNonUnique</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Non-Unique Animation method (between methods) <a href="ex/Dog/withAnimationNonUnique.html">[...]</a>
           <div class="features">inherited</div>
@@ -385,7 +385,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUniqueDeprecated.html">withAnimationNonUniqueDeprecated</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Non-Unique deprecated Animation method (between methods) <a href="ex/Dog/withAnimationNonUniqueDeprecated.html">[...]</a>
           <div class="features">inherited</div>
@@ -394,7 +394,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationOutOfOrder.html">withAnimationOutOfOrder</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation with out-of-order id argument. <a href="ex/Dog/withAnimationOutOfOrder.html">[...]</a>
           <div class="features">inherited</div>
@@ -403,7 +403,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationUnknownArg.html">withAnimationUnknownArg</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation with an argument that is not the id. <a href="ex/Dog/withAnimationUnknownArg.html">[...]</a>
           <div class="features">inherited</div>
@@ -412,7 +412,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationWrongParams.html">withAnimationWrongParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with wrong parameters <a href="ex/Dog/withAnimationWrongParams.html">[...]</a>
           <div class="features">inherited</div>
@@ -421,7 +421,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withDeprecatedAnimation.html">withDeprecatedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Deprecated animation method format. <a href="ex/Dog/withDeprecatedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -430,7 +430,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withInvalidNamedAnimation.html">withInvalidNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with invalid name <a href="ex/Dog/withInvalidNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -439,7 +439,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro.html">withMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Macro method <a href="ex/Dog/withMacro.html">[...]</a>
           <div class="features">inherited</div>
@@ -448,7 +448,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro2.html">withMacro2</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Foo macro content
           <div class="features">inherited</div>
@@ -457,7 +457,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withNamedAnimation.html">withNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with name <a href="ex/Dog/withNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -466,7 +466,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withPrivateMacro.html">withPrivateMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Use a privately defined macro: Private macro content
           <div class="features">inherited</div>
@@ -475,7 +475,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withQuotedNamedAnimation.html">withQuotedNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with quoted name <a href="ex/Dog/withQuotedNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -484,7 +484,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withUndefinedMacro.html">withUndefinedMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Don't define this:  null
           <div class="features">inherited</div>
@@ -499,7 +499,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Dog/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/ForAnnotation-class.html b/testing/test_package_docs/ex/ForAnnotation-class.html
index 3b20940543..1883d67324 100644
--- a/testing/test_package_docs/ex/ForAnnotation-class.html
+++ b/testing/test_package_docs/ex/ForAnnotation-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ForAnnotation class</h1>
+      <h1>ForAnnotation class </h1>
 
     
 
@@ -131,7 +131,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="ex/ForAnnotation/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -139,7 +139,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ForAnnotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -147,7 +147,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ForAnnotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ForAnnotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ForAnnotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ForAnnotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/HasAnnotation-class.html b/testing/test_package_docs/ex/HasAnnotation-class.html
index dbac55c671..317e3da30b 100644
--- a/testing/test_package_docs/ex/HasAnnotation-class.html
+++ b/testing/test_package_docs/ex/HasAnnotation-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasAnnotation class</h1>
+      <h1>HasAnnotation class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/HasAnnotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/HasAnnotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/HasAnnotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/HasAnnotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -190,7 +190,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/HasAnnotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/Helper-class.html b/testing/test_package_docs/ex/Helper-class.html
index 83d6125df1..4ffa97fb0d 100644
--- a/testing/test_package_docs/ex/Helper-class.html
+++ b/testing/test_package_docs/ex/Helper-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Helper class</h1>
+      <h1>Helper class </h1>
 
     <section class="desc markdown">
       <p>Even unresolved references in the same library should be resolved
@@ -135,7 +135,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Helper/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -143,7 +143,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Helper/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -159,7 +159,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/getContents.html">getContents</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Helper/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/Klass-class.html b/testing/test_package_docs/ex/Klass-class.html
index 45465b3c77..fd813619a1 100644
--- a/testing/test_package_docs/ex/Klass-class.html
+++ b/testing/test_package_docs/ex/Klass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Klass class</h1>
+      <h1>Klass class </h1>
 
     <section class="desc markdown">
       <p>A class</p>
@@ -133,7 +133,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Klass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -141,7 +141,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Klass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -157,7 +157,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/another.html">another</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Another method
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A method with a custom annotation
           <div class="features">@<a href="ex/aThingToDo-class.html">aThingToDo</a>(&#39;from&#39;, &#39;thing&#39;)</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/imAFactoryNoReally.html">imAFactoryNoReally</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Not really a factory, but...
           <div class="features">@factory</div>
@@ -184,7 +184,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/imProtected.html">imProtected</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A protected method
           <div class="features">@protected</div>
@@ -193,7 +193,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/method.html">method</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A method
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A shadowed method
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -226,7 +226,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Klass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html
index f3d42c90e0..3c7a24ec51 100644
--- a/testing/test_package_docs/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs/ex/MY_CAT-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MY_CAT top-level constant</h1>
+    <h1>MY_CAT top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">MY_CAT</span>
diff --git a/testing/test_package_docs/ex/MyError-class.html b/testing/test_package_docs/ex/MyError-class.html
index 66ac49b146..b4158377da 100644
--- a/testing/test_package_docs/ex/MyError-class.html
+++ b/testing/test_package_docs/ex/MyError-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyError class</h1>
+      <h1>MyError class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyError/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyError/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="stackTrace" class="property inherited">
           <span class="name"><a href="ex/MyError/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyError/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyError/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyError/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html
index 0ba8c31e48..badc615e1b 100644
--- a/testing/test_package_docs/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs/ex/MyErrorImplements-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyErrorImplements class</h1>
+      <h1>MyErrorImplements class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="stackTrace" class="property">
           <span class="name"><a href="ex/MyErrorImplements/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd>
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyErrorImplements/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyErrorImplements/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyErrorImplements/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyErrorImplements/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyErrorImplements/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/MyException-class.html b/testing/test_package_docs/ex/MyException-class.html
index 4a5be414d5..c9ab300b9b 100644
--- a/testing/test_package_docs/ex/MyException-class.html
+++ b/testing/test_package_docs/ex/MyException-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyException class</h1>
+      <h1>MyException class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyException/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyException/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyException/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyException/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyException/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements-class.html b/testing/test_package_docs/ex/MyExceptionImplements-class.html
index a28ffa5cb9..7e2b4f2ec3 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements-class.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyExceptionImplements class</h1>
+      <h1>MyExceptionImplements class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyExceptionImplements/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyExceptionImplements/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyExceptionImplements/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyExceptionImplements/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyExceptionImplements/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
index 70dddcdc82..1dc2dd0016 100644
--- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PRETTY_COLORS top-level constant</h1>
+    <h1>PRETTY_COLORS top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">PRETTY_COLORS</span>
diff --git a/testing/test_package_docs/ex/ParameterizedClass-class.html b/testing/test_package_docs/ex/ParameterizedClass-class.html
index 36a9dfe5e7..49bb70c346 100644
--- a/testing/test_package_docs/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/ParameterizedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Support class to test inheritance + type expansion from implements clause.</p>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aInheritedField" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span></span></span> 
         </dt>
         <dd>
           
@@ -169,7 +169,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -177,7 +177,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +193,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -220,7 +220,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +235,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +244,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html
index c6f4c166e1..a95fca7dbb 100644
--- a/testing/test_package_docs/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs/ex/ParameterizedTypedef.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
index 7e88a919cc..6739e0cf06 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PublicClassExtendsPrivateClass class</h1>
+      <h1>PublicClassExtendsPrivateClass class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
index 50aeb349fd..afda9251b3 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PublicClassImplementsPrivateInterface class</h1>
+      <h1>PublicClassImplementsPrivateInterface class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html
index ae26312525..a1105739c1 100644
--- a/testing/test_package_docs/ex/ShapeType-class.html
+++ b/testing/test_package_docs/ex/ShapeType-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ShapeType class</h1>
+      <h1>ShapeType class </h1>
 
     <section class="desc markdown">
       <p>Foo bar.</p><ol start="3"><li>All references should be hyperlinks. <a href="ex/MyError-class.html">MyError</a> and
@@ -124,7 +124,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShapeType/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -132,7 +132,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property inherited">
           <span class="name"><a href="ex/ShapeType/name.html">name</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -140,7 +140,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShapeType/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -156,7 +156,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShapeType/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -165,7 +165,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShapeType/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -180,7 +180,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShapeType/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -197,7 +197,7 @@ <h2>Constants</h2>
         <dt id="ellipse" class="constant">
           <span class="name "><a href="ex/ShapeType/ellipse-constant.html">ellipse</a></span>
           <span class="signature">&#8594; const <a href="ex/ShapeType-class.html">ShapeType</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -208,7 +208,7 @@ <h2>Constants</h2>
         <dt id="rect" class="constant">
           <span class="name "><a href="ex/ShapeType/rect-constant.html">rect</a></span>
           <span class="signature">&#8594; const <a href="ex/ShapeType-class.html">ShapeType</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/ex/ShortName-class.html b/testing/test_package_docs/ex/ShortName-class.html
index 97af9a4cd7..b122544c4e 100644
--- a/testing/test_package_docs/ex/ShortName-class.html
+++ b/testing/test_package_docs/ex/ShortName-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ShortName class</h1>
+      <h1>ShortName class </h1>
 
     
     <section>
@@ -143,7 +143,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aParameter" class="property">
           <span class="name"><a href="ex/ShortName/aParameter.html">aParameter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -151,7 +151,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShortName/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -159,7 +159,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShortName/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -184,7 +184,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -199,7 +199,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShortName/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/SpecializedDuration-class.html b/testing/test_package_docs/ex/SpecializedDuration-class.html
index d3385ea4a6..611d7e2213 100644
--- a/testing/test_package_docs/ex/SpecializedDuration-class.html
+++ b/testing/test_package_docs/ex/SpecializedDuration-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecializedDuration class</h1>
+      <h1>SpecializedDuration class </h1>
 
     <section class="desc markdown">
       <p>For testing a class that extends a class
@@ -148,7 +148,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -156,7 +156,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inDays" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inDays.html">inDays</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -164,7 +164,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inHours" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inHours.html">inHours</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -172,7 +172,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMicroseconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMicroseconds.html">inMicroseconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -180,7 +180,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMilliseconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMilliseconds.html">inMilliseconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -188,7 +188,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMinutes" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMinutes.html">inMinutes</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -196,7 +196,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inSeconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inSeconds.html">inSeconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -204,7 +204,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNegative" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/isNegative.html">isNegative</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -212,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/abs.html">abs</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/compareTo.html">compareTo</a></span><span class="signature">(<wbr><span class="parameter" id="compareTo-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +255,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -270,7 +270,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-factor"><span class="type-annotation">num</span> <span class="parameter-name">factor</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -279,7 +279,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -288,7 +288,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -297,7 +297,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_less.html">operator <</a></span><span class="signature">(<wbr><span class="parameter" id="<-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -306,7 +306,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_less_equal.html">operator <=</a></span><span class="signature">(<wbr><span class="parameter" id="<=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -315,7 +315,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -324,7 +324,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_greater.html">operator ></a></span><span class="signature">(<wbr><span class="parameter" id=">-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -333,7 +333,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_greater_equal.html">operator >=</a></span><span class="signature">(<wbr><span class="parameter" id=">=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -342,7 +342,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_unary_minus.html">operator unary-</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -351,7 +351,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_truncate_divide.html">operator ~/</a></span><span class="signature">(<wbr><span class="parameter" id="~/-param-quotient"><span class="type-annotation">int</span> <span class="parameter-name">quotient</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass-class.html b/testing/test_package_docs/ex/TemplatedClass-class.html
index 4b8b342a18..d3cce43572 100644
--- a/testing/test_package_docs/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs/ex/TemplatedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; class</h1>
+      <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/TemplatedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/TemplatedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-input"><span class="type-annotation">X</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/TemplatedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface-class.html b/testing/test_package_docs/ex/TemplatedInterface-class.html
index 65861965b8..f7b6d47e35 100644
--- a/testing/test_package_docs/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs/ex/TemplatedInterface-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
+      <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Class for testing expansion of type from implements clause.</p>
@@ -147,7 +147,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aField" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aField.html">aField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -155,7 +155,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aGetter.html">aGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -163,7 +163,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aSetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aSetter.html">aSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span></span></span> 
         </dt>
         <dd>
           
@@ -171,7 +171,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedField" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -179,7 +179,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -187,7 +187,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span></span> 
         </dt>
         <dd class="inherited">
           
@@ -195,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -203,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedInterface/aMethodInterface.html">aMethodInterface</a></span><span class="signature">(<wbr><span class="parameter" id="aMethodInterface-param-value"><span class="type-annotation">A</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedInterface/aTypedefReturningMethodInterface.html">aTypedefReturningMethodInterface</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +255,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -264,7 +264,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -279,7 +279,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -288,7 +288,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
index d7258e769b..115a6624db 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TypedFunctionsWithoutTypedefs class</h1>
+      <h1>TypedFunctionsWithoutTypedefs class </h1>
 
     <section class="desc markdown">
       <p>This class has a complicated type situation.</p>
@@ -133,7 +133,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -141,7 +141,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -157,7 +157,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html">getAComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a complex typedef that includes some anonymous typed functions.
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html">getAFunctionReturningBool</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool Function<span class="signature">&lt;<wbr><span class="type-parameter">T4</span>&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This helps us make sure we get both the empty and the non-empty
 case right for anonymous functions.
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html">getAFunctionReturningVoid</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a function that returns a void with some generic types sprinkled in.
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -209,7 +209,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index 74de37571a..a3d0e8c4ee 100644
--- a/testing/test_package_docs/ex/WithGeneric-class.html
+++ b/testing/test_package_docs/ex/WithGeneric-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="prop" class="property">
           <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
-          <span class="signature">&#8596; T</span>
+          <span class="signature">&#8596; T</span> 
         </dt>
         <dd>
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -158,7 +158,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -174,7 +174,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -183,7 +183,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -198,7 +198,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/WithGeneric/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html
index 28cb503153..42674d2882 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGenericSub class</h1>
+      <h1>WithGenericSub class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="prop" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
-          <span class="signature">&#8596; <a href="ex/Apple-class.html">Apple</a></span>
+          <span class="signature">&#8596; <a href="ex/Apple-class.html">Apple</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/WithGeneric/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index 3cd9a3f959..7774887cf0 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef</h1>
+    <h1>aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
diff --git a/testing/test_package_docs/ex/aThingToDo-class.html b/testing/test_package_docs/ex/aThingToDo-class.html
index 82742ba756..88d52faa9f 100644
--- a/testing/test_package_docs/ex/aThingToDo-class.html
+++ b/testing/test_package_docs/ex/aThingToDo-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aThingToDo class</h1>
+      <h1>aThingToDo class </h1>
 
     <section class="desc markdown">
       <p>A custom annotation.</p>
@@ -134,7 +134,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="what" class="property">
           <span class="name"><a href="ex/aThingToDo/what.html">what</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -142,7 +142,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="who" class="property">
           <span class="name"><a href="ex/aThingToDo/who.html">who</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/aThingToDo/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -158,7 +158,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/aThingToDo/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -174,7 +174,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/aThingToDo/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -183,7 +183,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/aThingToDo/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -198,7 +198,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/aThingToDo/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html
index 1d243438f6..e39704cfd7 100644
--- a/testing/test_package_docs/ex/deprecated-constant.html
+++ b/testing/test_package_docs/ex/deprecated-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecated top-level constant</h1>
+    <h1>deprecated top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">deprecated</span>
diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html
index b8da2da423..b087b38838 100644
--- a/testing/test_package_docs/ex/deprecatedField.html
+++ b/testing/test_package_docs/ex/deprecatedField.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedField top-level property</h1>
+    <h1>deprecatedField top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html
index 63222aca1b..d77dd2e542 100644
--- a/testing/test_package_docs/ex/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/deprecatedGetter.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedGetter top-level property</h1>
+    <h1>deprecatedGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html
index ed07215136..5273186102 100644
--- a/testing/test_package_docs/ex/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/deprecatedSetter.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedSetter top-level property</h1>
+    <h1>deprecatedSetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index 443ea26e5e..94d6fab565 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ex library</h1>
+    <h1>ex library </h1>
 
     <section class="desc markdown">
       <p>a library. testing string escaping: <code>var s = 'a string'</code> <cool></cool></p>
@@ -69,97 +74,97 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AnotherParameterizedClass">
-          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></span>
+          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Apple">
-          <span class="name "><a href="ex/Apple-class.html">Apple</a></span>
+          <span class="name "><a href="ex/Apple-class.html">Apple</a></span> 
         </dt>
         <dd>
           Sample class <code>String</code> <a href="ex/Apple-class.html">[...]</a>
         </dd>
         <dt id="aThingToDo">
-          <span class="name "><a href="ex/aThingToDo-class.html">aThingToDo</a></span>
+          <span class="name "><a href="ex/aThingToDo-class.html">aThingToDo</a></span> 
         </dt>
         <dd>
           A custom annotation.
         </dd>
         <dt id="B">
-          <span class="name "><a href="ex/B-class.html">B</a></span>
+          <span class="name "><a href="ex/B-class.html">B</a></span> 
         </dt>
         <dd>
           Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a> <a href="ex/B-class.html">[...]</a>
         </dd>
         <dt id="Cat">
-          <span class="name "><a href="ex/Cat-class.html">Cat</a></span>
+          <span class="name "><a href="ex/Cat-class.html">Cat</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="CatString">
-          <span class="name "><a href="ex/CatString-class.html">CatString</a></span>
+          <span class="name "><a href="ex/CatString-class.html">CatString</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ConstantCat">
-          <span class="name "><a href="ex/ConstantCat-class.html">ConstantCat</a></span>
+          <span class="name "><a href="ex/ConstantCat-class.html">ConstantCat</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Cool">
-          <span class="name "><a href="fake/Cool-class.html">Cool</a></span>
+          <span class="name "><a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           This class is cool!
         </dd>
         <dt id="Deprecated">
-          <span class="name "><a href="ex/Deprecated-class.html">Deprecated</a></span>
+          <span class="name "><a href="ex/Deprecated-class.html">Deprecated</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Dog">
-          <span class="name "><a href="ex/Dog-class.html">Dog</a></span>
+          <span class="name "><a href="ex/Dog-class.html">Dog</a></span> 
         </dt>
         <dd>
           implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a> <a href="ex/Dog-class.html">[...]</a>
         </dd>
         <dt id="E">
-          <span class="name "><a href="ex/E-class.html">E</a></span>
+          <span class="name "><a href="ex/E-class.html">E</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ExtendedShortName">
-          <span class="name "><a href="ex/ExtendedShortName-class.html">ExtendedShortName</a></span>
+          <span class="name "><a href="ex/ExtendedShortName-class.html">ExtendedShortName</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="F">
-          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></span>
+          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ForAnnotation">
-          <span class="name "><a href="ex/ForAnnotation-class.html">ForAnnotation</a></span>
+          <span class="name "><a href="ex/ForAnnotation-class.html">ForAnnotation</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="HasAnnotation">
-          <span class="name "><a href="ex/HasAnnotation-class.html">HasAnnotation</a></span>
+          <span class="name "><a href="ex/HasAnnotation-class.html">HasAnnotation</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Helper">
-          <span class="name "><a href="ex/Helper-class.html">Helper</a></span>
+          <span class="name "><a href="ex/Helper-class.html">Helper</a></span> 
         </dt>
         <dd>
           Even unresolved references in the same library should be resolved
@@ -167,74 +172,74 @@ <h2>Classes</h2>
 <a href="ex/B-class.html">ex.B</a>
         </dd>
         <dt id="Klass">
-          <span class="name "><a href="ex/Klass-class.html">Klass</a></span>
+          <span class="name "><a href="ex/Klass-class.html">Klass</a></span> 
         </dt>
         <dd>
           A class
         </dd>
         <dt id="ParameterizedClass">
-          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           Support class to test inheritance + type expansion from implements clause.
         </dd>
         <dt id="PublicClassExtendsPrivateClass">
-          <span class="name "><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></span>
+          <span class="name "><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="PublicClassImplementsPrivateInterface">
-          <span class="name "><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></span>
+          <span class="name "><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ShapeType">
-          <span class="name "><a href="ex/ShapeType-class.html">ShapeType</a></span>
+          <span class="name "><a href="ex/ShapeType-class.html">ShapeType</a></span> 
         </dt>
         <dd>
           Foo bar. <a href="ex/ShapeType-class.html">[...]</a>
         </dd>
         <dt id="ShortName">
-          <span class="name "><a href="ex/ShortName-class.html">ShortName</a></span>
+          <span class="name "><a href="ex/ShortName-class.html">ShortName</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SpecializedDuration">
-          <span class="name "><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></span>
+          <span class="name "><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></span> 
         </dt>
         <dd>
           For testing a class that extends a class
 that has some operators
         </dd>
         <dt id="TemplatedClass">
-          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="TemplatedInterface">
-          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span> 
         </dt>
         <dd>
           Class for testing expansion of type from implements clause.
         </dd>
         <dt id="TypedFunctionsWithoutTypedefs">
-          <span class="name "><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></span>
+          <span class="name "><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></span> 
         </dt>
         <dd>
           This class has a complicated type situation.
         </dd>
         <dt id="WithGeneric">
-          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="WithGenericSub">
-          <span class="name "><a href="ex/WithGenericSub-class.html">WithGenericSub</a></span>
+          <span class="name "><a href="ex/WithGenericSub-class.html">WithGenericSub</a></span> 
         </dt>
         <dd>
           
@@ -249,7 +254,7 @@ <h2>Constants</h2>
         <dt id="COLOR" class="constant">
           <span class="name "><a href="ex/COLOR-constant.html">COLOR</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -260,7 +265,7 @@ <h2>Constants</h2>
         <dt id="COLOR_GREEN" class="constant">
           <span class="name "><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -271,7 +276,7 @@ <h2>Constants</h2>
         <dt id="COLOR_ORANGE" class="constant">
           <span class="name "><a href="ex/COLOR_ORANGE-constant.html">COLOR_ORANGE</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -282,7 +287,7 @@ <h2>Constants</h2>
         <dt id="COMPLEX_COLOR" class="constant">
           <span class="name "><a href="ex/COMPLEX_COLOR-constant.html">COMPLEX_COLOR</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -293,7 +298,7 @@ <h2>Constants</h2>
         <dt id="deprecated" class="constant">
           <span class="name "><a href="ex/deprecated-constant.html">deprecated</a></span>
           <span class="signature">&#8594; const <a href="ex/Deprecated-class.html">Deprecated</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -304,7 +309,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReference" class="constant">
           <span class="name "><a href="ex/incorrectDocReference-constant.html">incorrectDocReference</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is the same name as a top-level const from the fake lib.
           
@@ -315,7 +320,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReferenceFromEx" class="constant">
           <span class="name "><a href="ex/incorrectDocReferenceFromEx-constant.html">incorrectDocReferenceFromEx</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This should <code>not work</code>.
           
@@ -326,7 +331,7 @@ <h2>Constants</h2>
         <dt id="MY_CAT" class="constant">
           <span class="name "><a href="ex/MY_CAT-constant.html">MY_CAT</a></span>
           <span class="signature">&#8594; const <a href="ex/ConstantCat-class.html">ConstantCat</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -337,7 +342,7 @@ <h2>Constants</h2>
         <dt id="PRETTY_COLORS" class="constant">
           <span class="name "><a href="ex/PRETTY_COLORS-constant.html">PRETTY_COLORS</a></span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -354,7 +359,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="deprecatedField" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -362,7 +367,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -370,7 +375,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           
@@ -378,7 +383,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="number" class="property">
           <span class="name"><a href="ex/number.html">number</a></span>
-          <span class="signature">&#8596; double</span>
+          <span class="signature">&#8596; double</span> 
         </dt>
         <dd>
           
@@ -386,7 +391,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="y" class="property">
           <span class="name"><a href="ex/y.html">y</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           
@@ -403,7 +408,7 @@ <h2>Functions</h2>
           <span class="name"><a href="ex/function1.html">function1</a></span><span class="signature">(<wbr><span class="parameter" id="function1-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span>, </span> <span class="parameter" id="function1-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="function1-param-lastParam"><span class="type-annotation">dynamic</span> <span class="parameter-name">lastParam</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -412,7 +417,7 @@ <h2>Functions</h2>
           <span class="name"><a href="ex/genericFunction.html">genericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -425,7 +430,7 @@ <h2>Enums</h2>
 
       <dl>
         <dt id="Animal">
-          <span class="name "><a href="ex/Animal-class.html">Animal</a></span>
+          <span class="name "><a href="ex/Animal-class.html">Animal</a></span> 
         </dt>
         <dd>
           Referencing <a href="ex/processMessage.html">processMessage</a> (or other things) here should not break
@@ -442,7 +447,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Someone might do this some day.
           
@@ -451,7 +456,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="ParameterizedTypedef-param-msg"><span class="type-annotation">T</span> <span class="parameter-name">msg</span>, </span> <span class="parameter" id="ParameterizedTypedef-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -460,7 +465,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/processMessage.html">processMessage</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="processMessage-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -473,25 +478,25 @@ <h2>Exceptions / Errors</h2>
 
       <dl>
         <dt id="MyError">
-          <span class="name "><a href="ex/MyError-class.html">MyError</a></span>
+          <span class="name "><a href="ex/MyError-class.html">MyError</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyErrorImplements">
-          <span class="name "><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></span>
+          <span class="name "><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyException">
-          <span class="name "><a href="ex/MyException-class.html">MyException</a></span>
+          <span class="name "><a href="ex/MyException-class.html">MyException</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyExceptionImplements">
-          <span class="name "><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></span>
+          <span class="name "><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/ex/function1.html b/testing/test_package_docs/ex/function1.html
index 370f19c73c..5d26328929 100644
--- a/testing/test_package_docs/ex/function1.html
+++ b/testing/test_package_docs/ex/function1.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>function1 function</h1>
+    <h1>function1 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html
index 22f15b4553..1fc3db248b 100644
--- a/testing/test_package_docs/ex/genericFunction.html
+++ b/testing/test_package_docs/ex/genericFunction.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
+    <h1>genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html
index 48d43faac3..e9b296e002 100644
--- a/testing/test_package_docs/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReference top-level constant</h1>
+    <h1>incorrectDocReference top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReference</span>
diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
index 1c527830e2..83eaa31659 100644
--- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReferenceFromEx top-level constant</h1>
+    <h1>incorrectDocReferenceFromEx top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReferenceFromEx</span>
diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html
index ac9fd37c7d..c89e6fa978 100644
--- a/testing/test_package_docs/ex/number.html
+++ b/testing/test_package_docs/ex/number.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>number top-level property</h1>
+    <h1>number top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">double</span>
diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html
index ec1a2fe0aa..021c70e0bc 100644
--- a/testing/test_package_docs/ex/processMessage.html
+++ b/testing/test_package_docs/ex/processMessage.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html
index 9dd12874e0..8eb237a44f 100644
--- a/testing/test_package_docs/ex/y.html
+++ b/testing/test_package_docs/ex/y.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>y top-level property</h1>
+    <h1>y top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/ABaseClass-class.html b/testing/test_package_docs/fake/ABaseClass-class.html
index 63881add4d..f764c4490d 100644
--- a/testing/test_package_docs/fake/ABaseClass-class.html
+++ b/testing/test_package_docs/fake/ABaseClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ABaseClass class</h1>
+      <h1>ABaseClass class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ABaseClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
index 74aaff3cab..7dba49724e 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AClassUsingASuperMixin class</h1>
+      <h1>AClassUsingASuperMixin class </h1>
 
     <section class="desc markdown">
       <p>Verify super-mixins don't break Dartdoc.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="superString" class="property inherited">
           <span class="name"><a href="fake/AMixinCallingSuper/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
index b3fb3dde11..a20883841f 100644
--- a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
+++ b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AClassWithFancyProperties class</h1>
+      <h1>AClassWithFancyProperties class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aProperty" class="property">
           <span class="name"><a href="fake/AClassWithFancyProperties/aProperty.html">aProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           This property is quite fancy, and requires sample code to understand. <a href="fake/AClassWithFancyProperties/aProperty.html">[...]</a>
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AClassWithFancyProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -198,7 +199,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AClassWithFancyProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -214,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper-class.html b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
index c85a4e3b6b..3222e997af 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AMixinCallingSuper class</h1>
+      <h1>AMixinCallingSuper class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="superString" class="property">
           <span class="name"><a href="fake/AMixinCallingSuper/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -256,7 +257,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass-class.html b/testing/test_package_docs/fake/ATypeTakingClass-class.html
index e7d9084686..ce6f27fc83 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>This class takes a type, and it might be void.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ATypeTakingClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ATypeTakingClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/aMethodMaybeReturningVoid.html">aMethodMaybeReturningVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -254,7 +255,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ATypeTakingClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
index 3d5650ede3..cd39f80f94 100644
--- a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClassMixedIn class</h1>
+      <h1>ATypeTakingClassMixedIn class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/aMethodMaybeReturningVoid.html">aMethodMaybeReturningVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ABaseClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/Annotation-class.html b/testing/test_package_docs/fake/Annotation-class.html
index f1876808d9..40b93946cf 100644
--- a/testing/test_package_docs/fake/Annotation-class.html
+++ b/testing/test_package_docs/fake/Annotation-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Annotation class</h1>
+      <h1>Annotation class </h1>
 
     <section class="desc markdown">
       <p>Useful for annotations.</p>
@@ -186,7 +187,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="fake/Annotation/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -194,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Annotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Annotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Annotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Annotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Annotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/AnotherInterface-class.html b/testing/test_package_docs/fake/AnotherInterface-class.html
index 774f35ba11..eee2fba500 100644
--- a/testing/test_package_docs/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs/fake/AnotherInterface-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherInterface class</h1>
+      <h1>AnotherInterface class </h1>
 
     <section class="desc markdown">
       <p>Yet another interface that can be implemented.</p>
@@ -198,7 +199,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -222,7 +223,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html
index b499bebc42..24bd8b5174 100644
--- a/testing/test_package_docs/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs/fake/BaseForDocComments-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,8 +160,13 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseForDocComments class</h1>
+      <h1>BaseForDocComments class   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
+    <section class="desc markdown">
+      <p>Category information should not follow inheritance.</p>
+    </section>
     
     <section>
       <dl class="dl-horizontal">
@@ -194,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -227,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/doAwesomeStuff.html">doAwesomeStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doAwesomeStuff-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Takes a <code>value</code> and returns a String. <a href="fake/BaseForDocComments/doAwesomeStuff.html">[...]</a>
           
@@ -236,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -260,7 +266,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-key"><span class="type-annotation">String</span> <span class="parameter-name">key</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -269,7 +275,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 0534d545f5..eb6ea68e43 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseThingy class</h1>
+      <h1>BaseThingy class </h1>
 
     
     <section>
@@ -195,7 +196,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
@@ -203,7 +204,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -253,7 +254,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -268,7 +269,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index 8f3cf539de..cc0a1ed19d 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseThingy2 class</h1>
+      <h1>BaseThingy2 class </h1>
 
     <section class="desc markdown">
       <p>Test for MultiplyInheritedExecutableElement handling.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property">
           <span class="name"><a href="fake/BaseThingy2/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd>
           BaseThingy2's doc for aImplementingThingy.
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -227,7 +228,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -243,7 +244,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -252,7 +253,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -261,7 +262,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -276,7 +277,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index 7db00bff61..8eb56be916 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CUSTOM_CLASS top-level constant</h1>
+    <h1>CUSTOM_CLASS top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">CUSTOM_CLASS</span>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
index 50ad7f3bb3..94e604c0d0 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CUSTOM_CLASS_PRIVATE top-level constant</h1>
+    <h1>CUSTOM_CLASS_PRIVATE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">CUSTOM_CLASS_PRIVATE</span>
diff --git a/testing/test_package_docs/fake/Callback2.html b/testing/test_package_docs/fake/Callback2.html
index d498cd0cbc..21dd36c16c 100644
--- a/testing/test_package_docs/fake/Callback2.html
+++ b/testing/test_package_docs/fake/Callback2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Callback2 typedef</h1>
+    <h1>Callback2 typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index 876dad5c82..c02a13fcfe 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ClassWithUnusualProperties class</h1>
+      <h1>ClassWithUnusualProperties class </h1>
 
     <section class="desc markdown">
       <p>Classes with unusual properties?  I don't think they exist.</p>
@@ -201,7 +202,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="documentedPartialFieldInSubclassOnly" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html">documentedPartialFieldInSubclassOnly</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           This getter is documented, so we should see a read-only property here.
@@ -209,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetter.html">explicitGetter</a></span>
-          <span class="signature">&#8594; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="signature">&#8594; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> 
         </dt>
         <dd>
           This property only has a getter and no setter; no parameters to print.
@@ -217,7 +218,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> 
         </dt>
         <dd>
           Getter doc for explicitGetterImplicitSetter
@@ -225,7 +226,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterSetter.html">explicitGetterSetter</a></span>
-          <span class="signature">&#8596; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="signature">&#8596; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> 
         </dt>
         <dd>
           Getter doc for explicitGetterSetter.
@@ -233,7 +234,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitNonDocumentedInBaseClassGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html">explicitNonDocumentedInBaseClassGetter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           Since I have a different doc, I should be documented.
@@ -241,7 +242,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitSetter.html">explicitSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span></span>
+          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span></span> 
         </dt>
         <dd>
           Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.
@@ -249,7 +250,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="finalProperty" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/finalProperty.html">finalProperty</a></span>
-          <span class="signature">&#8594; Set</span>
+          <span class="signature">&#8594; Set</span> 
         </dt>
         <dd>
           This property has some docs, too.
@@ -257,7 +258,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
@@ -265,7 +266,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitReadWrite" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/implicitReadWrite.html">implicitReadWrite</a></span>
-          <span class="signature">&#8596; Map</span>
+          <span class="signature">&#8596; Map</span> 
         </dt>
         <dd>
           
@@ -273,7 +274,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Explicit getter for inheriting.
@@ -281,7 +282,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitPartiallyDocumentedField" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/explicitPartiallyDocumentedField.html">explicitPartiallyDocumentedField</a></span>
-          <span class="signature">&#8594; double</span>
+          <span class="signature">&#8594; double</span> 
         </dt>
         <dd class="inherited">
           but documented here.
@@ -289,7 +290,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="forInheriting" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           A simple property to inherit.
@@ -297,7 +298,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -305,7 +306,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -321,7 +322,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ClassWithUnusualProperties/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-f"><span class="type-annotation">Function</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-x"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="f-param-q"><span class="type-annotation">bool</span> <span class="parameter-name">q</span></span>)</span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Hey there, more things not to warn about: <code>f</code>, <code>x</code>, or <code>q</code>.
           
@@ -330,7 +331,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -339,7 +340,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -354,7 +355,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplicitProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index b1f55d2278..5d74055e04 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Color enum</h1>
+    <h1>Color enum </h1>
 
     <section class="desc markdown">
       <p>An <code>enum</code> for ROYGBIV constants.</p>
@@ -173,7 +174,7 @@ <h2>Constants</h2>
         <dt id="BLUE" class="constant">
           <span class="name ">BLUE</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Some constants have long docs.</p>
 <p>Some constants have long docs.
@@ -186,7 +187,7 @@ <h2>Constants</h2>
         <dt id="GREEN" class="constant">
           <span class="name ">GREEN</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -197,7 +198,7 @@ <h2>Constants</h2>
         <dt id="INDIGO" class="constant">
           <span class="name ">INDIGO</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -208,7 +209,7 @@ <h2>Constants</h2>
         <dt id="ORANGE" class="constant">
           <span class="name ">ORANGE</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Orange</p>
           
@@ -219,7 +220,7 @@ <h2>Constants</h2>
         <dt id="RED" class="constant">
           <span class="name ">RED</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Red</p>
           
@@ -230,7 +231,7 @@ <h2>Constants</h2>
         <dt id="values" class="constant">
           <span class="name ">values</span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="fake/Color-class.html">Color</a></span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
@@ -241,7 +242,7 @@ <h2>Constants</h2>
         <dt id="VIOLET" class="constant">
           <span class="name ">VIOLET</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -252,7 +253,7 @@ <h2>Constants</h2>
         <dt id="YELLOW" class="constant">
           <span class="name ">YELLOW</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -270,7 +271,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name">index</span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           <p>The integer index of this enum.</p>
@@ -278,7 +279,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Color/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -286,7 +287,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Color/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -302,7 +303,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Color/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -311,7 +312,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -326,7 +327,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Color/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ConstantClass-class.html b/testing/test_package_docs/fake/ConstantClass-class.html
index 7d0eda1e56..94a494fb7f 100644
--- a/testing/test_package_docs/fake/ConstantClass-class.html
+++ b/testing/test_package_docs/fake/ConstantClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstantClass class</h1>
+      <h1>ConstantClass class </h1>
 
     <section class="desc markdown">
       <p>For make-better testing of constants.</p>
@@ -206,7 +207,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="fake/ConstantClass/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -214,7 +215,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ConstantClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -222,7 +223,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ConstantClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -238,7 +239,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstantClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -247,7 +248,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstantClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -262,7 +263,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ConstantClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index 99580869a7..71beb6c9a8 100644
--- a/testing/test_package_docs/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; class</h1>
+      <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; class </h1>
 
     
 
@@ -188,7 +189,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -196,7 +197,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -212,7 +213,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstructorTester/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -236,7 +237,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/Cool-class.html b/testing/test_package_docs/fake/Cool-class.html
index 204a0f0b29..7ef6fe31bf 100644
--- a/testing/test_package_docs/fake/Cool-class.html
+++ b/testing/test_package_docs/fake/Cool-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Cool class</h1>
+      <h1>Cool class </h1>
 
     <section class="desc markdown">
       <p>This class is cool!</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Cool/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Cool/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/returnCool.html">returnCool</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="fake/Cool-class.html">Cool</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Cool/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index 85b99cbab5..1831af6791 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>DOWN top-level constant</h1>
+    <h1>DOWN top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name deprecated">DOWN</span>
diff --git a/testing/test_package_docs/fake/DocumentWithATable-class.html b/testing/test_package_docs/fake/DocumentWithATable-class.html
index b4c7f01227..e7892023ad 100644
--- a/testing/test_package_docs/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs/fake/DocumentWithATable-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>DocumentWithATable class</h1>
+      <h1>DocumentWithATable class </h1>
 
     <section class="desc markdown">
       <p>This is a class with a table.</p>
@@ -189,7 +190,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/DocumentWithATable/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -197,7 +198,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/DocumentWithATable/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-parameter"><span class="type-annotation">String</span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -222,7 +223,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/DocumentWithATable/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -263,7 +264,7 @@ <h2>Constants</h2>
         <dt id="bar" class="constant">
           <span class="name "><a href="fake/DocumentWithATable/bar-constant.html">bar</a></span>
           <span class="signature">&#8594; const <a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -274,7 +275,7 @@ <h2>Constants</h2>
         <dt id="foo" class="constant">
           <span class="name "><a href="fake/DocumentWithATable/foo-constant.html">foo</a></span>
           <span class="signature">&#8594; const <a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/fake/Doh-class.html b/testing/test_package_docs/fake/Doh-class.html
index 4232b06953..e7b4c98863 100644
--- a/testing/test_package_docs/fake/Doh-class.html
+++ b/testing/test_package_docs/fake/Doh-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Doh class</h1>
+      <h1>Doh class </h1>
 
     <section class="desc markdown">
       <p>Also, my bad.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Doh/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Doh/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="stackTrace" class="property inherited">
           <span class="name"><a href="fake/Doh/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Doh/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Doh/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Doh/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
index 873461d12b..90f28ea278 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendsFutureVoid class</h1>
+      <h1>ExtendsFutureVoid class </h1>
 
     <section class="desc markdown">
       <p>This class extends Future<void></void></p>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -260,7 +261,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -269,7 +270,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -278,7 +279,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -293,7 +294,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 45b29038e1..8b71cb0cb5 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
+      <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>This inherits operators.</p>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="first" class="property inherited">
           <span class="name"><a href="fake/SpecialList/first.html">first</a></span>
-          <span class="signature">&#8596; dynamic</span>
+          <span class="signature">&#8596; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SpecialList/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +233,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="iterator" class="property inherited">
           <span class="name"><a href="fake/SpecialList/iterator.html">iterator</a></span>
-          <span class="signature">&#8594; Iterator</span>
+          <span class="signature">&#8594; Iterator</span> 
         </dt>
         <dd class="inherited">
           
@@ -240,7 +241,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="last" class="property inherited">
           <span class="name"><a href="fake/SpecialList/last.html">last</a></span>
-          <span class="signature">&#8596; dynamic</span>
+          <span class="signature">&#8596; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -248,7 +249,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="length" class="property inherited">
           <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -256,7 +257,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="reversed" class="property inherited">
           <span class="name"><a href="fake/SpecialList/reversed.html">reversed</a></span>
-          <span class="signature">&#8594; Iterable</span>
+          <span class="signature">&#8594; Iterable</span> 
         </dt>
         <dd class="inherited">
           
@@ -264,7 +265,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SpecialList/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -272,7 +273,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="single" class="property inherited">
           <span class="name"><a href="fake/SpecialList/single.html">single</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -288,7 +289,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/add.html">add</a></span><span class="signature">(<wbr><span class="parameter" id="add-param-element"><span class="type-annotation">dynamic</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -297,7 +298,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -306,7 +307,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/any.html">any</a></span><span class="signature">(<wbr><span class="parameter" id="any-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -315,7 +316,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">dynamic</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -324,7 +325,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -333,7 +334,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -342,7 +343,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/contains.html">contains</a></span><span class="signature">(<wbr><span class="parameter" id="contains-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -351,7 +352,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/elementAt.html">elementAt</a></span><span class="signature">(<wbr><span class="parameter" id="elementAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -360,7 +361,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/every.html">every</a></span><span class="signature">(<wbr><span class="parameter" id="every-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -369,7 +370,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -378,7 +379,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fillRange.html">fillRange</a></span><span class="signature">(<wbr><span class="parameter" id="fillRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="fillRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, [</span> <span class="parameter" id="fillRange-param-fill"><span class="type-annotation">dynamic</span> <span class="parameter-name">fill</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -387,7 +388,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/firstWhere.html">firstWhere</a></span><span class="signature">(<wbr><span class="parameter" id="firstWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="firstWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -396,7 +397,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -405,7 +406,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -414,7 +415,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/forEach.html">forEach</a></span><span class="signature">(<wbr><span class="parameter" id="forEach-param-action"><span class="type-annotation">void</span> <span class="parameter-name">action</span>(<span class="parameter" id="action-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -423,7 +424,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/getRange.html">getRange</a></span><span class="signature">(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -432,7 +433,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexOf.html">indexOf</a></span><span class="signature">(<wbr><span class="parameter" id="indexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="indexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -441,7 +442,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexWhere.html">indexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="indexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="indexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -450,7 +451,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insert.html">insert</a></span><span class="signature">(<wbr><span class="parameter" id="insert-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insert-param-element"><span class="type-annotation">dynamic</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -459,7 +460,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -468,7 +469,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/join.html">join</a></span><span class="signature">(<wbr>[<span class="parameter" id="join-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -477,7 +478,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexOf.html">lastIndexOf</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="lastIndexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -486,7 +487,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexWhere.html">lastIndexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="lastIndexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -495,7 +496,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastWhere.html">lastWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="lastWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -504,7 +505,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -513,7 +514,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -522,7 +523,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/reduce.html">reduce</a></span><span class="signature">(<wbr><span class="parameter" id="reduce-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">E</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -531,7 +532,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/remove.html">remove</a></span><span class="signature">(<wbr><span class="parameter" id="remove-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -540,7 +541,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeAt.html">removeAt</a></span><span class="signature">(<wbr><span class="parameter" id="removeAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -549,7 +550,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeLast.html">removeLast</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -558,7 +559,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeRange.html">removeRange</a></span><span class="signature">(<wbr><span class="parameter" id="removeRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="removeRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -567,7 +568,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></span><span class="signature">(<wbr><span class="parameter" id="removeWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -576,7 +577,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable</span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -585,7 +586,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></span><span class="signature">(<wbr><span class="parameter" id="retainWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -594,7 +595,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -603,7 +604,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -612,7 +613,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/shuffle.html">shuffle</a></span><span class="signature">(<wbr>[<span class="parameter" id="shuffle-param-random"><span class="type-annotation">Random</span> <span class="parameter-name">random</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -621,7 +622,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/singleWhere.html">singleWhere</a></span><span class="signature">(<wbr><span class="parameter" id="singleWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="singleWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -630,7 +631,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skip.html">skip</a></span><span class="signature">(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -639,7 +640,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></span><span class="signature">(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -648,7 +649,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sort.html">sort</a></span><span class="signature">(<wbr>[<span class="parameter" id="sort-param-compare"><span class="type-annotation">int</span> <span class="parameter-name">compare</span>(<span class="parameter" id="compare-param-a"><span class="type-annotation">E</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="compare-param-b"><span class="type-annotation">E</span> <span class="parameter-name">b</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -657,7 +658,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sublist.html">sublist</a></span><span class="signature">(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -666,7 +667,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/take.html">take</a></span><span class="signature">(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -675,7 +676,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></span><span class="signature">(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -684,7 +685,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toList.html">toList</a></span><span class="signature">(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -693,7 +694,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toSet.html">toSet</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Set</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -702,7 +703,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -711,7 +712,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/where.html">where</a></span><span class="signature">(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -720,7 +721,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -735,7 +736,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -744,7 +745,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -753,7 +754,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -762,7 +763,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">dynamic</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/FakeProcesses.html b/testing/test_package_docs/fake/FakeProcesses.html
index 793527dc94..eb04ef9ccb 100644
--- a/testing/test_package_docs/fake/FakeProcesses.html
+++ b/testing/test_package_docs/fake/FakeProcesses.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>FakeProcesses typedef</h1>
+    <h1>FakeProcesses typedef </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index f92c1bd084..4ed3474062 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Foo2 class</h1>
+      <h1>Foo2 class </h1>
 
     <section class="desc markdown">
       <p>link to method from class <a href="ex/Apple/m.html">Apple.m</a></p>
@@ -186,7 +187,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name"><a href="fake/Foo2/index.html">index</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -194,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Foo2/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Foo2/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Foo2/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Foo2/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Foo2/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Constants</h2>
         <dt id="BAR" class="constant">
           <span class="name "><a href="fake/Foo2/BAR-constant.html">BAR</a></span>
           <span class="signature">&#8594; const <a href="fake/Foo2-class.html">Foo2</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -270,7 +271,7 @@ <h2>Constants</h2>
         <dt id="BAZ" class="constant">
           <span class="name "><a href="fake/Foo2/BAZ-constant.html">BAZ</a></span>
           <span class="signature">&#8594; const <a href="fake/Foo2-class.html">Foo2</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index 9d01bc0cdb..5b39c51ff3 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index 47ba250e82..a79991cc6d 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; class</h1>
+      <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a></p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasGenericWithExtends/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasGenericWithExtends/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index 8cee963a5c..fe4ed37a75 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; class</h1>
+      <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasGenerics/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasGenerics/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/convertToMap.html">convertToMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Converts itself to a map.
           
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/doStuff.html">doStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doStuff-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span>, </span> <span class="parameter" id="doStuff-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span></span>)
             <span class="returntype parameter">&#8594; Z</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/returnX.html">returnX</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; X</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/returnZ.html">returnZ</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Z</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -266,7 +267,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasGenerics/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/HasPragma-class.html b/testing/test_package_docs/fake/HasPragma-class.html
index e64b0f3c88..fcf7b10441 100644
--- a/testing/test_package_docs/fake/HasPragma-class.html
+++ b/testing/test_package_docs/fake/HasPragma-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasPragma class</h1>
+      <h1>HasPragma class </h1>
 
     <section class="desc markdown">
       <p>This class uses a pragma annotation.</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasPragma/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasPragma/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasPragma/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasPragma/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasPragma/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index 23b4800574..10fde2005b 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementingThingy class</h1>
+      <h1>ImplementingThingy class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -240,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -249,7 +250,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -258,7 +259,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -273,7 +274,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index 01e6a55d1c..105821c652 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementingThingy2 class</h1>
+      <h1>ImplementingThingy2 class </h1>
 
     
     <section>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property inherited">
           <span class="name"><a href="fake/BaseThingy2/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd class="inherited">
           BaseThingy2's doc for aImplementingThingy.
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -237,7 +238,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +256,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -270,7 +271,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
index fa67d3f38f..19dbb1005b 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementsFutureVoid class</h1>
+      <h1>ImplementsFutureVoid class </h1>
 
     <section class="desc markdown">
       <p>This class implements Future<void></void></p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -268,7 +269,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -277,7 +278,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -292,7 +293,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index 060f56f1dc..077491569d 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplicitProperties class</h1>
+      <h1>ImplicitProperties class </h1>
 
     <section class="desc markdown">
       <p>Names are actually wrong in this class, but when we extend it,
@@ -198,7 +199,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> 
         </dt>
         <dd>
           Docs for explicitGetterImplicitSetter from ImplicitProperties.
@@ -206,7 +207,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           Explicit getter for inheriting.
@@ -214,7 +215,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitPartiallyDocumentedField" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitPartiallyDocumentedField.html">explicitPartiallyDocumentedField</a></span>
-          <span class="signature">&#8594; double</span>
+          <span class="signature">&#8594; double</span> 
         </dt>
         <dd>
           but documented here.
@@ -222,7 +223,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="forInheriting" class="property">
           <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           A simple property to inherit.
@@ -230,7 +231,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
           <span class="name"><a href="fake/ImplicitProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
@@ -238,7 +239,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -246,7 +247,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -262,7 +263,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -271,7 +272,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -286,7 +287,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplicitProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/InheritingClassOne-class.html b/testing/test_package_docs/fake/InheritingClassOne-class.html
index 19bd93c9a3..2583699db9 100644
--- a/testing/test_package_docs/fake/InheritingClassOne-class.html
+++ b/testing/test_package_docs/fake/InheritingClassOne-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>InheritingClassOne class</h1>
+      <h1>InheritingClassOne class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/InheritingClassOne/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/InheritingClassOne/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/aMethod.html">aMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/InheritingClassOne/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/InheritingClassTwo-class.html b/testing/test_package_docs/fake/InheritingClassTwo-class.html
index 96632ad4a4..1fa0111ce7 100644
--- a/testing/test_package_docs/fake/InheritingClassTwo-class.html
+++ b/testing/test_package_docs/fake/InheritingClassTwo-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>InheritingClassTwo class</h1>
+      <h1>InheritingClassTwo class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/InheritingClassTwo/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/InheritingClassTwo/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/aMethod.html">aMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/InheritingClassTwo/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/Interface-class.html b/testing/test_package_docs/fake/Interface-class.html
index 382aebe718..0f5d88a27a 100644
--- a/testing/test_package_docs/fake/Interface-class.html
+++ b/testing/test_package_docs/fake/Interface-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Interface class</h1>
+      <h1>Interface class </h1>
 
     <section class="desc markdown">
       <p>An interface that can be implemented.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Interface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Interface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Interface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Interface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +246,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Interface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 9761c0a0ef..41ae9cf015 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>LongFirstLine class</h1>
+      <h1>LongFirstLine class </h1>
 
     <section class="desc markdown">
       <p>This is a very long line spread
@@ -228,7 +229,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aStringProperty" class="property">
           <span class="name"><a href="fake/LongFirstLine/aStringProperty.html">aStringProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           An instance string property. Readable and writable.
@@ -236,7 +237,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="dynamicGetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/dynamicGetter.html">dynamicGetter</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           Dynamic getter. Readable only.
@@ -244,7 +245,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="onlySetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/onlySetter.html">onlySetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span></span></span> 
         </dt>
         <dd>
           Only a setter, with a single param, of type double.
@@ -252,7 +253,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -260,7 +261,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="powers" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           In the super class.
@@ -268,7 +269,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -284,7 +285,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/LongFirstLine/noParams.html">noParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           No params.
           
@@ -293,7 +294,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/optionalParams.html">optionalParams</a></span><span class="signature">(<wbr><span class="parameter" id="optionalParams-param-first"><span class="type-annotation">dynamic</span> <span class="parameter-name">first</span>, {</span> <span class="parameter" id="optionalParams-param-second"><span class="type-annotation">dynamic</span> <span class="parameter-name">second</span>, </span> <span class="parameter" id="optionalParams-param-third"><span class="type-annotation">int</span> <span class="parameter-name">third</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           One dynamic param, two named optionals.
           
@@ -302,7 +303,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/returnString.html">returnString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a single string.
           
@@ -311,7 +312,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/twoParams.html">twoParams</a></span><span class="signature">(<wbr><span class="parameter" id="twoParams-param-one"><span class="type-annotation">String</span> <span class="parameter-name">one</span>, </span> <span class="parameter" id="twoParams-param-two"><span class="type-annotation">dynamic</span> <span class="parameter-name">two</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Two params, the first has a type annotation, the second does not.
           
@@ -320,7 +321,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span>, </span> <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span>, {</span> <span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           In the super class. <a href="fake/SuperAwesomeClass/fly.html">[...]</a>
           <div class="features">inherited</div>
@@ -329,7 +330,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -338,7 +339,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -353,7 +354,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/LongFirstLine/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Multiplies a thingies to this thingie and then returns a new thingie.
           
@@ -362,7 +363,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/LongFirstLine/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds another one of these thingies.
           
@@ -371,7 +372,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -380,7 +381,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -394,7 +395,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="meaningOfLife" class="property">
           <span class="name"><a href="fake/LongFirstLine/meaningOfLife.html">meaningOfLife</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           A static int property.
@@ -402,7 +403,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticGetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/staticGetter.html">staticGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -410,7 +411,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticOnlySetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/staticOnlySetter.html">staticOnlySetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span></span></span> 
         </dt>
         <dd>
           
@@ -426,7 +427,7 @@ <h2>Static Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/staticMethodNoParams.html">staticMethodNoParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Just a static method with no parameters. <a href="fake/LongFirstLine/staticMethodNoParams.html">[...]</a>
           
@@ -435,7 +436,7 @@ <h2>Static Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/staticMethodReturnsVoid.html">staticMethodReturnsVoid</a></span><span class="signature">(<wbr><span class="parameter" id="staticMethodReturnsVoid-param-dynamicThing"><span class="type-annotation">dynamic</span> <span class="parameter-name">dynamicThing</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A static method that takes a single dynamic thing, and returns void.
           
@@ -450,7 +451,7 @@ <h2>Constants</h2>
         <dt id="ANSWER" class="constant">
           <span class="name "><a href="fake/LongFirstLine/ANSWER-constant.html">ANSWER</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -461,7 +462,7 @@ <h2>Constants</h2>
         <dt id="THING" class="constant">
           <span class="name "><a href="fake/LongFirstLine/THING-constant.html">THING</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
index 8e417e294b..dddb5b0ce1 100644
--- a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>LotsAndLotsOfParameters typedef</h1>
+    <h1>LotsAndLotsOfParameters typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs/fake/MIEEBase-class.html b/testing/test_package_docs/fake/MIEEBase-class.html
index 2fe90c3ae9..c4f5790388 100644
--- a/testing/test_package_docs/fake/MIEEBase-class.html
+++ b/testing/test_package_docs/fake/MIEEBase-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -248,7 +249,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixin/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/MIEEMixin-class.html b/testing/test_package_docs/fake/MIEEMixin-class.html
index 6c39f7db0e..5ec4e9c360 100644
--- a/testing/test_package_docs/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs/fake/MIEEMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -248,7 +249,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixin/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
index e70ba29e4c..7362677556 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Test an edge case for cases where inherited ExecutableElements can come
@@ -202,7 +203,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -210,7 +211,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixinWithOverride/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/MIEEThing-class.html b/testing/test_package_docs/fake/MIEEThing-class.html
index 4d0b3d9881..95ad43259e 100644
--- a/testing/test_package_docs/fake/MIEEThing-class.html
+++ b/testing/test_package_docs/fake/MIEEThing-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -251,7 +252,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/MixMeIn-class.html b/testing/test_package_docs/fake/MixMeIn-class.html
index b2608029c5..04439eacd3 100644
--- a/testing/test_package_docs/fake/MixMeIn-class.html
+++ b/testing/test_package_docs/fake/MixMeIn-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MixMeIn class</h1>
+      <h1>MixMeIn class </h1>
 
     <section class="desc markdown">
       <p>Perfect for mix-ins.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MixMeIn/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MixMeIn/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MixMeIn/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MixMeIn/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +246,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MixMeIn/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index bf37997c71..32d6460408 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NAME_SINGLEUNDERSCORE top-level constant</h1>
+    <h1>NAME_SINGLEUNDERSCORE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">NAME_SINGLEUNDERSCORE</span>
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index e699f0f0f2..4bdb4136fd 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NAME_WITH_TWO_UNDERSCORES top-level constant</h1>
+    <h1>NAME_WITH_TWO_UNDERSCORES top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">NAME_WITH_TWO_UNDERSCORES</span>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index 9a33b76863..9d6a219514 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/NotAMixin-class.html b/testing/test_package_docs/fake/NotAMixin-class.html
index f46bac6296..0d1bcd9a5c 100644
--- a/testing/test_package_docs/fake/NotAMixin-class.html
+++ b/testing/test_package_docs/fake/NotAMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NotAMixin class</h1>
+      <h1>NotAMixin class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="superString" class="property">
           <span class="name"><a href="fake/NotAMixin/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -210,7 +211,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/Oops-class.html b/testing/test_package_docs/fake/Oops-class.html
index eec8f0002b..0e957ba679 100644
--- a/testing/test_package_docs/fake/Oops-class.html
+++ b/testing/test_package_docs/fake/Oops-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Oops class</h1>
+      <h1>Oops class </h1>
 
     <section class="desc markdown">
       <p>My bad!</p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="message" class="property">
           <span class="name"><a href="fake/Oops/message.html">message</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Oops/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -215,7 +216,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Oops/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Oops/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -240,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Oops/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +256,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Oops/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass-class.html b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
index 633675274d..f8517fe13f 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OperatorReferenceClass class</h1>
+      <h1>OperatorReferenceClass class </h1>
 
     <section class="desc markdown">
       <p>Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/OperatorReferenceClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/OperatorReferenceClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 76e6c584f9..17de2ff97b 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
+      <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/OtherGenericsThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/OtherGenericsThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/convert.html">convert</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter"><a href="fake/Cool-class.html">Cool</a></span>, <span class="type-parameter">String</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/OtherGenericsThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index 81f58dad65..a12cff97f3 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PI top-level constant</h1>
+    <h1>PI top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">PI</span>
diff --git a/testing/test_package_docs/fake/ReferringClass-class.html b/testing/test_package_docs/fake/ReferringClass-class.html
index cf70baa9c0..3093f02230 100644
--- a/testing/test_package_docs/fake/ReferringClass-class.html
+++ b/testing/test_package_docs/fake/ReferringClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ReferringClass class</h1>
+      <h1>ReferringClass class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ReferringClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ReferringClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/notAMethodFromPrivateClass.html">notAMethodFromPrivateClass</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Here I am referring by full names, to <a href="fake/InheritingClassOne/aMethod.html">fake.InheritingClassOne.aMethod</a>,
 and to <a href="fake/InheritingClassTwo/aMethod.html">fake.InheritingClassTwo.aMethod</a>.  With luck, both of these
@@ -217,7 +218,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ReferringClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index f7d64aae55..931b50a677 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
+      <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Extends <code>ListBase</code></p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="length" class="property">
           <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="first" class="property inherited">
           <span class="name"><a href="fake/SpecialList/first.html">first</a></span>
-          <span class="signature">&#8596; E</span>
+          <span class="signature">&#8596; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SpecialList/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -227,7 +228,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -243,7 +244,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="iterator" class="property inherited">
           <span class="name"><a href="fake/SpecialList/iterator.html">iterator</a></span>
-          <span class="signature">&#8594; Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="signature">&#8594; Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -251,7 +252,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="last" class="property inherited">
           <span class="name"><a href="fake/SpecialList/last.html">last</a></span>
-          <span class="signature">&#8596; E</span>
+          <span class="signature">&#8596; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -259,7 +260,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="reversed" class="property inherited">
           <span class="name"><a href="fake/SpecialList/reversed.html">reversed</a></span>
-          <span class="signature">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="signature">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -267,7 +268,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SpecialList/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -275,7 +276,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="single" class="property inherited">
           <span class="name"><a href="fake/SpecialList/single.html">single</a></span>
-          <span class="signature">&#8594; E</span>
+          <span class="signature">&#8594; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -291,7 +292,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/add.html">add</a></span><span class="signature">(<wbr><span class="parameter" id="add-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -300,7 +301,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -309,7 +310,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/any.html">any</a></span><span class="signature">(<wbr><span class="parameter" id="any-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -318,7 +319,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -327,7 +328,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -336,7 +337,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -345,7 +346,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/contains.html">contains</a></span><span class="signature">(<wbr><span class="parameter" id="contains-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -354,7 +355,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/elementAt.html">elementAt</a></span><span class="signature">(<wbr><span class="parameter" id="elementAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -363,7 +364,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/every.html">every</a></span><span class="signature">(<wbr><span class="parameter" id="every-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -372,7 +373,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -381,7 +382,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fillRange.html">fillRange</a></span><span class="signature">(<wbr><span class="parameter" id="fillRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="fillRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, [</span> <span class="parameter" id="fillRange-param-fill"><span class="type-annotation">E</span> <span class="parameter-name">fill</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -390,7 +391,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/firstWhere.html">firstWhere</a></span><span class="signature">(<wbr><span class="parameter" id="firstWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="firstWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -399,7 +400,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -408,7 +409,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -417,7 +418,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/forEach.html">forEach</a></span><span class="signature">(<wbr><span class="parameter" id="forEach-param-action"><span class="type-annotation">void</span> <span class="parameter-name">action</span>(<span class="parameter" id="action-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -426,7 +427,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/getRange.html">getRange</a></span><span class="signature">(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -435,7 +436,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexOf.html">indexOf</a></span><span class="signature">(<wbr><span class="parameter" id="indexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="indexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -444,7 +445,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexWhere.html">indexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="indexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="indexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -453,7 +454,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insert.html">insert</a></span><span class="signature">(<wbr><span class="parameter" id="insert-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insert-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -462,7 +463,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -471,7 +472,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/join.html">join</a></span><span class="signature">(<wbr>[<span class="parameter" id="join-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -480,7 +481,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexOf.html">lastIndexOf</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="lastIndexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -489,7 +490,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexWhere.html">lastIndexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="lastIndexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -498,7 +499,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastWhere.html">lastWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="lastWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -507,7 +508,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -516,7 +517,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -525,7 +526,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/reduce.html">reduce</a></span><span class="signature">(<wbr><span class="parameter" id="reduce-param-combine"><span class="type-annotation">E</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">E</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -534,7 +535,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/remove.html">remove</a></span><span class="signature">(<wbr><span class="parameter" id="remove-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -543,7 +544,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeAt.html">removeAt</a></span><span class="signature">(<wbr><span class="parameter" id="removeAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -552,7 +553,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeLast.html">removeLast</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -561,7 +562,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeRange.html">removeRange</a></span><span class="signature">(<wbr><span class="parameter" id="removeRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="removeRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -570,7 +571,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></span><span class="signature">(<wbr><span class="parameter" id="removeWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -579,7 +580,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -588,7 +589,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></span><span class="signature">(<wbr><span class="parameter" id="retainWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -597,7 +598,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -606,7 +607,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -615,7 +616,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/shuffle.html">shuffle</a></span><span class="signature">(<wbr>[<span class="parameter" id="shuffle-param-random"><span class="type-annotation">Random</span> <span class="parameter-name">random</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -624,7 +625,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/singleWhere.html">singleWhere</a></span><span class="signature">(<wbr><span class="parameter" id="singleWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="singleWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -633,7 +634,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skip.html">skip</a></span><span class="signature">(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -642,7 +643,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></span><span class="signature">(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -651,7 +652,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sort.html">sort</a></span><span class="signature">(<wbr>[<span class="parameter" id="sort-param-compare"><span class="type-annotation">int</span> <span class="parameter-name">compare</span>(<span class="parameter" id="compare-param-a"><span class="type-annotation">E</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="compare-param-b"><span class="type-annotation">E</span> <span class="parameter-name">b</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -660,7 +661,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sublist.html">sublist</a></span><span class="signature">(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -669,7 +670,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/take.html">take</a></span><span class="signature">(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -678,7 +679,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></span><span class="signature">(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -687,7 +688,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toList.html">toList</a></span><span class="signature">(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -696,7 +697,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toSet.html">toSet</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Set<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -705,7 +706,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -714,7 +715,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/where.html">where</a></span><span class="signature">(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -723,7 +724,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -738,7 +739,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -747,7 +748,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">E</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -756,7 +757,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -765,7 +766,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/SubForDocComments-class.html b/testing/test_package_docs/fake/SubForDocComments-class.html
index cfa6c3fb94..6e24cb5a59 100644
--- a/testing/test_package_docs/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs/fake/SubForDocComments-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SubForDocComments class</h1>
+      <h1>SubForDocComments class </h1>
 
     <section class="desc markdown">
       <p>Testing if docs for inherited method are correct.</p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SubForDocComments/localMethod.html">localMethod</a></span><span class="signature">(<wbr><span class="parameter" id="localMethod-param-foo"><span class="type-annotation">String</span> <span class="parameter-name">foo</span>, </span> <span class="parameter" id="localMethod-param-bar"><span class="type-annotation">dynamic</span> <span class="parameter-name">bar</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Reference to <code>foo</code> and <code>bar</code>
           
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/doAwesomeStuff.html">doAwesomeStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doAwesomeStuff-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Takes a <code>value</code> and returns a String. <a href="fake/BaseForDocComments/doAwesomeStuff.html">[...]</a>
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -274,7 +275,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -283,7 +284,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-key"><span class="type-annotation">String</span> <span class="parameter-name">key</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 56d36a5177..3cd6090a41 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SuperAwesomeClass class</h1>
+      <h1>SuperAwesomeClass class </h1>
 
     <section class="desc markdown">
       <p>A super class, with many powers. Link to <a href="ex/Apple-class.html">Apple</a> from another library.</p>
@@ -201,7 +202,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="powers" class="property">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           In the super class.
@@ -209,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -217,7 +218,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span>, </span> <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span>, {</span> <span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           In the super class. <a href="fake/SuperAwesomeClass/fly.html">[...]</a>
           
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -266,7 +267,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -275,7 +276,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/TypedefUsingClass-class.html b/testing/test_package_docs/fake/TypedefUsingClass-class.html
index b10d928778..ef8f669211 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TypedefUsingClass class</h1>
+      <h1>TypedefUsingClass class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="x" class="property">
           <span class="name"><a href="fake/TypedefUsingClass/x.html">x</a></span>
-          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/TypedefUsingClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -198,7 +199,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/TypedefUsingClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -214,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/TypedefUsingClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/TypedefUsingClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/TypedefUsingClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index 1ed4e25e0d..d0564baa57 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>UP top-level constant</h1>
+    <h1>UP top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">UP</span>
diff --git a/testing/test_package_docs/fake/VoidCallback.html b/testing/test_package_docs/fake/VoidCallback.html
index 0416745ee2..6ae946acdd 100644
--- a/testing/test_package_docs/fake/VoidCallback.html
+++ b/testing/test_package_docs/fake/VoidCallback.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>VoidCallback typedef</h1>
+    <h1>VoidCallback typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index ce5a192b66..3327847b3c 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGetterAndSetter class</h1>
+      <h1>WithGetterAndSetter class </h1>
 
     <section class="desc markdown">
       <p>Tests a single field with explict getter and setter.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="lengthX" class="property">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -229,7 +230,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -253,7 +254,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index dcf82e06ee..5d97d74a95 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ZERO top-level constant</h1>
+    <h1>ZERO top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">ZERO</span>
diff --git a/testing/test_package_docs/fake/aCoolVariable.html b/testing/test_package_docs/fake/aCoolVariable.html
index 6471277a3e..093466907b 100644
--- a/testing/test_package_docs/fake/aCoolVariable.html
+++ b/testing/test_package_docs/fake/aCoolVariable.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aCoolVariable top-level property</h1>
+    <h1>aCoolVariable top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/Cool-class.html">Cool</a></span>
diff --git a/testing/test_package_docs/fake/aVoidParameter.html b/testing/test_package_docs/fake/aVoidParameter.html
index 6e6ef7a5be..9627057c68 100644
--- a/testing/test_package_docs/fake/aVoidParameter.html
+++ b/testing/test_package_docs/fake/aVoidParameter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aVoidParameter function</h1>
+    <h1>aVoidParameter function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/addCallback.html b/testing/test_package_docs/fake/addCallback.html
index 703b1763cd..f7c22d0d8b 100644
--- a/testing/test_package_docs/fake/addCallback.html
+++ b/testing/test_package_docs/fake/addCallback.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>addCallback function</h1>
+    <h1>addCallback function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/addCallback2.html b/testing/test_package_docs/fake/addCallback2.html
index d085ff03d6..03917fde7d 100644
--- a/testing/test_package_docs/fake/addCallback2.html
+++ b/testing/test_package_docs/fake/addCallback2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>addCallback2 function</h1>
+    <h1>addCallback2 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/bulletDoced-constant.html b/testing/test_package_docs/fake/bulletDoced-constant.html
index 9123c5349c..b4158fe434 100644
--- a/testing/test_package_docs/fake/bulletDoced-constant.html
+++ b/testing/test_package_docs/fake/bulletDoced-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>bulletDoced top-level constant</h1>
+    <h1>bulletDoced top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">bulletDoced</span>
diff --git a/testing/test_package_docs/fake/complicatedReturn.html b/testing/test_package_docs/fake/complicatedReturn.html
index fe225f79c4..cc0fcdc7de 100644
--- a/testing/test_package_docs/fake/complicatedReturn.html
+++ b/testing/test_package_docs/fake/complicatedReturn.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>complicatedReturn top-level property</h1>
+    <h1>complicatedReturn top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index 3929ec1c0d..0ec4826ab5 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>dynamicGetter top-level property</h1>
+    <h1>dynamicGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index 1cacdc273c..2163ba270b 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>fake library</h1>
+    <h1>fake library </h1>
 
     <section class="desc markdown">
       <h1 id="wow-fake-package-is-__best__-packagepkg">WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a></h1>
@@ -88,201 +93,210 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="ABaseClass">
-          <span class="name "><a href="fake/ABaseClass-class.html">ABaseClass</a></span>
+          <span class="name "><a href="fake/ABaseClass-class.html">ABaseClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="AClassUsingASuperMixin">
-          <span class="name "><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></span>
+          <span class="name "><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></span> 
         </dt>
         <dd>
           Verify super-mixins don't break Dartdoc.
         </dd>
         <dt id="AClassWithFancyProperties">
-          <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span>
+          <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="AMixinCallingSuper">
-          <span class="name "><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></span>
+          <span class="name "><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Annotation">
-          <span class="name "><a href="fake/Annotation-class.html">Annotation</a></span>
+          <span class="name "><a href="fake/Annotation-class.html">Annotation</a></span> 
         </dt>
         <dd>
           Useful for annotations.
         </dd>
         <dt id="AnotherInterface">
-          <span class="name "><a href="fake/AnotherInterface-class.html">AnotherInterface</a></span>
+          <span class="name "><a href="fake/AnotherInterface-class.html">AnotherInterface</a></span> 
         </dt>
         <dd>
           Yet another interface that can be implemented.
         </dd>
         <dt id="ATypeTakingClass">
-          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           This class takes a type, and it might be void.
         </dd>
         <dt id="ATypeTakingClassMixedIn">
-          <span class="name "><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></span>
+          <span class="name "><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="BaseForDocComments">
-          <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>
+          <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
         </dt>
         <dd>
-          
+          Category information should not follow inheritance.
         </dd>
         <dt id="BaseThingy">
-          <span class="name "><a href="fake/BaseThingy-class.html">BaseThingy</a></span>
+          <span class="name "><a href="fake/BaseThingy-class.html">BaseThingy</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="BaseThingy2">
-          <span class="name "><a href="fake/BaseThingy2-class.html">BaseThingy2</a></span>
+          <span class="name "><a href="fake/BaseThingy2-class.html">BaseThingy2</a></span> 
         </dt>
         <dd>
           Test for MultiplyInheritedExecutableElement handling.
         </dd>
         <dt id="ClassWithUnusualProperties">
-          <span class="name "><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></span>
+          <span class="name "><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></span> 
         </dt>
         <dd>
           Classes with unusual properties?  I don't think they exist. <a href="fake/ClassWithUnusualProperties-class.html">[...]</a>
         </dd>
         <dt id="ConstantClass">
-          <span class="name "><a href="fake/ConstantClass-class.html">ConstantClass</a></span>
+          <span class="name "><a href="fake/ConstantClass-class.html">ConstantClass</a></span> 
         </dt>
         <dd>
           For make-better testing of constants. <a href="fake/ConstantClass-class.html">[...]</a>
         </dd>
         <dt id="ConstructorTester">
-          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></span>
+          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Cool">
-          <span class="name "><a href="fake/Cool-class.html">Cool</a></span>
+          <span class="name "><a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           This class is cool!
         </dd>
         <dt id="DocumentWithATable">
-          <span class="name "><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
+          <span class="name "><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span> 
         </dt>
         <dd>
           This is a class with a table. <a href="fake/DocumentWithATable-class.html">[...]</a>
         </dd>
         <dt id="ExtendsFutureVoid">
-          <span class="name "><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></span>
+          <span class="name "><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></span> 
         </dt>
         <dd>
           This class extends Future<void></void>
         </dd>
         <dt id="ExtraSpecialList">
-          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd>
           This inherits operators.
         </dd>
         <dt id="Foo2">
-          <span class="name "><a href="fake/Foo2-class.html">Foo2</a></span>
+          <span class="name "><a href="fake/Foo2-class.html">Foo2</a></span> 
         </dt>
         <dd>
           link to method from class <a href="ex/Apple/m.html">Apple.m</a>
         </dd>
         <dt id="HasGenerics">
-          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span>
+          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="HasGenericWithExtends">
-          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span></span>
+          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span></span> 
         </dt>
         <dd>
           I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a>
         </dd>
         <dt id="HasPragma">
-          <span class="name "><a href="fake/HasPragma-class.html">HasPragma</a></span>
+          <span class="name "><a href="fake/HasPragma-class.html">HasPragma</a></span> 
         </dt>
         <dd>
           This class uses a pragma annotation.
         </dd>
+        <dt id="IAmAClassWithCategories">
+          <span class="name "><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+
+        </dt>
+        <dd>
+          Categories test for auto-include-dependencies (Flutter).
+        </dd>
         <dt id="ImplementingThingy">
-          <span class="name "><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="name "><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ImplementingThingy2">
-          <span class="name "><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="name "><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ImplementsFutureVoid">
-          <span class="name "><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></span>
+          <span class="name "><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></span> 
         </dt>
         <dd>
           This class implements Future<void></void>
         </dd>
         <dt id="ImplicitProperties">
-          <span class="name "><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></span>
+          <span class="name "><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></span> 
         </dt>
         <dd>
           Names are actually wrong in this class, but when we extend it,
 they are correct.
         </dd>
         <dt id="InheritingClassOne">
-          <span class="name "><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></span>
+          <span class="name "><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="InheritingClassTwo">
-          <span class="name "><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></span>
+          <span class="name "><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Interface">
-          <span class="name "><a href="fake/Interface-class.html">Interface</a></span>
+          <span class="name "><a href="fake/Interface-class.html">Interface</a></span> 
         </dt>
         <dd>
           An interface that can be implemented.
         </dd>
         <dt id="LongFirstLine">
-          <span class="name "><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
+          <span class="name "><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> 
         </dt>
         <dd>
           This is a very long line spread
 across... wait for it... two physical lines. <a href="fake/LongFirstLine-class.html">[...]</a>
         </dd>
         <dt id="MIEEBase">
-          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixin">
-          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixinWithOverride">
-          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           Test an edge case for cases where inherited ExecutableElements can come
@@ -290,67 +304,67 @@ <h2>Classes</h2>
 class still takes precedence (#1561).
         </dd>
         <dt id="MIEEThing">
-          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MixMeIn">
-          <span class="name "><a href="fake/MixMeIn-class.html">MixMeIn</a></span>
+          <span class="name "><a href="fake/MixMeIn-class.html">MixMeIn</a></span> 
         </dt>
         <dd>
           Perfect for mix-ins.
         </dd>
         <dt id="NotAMixin">
-          <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span>
+          <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="OperatorReferenceClass">
-          <span class="name "><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></span>
+          <span class="name "><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></span> 
         </dt>
         <dd>
           Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.
         </dd>
         <dt id="OtherGenericsThing">
-          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
+          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ReferringClass">
-          <span class="name "><a href="fake/ReferringClass-class.html">ReferringClass</a></span>
+          <span class="name "><a href="fake/ReferringClass-class.html">ReferringClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SpecialList">
-          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd>
           Extends <code>ListBase</code>
         </dd>
         <dt id="SubForDocComments">
-          <span class="name "><a href="fake/SubForDocComments-class.html">SubForDocComments</a></span>
+          <span class="name "><a href="fake/SubForDocComments-class.html">SubForDocComments</a></span> 
         </dt>
         <dd>
           Testing if docs for inherited method are correct.
         </dd>
         <dt id="SuperAwesomeClass">
-          <span class="name deprecated"><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
+          <span class="name deprecated"><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span> 
         </dt>
         <dd>
           A super class, with many powers. Link to <a href="ex/Apple-class.html">Apple</a> from another library.
         </dd>
         <dt id="TypedefUsingClass">
-          <span class="name "><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></span>
+          <span class="name "><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="WithGetterAndSetter">
-          <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span>
+          <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span> 
         </dt>
         <dd>
           Tests a single field with explict getter and setter.
@@ -365,7 +379,7 @@ <h2>Constants</h2>
         <dt id="bulletDoced" class="constant">
           <span class="name "><a href="fake/bulletDoced-constant.html">bulletDoced</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Bullet point documentation. <a href="fake/bulletDoced-constant.html">[...]</a>
           
@@ -376,7 +390,7 @@ <h2>Constants</h2>
         <dt id="CUSTOM_CLASS" class="constant">
           <span class="name "><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></span>
           <span class="signature">&#8594; const <a href="fake/ConstantClass-class.html">ConstantClass</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -387,7 +401,7 @@ <h2>Constants</h2>
         <dt id="CUSTOM_CLASS_PRIVATE" class="constant">
           <span class="name "><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></span>
           <span class="signature">&#8594; const _APrivateConstClass</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -398,7 +412,7 @@ <h2>Constants</h2>
         <dt id="DOWN" class="constant">
           <span class="name deprecated"><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Dynamic-typed down.
           
@@ -409,7 +423,7 @@ <h2>Constants</h2>
         <dt id="greatAnnotation" class="constant">
           <span class="name "><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is a great thing.
           
@@ -420,7 +434,7 @@ <h2>Constants</h2>
         <dt id="greatestAnnotation" class="constant">
           <span class="name "><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is the greatest thing.
           
@@ -431,7 +445,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReference" class="constant">
           <span class="name "><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Referencing something that <code>doesn't exist</code>.
           
@@ -442,7 +456,7 @@ <h2>Constants</h2>
         <dt id="myMap" class="constant">
           <span class="name "><a href="fake/myMap-constant.html">myMap</a></span>
           <span class="signature">&#8594; const Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">String</span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           A map initialization making use of optional const.
           
@@ -453,7 +467,7 @@ <h2>Constants</h2>
         <dt id="NAME_SINGLEUNDERSCORE" class="constant">
           <span class="name "><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -464,7 +478,7 @@ <h2>Constants</h2>
         <dt id="NAME_WITH_TWO_UNDERSCORES" class="constant">
           <span class="name "><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -475,7 +489,7 @@ <h2>Constants</h2>
         <dt id="PI" class="constant">
           <span class="name "><a href="fake/PI-constant.html">PI</a></span>
           <span class="signature">&#8594; const double</span>
-        </dt>
+          </dt>
         <dd>
           Constant property.
           
@@ -486,7 +500,7 @@ <h2>Constants</h2>
         <dt id="required" class="constant">
           <span class="name "><a href="fake/required-constant.html">required</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -497,7 +511,7 @@ <h2>Constants</h2>
         <dt id="testingCodeSyntaxInOneLiners" class="constant">
           <span class="name "><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           These are code syntaxes: <code>true</code> and <code>false</code>
           
@@ -508,7 +522,7 @@ <h2>Constants</h2>
         <dt id="UP" class="constant">
           <span class="name "><a href="fake/UP-constant.html">UP</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Up is a direction. <a href="fake/UP-constant.html">[...]</a>
           
@@ -519,7 +533,7 @@ <h2>Constants</h2>
         <dt id="ZERO" class="constant">
           <span class="name "><a href="fake/ZERO-constant.html">ZERO</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           A constant integer value,
 which is a bit redundant.
@@ -537,7 +551,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aCoolVariable" class="property">
           <span class="name"><a href="fake/aCoolVariable.html">aCoolVariable</a></span>
-          <span class="signature">&#8596; <a href="fake/Cool-class.html">Cool</a></span>
+          <span class="signature">&#8596; <a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           A variable initalization making use of optional new.
@@ -545,7 +559,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="complicatedReturn" class="property">
           <span class="name"><a href="fake/complicatedReturn.html">complicatedReturn</a></span>
-          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span> 
         </dt>
         <dd>
           A complicated type parameter to ATypeTakingClass.
@@ -553,7 +567,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="dynamicGetter" class="property">
           <span class="name"><a href="fake/dynamicGetter.html">dynamicGetter</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           A dynamic getter.
@@ -561,7 +575,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="getterSetterNodocGetter" class="property">
           <span class="name"><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></span>
-          <span class="signature">&#8592; int</span>
+          <span class="signature">&#8592; int</span> 
         </dt>
         <dd>
           Setter docs should be shown.
@@ -569,7 +583,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="getterSetterNodocSetter" class="property">
           <span class="name"><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           Getter docs should be shown.
@@ -577,7 +591,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="importantComputations" class="property">
           <span class="name"><a href="fake/importantComputations.html">importantComputations</a></span>
-          <span class="signature">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
+          <span class="signature">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span> 
         </dt>
         <dd>
           Type inference mixing with anonymous functions.
@@ -585,7 +599,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="justGetter" class="property">
           <span class="name"><a href="fake/justGetter.html">justGetter</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           Just a getter. No partner setter.
@@ -593,7 +607,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="justSetter" class="property">
           <span class="name"><a href="fake/justSetter.html">justSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           Just a setter. No partner getter.
@@ -601,7 +615,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="mapWithDynamicKeys" class="property">
           <span class="name"><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></span>
-          <span class="signature">&#8596; Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -609,7 +623,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="meaningOfLife" class="property">
           <span class="name"><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           Final property.
@@ -617,7 +631,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="mustGetThis" class="property">
           <span class="name"><a href="fake/mustGetThis.html">mustGetThis</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           A doc reference mentioning <code>dynamic</code>.
@@ -625,7 +639,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="setAndGet" class="property">
           <span class="name"><a href="fake/setAndGet.html">setAndGet</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for setAndGet.
@@ -633,7 +647,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="simpleProperty" class="property">
           <span class="name"><a href="fake/simpleProperty.html">simpleProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Simple property
@@ -641,7 +655,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="useSomethingInAnotherPackage" class="property">
           <span class="name"><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></span>
-          <span class="signature">&#8596; Required</span>
+          <span class="signature">&#8596; Required</span> 
         </dt>
         <dd>
           
@@ -649,7 +663,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="useSomethingInTheSdk" class="property">
           <span class="name"><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -666,7 +680,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/addCallback.html">addCallback</a></span><span class="signature">(<wbr><span class="parameter" id="addCallback-param-callback"><span class="type-annotation"><a href="fake/VoidCallback.html">VoidCallback</a></span> <span class="parameter-name">callback</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds a callback.
           
@@ -675,7 +689,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/addCallback2.html">addCallback2</a></span><span class="signature">(<wbr><span class="parameter" id="addCallback2-param-callback"><span class="type-annotation"><a href="fake/Callback2.html">Callback2</a></span> <span class="parameter-name">callback</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds another callback.
           
@@ -684,7 +698,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/aVoidParameter.html">aVoidParameter</a></span><span class="signature">(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">p1</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function requires a Future<void> as a parameter</void>
           
@@ -693,7 +707,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></span><span class="signature">(<wbr><span class="parameter" id="functionWithFunctionParameters-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, </span> <span class="parameter" id="functionWithFunctionParameters-param-thing"><span class="type-annotation">void</span> <span class="parameter-name">thing</span>(<span class="parameter" id="thing-param-one"><span class="type-annotation">dynamic</span> <span class="parameter-name">one</span>, </span> <span class="parameter" id="thing-param-two"><span class="type-annotation">dynamic</span> <span class="parameter-name">two</span></span>), </span> <span class="parameter" id="functionWithFunctionParameters-param-string"><span class="type-annotation">String</span> <span class="parameter-name">string</span>, </span> <span class="parameter" id="functionWithFunctionParameters-param-asyncThing"><span class="type-annotation">Future</span> <span class="parameter-name">asyncThing</span>(<span class="parameter" id="asyncThing-param-three"><span class="type-annotation">dynamic</span> <span class="parameter-name">three</span>, </span> <span class="parameter" id="asyncThing-param-four"><span class="type-annotation">dynamic</span> <span class="parameter-name">four</span>, </span> <span class="parameter" id="asyncThing-param-five"><span class="type-annotation">dynamic</span> <span class="parameter-name">five</span>, </span> <span class="parameter" id="asyncThing-param-six"><span class="type-annotation">dynamic</span> <span class="parameter-name">six</span>, </span> <span class="parameter" id="asyncThing-param-seven"><span class="type-annotation">dynamic</span> <span class="parameter-name">seven</span></span>)</span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function has two parameters that are functions. <a href="fake/functionWithFunctionParameters.html">[...]</a>
           
@@ -702,7 +716,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/myGenericFunction.html">myGenericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A generic function with a type parameter.
           
@@ -711,7 +725,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></span><span class="signature">(<wbr>[<span class="parameter" id="onlyPositionalWithNoDefaultNoType-param-anything"><span class="type-annotation">dynamic</span> <span class="parameter-name">anything</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A single optional positional param, no type annotation, no default value.
           <div class="features">@greatAnnotation</div>
@@ -720,7 +734,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paintImage1.html">paintImage1</a></span><span class="signature">(<wbr>{<span class="parameter" id="paintImage1-param-canvas"><span class="type-annotation">String</span> <span class="parameter-name">canvas</span>, </span> <span class="parameter" id="paintImage1-param-rect"><span class="type-annotation">int</span> <span class="parameter-name">rect</span>, </span> <span class="parameter" id="paintImage1-param-image"><span class="type-annotation"><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></span> <span class="parameter-name">image</span>, </span> <span class="parameter" id="paintImage1-param-colorFilter"><span class="type-annotation"><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span> <span class="parameter-name">colorFilter</span>, </span> <span class="parameter" id="paintImage1-param-repeat"><span class="type-annotation">String</span> <span class="parameter-name">repeat</span>: <span class="default-value">LongFirstLine.THING</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Paints an image into the given rectangle in the canvas.
           
@@ -729,7 +743,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paintImage2.html">paintImage2</a></span><span class="signature">(<wbr><span class="parameter" id="paintImage2-param-fooParam"><span class="type-annotation">String</span> <span class="parameter-name">fooParam</span>, [</span> <span class="parameter" id="paintImage2-param-canvas"><span class="type-annotation">String</span> <span class="parameter-name">canvas</span>, </span> <span class="parameter" id="paintImage2-param-rect"><span class="type-annotation">int</span> <span class="parameter-name">rect</span>, </span> <span class="parameter" id="paintImage2-param-image"><span class="type-annotation"><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></span> <span class="parameter-name">image</span>, </span> <span class="parameter" id="paintImage2-param-colorFilter"><span class="type-annotation"><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span> <span class="parameter-name">colorFilter</span>, </span> <span class="parameter" id="paintImage2-param-repeat"><span class="type-annotation">String</span> <span class="parameter-name">repeat</span> = <span class="default-value">LongFirstLine.THING</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Paints an image into the given rectangle in the canvas.
           
@@ -738,7 +752,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromAnotherLib-param-thing"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">thing</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           <code>FooBar</code> comes from another library.
           
@@ -747,7 +761,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></span><span class="signature">(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span> <span class="parameter-name">future</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Has a parameter explicitly typed <code>FutureOr&lt;Null&gt;</code>.
           
@@ -756,7 +770,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/returningFutureVoid.html">returningFutureVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function returns Future<void></void>
           
@@ -765,7 +779,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/short.html">short</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Testing <a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a> should not be italicized. <a href="fake/short.html">[...]</a>
           
@@ -774,7 +788,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/soIntense.html">soIntense</a></span><span class="signature">(<wbr><span class="parameter" id="soIntense-param-anything"><span class="type-annotation">dynamic</span> <span class="parameter-name">anything</span>, {</span> <span class="parameter" id="soIntense-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span>: <span class="default-value">true</span>, </span> <span class="parameter" id="soIntense-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Top-level function with 1 param and 2 optional named params, 1 with a
 default value.
@@ -784,7 +798,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly returns a Future and is marked async.
           
@@ -793,7 +807,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsAsync.html">thisIsAsync</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           An async function. It should look like I return a <code>Future</code>.
           
@@ -802,7 +816,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr</code>.
           
@@ -811,7 +825,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr&lt;Null&gt;</code>.
           
@@ -820,7 +834,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr&lt;T&gt;</code>.
           
@@ -829,7 +843,7 @@ <h2>Functions</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></span><span class="signature">(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span>, </span> <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span>, </span> <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span>, [</span> <span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Top-level function 3 params and 1 optional positional param. <a href="fake/topLevelFunction.html">[...]</a>
           
@@ -838,7 +852,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T extends FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">List</span>&gt;</span></span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Has a type parameter bound to <code>FutureOr&lt;List&gt;</code>.
           
@@ -851,7 +865,7 @@ <h2>Enums</h2>
 
       <dl>
         <dt id="Color">
-          <span class="name "><a href="fake/Color-class.html">Color</a></span>
+          <span class="name "><a href="fake/Color-class.html">Color</a></span> 
         </dt>
         <dd>
           An <code>enum</code> for ROYGBIV constants.
@@ -867,7 +881,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/Callback2.html">Callback2</a></span><span class="signature">(<wbr><span class="parameter" id="Callback2-param-String"><span class="type-annotation">dynamic</span> <span class="parameter-name">String</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -876,7 +890,7 @@ <h2>Typedefs</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></span><span class="signature">(<wbr><span class="parameter" id="FakeProcesses-param-input"><span class="type-annotation">String</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Takes input, returns output.
           
@@ -885,7 +899,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/GenericTypedef.html">GenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="GenericTypedef-param-input"><span class="type-annotation">T</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A typedef with a type parameter.
           
@@ -894,7 +908,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></span><span class="signature">(<wbr><span class="parameter" id="LotsAndLotsOfParameters-param-so"><span class="type-annotation">dynamic</span> <span class="parameter-name">so</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-many"><span class="type-annotation">dynamic</span> <span class="parameter-name">many</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-parameters"><span class="type-annotation">dynamic</span> <span class="parameter-name">parameters</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-it"><span class="type-annotation">dynamic</span> <span class="parameter-name">it</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-should"><span class="type-annotation">dynamic</span> <span class="parameter-name">should</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-wrap"><span class="type-annotation">dynamic</span> <span class="parameter-name">wrap</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-when"><span class="type-annotation">dynamic</span> <span class="parameter-name">when</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-converted"><span class="type-annotation">dynamic</span> <span class="parameter-name">converted</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-to"><span class="type-annotation">dynamic</span> <span class="parameter-name">to</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-html"><span class="type-annotation">dynamic</span> <span class="parameter-name">html</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-documentation"><span class="type-annotation">dynamic</span> <span class="parameter-name">documentation</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Lots and lots of parameters.
           
@@ -903,7 +917,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span><span class="signature">(<wbr><span class="parameter" id="myCoolTypedef-param-x"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="myCoolTypedef-param-y"><span class="type-annotation">bool</span> <span class="parameter-name">y</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -912,7 +926,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A typedef with the new style generic function syntax.
           
@@ -921,7 +935,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/VoidCallback.html">VoidCallback</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -934,13 +948,13 @@ <h2>Exceptions / Errors</h2>
 
       <dl>
         <dt id="Doh">
-          <span class="name deprecated"><a class="deprecated" href="fake/Doh-class.html">Doh</a></span>
+          <span class="name deprecated"><a class="deprecated" href="fake/Doh-class.html">Doh</a></span> 
         </dt>
         <dd>
           Also, my bad.
         </dd>
         <dt id="Oops">
-          <span class="name "><a href="fake/Oops-class.html">Oops</a></span>
+          <span class="name "><a href="fake/Oops-class.html">Oops</a></span> 
         </dt>
         <dd>
           My bad!
@@ -976,6 +990,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
diff --git a/testing/test_package_docs/fake/functionWithFunctionParameters.html b/testing/test_package_docs/fake/functionWithFunctionParameters.html
index 4ef9406e62..c3a0e73da4 100644
--- a/testing/test_package_docs/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs/fake/functionWithFunctionParameters.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>functionWithFunctionParameters function</h1>
+    <h1>functionWithFunctionParameters function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index b3850c3604..8b2f31ec6f 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getterSetterNodocGetter top-level property</h1>
+    <h1>getterSetterNodocGetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index d9168879ce..4b1ef63dbf 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getterSetterNodocSetter top-level property</h1>
+    <h1>getterSetterNodocSetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index 5054c1d4be..5c0a74706e 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greatAnnotation top-level constant</h1>
+    <h1>greatAnnotation top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">greatAnnotation</span>
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index db15d5a2d4..84982871b9 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greatestAnnotation top-level constant</h1>
+    <h1>greatestAnnotation top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">greatestAnnotation</span>
diff --git a/testing/test_package_docs/fake/importantComputations.html b/testing/test_package_docs/fake/importantComputations.html
index 7a02f9b92e..7b3bdc7207 100644
--- a/testing/test_package_docs/fake/importantComputations.html
+++ b/testing/test_package_docs/fake/importantComputations.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>importantComputations top-level property</h1>
+    <h1>importantComputations top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 956d960fe0..18c059e768 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReference top-level constant</h1>
+    <h1>incorrectDocReference top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReference</span>
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index e12e5049df..70314b8eaa 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>justGetter top-level property</h1>
+    <h1>justGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index 4e611ed75c..24ee98ffcc 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>justSetter top-level property</h1>
+    <h1>justSetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index 5faa1c95e9..55037fb4f7 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>mapWithDynamicKeys top-level property</h1>
+    <h1>mapWithDynamicKeys top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index e5f0f77087..1807eec8f4 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>meaningOfLife top-level property</h1>
+    <h1>meaningOfLife top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs/fake/mustGetThis.html b/testing/test_package_docs/fake/mustGetThis.html
index 633778da8d..368f633f9d 100644
--- a/testing/test_package_docs/fake/mustGetThis.html
+++ b/testing/test_package_docs/fake/mustGetThis.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>mustGetThis top-level property</h1>
+    <h1>mustGetThis top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/myCoolTypedef.html b/testing/test_package_docs/fake/myCoolTypedef.html
index 483ce8686a..d532e9caef 100644
--- a/testing/test_package_docs/fake/myCoolTypedef.html
+++ b/testing/test_package_docs/fake/myCoolTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myCoolTypedef typedef</h1>
+    <h1>myCoolTypedef typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index a6fdb8035e..7a2e92b988 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function</h1>
+    <h1>myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/myMap-constant.html b/testing/test_package_docs/fake/myMap-constant.html
index 41915f3d50..861751248d 100644
--- a/testing/test_package_docs/fake/myMap-constant.html
+++ b/testing/test_package_docs/fake/myMap-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myMap top-level constant</h1>
+    <h1>myMap top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">myMap</span>
diff --git a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
index 18fc9918df..b7d81b45f9 100644
--- a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>onlyPositionalWithNoDefaultNoType function</h1>
+    <h1>onlyPositionalWithNoDefaultNoType function </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs/fake/paintImage1.html b/testing/test_package_docs/fake/paintImage1.html
index bea499d4de..2a0e89410e 100644
--- a/testing/test_package_docs/fake/paintImage1.html
+++ b/testing/test_package_docs/fake/paintImage1.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paintImage1 function</h1>
+    <h1>paintImage1 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/paintImage2.html b/testing/test_package_docs/fake/paintImage2.html
index 396b54d991..60848b9b10 100644
--- a/testing/test_package_docs/fake/paintImage2.html
+++ b/testing/test_package_docs/fake/paintImage2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paintImage2 function</h1>
+    <h1>paintImage2 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/paramFromAnotherLib.html b/testing/test_package_docs/fake/paramFromAnotherLib.html
index 9b79c7bd09..1afdd83815 100644
--- a/testing/test_package_docs/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs/fake/paramFromAnotherLib.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paramFromAnotherLib function</h1>
+    <h1>paramFromAnotherLib function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/paramOfFutureOrNull.html b/testing/test_package_docs/fake/paramOfFutureOrNull.html
index 808bcad632..3cc766057b 100644
--- a/testing/test_package_docs/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs/fake/paramOfFutureOrNull.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paramOfFutureOrNull function</h1>
+    <h1>paramOfFutureOrNull function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index 263e2ba822..bd6e264ea1 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>required top-level constant</h1>
+    <h1>required top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">required</span>
diff --git a/testing/test_package_docs/fake/returningFutureVoid.html b/testing/test_package_docs/fake/returningFutureVoid.html
index 67ee537293..1b20e89c2d 100644
--- a/testing/test_package_docs/fake/returningFutureVoid.html
+++ b/testing/test_package_docs/fake/returningFutureVoid.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>returningFutureVoid function</h1>
+    <h1>returningFutureVoid function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index 203173b9f4..56dca5d1e8 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>setAndGet top-level property</h1>
+    <h1>setAndGet top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs/fake/short.html b/testing/test_package_docs/fake/short.html
index 524692135a..0b01646d2a 100644
--- a/testing/test_package_docs/fake/short.html
+++ b/testing/test_package_docs/fake/short.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>short function</h1>
+    <h1>short function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index 7c4c47adb5..9dbbcc8a1d 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>simpleProperty top-level property</h1>
+    <h1>simpleProperty top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs/fake/soIntense.html b/testing/test_package_docs/fake/soIntense.html
index 21927491be..cf3c5c582c 100644
--- a/testing/test_package_docs/fake/soIntense.html
+++ b/testing/test_package_docs/fake/soIntense.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>soIntense function</h1>
+    <h1>soIntense function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index 5fc022c378..ccc0d9d9ef 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>testingCodeSyntaxInOneLiners top-level constant</h1>
+    <h1>testingCodeSyntaxInOneLiners top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">testingCodeSyntaxInOneLiners</span>
diff --git a/testing/test_package_docs/fake/thisIsAlsoAsync.html b/testing/test_package_docs/fake/thisIsAlsoAsync.html
index b63277c392..449597a8db 100644
--- a/testing/test_package_docs/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs/fake/thisIsAlsoAsync.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsAlsoAsync function</h1>
+    <h1>thisIsAlsoAsync function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
diff --git a/testing/test_package_docs/fake/thisIsAsync.html b/testing/test_package_docs/fake/thisIsAsync.html
index e421ddaa58..d060d2ee0a 100644
--- a/testing/test_package_docs/fake/thisIsAsync.html
+++ b/testing/test_package_docs/fake/thisIsAsync.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsAsync function</h1>
+    <h1>thisIsAsync function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
diff --git a/testing/test_package_docs/fake/thisIsFutureOr.html b/testing/test_package_docs/fake/thisIsFutureOr.html
index 0f88874ee4..e629db8ee4 100644
--- a/testing/test_package_docs/fake/thisIsFutureOr.html
+++ b/testing/test_package_docs/fake/thisIsFutureOr.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOr function</h1>
+    <h1>thisIsFutureOr function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr</span>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrNull.html b/testing/test_package_docs/fake/thisIsFutureOrNull.html
index a4eeda31ef..88f132eaa3 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrNull.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOrNull function</h1>
+    <h1>thisIsFutureOrNull function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrT.html b/testing/test_package_docs/fake/thisIsFutureOrT.html
index 1814a5d170..8b444ae7da 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrT.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
+    <h1>thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
index 068e5d8418..de1dcaaa1c 100644
--- a/testing/test_package_docs/fake/topLevelFunction.html
+++ b/testing/test_package_docs/fake/topLevelFunction.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>topLevelFunction function</h1>
+    <h1>topLevelFunction function </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs/fake/typeParamOfFutureOr.html b/testing/test_package_docs/fake/typeParamOfFutureOr.html
index b6c7b8e38a..296dc361a6 100644
--- a/testing/test_package_docs/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs/fake/typeParamOfFutureOr.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function</h1>
+    <h1>typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs/fake/useSomethingInAnotherPackage.html b/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
index 55988f7d3f..9100519e54 100644
--- a/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
+++ b/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>useSomethingInAnotherPackage top-level property</h1>
+    <h1>useSomethingInAnotherPackage top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Required</span>
diff --git a/testing/test_package_docs/fake/useSomethingInTheSdk.html b/testing/test_package_docs/fake/useSomethingInTheSdk.html
index e711f23bb4..73484d18e8 100644
--- a/testing/test_package_docs/fake/useSomethingInTheSdk.html
+++ b/testing/test_package_docs/fake/useSomethingInTheSdk.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>useSomethingInTheSdk top-level property</h1>
+    <h1>useSomethingInTheSdk top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html
index 4265511e5c..e41af2075d 100644
--- a/testing/test_package_docs/index.html
+++ b/testing/test_package_docs/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.20.4">
+  <meta name="generator" content="made with love by dartdoc 0.21.0-dev.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
@@ -34,6 +34,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -42,6 +45,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -50,6 +54,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
@@ -106,17 +111,17 @@ <h2 id="another-section">Another Section</h2>
             <h2>Libraries</h2>
           <dl>
             <dt id="anonymous_library">
-              <span class="name"><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></span>
+              <span class="name"><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></span> 
             </dt>
             <dd>
               
             </dd>            <dt id="another_anonymous_lib">
-              <span class="name"><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></span>
+              <span class="name"><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></span> 
             </dt>
             <dd>
               
             </dd>            <dt id="code_in_comments">
-              <span class="name"><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></span>
+              <span class="name"><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></span> 
             </dt>
             <dd>
               <code class="language-dart">void main() {
@@ -124,41 +129,48 @@ <h2>Libraries</h2>
 }
 </code> <a href="code_in_comments/code_in_comments-library.html">[...]</a>
             </dd>            <dt id="is_deprecated">
-              <span class="name"><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></span>
+              <span class="name"><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></span> 
             </dt>
             <dd>
               This lib is deprecated. It never had a chance
             </dd>            <h3>Real Libraries</h3>
               <dt id="ex">
-                <span class="name"><a href="ex/ex-library.html">ex</a></span>
+                <span class="name"><a href="ex/ex-library.html">ex</a></span> 
               </dt>
               <dd>
                 a library. testing string escaping: <code>var s = 'a string'</code> <cool></cool>
               </dd>              <dt id="fake">
-                <span class="name"><a href="fake/fake-library.html">fake</a></span>
+                <span class="name"><a href="fake/fake-library.html">fake</a></span> 
               </dt>
               <dd>
                 WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a> <a href="fake/fake-library.html">[...]</a>
+              </dd>              <dt id="two_exports">
+                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span> 
+              </dt>
+              <dd>
+                
               </dd>            <h3>Unreal</h3>
               <dt id="reexport_one">
-                <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>
+                <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
               </dt>
               <dd>
                 
               </dd>              <dt id="reexport_two">
-                <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>
+                <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
               </dt>
               <dd>
                 
               </dd>            <h3>Misc</h3>
               <dt id="two_exports">
-                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span>
+                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span> 
               </dt>
               <dd>
                 
               </dd>            <h3>Other</h3>
               <dt id="css">
-                <span class="name"><a href="css/css-library.html">css</a></span>
+                <span class="name"><a href="css/css-library.html">css</a></span> 
               </dt>
               <dd>
                 Testing that a library name doesn't conflict
@@ -168,8 +180,13 @@ <h2>Libraries</h2>
         <section class="summary">
             <h2>test_package_imported</h2>
           <dl>
-            <dt id="test_package_imported.main">
-              <span class="name"><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></span>
+            <dt id="categoriesExported">
+              <span class="name"><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></span> 
+            </dt>
+            <dd>
+              
+            </dd>            <dt id="test_package_imported.main">
+              <span class="name"><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></span> 
             </dt>
             <dd>
               
diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json
index a1f16cc72a..19cadde2f8 100644
--- a/testing/test_package_docs/index.json
+++ b/testing/test_package_docs/index.json
@@ -1,4 +1,18 @@
 [
+ {
+  "name": "Superb",
+  "qualifiedName": "Superb",
+  "href": "topics/Superb-topic.html",
+  "type": "Topic",
+  "overriddenDepth": 0
+ },
+ {
+  "name": "Unreal",
+  "qualifiedName": "Unreal",
+  "href": "topics/Unreal-topic.html",
+  "type": "Topic",
+  "overriddenDepth": 0
+ },
  {
   "name": "anonymous_library",
   "qualifiedName": "anonymous_library",
@@ -35,6 +49,90 @@
    "type": "library"
   }
  },
+ {
+  "name": "categoriesExported",
+  "qualifiedName": "categoriesExported",
+  "href": "categoriesExported/categoriesExported-library.html",
+  "type": "library",
+  "overriddenDepth": 0
+ },
+ {
+  "name": "IAmAClassWithCategories",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+  "href": "categoriesExported/IAmAClassWithCategories-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "categoriesExported",
+   "type": "library"
+  }
+ },
+ {
+  "name": "IAmAClassWithCategories",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+  "href": "categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "operator ==",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.==",
+  "href": "categoriesExported/IAmAClassWithCategories/operator_equals.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "hashCode",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.hashCode",
+  "href": "categoriesExported/IAmAClassWithCategories/hashCode.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "noSuchMethod",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.noSuchMethod",
+  "href": "categoriesExported/IAmAClassWithCategories/noSuchMethod.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "runtimeType",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.runtimeType",
+  "href": "categoriesExported/IAmAClassWithCategories/runtimeType.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "toString",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.toString",
+  "href": "categoriesExported/IAmAClassWithCategories/toString.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
  {
   "name": "code_in_comments",
   "qualifiedName": "code_in_comments",
diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
index c918e0134d..cb23111923 100644
--- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>is_deprecated library</h1>
+    <h1>is_deprecated library </h1>
 
     <section class="desc markdown">
       <p>This lib is deprecated. It never had a chance</p>
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
index e1e9d5f90c..6974015a20 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_one library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SomeOtherClass class</h1>
+      <h1>SomeOtherClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_one/SomeOtherClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_one/SomeOtherClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html
index baadb44e0f..2ffe60667f 100644
--- a/testing/test_package_docs/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs/reexport_one/reexport_one-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,14 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>reexport_one library</h1>
+    <h1>reexport_one library   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
     <section class="desc markdown">
       
@@ -69,25 +75,25 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AUnicornClass">
-          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span>
+          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeClass">
-          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span>
+          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeOtherClass">
-          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span>
+          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="YetAnotherClass">
-          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span>
+          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass-class.html b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
index f41b3deb7a..5b7a42df18 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass-class.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AUnicornClass class</h1>
+      <h1>AUnicornClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/AUnicornClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/AUnicornClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/reexport_two/SomeClass-class.html b/testing/test_package_docs/reexport_two/SomeClass-class.html
index f559855600..2cff883f72 100644
--- a/testing/test_package_docs/reexport_two/SomeClass-class.html
+++ b/testing/test_package_docs/reexport_two/SomeClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SomeClass class</h1>
+      <h1>SomeClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/SomeClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/SomeClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/SomeClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/SomeClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/SomeClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
index 44e6fcf076..e9153f403c 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>YetAnotherClass class</h1>
+      <h1>YetAnotherClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/YetAnotherClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/YetAnotherClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html
index 6355f9bc2a..5636cfba4a 100644
--- a/testing/test_package_docs/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs/reexport_two/reexport_two-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,14 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>reexport_two library</h1>
+    <h1>reexport_two library   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
     <section class="desc markdown">
       
@@ -69,25 +75,25 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AUnicornClass">
-          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span>
+          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeClass">
-          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span>
+          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeOtherClass">
-          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span>
+          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="YetAnotherClass">
-          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span>
+          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs/static-assets/styles.css b/testing/test_package_docs/static-assets/styles.css
index 3ac01890db..07ac4ae0ec 100644
--- a/testing/test_package_docs/static-assets/styles.css
+++ b/testing/test_package_docs/static-assets/styles.css
@@ -394,6 +394,55 @@ dl dt.callable .name {
   text-decoration: line-through;
 }
 
+.category.linked {
+  font-weight: bold;
+  opacity: 1;
+}
+
+/* Colors for category based on categoryOrder in dartdoc_options.config. */
+.category.cp-0 {
+  background-color: #54b7c4
+}
+
+.category.cp-1 {
+  background-color: #54c47f
+}
+
+.category.cp-2 {
+  background-color: #c4c254
+}
+
+.category.cp-3 {
+  background-color: #c49f54
+}
+
+.category.cp-4 {
+  background-color: #c45465
+}
+
+.category.cp-5 {
+  background-color: #c454c4
+}
+
+.category a {
+  color: white;
+}
+
+.category {
+  vertical-align: text-top;
+  padding: 4px;
+  font-size: 12px;
+  border-radius: 4px;
+  background-color: #B6B6B6;
+  text-transform: uppercase;
+  color: white;
+  opacity: .5;
+}
+
+h1 .category {
+  vertical-align: middle;
+}
+
 p.firstline {
   font-weight: bold;
 }
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
index 376eabc9f4..4d073ac567 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
@@ -51,7 +51,7 @@ <h5>test_package_imported.main library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass</p>
@@ -77,7 +77,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -85,7 +85,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -101,7 +101,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -110,7 +110,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -125,7 +125,7 @@ <h2>Operators</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
index 5b8a89cbf7..0732e6e6c8 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
@@ -51,7 +51,7 @@ <h5>test_package_imported.main library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass2 class</h1>
+      <h1>Whataclass2 class </h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass 2</p>
@@ -77,7 +77,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass2/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -85,7 +85,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass2/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -101,7 +101,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -110,7 +110,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -125,7 +125,7 @@ <h2>Operators</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index de4d5e4b2f..6378e5ae86 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>test_package_imported.main library</h1>
+    <h1>test_package_imported.main library </h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -66,13 +71,13 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="Whataclass">
-          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           Some docs for whataclass
         </dd>
         <dt id="Whataclass2">
-          <span class="name "><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></span> 
         </dt>
         <dd>
           Some docs for whataclass 2
diff --git a/testing/test_package_docs/topics/Superb-topic.html b/testing/test_package_docs/topics/Superb-topic.html
new file mode 100644
index 0000000000..b04ff3b68a
--- /dev/null
+++ b/testing/test_package_docs/topics/Superb-topic.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="Superb Topic docs, for the Dart programming language.">
+  <title>Superb Topic - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">Superb Topic</li>
+  </ol>
+  <div class="self-name">Superb</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>Superb Topic</h1>
+      <section class="desc markdown">
+        <p>This is the documentation for our category.</p>
+<p>Wheee!</p>
+      </section>
+      
+
+        <section class="summary offset-anchor" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+            <dt id="BaseForDocComments">
+              <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              Category information should not follow inheritance.
+            </dd>
+        </dl>
+      </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>Superb Topic</h5>
+    <ol>
+    
+      <li class="section-title"><a href="topics/Superb-topic.html#classes">Classes</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/topics/Unreal-topic.html b/testing/test_package_docs/topics/Unreal-topic.html
new file mode 100644
index 0000000000..3cce04d471
--- /dev/null
+++ b/testing/test_package_docs/topics/Unreal-topic.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="Unreal Topic docs, for the Dart programming language.">
+  <title>Unreal Topic - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">Unreal Topic</li>
+  </ol>
+  <div class="self-name">Unreal</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>Unreal Topic</h1>
+      <section class="desc markdown">
+        <p>This is the documentation for the Unreal category,
+not to be confused with <code>Real Libraries</code>.  Unreal holds
+more than just libraries.</p>
+      </section>
+      
+        <section class="summary offset-anchor" id="libraries">
+        <h2>Libraries</h2>
+
+        <dl>
+            <dt id="reexport_one">
+              <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              
+            </dd>            <dt id="reexport_two">
+              <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              
+            </dd>        </dl>
+        </section>
+
+        <section class="summary offset-anchor" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+            <dt id="BaseForDocComments">
+              <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              Category information should not follow inheritance.
+            </dd>
+        </dl>
+      </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>Unreal Topic</h5>
+    <ol>
+      <li class="section-title"><a href="topics/Unreal-topic.html#libraries">Libraries</a></li>
+      <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+      <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+    
+      <li class="section-title"><a href="topics/Unreal-topic.html#classes">Classes</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/two_exports/BaseClass-class.html b/testing/test_package_docs/two_exports/BaseClass-class.html
index a7db8670d9..b71aeda118 100644
--- a/testing/test_package_docs/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs/two_exports/BaseClass-class.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseClass class</h1>
+      <h1>BaseClass class </h1>
 
     
     <section>
@@ -94,7 +94,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -102,7 +102,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="lengthX" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -110,7 +110,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -126,7 +126,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -135,7 +135,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -150,7 +150,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/two_exports/ExtendingClass-class.html b/testing/test_package_docs/two_exports/ExtendingClass-class.html
index 219848fe67..eeebb58c53 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass-class.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendingClass class</h1>
+      <h1>ExtendingClass class </h1>
 
     <section class="desc markdown">
       <p>Extending class extends <a href="two_exports/BaseClass-class.html">BaseClass</a>.</p>
@@ -96,7 +96,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -104,7 +104,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="lengthX" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -112,7 +112,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -128,7 +128,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -137,7 +137,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -152,7 +152,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs/two_exports/topLevelVariable.html b/testing/test_package_docs/two_exports/topLevelVariable.html
index 6e548501bd..2286b5481e 100644
--- a/testing/test_package_docs/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs/two_exports/topLevelVariable.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>topLevelVariable top-level property</h1>
+    <h1>topLevelVariable top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index 410e513a73..4d81759f77 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>two_exports library</h1>
+    <h1>two_exports library </h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -66,13 +71,13 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="BaseClass">
-          <span class="name "><a href="two_exports/BaseClass-class.html">BaseClass</a></span>
+          <span class="name "><a href="two_exports/BaseClass-class.html">BaseClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ExtendingClass">
-          <span class="name "><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></span>
+          <span class="name "><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></span> 
         </dt>
         <dd>
           Extending class extends <a href="two_exports/BaseClass-class.html">BaseClass</a>. <a href="two_exports/ExtendingClass-class.html">[...]</a>
@@ -87,7 +92,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="topLevelVariable" class="property">
           <span class="name"><a href="two_exports/topLevelVariable.html">topLevelVariable</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs_dev/__404error.html b/testing/test_package_docs_dev/__404error.html
index f536a6bef0..938d312a29 100644
--- a/testing/test_package_docs_dev/__404error.html
+++ b/testing/test_package_docs_dev/__404error.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.20.4">
+  <meta name="generator" content="made with love by dartdoc 0.21.0-dev.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
@@ -34,6 +34,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -42,6 +45,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -50,6 +54,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
diff --git a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
index 88f41e9451..9d0bd847eb 100644
--- a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>anonymous_library library</h1>
+    <h1>anonymous_library library </h1>
 
     
 
@@ -72,7 +77,7 @@ <h2>Functions</h2>
           <span class="name"><a href="anonymous_library/doesStuff.html">doesStuff</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/anonymous_library/doesStuff.html b/testing/test_package_docs_dev/anonymous_library/doesStuff.html
index f840ef0a38..1a498697cb 100644
--- a/testing/test_package_docs_dev/anonymous_library/doesStuff.html
+++ b/testing/test_package_docs_dev/anonymous_library/doesStuff.html
@@ -50,7 +50,7 @@ <h5>anonymous_library library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>doesStuff function</h1>
+    <h1>doesStuff function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
index df4fbbef68..a5e48ab82f 100644
--- a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>another_anonymous_lib library</h1>
+    <h1>another_anonymous_lib library </h1>
 
     
 
@@ -72,7 +77,7 @@ <h2>Functions</h2>
           <span class="name"><a href="another_anonymous_lib/greeting.html">greeting</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/another_anonymous_lib/greeting.html b/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
index 470b025961..c07f32a6fd 100644
--- a/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
+++ b/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
@@ -50,7 +50,7 @@ <h5>another_anonymous_lib library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greeting function</h1>
+    <h1>greeting function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/categories.json b/testing/test_package_docs_dev/categories.json
new file mode 100644
index 0000000000..81c00db5bd
--- /dev/null
+++ b/testing/test_package_docs_dev/categories.json
@@ -0,0 +1,91 @@
+[
+  {
+    "name": "IAmAClassWithCategories",
+    "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+    "href": "categoriesExported/IAmAClassWithCategories-class.html",
+    "type": "class",
+    "categories": [
+      "Excellent"
+    ]
+  },
+  {
+    "name": "css",
+    "qualifiedName": "css",
+    "href": "css/css-library.html",
+    "type": "library",
+    "categories": [
+      "Other"
+    ]
+  },
+  {
+    "name": "ex",
+    "qualifiedName": "ex",
+    "href": "ex/ex-library.html",
+    "type": "library",
+    "categories": [
+      "Real Libraries"
+    ]
+  },
+  {
+    "name": "fake",
+    "qualifiedName": "fake",
+    "href": "fake/fake-library.html",
+    "type": "library",
+    "categories": [
+      "Real Libraries"
+    ]
+  },
+  {
+    "name": "BaseForDocComments",
+    "qualifiedName": "fake.BaseForDocComments",
+    "href": "fake/BaseForDocComments-class.html",
+    "type": "class",
+    "categories": [
+      "Excellent",
+      "More Excellence",
+      "Unreal"
+    ],
+    "subcategories": [
+      "Things and Such"
+    ],
+    "image": "https://flutter.io/images/catalog-widget-placeholder.png",
+    "samples": "https://flutter.io"
+  },
+  {
+    "name": "SubForDocComments",
+    "qualifiedName": "fake.SubForDocComments",
+    "href": "fake/SubForDocComments-class.html",
+    "type": "class",
+    "categories": [
+      "NotSoExcellent"
+    ]
+  },
+  {
+    "name": "reexport_one",
+    "qualifiedName": "reexport_one",
+    "href": "reexport_one/reexport_one-library.html",
+    "type": "library",
+    "categories": [
+      "Unreal"
+    ]
+  },
+  {
+    "name": "reexport_two",
+    "qualifiedName": "reexport_two",
+    "href": "reexport_two/reexport_two-library.html",
+    "type": "library",
+    "categories": [
+      "Unreal"
+    ]
+  },
+  {
+    "name": "two_exports",
+    "qualifiedName": "two_exports",
+    "href": "two_exports/two_exports-library.html",
+    "type": "library",
+    "categories": [
+      "Misc",
+      "Real Libraries"
+    ]
+  }
+]
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html
new file mode 100644
index 0000000000..eec9c6368a
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the IAmAClassWithCategories class from the categoriesExported library, for the Dart programming language.">
+  <title>IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li class="self-crumb">IAmAClassWithCategories class</li>
+  </ol>
+  <div class="self-name">IAmAClassWithCategories</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>categoriesExported library</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/categoriesExported-library.html#classes">Classes</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>IAmAClassWithCategories class </h1>
+
+    <section class="desc markdown">
+      <p>Categories test for auto-include-dependencies (Flutter).</p>
+    </section>
+    
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="IAmAClassWithCategories" class="callable">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html
new file mode 100644
index 0000000000..7a6b985569
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the IAmAClassWithCategories constructor from the Class IAmAClassWithCategories class from the categoriesExported library, for the Dart programming language.">
+  <title>IAmAClassWithCategories constructor - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">IAmAClassWithCategories constructor</li>
+  </ol>
+  <div class="self-name">IAmAClassWithCategories</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>IAmAClassWithCategories constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">IAmAClassWithCategories</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/hashCode.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/hashCode.html
new file mode 100644
index 0000000000..253d785e04
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/hashCode.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the hashCode property from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>hashCode property - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">hashCode property</li>
+  </ol>
+  <div class="self-name">hashCode</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/noSuchMethod.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/noSuchMethod.html
new file mode 100644
index 0000000000..cbb992dd0b
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/noSuchMethod.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the noSuchMethod method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>noSuchMethod method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">noSuchMethod method</li>
+  </ol>
+  <div class="self-name">noSuchMethod</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">noSuchMethod</span>
+(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/operator_equals.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/operator_equals.html
new file mode 100644
index 0000000000..4dcf9dd573
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/operator_equals.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the operator == method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>operator == method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">operator == method</li>
+  </ol>
+  <div class="self-name">operator ==</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">operator ==</span>
+(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/runtimeType.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/runtimeType.html
new file mode 100644
index 0000000000..7eebb5036b
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/runtimeType.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the runtimeType property from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>runtimeType property - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">runtimeType property</li>
+  </ol>
+  <div class="self-name">runtimeType</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/toString.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/toString.html
new file mode 100644
index 0000000000..0bc29acc3c
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories/toString.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the toString method from the IAmAClassWithCategories class, for the Dart programming language.">
+  <title>toString method - IAmAClassWithCategories class - categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+    <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    <li class="self-crumb">toString method</li>
+  </ol>
+  <div class="self-name">toString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>IAmAClassWithCategories class</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/IAmAClassWithCategories-class.html#constructors">Constructors</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html">IAmAClassWithCategories</a></li>
+    
+      <li class="section-title inherited">
+        <a href="categoriesExported/IAmAClassWithCategories-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="categoriesExported/IAmAClassWithCategories-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="categoriesExported/IAmAClassWithCategories/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">toString</span>
+(<wbr>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html
new file mode 100644
index 0000000000..308a9664f6
--- /dev/null
+++ b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="categoriesExported library API docs, for the Dart programming language.">
+  <title>categoriesExported library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">categoriesExported library</li>
+  </ol>
+  <div class="self-name">categoriesExported</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>categoriesExported library </h1>
+
+    
+    <section class="summary offset-anchor" id="classes">
+      <h2>Classes</h2>
+
+      <dl>
+        <dt id="IAmAClassWithCategories">
+          <span class="name "><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></span> 
+        </dt>
+        <dd>
+          Categories test for auto-include-dependencies (Flutter).
+        </dd>
+      </dl>
+    </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>categoriesExported library</h5>
+    <ol>
+      <li class="section-title"><a href="categoriesExported/categoriesExported-library.html#classes">Classes</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
index e212de3b2d..4d4df09a03 100644
--- a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>code_in_comments library</h1>
+    <h1>code_in_comments library </h1>
 
     <section class="desc markdown">
       <pre class="language-dart"><code class="language-dart">void main() {
diff --git a/testing/test_package_docs_dev/css/css-library.html b/testing/test_package_docs_dev/css/css-library.html
index ff38dcce76..4560937206 100644
--- a/testing/test_package_docs_dev/css/css-library.html
+++ b/testing/test_package_docs_dev/css/css-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>css library</h1>
+    <h1>css library </h1>
 
     <section class="desc markdown">
       <p>Testing that a library name doesn't conflict
@@ -73,7 +78,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="theOnlyThingInTheLibrary" class="property">
           <span class="name"><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
index 43a261bbe3..7671e69e71 100644
--- a/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
@@ -50,7 +50,7 @@ <h5>css library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>theOnlyThingInTheLibrary top-level property</h1>
+    <h1>theOnlyThingInTheLibrary top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/ex/Animal-class.html b/testing/test_package_docs_dev/ex/Animal-class.html
index a58ab32dae..9d24ddeb30 100644
--- a/testing/test_package_docs_dev/ex/Animal-class.html
+++ b/testing/test_package_docs_dev/ex/Animal-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Animal enum</h1>
+    <h1>Animal enum </h1>
 
     <section class="desc markdown">
       <p>Referencing <a href="ex/processMessage.html">processMessage</a> (or other things) here should not break
@@ -122,7 +122,7 @@ <h2>Constants</h2>
         <dt id="CAT" class="constant">
           <span class="name ">CAT</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Single line docs.</p>
           
@@ -133,7 +133,7 @@ <h2>Constants</h2>
         <dt id="DOG" class="constant">
           <span class="name ">DOG</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Multi line docs.</p>
 <p><a href="ex/Dog-class.html">Dog</a> needs lots of docs.</p>
@@ -145,7 +145,7 @@ <h2>Constants</h2>
         <dt id="HORSE" class="constant">
           <span class="name ">HORSE</span>
           <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -156,7 +156,7 @@ <h2>Constants</h2>
         <dt id="values" class="constant">
           <span class="name ">values</span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Animal-class.html">Animal</a></span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
@@ -174,7 +174,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name">index</span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           <p>The integer index of this enum.</p>
@@ -182,7 +182,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Animal/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +190,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Animal/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +206,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -215,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +230,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Animal/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
index 2df64ea5dd..904a00a79b 100644
--- a/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; class</h1>
+      <h1>AnotherParameterizedClass&lt;<wbr><span class="type-parameter">B</span>&gt; class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/AnotherParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/AnotherParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -178,7 +178,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/AnotherParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/Apple-class.html b/testing/test_package_docs_dev/ex/Apple-class.html
index 4a2378fd20..6f5e8268c3 100644
--- a/testing/test_package_docs_dev/ex/Apple-class.html
+++ b/testing/test_package_docs_dev/ex/Apple-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Apple class</h1>
+      <h1>Apple class </h1>
 
     <section class="desc markdown">
       <p>Sample class <code>String</code></p><pre class="language-dart">  A
@@ -154,7 +154,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="fieldWithTypedef" class="property">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span> 
         </dt>
         <dd>
           fieldWithTypedef docs here
@@ -162,7 +162,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="m" class="property">
           <span class="name"><a href="ex/Apple/m.html">m</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           The read-write field <code>m</code>.
@@ -170,7 +170,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="s" class="property">
           <span class="name"><a href="ex/Apple/s.html">s</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for <code>s</code>
@@ -178,7 +178,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Apple/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -186,7 +186,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Apple/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/isGreaterThan.html">isGreaterThan</a></span><span class="signature">(<wbr><span class="parameter" id="isGreaterThan-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, {</span> <span class="parameter" id="isGreaterThan-param-check"><span class="type-annotation">int</span> <span class="parameter-name">check</span>: <span class="default-value">5</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/m1.html">m1</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This is a method. <a href="ex/Apple/m1.html">[...]</a>
           
@@ -220,7 +220,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/methodWithTypedefParam.html">methodWithTypedefParam</a></span><span class="signature">(<wbr><span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -229,7 +229,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/paramFromExportLib.html">paramFromExportLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromExportLib-param-helper"><span class="type-annotation"><a href="ex/Helper-class.html">Helper</a></span> <span class="parameter-name">helper</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -238,7 +238,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/printMsg.html">printMsg</a></span><span class="signature">(<wbr><span class="parameter" id="printMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="printMsg-param-linebreak"><span class="type-annotation">bool</span> <span class="parameter-name">linebreak</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -247,7 +247,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Apple docs for whataclass
           
@@ -256,7 +256,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -265,7 +265,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -280,7 +280,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -289,7 +289,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -303,7 +303,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="string" class="property">
           <span class="name"><a href="ex/Apple/string.html">string</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -320,7 +320,7 @@ <h2>Constants</h2>
         <dt id="n" class="constant">
           <span class="name "><a href="ex/Apple/n-constant.html">n</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/ex/B-class.html b/testing/test_package_docs_dev/ex/B-class.html
index 5a3e870241..627b374201 100644
--- a/testing/test_package_docs_dev/ex/B-class.html
+++ b/testing/test_package_docs_dev/ex/B-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>B class</h1>
+      <h1>B class </h1>
 
     <section class="desc markdown">
       <p>Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a></p><pre class="language-dart"> B extends A
@@ -153,7 +153,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="autoCompress" class="property">
           <span class="name"><a href="ex/B/autoCompress.html">autoCompress</a></span>
-          <span class="signature">&#8596; bool</span>
+          <span class="signature">&#8596; bool</span> 
         </dt>
         <dd>
           The default value is <code>false</code> (compression disabled).
@@ -162,7 +162,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/B/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -170,7 +170,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="list" class="property">
           <span class="name"><a href="ex/B/list.html">list</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           A list of Strings
@@ -178,7 +178,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="s" class="property">
           <span class="name"><a href="ex/B/s.html">s</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for <code>s</code>
@@ -186,7 +186,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="fieldWithTypedef" class="property inherited">
           <span class="name"><a href="ex/Apple/fieldWithTypedef.html">fieldWithTypedef</a></span>
-          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           fieldWithTypedef docs here
@@ -194,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Apple/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +202,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="m" class="property inherited">
           <span class="name"><a href="ex/Apple/m.html">m</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           The read-write field <code>m</code>.
@@ -210,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Apple/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +226,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -235,7 +235,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/B/doNothing.html">doNothing</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +244,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/m1.html">m1</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This is a method. <a href="ex/B/m1.html">[...]</a>
           
@@ -253,7 +253,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/B/writeMsg.html">writeMsg</a></span><span class="signature">(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation">String</span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span>, </span> <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -262,7 +262,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/isGreaterThan.html">isGreaterThan</a></span><span class="signature">(<wbr><span class="parameter" id="isGreaterThan-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, {</span> <span class="parameter" id="isGreaterThan-param-check"><span class="type-annotation">int</span> <span class="parameter-name">check</span>: <span class="default-value">5</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -271,7 +271,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/methodWithTypedefParam.html">methodWithTypedefParam</a></span><span class="signature">(<wbr><span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -280,7 +280,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -289,7 +289,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/paramFromExportLib.html">paramFromExportLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromExportLib-param-helper"><span class="type-annotation"><a href="ex/Helper-class.html">Helper</a></span> <span class="parameter-name">helper</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -298,7 +298,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/printMsg.html">printMsg</a></span><span class="signature">(<wbr><span class="parameter" id="printMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span>, [</span> <span class="parameter" id="printMsg-param-linebreak"><span class="type-annotation">bool</span> <span class="parameter-name">linebreak</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -307,7 +307,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -316,7 +316,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Apple/whataclass.html">whataclass</a></span><span class="signature">(<wbr><span class="parameter" id="whataclass-param-list"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">list</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Apple docs for whataclass
           <div class="features">inherited</div>
@@ -331,7 +331,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -340,7 +340,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Apple/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/COLOR-constant.html b/testing/test_package_docs_dev/ex/COLOR-constant.html
index ebe03e2f83..b83cc9113b 100644
--- a/testing/test_package_docs_dev/ex/COLOR-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR top-level constant</h1>
+    <h1>COLOR top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR</span>
diff --git a/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html b/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
index 3b7477a395..92612213d6 100644
--- a/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR_GREEN top-level constant</h1>
+    <h1>COLOR_GREEN top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR_GREEN</span>
diff --git a/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
index 8f7ae7bd33..154ae2d942 100644
--- a/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COLOR_ORANGE top-level constant</h1>
+    <h1>COLOR_ORANGE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COLOR_ORANGE</span>
diff --git a/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
index a2be8e01f9..4522aff681 100644
--- a/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>COMPLEX_COLOR top-level constant</h1>
+    <h1>COMPLEX_COLOR top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">COMPLEX_COLOR</span>
diff --git a/testing/test_package_docs_dev/ex/Cat-class.html b/testing/test_package_docs_dev/ex/Cat-class.html
index adc874cacf..b0249ec9c7 100644
--- a/testing/test_package_docs_dev/ex/Cat-class.html
+++ b/testing/test_package_docs_dev/ex/Cat-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Cat class</h1>
+      <h1>Cat class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/Cat/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Cat/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Cat/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -209,7 +209,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Cat/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/CatString-class.html b/testing/test_package_docs_dev/ex/CatString-class.html
index a2f91cc5a1..cd86728741 100644
--- a/testing/test_package_docs_dev/ex/CatString-class.html
+++ b/testing/test_package_docs_dev/ex/CatString-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CatString class</h1>
+      <h1>CatString class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/CatString/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="ex/CatString/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="ex/CatString/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="length" class="property inherited">
           <span class="name"><a href="ex/CatString/length.html">length</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/CatString/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -192,7 +192,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -201,7 +201,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -210,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -219,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/write.html">write</a></span><span class="signature">(<wbr><span class="parameter" id="write-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeAll.html">writeAll</a></span><span class="signature">(<wbr><span class="parameter" id="writeAll-param-objects"><span class="type-annotation">Iterable</span> <span class="parameter-name">objects</span>, [</span> <span class="parameter" id="writeAll-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeCharCode.html">writeCharCode</a></span><span class="signature">(<wbr><span class="parameter" id="writeCharCode-param-charCode"><span class="type-annotation">int</span> <span class="parameter-name">charCode</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/CatString/writeln.html">writeln</a></span><span class="signature">(<wbr>[<span class="parameter" id="writeln-param-obj"><span class="type-annotation">Object</span> <span class="parameter-name">obj</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -261,7 +261,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/CatString/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/ConstantCat-class.html b/testing/test_package_docs_dev/ex/ConstantCat-class.html
index 04b10c717b..f7d3273a15 100644
--- a/testing/test_package_docs_dev/ex/ConstantCat-class.html
+++ b/testing/test_package_docs_dev/ex/ConstantCat-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstantCat class</h1>
+      <h1>ConstantCat class </h1>
 
     
     <section>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/ConstantCat/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property">
           <span class="name"><a href="ex/ConstantCat/name.html">name</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Cat/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -169,7 +169,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Cat/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ConstantCat/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -203,7 +203,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Cat/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +218,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Cat/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/Deprecated-class.html b/testing/test_package_docs_dev/ex/Deprecated-class.html
index 61c2ff74e9..0da2333e21 100644
--- a/testing/test_package_docs_dev/ex/Deprecated-class.html
+++ b/testing/test_package_docs_dev/ex/Deprecated-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Deprecated class</h1>
+      <h1>Deprecated class </h1>
 
     
 
@@ -131,7 +131,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="expires" class="property">
           <span class="name"><a class="deprecated" href="ex/Deprecated/expires.html">expires</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -139,7 +139,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="message" class="property">
           <span class="name"><a href="ex/Deprecated/message.html">message</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -147,7 +147,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Deprecated/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -155,7 +155,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Deprecated/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -171,7 +171,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Deprecated/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -180,7 +180,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Deprecated/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -195,7 +195,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Deprecated/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/Dog-class.html b/testing/test_package_docs_dev/ex/Dog-class.html
index a433669b44..243ebec08b 100644
--- a/testing/test_package_docs_dev/ex/Dog-class.html
+++ b/testing/test_package_docs_dev/ex/Dog-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Dog class</h1>
+      <h1>Dog class </h1>
 
     <section class="desc markdown">
       <p>implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a></p>
@@ -166,7 +166,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aFinalField" class="property">
           <span class="name"><a href="ex/Dog/aFinalField.html">aFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -174,7 +174,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetterReturningRandomThings" class="property">
           <span class="name"><a href="ex/Dog/aGetterReturningRandomThings.html">aGetterReturningRandomThings</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -182,7 +182,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aProtectedFinalField" class="property">
           <span class="name"><a href="ex/Dog/aProtectedFinalField.html">aProtectedFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -190,7 +190,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedField" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -198,7 +198,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -206,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           
@@ -214,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property">
           <span class="name"><a href="ex/Dog/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           
@@ -222,7 +222,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property">
           <span class="name"><a href="ex/Dog/name.html">name</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -230,7 +230,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -238,7 +238,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -254,7 +254,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -263,7 +263,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/foo.html">foo</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -272,7 +272,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;)</div>
@@ -281,7 +281,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -290,7 +290,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -299,7 +299,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -308,7 +308,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testMethod.html">testMethod</a></span><span class="signature">(<wbr><span class="parameter" id="testMethod-param-it"><span class="type-annotation">Iterable</span> <span class="parameter-name">it</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -317,7 +317,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimation.html">withAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method <a href="ex/Dog/withAnimation.html">[...]</a>
           
@@ -326,7 +326,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadHeight.html">withAnimationBadHeight</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with non-integer height <a href="ex/Dog/withAnimationBadHeight.html">[...]</a>
           
@@ -335,7 +335,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadWidth.html">withAnimationBadWidth</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with non-integer width <a href="ex/Dog/withAnimationBadWidth.html">[...]</a>
           
@@ -344,7 +344,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInline.html">withAnimationInline</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation inline in text. <a href="ex/Dog/withAnimationInline.html">[...]</a>
           
@@ -353,7 +353,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInOneLineDoc.html">withAnimationInOneLineDoc</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation in one line doc  <a href="ex/Dog/withAnimationInOneLineDoc.html">[...]</a>
           
@@ -362,7 +362,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUnique.html">withAnimationNonUnique</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Non-Unique Animation method (between methods) <a href="ex/Dog/withAnimationNonUnique.html">[...]</a>
           
@@ -371,7 +371,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUniqueDeprecated.html">withAnimationNonUniqueDeprecated</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Non-Unique deprecated Animation method (between methods) <a href="ex/Dog/withAnimationNonUniqueDeprecated.html">[...]</a>
           
@@ -380,7 +380,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationOutOfOrder.html">withAnimationOutOfOrder</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation with out-of-order id argument. <a href="ex/Dog/withAnimationOutOfOrder.html">[...]</a>
           
@@ -389,7 +389,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationUnknownArg.html">withAnimationUnknownArg</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation with an argument that is not the id. <a href="ex/Dog/withAnimationUnknownArg.html">[...]</a>
           
@@ -398,7 +398,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationWrongParams.html">withAnimationWrongParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Malformed Animation method with wrong parameters <a href="ex/Dog/withAnimationWrongParams.html">[...]</a>
           
@@ -407,7 +407,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withDeprecatedAnimation.html">withDeprecatedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Deprecated animation method format. <a href="ex/Dog/withDeprecatedAnimation.html">[...]</a>
           
@@ -416,7 +416,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withInvalidNamedAnimation.html">withInvalidNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with invalid name <a href="ex/Dog/withInvalidNamedAnimation.html">[...]</a>
           
@@ -425,7 +425,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro.html">withMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Macro method <a href="ex/Dog/withMacro.html">[...]</a>
           
@@ -434,7 +434,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro2.html">withMacro2</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Foo macro content
           
@@ -443,7 +443,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withNamedAnimation.html">withNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with name <a href="ex/Dog/withNamedAnimation.html">[...]</a>
           
@@ -452,7 +452,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withPrivateMacro.html">withPrivateMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Use a privately defined macro: Private macro content
           
@@ -461,7 +461,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withQuotedNamedAnimation.html">withQuotedNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Animation method with quoted name <a href="ex/Dog/withQuotedNamedAnimation.html">[...]</a>
           
@@ -470,7 +470,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withUndefinedMacro.html">withUndefinedMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Don't define this:  null
           
@@ -479,7 +479,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -488,7 +488,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -503,7 +503,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Dog/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -517,7 +517,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="somethingTasty" class="property">
           <span class="name"><a href="ex/Dog/somethingTasty.html">somethingTasty</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           A tasty static + final property.
@@ -525,7 +525,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticGetterSetter" class="property">
           <span class="name"><a href="ex/Dog/staticGetterSetter.html">staticGetterSetter</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -541,7 +541,7 @@ <h2>Static Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/createDog.html">createDog</a></span><span class="signature">(<wbr><span class="parameter" id="createDog-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/Dog-class.html">Dog</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&quot;Internal use&quot;)</div>
@@ -556,7 +556,7 @@ <h2>Constants</h2>
         <dt id="aName" class="constant">
           <span class="name "><a href="ex/Dog/aName-constant.html">aName</a></span>
           <span class="signature">&#8594; const <a href="ex/ShortName-class.html">ShortName</a></span>
-        </dt>
+          </dt>
         <dd>
           Verify link substitution in constants (#1535)
           
@@ -567,7 +567,7 @@ <h2>Constants</h2>
         <dt id="aStaticConstField" class="constant">
           <span class="name "><a href="ex/Dog/aStaticConstField-constant.html">aStaticConstField</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/ex/E-class.html b/testing/test_package_docs_dev/ex/E-class.html
index cf6d194c24..a2a1c36a35 100644
--- a/testing/test_package_docs_dev/ex/E-class.html
+++ b/testing/test_package_docs_dev/ex/E-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>E class</h1>
+      <h1>E class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -190,7 +190,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/E/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/ExtendedShortName-class.html b/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
index 9e3242a925..57078ab5b2 100644
--- a/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
+++ b/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendedShortName class</h1>
+      <h1>ExtendedShortName class </h1>
 
     
     <section>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aParameter" class="property inherited">
           <span class="name"><a href="ex/ShortName/aParameter.html">aParameter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShortName/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShortName/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -186,7 +186,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -201,7 +201,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShortName/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/F-class.html b/testing/test_package_docs_dev/ex/F-class.html
index 4cc965292d..f9e79ea76d 100644
--- a/testing/test_package_docs_dev/ex/F-class.html
+++ b/testing/test_package_docs_dev/ex/F-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; class</h1>
+      <h1>F&lt;<wbr><span class="type-parameter">T extends String</span>&gt; class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aFinalField" class="property inherited">
           <span class="name"><a href="ex/Dog/aFinalField.html">aFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetterReturningRandomThings" class="property inherited">
           <span class="name"><a href="ex/Dog/aGetterReturningRandomThings.html">aGetterReturningRandomThings</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aProtectedFinalField" class="property inherited">
           <span class="name"><a href="ex/Dog/aProtectedFinalField.html">aProtectedFinalField</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedField" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -184,7 +184,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property inherited">
           <span class="name"><a class="deprecated" href="ex/Dog/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd class="inherited">
           
@@ -192,7 +192,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/E/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -200,7 +200,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isImplemented" class="property inherited">
           <span class="name"><a href="ex/Dog/isImplemented.html">isImplemented</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property inherited">
           <span class="name"><a href="ex/Dog/name.html">name</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +216,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/E/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/F/methodWithGenericParam.html">methodWithGenericParam</a></span><span class="signature">(<wbr>[<span class="parameter" id="methodWithGenericParam-param-msgs"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span> <span class="parameter-name">msgs</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -241,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/abstractMethod.html">abstractMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +250,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/foo.html">foo</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +259,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getAnotherClassD.html">getAnotherClassD</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Dog-class.html">Dog</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;before v27.3&#39;), inherited</div>
@@ -268,7 +268,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="ex/Dog/getClassA.html">getClassA</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="ex/Apple-class.html">Apple</a></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -277,7 +277,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -286,7 +286,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/F/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -295,7 +295,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGeneric.html">testGeneric</a></span><span class="signature">(<wbr><span class="parameter" id="testGeneric-param-args"><span class="type-annotation">Map<span class="signature">&lt;<wbr><span class="type-parameter">String</span>, <span class="type-parameter">dynamic</span>&gt;</span></span> <span class="parameter-name">args</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -304,7 +304,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testGenericMethod.html">testGenericMethod</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="testGenericMethod-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -313,7 +313,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/testMethod.html">testMethod</a></span><span class="signature">(<wbr><span class="parameter" id="testMethod-param-it"><span class="type-annotation">Iterable</span> <span class="parameter-name">it</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -322,7 +322,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/E/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -331,7 +331,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimation.html">withAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method <a href="ex/Dog/withAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -340,7 +340,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadHeight.html">withAnimationBadHeight</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with non-integer height <a href="ex/Dog/withAnimationBadHeight.html">[...]</a>
           <div class="features">inherited</div>
@@ -349,7 +349,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationBadWidth.html">withAnimationBadWidth</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with non-integer width <a href="ex/Dog/withAnimationBadWidth.html">[...]</a>
           <div class="features">inherited</div>
@@ -358,7 +358,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInline.html">withAnimationInline</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation inline in text. <a href="ex/Dog/withAnimationInline.html">[...]</a>
           <div class="features">inherited</div>
@@ -367,7 +367,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationInOneLineDoc.html">withAnimationInOneLineDoc</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation in one line doc  <a href="ex/Dog/withAnimationInOneLineDoc.html">[...]</a>
           <div class="features">inherited</div>
@@ -376,7 +376,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUnique.html">withAnimationNonUnique</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Non-Unique Animation method (between methods) <a href="ex/Dog/withAnimationNonUnique.html">[...]</a>
           <div class="features">inherited</div>
@@ -385,7 +385,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationNonUniqueDeprecated.html">withAnimationNonUniqueDeprecated</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Non-Unique deprecated Animation method (between methods) <a href="ex/Dog/withAnimationNonUniqueDeprecated.html">[...]</a>
           <div class="features">inherited</div>
@@ -394,7 +394,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationOutOfOrder.html">withAnimationOutOfOrder</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation with out-of-order id argument. <a href="ex/Dog/withAnimationOutOfOrder.html">[...]</a>
           <div class="features">inherited</div>
@@ -403,7 +403,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationUnknownArg.html">withAnimationUnknownArg</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation with an argument that is not the id. <a href="ex/Dog/withAnimationUnknownArg.html">[...]</a>
           <div class="features">inherited</div>
@@ -412,7 +412,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withAnimationWrongParams.html">withAnimationWrongParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Malformed Animation method with wrong parameters <a href="ex/Dog/withAnimationWrongParams.html">[...]</a>
           <div class="features">inherited</div>
@@ -421,7 +421,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withDeprecatedAnimation.html">withDeprecatedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Deprecated animation method format. <a href="ex/Dog/withDeprecatedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -430,7 +430,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withInvalidNamedAnimation.html">withInvalidNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with invalid name <a href="ex/Dog/withInvalidNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -439,7 +439,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro.html">withMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Macro method <a href="ex/Dog/withMacro.html">[...]</a>
           <div class="features">inherited</div>
@@ -448,7 +448,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withMacro2.html">withMacro2</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Foo macro content
           <div class="features">inherited</div>
@@ -457,7 +457,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withNamedAnimation.html">withNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with name <a href="ex/Dog/withNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -466,7 +466,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withPrivateMacro.html">withPrivateMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Use a privately defined macro: Private macro content
           <div class="features">inherited</div>
@@ -475,7 +475,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withQuotedNamedAnimation.html">withQuotedNamedAnimation</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Animation method with quoted name <a href="ex/Dog/withQuotedNamedAnimation.html">[...]</a>
           <div class="features">inherited</div>
@@ -484,7 +484,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Dog/withUndefinedMacro.html">withUndefinedMacro</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Don't define this:  null
           <div class="features">inherited</div>
@@ -499,7 +499,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Dog/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/ForAnnotation-class.html b/testing/test_package_docs_dev/ex/ForAnnotation-class.html
index 3b20940543..1883d67324 100644
--- a/testing/test_package_docs_dev/ex/ForAnnotation-class.html
+++ b/testing/test_package_docs_dev/ex/ForAnnotation-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ForAnnotation class</h1>
+      <h1>ForAnnotation class </h1>
 
     
 
@@ -131,7 +131,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="ex/ForAnnotation/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -139,7 +139,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ForAnnotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -147,7 +147,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ForAnnotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ForAnnotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ForAnnotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ForAnnotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/HasAnnotation-class.html b/testing/test_package_docs_dev/ex/HasAnnotation-class.html
index dbac55c671..317e3da30b 100644
--- a/testing/test_package_docs_dev/ex/HasAnnotation-class.html
+++ b/testing/test_package_docs_dev/ex/HasAnnotation-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasAnnotation class</h1>
+      <h1>HasAnnotation class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/HasAnnotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/HasAnnotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/HasAnnotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/HasAnnotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -190,7 +190,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/HasAnnotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/Helper-class.html b/testing/test_package_docs_dev/ex/Helper-class.html
index 83d6125df1..4ffa97fb0d 100644
--- a/testing/test_package_docs_dev/ex/Helper-class.html
+++ b/testing/test_package_docs_dev/ex/Helper-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Helper class</h1>
+      <h1>Helper class </h1>
 
     <section class="desc markdown">
       <p>Even unresolved references in the same library should be resolved
@@ -135,7 +135,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Helper/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -143,7 +143,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Helper/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -159,7 +159,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/getContents.html">getContents</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Helper/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Helper/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/Klass-class.html b/testing/test_package_docs_dev/ex/Klass-class.html
index 45465b3c77..fd813619a1 100644
--- a/testing/test_package_docs_dev/ex/Klass-class.html
+++ b/testing/test_package_docs_dev/ex/Klass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Klass class</h1>
+      <h1>Klass class </h1>
 
     <section class="desc markdown">
       <p>A class</p>
@@ -133,7 +133,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/Klass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -141,7 +141,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/Klass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -157,7 +157,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/another.html">another</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Another method
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A method with a custom annotation
           <div class="features">@<a href="ex/aThingToDo-class.html">aThingToDo</a>(&#39;from&#39;, &#39;thing&#39;)</div>
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/imAFactoryNoReally.html">imAFactoryNoReally</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Not really a factory, but...
           <div class="features">@factory</div>
@@ -184,7 +184,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/imProtected.html">imProtected</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A protected method
           <div class="features">@protected</div>
@@ -193,7 +193,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/method.html">method</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A method
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A shadowed method
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/Klass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -226,7 +226,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/Klass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/MY_CAT-constant.html b/testing/test_package_docs_dev/ex/MY_CAT-constant.html
index f3d42c90e0..3c7a24ec51 100644
--- a/testing/test_package_docs_dev/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs_dev/ex/MY_CAT-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MY_CAT top-level constant</h1>
+    <h1>MY_CAT top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">MY_CAT</span>
diff --git a/testing/test_package_docs_dev/ex/MyError-class.html b/testing/test_package_docs_dev/ex/MyError-class.html
index 66ac49b146..b4158377da 100644
--- a/testing/test_package_docs_dev/ex/MyError-class.html
+++ b/testing/test_package_docs_dev/ex/MyError-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyError class</h1>
+      <h1>MyError class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyError/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyError/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="stackTrace" class="property inherited">
           <span class="name"><a href="ex/MyError/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyError/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyError/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyError/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/MyErrorImplements-class.html b/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
index 0ba8c31e48..badc615e1b 100644
--- a/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyErrorImplements class</h1>
+      <h1>MyErrorImplements class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="stackTrace" class="property">
           <span class="name"><a href="ex/MyErrorImplements/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd>
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyErrorImplements/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyErrorImplements/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyErrorImplements/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyErrorImplements/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyErrorImplements/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/MyException-class.html b/testing/test_package_docs_dev/ex/MyException-class.html
index 4a5be414d5..c9ab300b9b 100644
--- a/testing/test_package_docs_dev/ex/MyException-class.html
+++ b/testing/test_package_docs_dev/ex/MyException-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyException class</h1>
+      <h1>MyException class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyException/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyException/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyException/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyException/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyException/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html b/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
index a28ffa5cb9..7e2b4f2ec3 100644
--- a/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
+++ b/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MyExceptionImplements class</h1>
+      <h1>MyExceptionImplements class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/MyExceptionImplements/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/MyExceptionImplements/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -168,7 +168,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyExceptionImplements/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -177,7 +177,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/MyExceptionImplements/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -192,7 +192,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/MyExceptionImplements/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
index 70dddcdc82..1dc2dd0016 100644
--- a/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PRETTY_COLORS top-level constant</h1>
+    <h1>PRETTY_COLORS top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">PRETTY_COLORS</span>
diff --git a/testing/test_package_docs_dev/ex/ParameterizedClass-class.html b/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
index 36a9dfe5e7..49bb70c346 100644
--- a/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>ParameterizedClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Support class to test inheritance + type expansion from implements clause.</p>
@@ -145,7 +145,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aInheritedField" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -153,7 +153,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -161,7 +161,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span></span></span> 
         </dt>
         <dd>
           
@@ -169,7 +169,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -177,7 +177,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +193,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -202,7 +202,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -211,7 +211,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -220,7 +220,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +235,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +244,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/ParameterizedTypedef.html b/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
index c6f4c166e1..a95fca7dbb 100644
--- a/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>ParameterizedTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
index 7e88a919cc..6739e0cf06 100644
--- a/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
+++ b/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PublicClassExtendsPrivateClass class</h1>
+      <h1>PublicClassExtendsPrivateClass class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/PublicClassExtendsPrivateClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
index 50aeb349fd..afda9251b3 100644
--- a/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
+++ b/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PublicClassImplementsPrivateInterface class</h1>
+      <h1>PublicClassImplementsPrivateInterface class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/test.html">test</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/PublicClassImplementsPrivateInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/ShapeType-class.html b/testing/test_package_docs_dev/ex/ShapeType-class.html
index ae26312525..a1105739c1 100644
--- a/testing/test_package_docs_dev/ex/ShapeType-class.html
+++ b/testing/test_package_docs_dev/ex/ShapeType-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ShapeType class</h1>
+      <h1>ShapeType class </h1>
 
     <section class="desc markdown">
       <p>Foo bar.</p><ol start="3"><li>All references should be hyperlinks. <a href="ex/MyError-class.html">MyError</a> and
@@ -124,7 +124,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShapeType/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -132,7 +132,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="name" class="property inherited">
           <span class="name"><a href="ex/ShapeType/name.html">name</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -140,7 +140,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShapeType/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -156,7 +156,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShapeType/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -165,7 +165,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShapeType/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -180,7 +180,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShapeType/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -197,7 +197,7 @@ <h2>Constants</h2>
         <dt id="ellipse" class="constant">
           <span class="name "><a href="ex/ShapeType/ellipse-constant.html">ellipse</a></span>
           <span class="signature">&#8594; const <a href="ex/ShapeType-class.html">ShapeType</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -208,7 +208,7 @@ <h2>Constants</h2>
         <dt id="rect" class="constant">
           <span class="name "><a href="ex/ShapeType/rect-constant.html">rect</a></span>
           <span class="signature">&#8594; const <a href="ex/ShapeType-class.html">ShapeType</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/ex/ShortName-class.html b/testing/test_package_docs_dev/ex/ShortName-class.html
index 97af9a4cd7..b122544c4e 100644
--- a/testing/test_package_docs_dev/ex/ShortName-class.html
+++ b/testing/test_package_docs_dev/ex/ShortName-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ShortName class</h1>
+      <h1>ShortName class </h1>
 
     
     <section>
@@ -143,7 +143,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aParameter" class="property">
           <span class="name"><a href="ex/ShortName/aParameter.html">aParameter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -151,7 +151,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ShortName/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -159,7 +159,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ShortName/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -175,7 +175,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -184,7 +184,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ShortName/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -199,7 +199,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ShortName/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/SpecializedDuration-class.html b/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
index d3385ea4a6..611d7e2213 100644
--- a/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
+++ b/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecializedDuration class</h1>
+      <h1>SpecializedDuration class </h1>
 
     <section class="desc markdown">
       <p>For testing a class that extends a class
@@ -148,7 +148,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -156,7 +156,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inDays" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inDays.html">inDays</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -164,7 +164,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inHours" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inHours.html">inHours</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -172,7 +172,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMicroseconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMicroseconds.html">inMicroseconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -180,7 +180,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMilliseconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMilliseconds.html">inMilliseconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -188,7 +188,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inMinutes" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inMinutes.html">inMinutes</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -196,7 +196,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="inSeconds" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/inSeconds.html">inSeconds</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -204,7 +204,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNegative" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/isNegative.html">isNegative</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -212,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/SpecializedDuration/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/abs.html">abs</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/compareTo.html">compareTo</a></span><span class="signature">(<wbr><span class="parameter" id="compareTo-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +255,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/SpecializedDuration/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -270,7 +270,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-factor"><span class="type-annotation">num</span> <span class="parameter-name">factor</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -279,7 +279,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -288,7 +288,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -297,7 +297,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_less.html">operator <</a></span><span class="signature">(<wbr><span class="parameter" id="<-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -306,7 +306,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_less_equal.html">operator <=</a></span><span class="signature">(<wbr><span class="parameter" id="<=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -315,7 +315,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -324,7 +324,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_greater.html">operator ></a></span><span class="signature">(<wbr><span class="parameter" id=">-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -333,7 +333,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_greater_equal.html">operator >=</a></span><span class="signature">(<wbr><span class="parameter" id=">=-param-other"><span class="type-annotation">Duration</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -342,7 +342,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_unary_minus.html">operator unary-</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -351,7 +351,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/SpecializedDuration/operator_truncate_divide.html">operator ~/</a></span><span class="signature">(<wbr><span class="parameter" id="~/-param-quotient"><span class="type-annotation">int</span> <span class="parameter-name">quotient</span></span>)
             <span class="returntype parameter">&#8594; Duration</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/TemplatedClass-class.html b/testing/test_package_docs_dev/ex/TemplatedClass-class.html
index 4b8b342a18..d3cce43572 100644
--- a/testing/test_package_docs_dev/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs_dev/ex/TemplatedClass-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; class</h1>
+      <h1>TemplatedClass&lt;<wbr><span class="type-parameter">X</span>&gt; class </h1>
 
     
 
@@ -130,7 +130,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/TemplatedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -138,7 +138,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/TemplatedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -154,7 +154,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-input"><span class="type-annotation">X</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -163,7 +163,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -172,7 +172,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -187,7 +187,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/TemplatedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/TemplatedInterface-class.html b/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
index 65861965b8..f7b6d47e35 100644
--- a/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
+      <h1>TemplatedInterface&lt;<wbr><span class="type-parameter">A</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Class for testing expansion of type from implements clause.</p>
@@ -147,7 +147,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aField" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aField.html">aField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -155,7 +155,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aGetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aGetter.html">aGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Map<span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -163,7 +163,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aSetter" class="property">
           <span class="name"><a href="ex/TemplatedInterface/aSetter.html">aSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">bool</span>&gt;</span></span>&gt;</span></span></span></span> 
         </dt>
         <dd>
           
@@ -171,7 +171,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedField" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedField.html">aInheritedField</a></span>
-          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -179,7 +179,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedGetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedGetter.html">aInheritedGetter</a></span>
-          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -187,7 +187,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aInheritedSetter" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/aInheritedSetter.html">aInheritedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="aInheritedSetter=-param-thingToSet"><span class="type-annotation"><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span></span></span> 
         </dt>
         <dd class="inherited">
           
@@ -195,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -203,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/ParameterizedClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedInterface/aMethodInterface.html">aMethodInterface</a></span><span class="signature">(<wbr><span class="parameter" id="aMethodInterface-param-value"><span class="type-annotation">A</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -228,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TemplatedInterface/aTypedefReturningMethodInterface.html">aTypedefReturningMethodInterface</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -237,7 +237,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedMethod.html">aInheritedMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aInheritedMethod-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +246,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/aInheritedTypedefReturningMethod.html">aInheritedTypedefReturningMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +255,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -264,7 +264,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/ParameterizedClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -279,7 +279,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -288,7 +288,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/ParameterizedClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
index d7258e769b..115a6624db 100644
--- a/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TypedFunctionsWithoutTypedefs class</h1>
+      <h1>TypedFunctionsWithoutTypedefs class </h1>
 
     <section class="desc markdown">
       <p>This class has a complicated type situation.</p>
@@ -133,7 +133,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -141,7 +141,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -157,7 +157,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAComplexTypedef.html">getAComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A4</span>, <span class="type-parameter">A5</span>, <span class="type-parameter">A6</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="ex/aComplexTypedef.html">aComplexTypedef</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a complex typedef that includes some anonymous typed functions.
           
@@ -166,7 +166,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningBool.html">getAFunctionReturningBool</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>, <span class="type-parameter">T3</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool Function<span class="signature">&lt;<wbr><span class="type-parameter">T4</span>&gt;</span><span class="signature">(<span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">String</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningBool-param-"><span class="type-annotation">T4</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This helps us make sure we get both the empty and the non-empty
 case right for anonymous functions.
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/getAFunctionReturningVoid.html">getAFunctionReturningVoid</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T1</span>, <span class="type-parameter">T2</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="getAFunctionReturningVoid-param-callback"><span class="type-annotation">void</span> <span class="parameter-name">callback</span>(<span class="parameter" id="callback-param-argument1"><span class="type-annotation">T1</span> <span class="parameter-name">argument1</span>, </span> <span class="parameter" id="callback-param-argument2"><span class="type-annotation">T2</span> <span class="parameter-name">argument2</span></span>)</span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T1</span>, </span> <span class="parameter" id="getAFunctionReturningVoid-param-"><span class="type-annotation">T2</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a function that returns a void with some generic types sprinkled in.
           
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -194,7 +194,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -209,7 +209,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/TypedFunctionsWithoutTypedefs/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/WithGeneric-class.html b/testing/test_package_docs_dev/ex/WithGeneric-class.html
index 74de37571a..a3d0e8c4ee 100644
--- a/testing/test_package_docs_dev/ex/WithGeneric-class.html
+++ b/testing/test_package_docs_dev/ex/WithGeneric-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>WithGeneric&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     
     <section>
@@ -142,7 +142,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="prop" class="property">
           <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
-          <span class="signature">&#8596; T</span>
+          <span class="signature">&#8596; T</span> 
         </dt>
         <dd>
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -158,7 +158,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -174,7 +174,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -183,7 +183,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -198,7 +198,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/WithGeneric/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/WithGenericSub-class.html b/testing/test_package_docs_dev/ex/WithGenericSub-class.html
index 28cb503153..42674d2882 100644
--- a/testing/test_package_docs_dev/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs_dev/ex/WithGenericSub-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGenericSub class</h1>
+      <h1>WithGenericSub class </h1>
 
     
     <section>
@@ -144,7 +144,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -152,7 +152,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="prop" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/prop.html">prop</a></span>
-          <span class="signature">&#8596; <a href="ex/Apple-class.html">Apple</a></span>
+          <span class="signature">&#8596; <a href="ex/Apple-class.html">Apple</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -160,7 +160,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/WithGeneric/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -176,7 +176,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -185,7 +185,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/WithGeneric/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -200,7 +200,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/WithGeneric/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/aComplexTypedef.html b/testing/test_package_docs_dev/ex/aComplexTypedef.html
index 3cd9a3f959..7774887cf0 100644
--- a/testing/test_package_docs_dev/ex/aComplexTypedef.html
+++ b/testing/test_package_docs_dev/ex/aComplexTypedef.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef</h1>
+    <h1>aComplexTypedef&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
diff --git a/testing/test_package_docs_dev/ex/aThingToDo-class.html b/testing/test_package_docs_dev/ex/aThingToDo-class.html
index 82742ba756..88d52faa9f 100644
--- a/testing/test_package_docs_dev/ex/aThingToDo-class.html
+++ b/testing/test_package_docs_dev/ex/aThingToDo-class.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aThingToDo class</h1>
+      <h1>aThingToDo class </h1>
 
     <section class="desc markdown">
       <p>A custom annotation.</p>
@@ -134,7 +134,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="what" class="property">
           <span class="name"><a href="ex/aThingToDo/what.html">what</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -142,7 +142,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="who" class="property">
           <span class="name"><a href="ex/aThingToDo/who.html">who</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -150,7 +150,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="ex/aThingToDo/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -158,7 +158,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="ex/aThingToDo/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -174,7 +174,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/aThingToDo/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -183,7 +183,7 @@ <h2>Methods</h2>
           <span class="name"><a href="ex/aThingToDo/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -198,7 +198,7 @@ <h2>Operators</h2>
           <span class="name"><a href="ex/aThingToDo/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/ex/deprecated-constant.html b/testing/test_package_docs_dev/ex/deprecated-constant.html
index 1d243438f6..e39704cfd7 100644
--- a/testing/test_package_docs_dev/ex/deprecated-constant.html
+++ b/testing/test_package_docs_dev/ex/deprecated-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecated top-level constant</h1>
+    <h1>deprecated top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">deprecated</span>
diff --git a/testing/test_package_docs_dev/ex/deprecatedField.html b/testing/test_package_docs_dev/ex/deprecatedField.html
index b8da2da423..b087b38838 100644
--- a/testing/test_package_docs_dev/ex/deprecatedField.html
+++ b/testing/test_package_docs_dev/ex/deprecatedField.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedField top-level property</h1>
+    <h1>deprecatedField top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/ex/deprecatedGetter.html b/testing/test_package_docs_dev/ex/deprecatedGetter.html
index 63222aca1b..d77dd2e542 100644
--- a/testing/test_package_docs_dev/ex/deprecatedGetter.html
+++ b/testing/test_package_docs_dev/ex/deprecatedGetter.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedGetter top-level property</h1>
+    <h1>deprecatedGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/ex/deprecatedSetter.html b/testing/test_package_docs_dev/ex/deprecatedSetter.html
index ed07215136..5273186102 100644
--- a/testing/test_package_docs_dev/ex/deprecatedSetter.html
+++ b/testing/test_package_docs_dev/ex/deprecatedSetter.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>deprecatedSetter top-level property</h1>
+    <h1>deprecatedSetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs_dev/ex/ex-library.html b/testing/test_package_docs_dev/ex/ex-library.html
index 443ea26e5e..94d6fab565 100644
--- a/testing/test_package_docs_dev/ex/ex-library.html
+++ b/testing/test_package_docs_dev/ex/ex-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ex library</h1>
+    <h1>ex library </h1>
 
     <section class="desc markdown">
       <p>a library. testing string escaping: <code>var s = 'a string'</code> <cool></cool></p>
@@ -69,97 +74,97 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AnotherParameterizedClass">
-          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></span>
+          <span class="name "><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">B</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Apple">
-          <span class="name "><a href="ex/Apple-class.html">Apple</a></span>
+          <span class="name "><a href="ex/Apple-class.html">Apple</a></span> 
         </dt>
         <dd>
           Sample class <code>String</code> <a href="ex/Apple-class.html">[...]</a>
         </dd>
         <dt id="aThingToDo">
-          <span class="name "><a href="ex/aThingToDo-class.html">aThingToDo</a></span>
+          <span class="name "><a href="ex/aThingToDo-class.html">aThingToDo</a></span> 
         </dt>
         <dd>
           A custom annotation.
         </dd>
         <dt id="B">
-          <span class="name "><a href="ex/B-class.html">B</a></span>
+          <span class="name "><a href="ex/B-class.html">B</a></span> 
         </dt>
         <dd>
           Extends class <a href="ex/Apple-class.html">Apple</a>, use <a href="ex/Apple/Apple.html">new Apple</a> or <a href="ex/Apple/Apple.fromString.html">new Apple.fromString</a> <a href="ex/B-class.html">[...]</a>
         </dd>
         <dt id="Cat">
-          <span class="name "><a href="ex/Cat-class.html">Cat</a></span>
+          <span class="name "><a href="ex/Cat-class.html">Cat</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="CatString">
-          <span class="name "><a href="ex/CatString-class.html">CatString</a></span>
+          <span class="name "><a href="ex/CatString-class.html">CatString</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ConstantCat">
-          <span class="name "><a href="ex/ConstantCat-class.html">ConstantCat</a></span>
+          <span class="name "><a href="ex/ConstantCat-class.html">ConstantCat</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Cool">
-          <span class="name "><a href="fake/Cool-class.html">Cool</a></span>
+          <span class="name "><a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           This class is cool!
         </dd>
         <dt id="Deprecated">
-          <span class="name "><a href="ex/Deprecated-class.html">Deprecated</a></span>
+          <span class="name "><a href="ex/Deprecated-class.html">Deprecated</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Dog">
-          <span class="name "><a href="ex/Dog-class.html">Dog</a></span>
+          <span class="name "><a href="ex/Dog-class.html">Dog</a></span> 
         </dt>
         <dd>
           implements <a href="ex/Cat-class.html">Cat</a>, <a href="ex/E-class.html">E</a> <a href="ex/Dog-class.html">[...]</a>
         </dd>
         <dt id="E">
-          <span class="name "><a href="ex/E-class.html">E</a></span>
+          <span class="name "><a href="ex/E-class.html">E</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ExtendedShortName">
-          <span class="name "><a href="ex/ExtendedShortName-class.html">ExtendedShortName</a></span>
+          <span class="name "><a href="ex/ExtendedShortName-class.html">ExtendedShortName</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="F">
-          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></span>
+          <span class="name "><a href="ex/F-class.html">F</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends String</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ForAnnotation">
-          <span class="name "><a href="ex/ForAnnotation-class.html">ForAnnotation</a></span>
+          <span class="name "><a href="ex/ForAnnotation-class.html">ForAnnotation</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="HasAnnotation">
-          <span class="name "><a href="ex/HasAnnotation-class.html">HasAnnotation</a></span>
+          <span class="name "><a href="ex/HasAnnotation-class.html">HasAnnotation</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Helper">
-          <span class="name "><a href="ex/Helper-class.html">Helper</a></span>
+          <span class="name "><a href="ex/Helper-class.html">Helper</a></span> 
         </dt>
         <dd>
           Even unresolved references in the same library should be resolved
@@ -167,74 +172,74 @@ <h2>Classes</h2>
 <a href="ex/B-class.html">ex.B</a>
         </dd>
         <dt id="Klass">
-          <span class="name "><a href="ex/Klass-class.html">Klass</a></span>
+          <span class="name "><a href="ex/Klass-class.html">Klass</a></span> 
         </dt>
         <dd>
           A class
         </dd>
         <dt id="ParameterizedClass">
-          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           Support class to test inheritance + type expansion from implements clause.
         </dd>
         <dt id="PublicClassExtendsPrivateClass">
-          <span class="name "><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></span>
+          <span class="name "><a href="ex/PublicClassExtendsPrivateClass-class.html">PublicClassExtendsPrivateClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="PublicClassImplementsPrivateInterface">
-          <span class="name "><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></span>
+          <span class="name "><a href="ex/PublicClassImplementsPrivateInterface-class.html">PublicClassImplementsPrivateInterface</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ShapeType">
-          <span class="name "><a href="ex/ShapeType-class.html">ShapeType</a></span>
+          <span class="name "><a href="ex/ShapeType-class.html">ShapeType</a></span> 
         </dt>
         <dd>
           Foo bar. <a href="ex/ShapeType-class.html">[...]</a>
         </dd>
         <dt id="ShortName">
-          <span class="name "><a href="ex/ShortName-class.html">ShortName</a></span>
+          <span class="name "><a href="ex/ShortName-class.html">ShortName</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SpecializedDuration">
-          <span class="name "><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></span>
+          <span class="name "><a href="ex/SpecializedDuration-class.html">SpecializedDuration</a></span> 
         </dt>
         <dd>
           For testing a class that extends a class
 that has some operators
         </dd>
         <dt id="TemplatedClass">
-          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedClass-class.html">TemplatedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="TemplatedInterface">
-          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
+          <span class="name "><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span> 
         </dt>
         <dd>
           Class for testing expansion of type from implements clause.
         </dd>
         <dt id="TypedFunctionsWithoutTypedefs">
-          <span class="name "><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></span>
+          <span class="name "><a href="ex/TypedFunctionsWithoutTypedefs-class.html">TypedFunctionsWithoutTypedefs</a></span> 
         </dt>
         <dd>
           This class has a complicated type situation.
         </dd>
         <dt id="WithGeneric">
-          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="ex/WithGeneric-class.html">WithGeneric</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="WithGenericSub">
-          <span class="name "><a href="ex/WithGenericSub-class.html">WithGenericSub</a></span>
+          <span class="name "><a href="ex/WithGenericSub-class.html">WithGenericSub</a></span> 
         </dt>
         <dd>
           
@@ -249,7 +254,7 @@ <h2>Constants</h2>
         <dt id="COLOR" class="constant">
           <span class="name "><a href="ex/COLOR-constant.html">COLOR</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -260,7 +265,7 @@ <h2>Constants</h2>
         <dt id="COLOR_GREEN" class="constant">
           <span class="name "><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -271,7 +276,7 @@ <h2>Constants</h2>
         <dt id="COLOR_ORANGE" class="constant">
           <span class="name "><a href="ex/COLOR_ORANGE-constant.html">COLOR_ORANGE</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -282,7 +287,7 @@ <h2>Constants</h2>
         <dt id="COMPLEX_COLOR" class="constant">
           <span class="name "><a href="ex/COMPLEX_COLOR-constant.html">COMPLEX_COLOR</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -293,7 +298,7 @@ <h2>Constants</h2>
         <dt id="deprecated" class="constant">
           <span class="name "><a href="ex/deprecated-constant.html">deprecated</a></span>
           <span class="signature">&#8594; const <a href="ex/Deprecated-class.html">Deprecated</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -304,7 +309,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReference" class="constant">
           <span class="name "><a href="ex/incorrectDocReference-constant.html">incorrectDocReference</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is the same name as a top-level const from the fake lib.
           
@@ -315,7 +320,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReferenceFromEx" class="constant">
           <span class="name "><a href="ex/incorrectDocReferenceFromEx-constant.html">incorrectDocReferenceFromEx</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This should <code>not work</code>.
           
@@ -326,7 +331,7 @@ <h2>Constants</h2>
         <dt id="MY_CAT" class="constant">
           <span class="name "><a href="ex/MY_CAT-constant.html">MY_CAT</a></span>
           <span class="signature">&#8594; const <a href="ex/ConstantCat-class.html">ConstantCat</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -337,7 +342,7 @@ <h2>Constants</h2>
         <dt id="PRETTY_COLORS" class="constant">
           <span class="name "><a href="ex/PRETTY_COLORS-constant.html">PRETTY_COLORS</a></span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -354,7 +359,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="deprecatedField" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedField.html">deprecatedField</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -362,7 +367,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedGetter" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedGetter.html">deprecatedGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -370,7 +375,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="deprecatedSetter" class="property">
           <span class="name"><a class="deprecated" href="ex/deprecatedSetter.html">deprecatedSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="deprecatedSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           
@@ -378,7 +383,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="number" class="property">
           <span class="name"><a href="ex/number.html">number</a></span>
-          <span class="signature">&#8596; double</span>
+          <span class="signature">&#8596; double</span> 
         </dt>
         <dd>
           
@@ -386,7 +391,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="y" class="property">
           <span class="name"><a href="ex/y.html">y</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           
@@ -403,7 +408,7 @@ <h2>Functions</h2>
           <span class="name"><a href="ex/function1.html">function1</a></span><span class="signature">(<wbr><span class="parameter" id="function1-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span>, </span> <span class="parameter" id="function1-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="function1-param-lastParam"><span class="type-annotation">dynamic</span> <span class="parameter-name">lastParam</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -412,7 +417,7 @@ <h2>Functions</h2>
           <span class="name"><a href="ex/genericFunction.html">genericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="genericFunction-param-arg"><span class="type-annotation">T</span> <span class="parameter-name">arg</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -425,7 +430,7 @@ <h2>Enums</h2>
 
       <dl>
         <dt id="Animal">
-          <span class="name "><a href="ex/Animal-class.html">Animal</a></span>
+          <span class="name "><a href="ex/Animal-class.html">Animal</a></span> 
         </dt>
         <dd>
           Referencing <a href="ex/processMessage.html">processMessage</a> (or other things) here should not break
@@ -442,7 +447,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/aComplexTypedef.html">aComplexTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">A1</span>, <span class="type-parameter">A2</span>, <span class="type-parameter">A3</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">String</span></span>)
             <span class="returntype parameter">&#8594; void Function<span class="signature">(<span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A1</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A2</span>, </span> <span class="parameter" id="aComplexTypedef-param-"><span class="type-annotation">A3</span></span>)</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Someone might do this some day.
           
@@ -451,7 +456,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="ParameterizedTypedef-param-msg"><span class="type-annotation">T</span> <span class="parameter-name">msg</span>, </span> <span class="parameter" id="ParameterizedTypedef-param-foo"><span class="type-annotation">int</span> <span class="parameter-name">foo</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -460,7 +465,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="ex/processMessage.html">processMessage</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="processMessage-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -473,25 +478,25 @@ <h2>Exceptions / Errors</h2>
 
       <dl>
         <dt id="MyError">
-          <span class="name "><a href="ex/MyError-class.html">MyError</a></span>
+          <span class="name "><a href="ex/MyError-class.html">MyError</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyErrorImplements">
-          <span class="name "><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></span>
+          <span class="name "><a href="ex/MyErrorImplements-class.html">MyErrorImplements</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyException">
-          <span class="name "><a href="ex/MyException-class.html">MyException</a></span>
+          <span class="name "><a href="ex/MyException-class.html">MyException</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MyExceptionImplements">
-          <span class="name "><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></span>
+          <span class="name "><a href="ex/MyExceptionImplements-class.html">MyExceptionImplements</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs_dev/ex/function1.html b/testing/test_package_docs_dev/ex/function1.html
index 370f19c73c..5d26328929 100644
--- a/testing/test_package_docs_dev/ex/function1.html
+++ b/testing/test_package_docs_dev/ex/function1.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>function1 function</h1>
+    <h1>function1 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/ex/genericFunction.html b/testing/test_package_docs_dev/ex/genericFunction.html
index 22f15b4553..1fc3db248b 100644
--- a/testing/test_package_docs_dev/ex/genericFunction.html
+++ b/testing/test_package_docs_dev/ex/genericFunction.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
+    <h1>genericFunction&lt;<wbr><span class="type-parameter">T</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
diff --git a/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html b/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
index 48d43faac3..e9b296e002 100644
--- a/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReference top-level constant</h1>
+    <h1>incorrectDocReference top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReference</span>
diff --git a/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
index 1c527830e2..83eaa31659 100644
--- a/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReferenceFromEx top-level constant</h1>
+    <h1>incorrectDocReferenceFromEx top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReferenceFromEx</span>
diff --git a/testing/test_package_docs_dev/ex/number.html b/testing/test_package_docs_dev/ex/number.html
index ac9fd37c7d..c89e6fa978 100644
--- a/testing/test_package_docs_dev/ex/number.html
+++ b/testing/test_package_docs_dev/ex/number.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>number top-level property</h1>
+    <h1>number top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">double</span>
diff --git a/testing/test_package_docs_dev/ex/processMessage.html b/testing/test_package_docs_dev/ex/processMessage.html
index ec1a2fe0aa..021c70e0bc 100644
--- a/testing/test_package_docs_dev/ex/processMessage.html
+++ b/testing/test_package_docs_dev/ex/processMessage.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>processMessage&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/ex/y.html b/testing/test_package_docs_dev/ex/y.html
index 9dd12874e0..8eb237a44f 100644
--- a/testing/test_package_docs_dev/ex/y.html
+++ b/testing/test_package_docs_dev/ex/y.html
@@ -107,7 +107,7 @@ <h5>ex library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>y top-level property</h1>
+    <h1>y top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/ABaseClass-class.html b/testing/test_package_docs_dev/fake/ABaseClass-class.html
index 63881add4d..f764c4490d 100644
--- a/testing/test_package_docs_dev/fake/ABaseClass-class.html
+++ b/testing/test_package_docs_dev/fake/ABaseClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ABaseClass class</h1>
+      <h1>ABaseClass class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ABaseClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
index 74aaff3cab..7dba49724e 100644
--- a/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AClassUsingASuperMixin class</h1>
+      <h1>AClassUsingASuperMixin class </h1>
 
     <section class="desc markdown">
       <p>Verify super-mixins don't break Dartdoc.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="superString" class="property inherited">
           <span class="name"><a href="fake/AMixinCallingSuper/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html b/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
index b3fb3dde11..a20883841f 100644
--- a/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
+++ b/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AClassWithFancyProperties class</h1>
+      <h1>AClassWithFancyProperties class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aProperty" class="property">
           <span class="name"><a href="fake/AClassWithFancyProperties/aProperty.html">aProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           This property is quite fancy, and requires sample code to understand. <a href="fake/AClassWithFancyProperties/aProperty.html">[...]</a>
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AClassWithFancyProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -198,7 +199,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AClassWithFancyProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -214,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AClassWithFancyProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html b/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
index c85a4e3b6b..3222e997af 100644
--- a/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AMixinCallingSuper class</h1>
+      <h1>AMixinCallingSuper class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="superString" class="property">
           <span class="name"><a href="fake/AMixinCallingSuper/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -256,7 +257,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html b/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
index e7d9084686..ce6f27fc83 100644
--- a/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>ATypeTakingClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>This class takes a type, and it might be void.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ATypeTakingClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ATypeTakingClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/aMethodMaybeReturningVoid.html">aMethodMaybeReturningVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -254,7 +255,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ATypeTakingClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
index 3d5650ede3..cd39f80f94 100644
--- a/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ATypeTakingClassMixedIn class</h1>
+      <h1>ATypeTakingClassMixedIn class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ABaseClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ATypeTakingClass/aMethodMaybeReturningVoid.html">aMethodMaybeReturningVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ABaseClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ABaseClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/Annotation-class.html b/testing/test_package_docs_dev/fake/Annotation-class.html
index f1876808d9..40b93946cf 100644
--- a/testing/test_package_docs_dev/fake/Annotation-class.html
+++ b/testing/test_package_docs_dev/fake/Annotation-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Annotation class</h1>
+      <h1>Annotation class </h1>
 
     <section class="desc markdown">
       <p>Useful for annotations.</p>
@@ -186,7 +187,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="fake/Annotation/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -194,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Annotation/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Annotation/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Annotation/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Annotation/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Annotation/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/AnotherInterface-class.html b/testing/test_package_docs_dev/fake/AnotherInterface-class.html
index 774f35ba11..eee2fba500 100644
--- a/testing/test_package_docs_dev/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs_dev/fake/AnotherInterface-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AnotherInterface class</h1>
+      <h1>AnotherInterface class </h1>
 
     <section class="desc markdown">
       <p>Yet another interface that can be implemented.</p>
@@ -198,7 +199,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -222,7 +223,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
index b499bebc42..24bd8b5174 100644
--- a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,8 +160,13 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseForDocComments class</h1>
+      <h1>BaseForDocComments class   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
+    <section class="desc markdown">
+      <p>Category information should not follow inheritance.</p>
+    </section>
     
     <section>
       <dl class="dl-horizontal">
@@ -194,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -227,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/doAwesomeStuff.html">doAwesomeStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doAwesomeStuff-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Takes a <code>value</code> and returns a String. <a href="fake/BaseForDocComments/doAwesomeStuff.html">[...]</a>
           
@@ -236,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -260,7 +266,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-key"><span class="type-annotation">String</span> <span class="parameter-name">key</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -269,7 +275,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/BaseThingy-class.html b/testing/test_package_docs_dev/fake/BaseThingy-class.html
index 0534d545f5..eb6ea68e43 100644
--- a/testing/test_package_docs_dev/fake/BaseThingy-class.html
+++ b/testing/test_package_docs_dev/fake/BaseThingy-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseThingy class</h1>
+      <h1>BaseThingy class </h1>
 
     
     <section>
@@ -195,7 +196,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
@@ -203,7 +204,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -253,7 +254,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -268,7 +269,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/BaseThingy2-class.html b/testing/test_package_docs_dev/fake/BaseThingy2-class.html
index 8f3cf539de..cc0a1ed19d 100644
--- a/testing/test_package_docs_dev/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs_dev/fake/BaseThingy2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseThingy2 class</h1>
+      <h1>BaseThingy2 class </h1>
 
     <section class="desc markdown">
       <p>Test for MultiplyInheritedExecutableElement handling.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property">
           <span class="name"><a href="fake/BaseThingy2/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd>
           BaseThingy2's doc for aImplementingThingy.
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -227,7 +228,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -243,7 +244,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -252,7 +253,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -261,7 +262,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -276,7 +277,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
index 7db00bff61..8eb56be916 100644
--- a/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CUSTOM_CLASS top-level constant</h1>
+    <h1>CUSTOM_CLASS top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">CUSTOM_CLASS</span>
diff --git a/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html b/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
index 50ad7f3bb3..94e604c0d0 100644
--- a/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
+++ b/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>CUSTOM_CLASS_PRIVATE top-level constant</h1>
+    <h1>CUSTOM_CLASS_PRIVATE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">CUSTOM_CLASS_PRIVATE</span>
diff --git a/testing/test_package_docs_dev/fake/Callback2.html b/testing/test_package_docs_dev/fake/Callback2.html
index d498cd0cbc..21dd36c16c 100644
--- a/testing/test_package_docs_dev/fake/Callback2.html
+++ b/testing/test_package_docs_dev/fake/Callback2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Callback2 typedef</h1>
+    <h1>Callback2 typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
index 876dad5c82..c02a13fcfe 100644
--- a/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ClassWithUnusualProperties class</h1>
+      <h1>ClassWithUnusualProperties class </h1>
 
     <section class="desc markdown">
       <p>Classes with unusual properties?  I don't think they exist.</p>
@@ -201,7 +202,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="documentedPartialFieldInSubclassOnly" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/documentedPartialFieldInSubclassOnly.html">documentedPartialFieldInSubclassOnly</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           This getter is documented, so we should see a read-only property here.
@@ -209,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetter.html">explicitGetter</a></span>
-          <span class="signature">&#8594; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="signature">&#8594; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> 
         </dt>
         <dd>
           This property only has a getter and no setter; no parameters to print.
@@ -217,7 +218,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> 
         </dt>
         <dd>
           Getter doc for explicitGetterImplicitSetter
@@ -225,7 +226,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitGetterSetter.html">explicitGetterSetter</a></span>
-          <span class="signature">&#8596; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span>
+          <span class="signature">&#8596; <a href="fake/myCoolTypedef.html">myCoolTypedef</a></span> 
         </dt>
         <dd>
           Getter doc for explicitGetterSetter.
@@ -233,7 +234,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitNonDocumentedInBaseClassGetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitNonDocumentedInBaseClassGetter.html">explicitNonDocumentedInBaseClassGetter</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           Since I have a different doc, I should be documented.
@@ -241,7 +242,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/explicitSetter.html">explicitSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span></span>
+          <span class="signature">&#8592; <span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span></span>)</span></span> 
         </dt>
         <dd>
           Set to <code>f</code>, and don't warn about <code>bar</code> or <code>baz</code>.
@@ -249,7 +250,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="finalProperty" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/finalProperty.html">finalProperty</a></span>
-          <span class="signature">&#8594; Set</span>
+          <span class="signature">&#8594; Set</span> 
         </dt>
         <dd>
           This property has some docs, too.
@@ -257,7 +258,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
@@ -265,7 +266,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitReadWrite" class="property">
           <span class="name"><a href="fake/ClassWithUnusualProperties/implicitReadWrite.html">implicitReadWrite</a></span>
-          <span class="signature">&#8596; Map</span>
+          <span class="signature">&#8596; Map</span> 
         </dt>
         <dd>
           
@@ -273,7 +274,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Explicit getter for inheriting.
@@ -281,7 +282,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitPartiallyDocumentedField" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/explicitPartiallyDocumentedField.html">explicitPartiallyDocumentedField</a></span>
-          <span class="signature">&#8594; double</span>
+          <span class="signature">&#8594; double</span> 
         </dt>
         <dd class="inherited">
           but documented here.
@@ -289,7 +290,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="forInheriting" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           A simple property to inherit.
@@ -297,7 +298,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -305,7 +306,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -321,7 +322,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ClassWithUnusualProperties/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-f"><span class="type-annotation">Function</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-x"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="f-param-q"><span class="type-annotation">bool</span> <span class="parameter-name">q</span></span>)</span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Hey there, more things not to warn about: <code>f</code>, <code>x</code>, or <code>q</code>.
           
@@ -330,7 +331,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -339,7 +340,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -354,7 +355,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplicitProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/Color-class.html b/testing/test_package_docs_dev/fake/Color-class.html
index b1f55d2278..5d74055e04 100644
--- a/testing/test_package_docs_dev/fake/Color-class.html
+++ b/testing/test_package_docs_dev/fake/Color-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Color enum</h1>
+    <h1>Color enum </h1>
 
     <section class="desc markdown">
       <p>An <code>enum</code> for ROYGBIV constants.</p>
@@ -173,7 +174,7 @@ <h2>Constants</h2>
         <dt id="BLUE" class="constant">
           <span class="name ">BLUE</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Some constants have long docs.</p>
 <p>Some constants have long docs.
@@ -186,7 +187,7 @@ <h2>Constants</h2>
         <dt id="GREEN" class="constant">
           <span class="name ">GREEN</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -197,7 +198,7 @@ <h2>Constants</h2>
         <dt id="INDIGO" class="constant">
           <span class="name ">INDIGO</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -208,7 +209,7 @@ <h2>Constants</h2>
         <dt id="ORANGE" class="constant">
           <span class="name ">ORANGE</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Orange</p>
           
@@ -219,7 +220,7 @@ <h2>Constants</h2>
         <dt id="RED" class="constant">
           <span class="name ">RED</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           <p>Red</p>
           
@@ -230,7 +231,7 @@ <h2>Constants</h2>
         <dt id="values" class="constant">
           <span class="name ">values</span>
           <span class="signature">&#8594; const List<span class="signature">&lt;<wbr><span class="type-parameter"><a href="fake/Color-class.html">Color</a></span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>
           
@@ -241,7 +242,7 @@ <h2>Constants</h2>
         <dt id="VIOLET" class="constant">
           <span class="name ">VIOLET</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -252,7 +253,7 @@ <h2>Constants</h2>
         <dt id="YELLOW" class="constant">
           <span class="name ">YELLOW</span>
           <span class="signature">&#8594; const <a href="fake/Color-class.html">Color</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -270,7 +271,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name">index</span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           <p>The integer index of this enum.</p>
@@ -278,7 +279,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Color/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -286,7 +287,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Color/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -302,7 +303,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Color/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -311,7 +312,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -326,7 +327,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Color/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ConstantClass-class.html b/testing/test_package_docs_dev/fake/ConstantClass-class.html
index 7d0eda1e56..94a494fb7f 100644
--- a/testing/test_package_docs_dev/fake/ConstantClass-class.html
+++ b/testing/test_package_docs_dev/fake/ConstantClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstantClass class</h1>
+      <h1>ConstantClass class </h1>
 
     <section class="desc markdown">
       <p>For make-better testing of constants.</p>
@@ -206,7 +207,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="value" class="property">
           <span class="name"><a href="fake/ConstantClass/value.html">value</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -214,7 +215,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ConstantClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -222,7 +223,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ConstantClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -238,7 +239,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstantClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -247,7 +248,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstantClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -262,7 +263,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ConstantClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ConstructorTester-class.html b/testing/test_package_docs_dev/fake/ConstructorTester-class.html
index 99580869a7..71beb6c9a8 100644
--- a/testing/test_package_docs_dev/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs_dev/fake/ConstructorTester-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; class</h1>
+      <h1>ConstructorTester&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt; class </h1>
 
     
 
@@ -188,7 +189,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -196,7 +197,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -212,7 +213,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ConstructorTester/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -236,7 +237,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/Cool-class.html b/testing/test_package_docs_dev/fake/Cool-class.html
index 204a0f0b29..7ef6fe31bf 100644
--- a/testing/test_package_docs_dev/fake/Cool-class.html
+++ b/testing/test_package_docs_dev/fake/Cool-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Cool class</h1>
+      <h1>Cool class </h1>
 
     <section class="desc markdown">
       <p>This class is cool!</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Cool/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Cool/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/returnCool.html">returnCool</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="fake/Cool-class.html">Cool</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Cool/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Cool/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/DOWN-constant.html b/testing/test_package_docs_dev/fake/DOWN-constant.html
index 85b99cbab5..1831af6791 100644
--- a/testing/test_package_docs_dev/fake/DOWN-constant.html
+++ b/testing/test_package_docs_dev/fake/DOWN-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>DOWN top-level constant</h1>
+    <h1>DOWN top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name deprecated">DOWN</span>
diff --git a/testing/test_package_docs_dev/fake/DocumentWithATable-class.html b/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
index b4c7f01227..e7892023ad 100644
--- a/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>DocumentWithATable class</h1>
+      <h1>DocumentWithATable class </h1>
 
     <section class="desc markdown">
       <p>This is a class with a table.</p>
@@ -189,7 +190,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/DocumentWithATable/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -197,7 +198,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/DocumentWithATable/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/aMethod.html">aMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aMethod-param-parameter"><span class="type-annotation">String</span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -222,7 +223,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/DocumentWithATable/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/DocumentWithATable/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -263,7 +264,7 @@ <h2>Constants</h2>
         <dt id="bar" class="constant">
           <span class="name "><a href="fake/DocumentWithATable/bar-constant.html">bar</a></span>
           <span class="signature">&#8594; const <a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -274,7 +275,7 @@ <h2>Constants</h2>
         <dt id="foo" class="constant">
           <span class="name "><a href="fake/DocumentWithATable/foo-constant.html">foo</a></span>
           <span class="signature">&#8594; const <a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/fake/Doh-class.html b/testing/test_package_docs_dev/fake/Doh-class.html
index 4232b06953..e7b4c98863 100644
--- a/testing/test_package_docs_dev/fake/Doh-class.html
+++ b/testing/test_package_docs_dev/fake/Doh-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Doh class</h1>
+      <h1>Doh class </h1>
 
     <section class="desc markdown">
       <p>Also, my bad.</p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Doh/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Doh/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="stackTrace" class="property inherited">
           <span class="name"><a href="fake/Doh/stackTrace.html">stackTrace</a></span>
-          <span class="signature">&#8594; StackTrace</span>
+          <span class="signature">&#8594; StackTrace</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Doh/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -244,7 +245,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Doh/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Doh/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
index 873461d12b..90f28ea278 100644
--- a/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendsFutureVoid class</h1>
+      <h1>ExtendsFutureVoid class </h1>
 
     <section class="desc markdown">
       <p>This class extends Future<void></void></p>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ExtendsFutureVoid/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -260,7 +261,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -269,7 +270,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -278,7 +279,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -293,7 +294,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ExtendsFutureVoid/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html b/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
index 45b29038e1..8b71cb0cb5 100644
--- a/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
+      <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>This inherits operators.</p>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="first" class="property inherited">
           <span class="name"><a href="fake/SpecialList/first.html">first</a></span>
-          <span class="signature">&#8596; dynamic</span>
+          <span class="signature">&#8596; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SpecialList/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -232,7 +233,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="iterator" class="property inherited">
           <span class="name"><a href="fake/SpecialList/iterator.html">iterator</a></span>
-          <span class="signature">&#8594; Iterator</span>
+          <span class="signature">&#8594; Iterator</span> 
         </dt>
         <dd class="inherited">
           
@@ -240,7 +241,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="last" class="property inherited">
           <span class="name"><a href="fake/SpecialList/last.html">last</a></span>
-          <span class="signature">&#8596; dynamic</span>
+          <span class="signature">&#8596; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -248,7 +249,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="length" class="property inherited">
           <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -256,7 +257,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="reversed" class="property inherited">
           <span class="name"><a href="fake/SpecialList/reversed.html">reversed</a></span>
-          <span class="signature">&#8594; Iterable</span>
+          <span class="signature">&#8594; Iterable</span> 
         </dt>
         <dd class="inherited">
           
@@ -264,7 +265,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SpecialList/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -272,7 +273,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="single" class="property inherited">
           <span class="name"><a href="fake/SpecialList/single.html">single</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd class="inherited">
           
@@ -288,7 +289,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/add.html">add</a></span><span class="signature">(<wbr><span class="parameter" id="add-param-element"><span class="type-annotation">dynamic</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -297,7 +298,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -306,7 +307,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/any.html">any</a></span><span class="signature">(<wbr><span class="parameter" id="any-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -315,7 +316,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">dynamic</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -324,7 +325,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -333,7 +334,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -342,7 +343,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/contains.html">contains</a></span><span class="signature">(<wbr><span class="parameter" id="contains-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -351,7 +352,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/elementAt.html">elementAt</a></span><span class="signature">(<wbr><span class="parameter" id="elementAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -360,7 +361,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/every.html">every</a></span><span class="signature">(<wbr><span class="parameter" id="every-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -369,7 +370,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -378,7 +379,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fillRange.html">fillRange</a></span><span class="signature">(<wbr><span class="parameter" id="fillRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="fillRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, [</span> <span class="parameter" id="fillRange-param-fill"><span class="type-annotation">dynamic</span> <span class="parameter-name">fill</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -387,7 +388,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/firstWhere.html">firstWhere</a></span><span class="signature">(<wbr><span class="parameter" id="firstWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="firstWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -396,7 +397,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -405,7 +406,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -414,7 +415,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/forEach.html">forEach</a></span><span class="signature">(<wbr><span class="parameter" id="forEach-param-action"><span class="type-annotation">void</span> <span class="parameter-name">action</span>(<span class="parameter" id="action-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -423,7 +424,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/getRange.html">getRange</a></span><span class="signature">(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -432,7 +433,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexOf.html">indexOf</a></span><span class="signature">(<wbr><span class="parameter" id="indexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="indexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -441,7 +442,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexWhere.html">indexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="indexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="indexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -450,7 +451,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insert.html">insert</a></span><span class="signature">(<wbr><span class="parameter" id="insert-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insert-param-element"><span class="type-annotation">dynamic</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -459,7 +460,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -468,7 +469,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/join.html">join</a></span><span class="signature">(<wbr>[<span class="parameter" id="join-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -477,7 +478,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexOf.html">lastIndexOf</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="lastIndexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -486,7 +487,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexWhere.html">lastIndexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="lastIndexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -495,7 +496,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastWhere.html">lastWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="lastWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -504,7 +505,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -513,7 +514,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -522,7 +523,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/reduce.html">reduce</a></span><span class="signature">(<wbr><span class="parameter" id="reduce-param-combine"><span class="type-annotation">dynamic</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">E</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -531,7 +532,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/remove.html">remove</a></span><span class="signature">(<wbr><span class="parameter" id="remove-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -540,7 +541,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeAt.html">removeAt</a></span><span class="signature">(<wbr><span class="parameter" id="removeAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -549,7 +550,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeLast.html">removeLast</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -558,7 +559,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeRange.html">removeRange</a></span><span class="signature">(<wbr><span class="parameter" id="removeRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="removeRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -567,7 +568,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></span><span class="signature">(<wbr><span class="parameter" id="removeWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -576,7 +577,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable</span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -585,7 +586,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></span><span class="signature">(<wbr><span class="parameter" id="retainWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -594,7 +595,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -603,7 +604,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -612,7 +613,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/shuffle.html">shuffle</a></span><span class="signature">(<wbr>[<span class="parameter" id="shuffle-param-random"><span class="type-annotation">Random</span> <span class="parameter-name">random</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -621,7 +622,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/singleWhere.html">singleWhere</a></span><span class="signature">(<wbr><span class="parameter" id="singleWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="singleWhere-param-orElse"><span class="type-annotation">dynamic</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -630,7 +631,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skip.html">skip</a></span><span class="signature">(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -639,7 +640,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></span><span class="signature">(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -648,7 +649,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sort.html">sort</a></span><span class="signature">(<wbr>[<span class="parameter" id="sort-param-compare"><span class="type-annotation">int</span> <span class="parameter-name">compare</span>(<span class="parameter" id="compare-param-a"><span class="type-annotation">E</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="compare-param-b"><span class="type-annotation">E</span> <span class="parameter-name">b</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -657,7 +658,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sublist.html">sublist</a></span><span class="signature">(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -666,7 +667,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/take.html">take</a></span><span class="signature">(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -675,7 +676,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></span><span class="signature">(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -684,7 +685,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toList.html">toList</a></span><span class="signature">(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -693,7 +694,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toSet.html">toSet</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Set</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -702,7 +703,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -711,7 +712,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/where.html">where</a></span><span class="signature">(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -720,7 +721,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -735,7 +736,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; List</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -744,7 +745,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -753,7 +754,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -762,7 +763,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">dynamic</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/FakeProcesses.html b/testing/test_package_docs_dev/fake/FakeProcesses.html
index 793527dc94..eb04ef9ccb 100644
--- a/testing/test_package_docs_dev/fake/FakeProcesses.html
+++ b/testing/test_package_docs_dev/fake/FakeProcesses.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>FakeProcesses typedef</h1>
+    <h1>FakeProcesses typedef </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs_dev/fake/Foo2-class.html b/testing/test_package_docs_dev/fake/Foo2-class.html
index f92c1bd084..4ed3474062 100644
--- a/testing/test_package_docs_dev/fake/Foo2-class.html
+++ b/testing/test_package_docs_dev/fake/Foo2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Foo2 class</h1>
+      <h1>Foo2 class </h1>
 
     <section class="desc markdown">
       <p>link to method from class <a href="ex/Apple/m.html">Apple.m</a></p>
@@ -186,7 +187,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="index" class="property">
           <span class="name"><a href="fake/Foo2/index.html">index</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -194,7 +195,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Foo2/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Foo2/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Foo2/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Foo2/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Foo2/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Constants</h2>
         <dt id="BAR" class="constant">
           <span class="name "><a href="fake/Foo2/BAR-constant.html">BAR</a></span>
           <span class="signature">&#8594; const <a href="fake/Foo2-class.html">Foo2</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -270,7 +271,7 @@ <h2>Constants</h2>
         <dt id="BAZ" class="constant">
           <span class="name "><a href="fake/Foo2/BAZ-constant.html">BAZ</a></span>
           <span class="signature">&#8594; const <a href="fake/Foo2-class.html">Foo2</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/fake/GenericTypedef.html b/testing/test_package_docs_dev/fake/GenericTypedef.html
index 9d01bc0cdb..5b39c51ff3 100644
--- a/testing/test_package_docs_dev/fake/GenericTypedef.html
+++ b/testing/test_package_docs_dev/fake/GenericTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>GenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">T</span>
diff --git a/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html b/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
index 47ba250e82..a79991cc6d 100644
--- a/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; class</h1>
+      <h1>HasGenericWithExtends&lt;<wbr><span class="type-parameter">T extends Foo2</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a></p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasGenericWithExtends/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasGenericWithExtends/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasGenericWithExtends/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/HasGenerics-class.html b/testing/test_package_docs_dev/fake/HasGenerics-class.html
index 8cee963a5c..fe4ed37a75 100644
--- a/testing/test_package_docs_dev/fake/HasGenerics-class.html
+++ b/testing/test_package_docs_dev/fake/HasGenerics-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; class</h1>
+      <h1>HasGenerics&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt; class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasGenerics/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasGenerics/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/convertToMap.html">convertToMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Converts itself to a map.
           
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/doStuff.html">doStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doStuff-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span>, </span> <span class="parameter" id="doStuff-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span></span>)
             <span class="returntype parameter">&#8594; Z</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/returnX.html">returnX</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; X</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/returnZ.html">returnZ</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Z</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasGenerics/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -266,7 +267,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasGenerics/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/HasPragma-class.html b/testing/test_package_docs_dev/fake/HasPragma-class.html
index e64b0f3c88..fcf7b10441 100644
--- a/testing/test_package_docs_dev/fake/HasPragma-class.html
+++ b/testing/test_package_docs_dev/fake/HasPragma-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>HasPragma class</h1>
+      <h1>HasPragma class </h1>
 
     <section class="desc markdown">
       <p>This class uses a pragma annotation.</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/HasPragma/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/HasPragma/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasPragma/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/HasPragma/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/HasPragma/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ImplementingThingy-class.html b/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
index 23b4800574..10fde2005b 100644
--- a/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementingThingy class</h1>
+      <h1>ImplementingThingy class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -216,7 +217,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -240,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -249,7 +250,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -258,7 +259,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -273,7 +274,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html b/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
index 01e6a55d1c..105821c652 100644
--- a/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementingThingy2 class</h1>
+      <h1>ImplementingThingy2 class </h1>
 
     
     <section>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aImplementingThingy" class="property inherited">
           <span class="name"><a href="fake/BaseThingy2/aImplementingThingy.html">aImplementingThingy</a></span>
-          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="signature">&#8594; <a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd class="inherited">
           BaseThingy2's doc for aImplementingThingy.
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="aImplementingThingyField" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyField.html">aImplementingThingyField</a></span>
-          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="signature">&#8596; <a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseThingy/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -237,7 +238,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/aImplementingThingyMethod.html">aImplementingThingyMethod</a></span><span class="signature">(<wbr><span class="parameter" id="aImplementingThingyMethod-param-parameter"><span class="type-annotation"><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> <span class="parameter-name">parameter</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -246,7 +247,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +256,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseThingy/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -270,7 +271,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseThingy/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
index fa67d3f38f..19dbb1005b 100644
--- a/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplementsFutureVoid class</h1>
+      <h1>ImplementsFutureVoid class </h1>
 
     <section class="desc markdown">
       <p>This class implements Future<void></void></p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplementsFutureVoid/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/asStream.html">asStream</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Stream<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/catchError.html">catchError</a></span><span class="signature">(<wbr><span class="parameter" id="catchError-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span>, {</span> <span class="parameter" id="catchError-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-error"><span class="type-annotation">Object</span> <span class="parameter-name">error</span></span>)</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/timeout.html">timeout</a></span><span class="signature">(<wbr><span class="parameter" id="timeout-param-timeLimit"><span class="type-annotation">Duration</span> <span class="parameter-name">timeLimit</span>, {</span> <span class="parameter" id="timeout-param-onTimeout"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">onTimeout</span>()</span> })
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -268,7 +269,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -277,7 +278,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/whenComplete.html">whenComplete</a></span><span class="signature">(<wbr><span class="parameter" id="whenComplete-param-action"><span class="type-annotation">FutureOr</span> <span class="parameter-name">action</span>()</span>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -292,7 +293,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplementsFutureVoid/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ImplicitProperties-class.html b/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
index 060f56f1dc..077491569d 100644
--- a/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ImplicitProperties class</h1>
+      <h1>ImplicitProperties class </h1>
 
     <section class="desc markdown">
       <p>Names are actually wrong in this class, but when we extend it,
@@ -198,7 +199,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="explicitGetterImplicitSetter" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterImplicitSetter.html">explicitGetterImplicitSetter</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span> 
         </dt>
         <dd>
           Docs for explicitGetterImplicitSetter from ImplicitProperties.
@@ -206,7 +207,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitGetterSetterForInheriting" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitGetterSetterForInheriting.html">explicitGetterSetterForInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           Explicit getter for inheriting.
@@ -214,7 +215,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="explicitPartiallyDocumentedField" class="property">
           <span class="name"><a href="fake/ImplicitProperties/explicitPartiallyDocumentedField.html">explicitPartiallyDocumentedField</a></span>
-          <span class="signature">&#8594; double</span>
+          <span class="signature">&#8594; double</span> 
         </dt>
         <dd>
           but documented here.
@@ -222,7 +223,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="forInheriting" class="property">
           <span class="name"><a href="fake/ImplicitProperties/forInheriting.html">forInheriting</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           A simple property to inherit.
@@ -230,7 +231,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="implicitGetterExplicitSetter" class="property">
           <span class="name"><a href="fake/ImplicitProperties/implicitGetterExplicitSetter.html">implicitGetterExplicitSetter</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Docs for implicitGetterExplicitSetter from ImplicitProperties.
@@ -238,7 +239,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -246,7 +247,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ImplicitProperties/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -262,7 +263,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -271,7 +272,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ImplicitProperties/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -286,7 +287,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ImplicitProperties/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/InheritingClassOne-class.html b/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
index 19bd93c9a3..2583699db9 100644
--- a/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
+++ b/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>InheritingClassOne class</h1>
+      <h1>InheritingClassOne class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/InheritingClassOne/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/InheritingClassOne/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/aMethod.html">aMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassOne/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/InheritingClassOne/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html b/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
index 96632ad4a4..1fa0111ce7 100644
--- a/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
+++ b/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>InheritingClassTwo class</h1>
+      <h1>InheritingClassTwo class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/InheritingClassTwo/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/InheritingClassTwo/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/aMethod.html">aMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/InheritingClassTwo/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/InheritingClassTwo/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/Interface-class.html b/testing/test_package_docs_dev/fake/Interface-class.html
index 382aebe718..0f5d88a27a 100644
--- a/testing/test_package_docs_dev/fake/Interface-class.html
+++ b/testing/test_package_docs_dev/fake/Interface-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Interface class</h1>
+      <h1>Interface class </h1>
 
     <section class="desc markdown">
       <p>An interface that can be implemented.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Interface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Interface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Interface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Interface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +246,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Interface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/LongFirstLine-class.html b/testing/test_package_docs_dev/fake/LongFirstLine-class.html
index 9761c0a0ef..41ae9cf015 100644
--- a/testing/test_package_docs_dev/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs_dev/fake/LongFirstLine-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>LongFirstLine class</h1>
+      <h1>LongFirstLine class </h1>
 
     <section class="desc markdown">
       <p>This is a very long line spread
@@ -228,7 +229,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aStringProperty" class="property">
           <span class="name"><a href="fake/LongFirstLine/aStringProperty.html">aStringProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           An instance string property. Readable and writable.
@@ -236,7 +237,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="dynamicGetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/dynamicGetter.html">dynamicGetter</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           Dynamic getter. Readable only.
@@ -244,7 +245,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="onlySetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/onlySetter.html">onlySetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="onlySetter=-param-d"><span class="type-annotation">double</span></span></span> 
         </dt>
         <dd>
           Only a setter, with a single param, of type double.
@@ -252,7 +253,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -260,7 +261,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="powers" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           In the super class.
@@ -268,7 +269,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/AnotherInterface/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -284,7 +285,7 @@ <h2>Methods</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/LongFirstLine/noParams.html">noParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           No params.
           
@@ -293,7 +294,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/optionalParams.html">optionalParams</a></span><span class="signature">(<wbr><span class="parameter" id="optionalParams-param-first"><span class="type-annotation">dynamic</span> <span class="parameter-name">first</span>, {</span> <span class="parameter" id="optionalParams-param-second"><span class="type-annotation">dynamic</span> <span class="parameter-name">second</span>, </span> <span class="parameter" id="optionalParams-param-third"><span class="type-annotation">int</span> <span class="parameter-name">third</span></span> })
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           One dynamic param, two named optionals.
           
@@ -302,7 +303,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/returnString.html">returnString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Returns a single string.
           
@@ -311,7 +312,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/twoParams.html">twoParams</a></span><span class="signature">(<wbr><span class="parameter" id="twoParams-param-one"><span class="type-annotation">String</span> <span class="parameter-name">one</span>, </span> <span class="parameter" id="twoParams-param-two"><span class="type-annotation">dynamic</span> <span class="parameter-name">two</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Two params, the first has a type annotation, the second does not.
           
@@ -320,7 +321,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span>, </span> <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span>, {</span> <span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           In the super class. <a href="fake/SuperAwesomeClass/fly.html">[...]</a>
           <div class="features">inherited</div>
@@ -329,7 +330,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -338,7 +339,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/AnotherInterface/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -353,7 +354,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/LongFirstLine/operator_multiply.html">operator *</a></span><span class="signature">(<wbr><span class="parameter" id="*-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Multiplies a thingies to this thingie and then returns a new thingie.
           
@@ -362,7 +363,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/LongFirstLine/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation"><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds another one of these thingies.
           
@@ -371,7 +372,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -380,7 +381,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/AnotherInterface/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -394,7 +395,7 @@ <h2>Static Properties</h2>
       <dl class="properties">
         <dt id="meaningOfLife" class="property">
           <span class="name"><a href="fake/LongFirstLine/meaningOfLife.html">meaningOfLife</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           A static int property.
@@ -402,7 +403,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticGetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/staticGetter.html">staticGetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           
@@ -410,7 +411,7 @@ <h2>Static Properties</h2>
 </dd>
         <dt id="staticOnlySetter" class="property">
           <span class="name"><a href="fake/LongFirstLine/staticOnlySetter.html">staticOnlySetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="staticOnlySetter=-param-thing"><span class="type-annotation">bool</span></span></span> 
         </dt>
         <dd>
           
@@ -426,7 +427,7 @@ <h2>Static Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/staticMethodNoParams.html">staticMethodNoParams</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Just a static method with no parameters. <a href="fake/LongFirstLine/staticMethodNoParams.html">[...]</a>
           
@@ -435,7 +436,7 @@ <h2>Static Methods</h2>
           <span class="name"><a href="fake/LongFirstLine/staticMethodReturnsVoid.html">staticMethodReturnsVoid</a></span><span class="signature">(<wbr><span class="parameter" id="staticMethodReturnsVoid-param-dynamicThing"><span class="type-annotation">dynamic</span> <span class="parameter-name">dynamicThing</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A static method that takes a single dynamic thing, and returns void.
           
@@ -450,7 +451,7 @@ <h2>Constants</h2>
         <dt id="ANSWER" class="constant">
           <span class="name "><a href="fake/LongFirstLine/ANSWER-constant.html">ANSWER</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -461,7 +462,7 @@ <h2>Constants</h2>
         <dt id="THING" class="constant">
           <span class="name "><a href="fake/LongFirstLine/THING-constant.html">THING</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
index 8e417e294b..dddb5b0ce1 100644
--- a/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>LotsAndLotsOfParameters typedef</h1>
+    <h1>LotsAndLotsOfParameters typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/fake/MIEEBase-class.html b/testing/test_package_docs_dev/fake/MIEEBase-class.html
index 2fe90c3ae9..c4f5790388 100644
--- a/testing/test_package_docs_dev/fake/MIEEBase-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEBase-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEBase&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -248,7 +249,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixin/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/MIEEMixin-class.html b/testing/test_package_docs_dev/fake/MIEEMixin-class.html
index 6c39f7db0e..5ec4e9c360 100644
--- a/testing/test_package_docs_dev/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEMixin&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -200,7 +201,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -208,7 +209,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -248,7 +249,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixin/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -257,7 +258,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
index e70ba29e4c..7362677556 100644
--- a/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEMixinWithOverride&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Test an edge case for cases where inherited ExecutableElements can come
@@ -202,7 +203,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -210,7 +211,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEMixinWithOverride/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/MIEEThing-class.html b/testing/test_package_docs_dev/fake/MIEEThing-class.html
index 4d0b3d9881..95ad43259e 100644
--- a/testing/test_package_docs_dev/fake/MIEEThing-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEThing-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class</h1>
+      <h1>MIEEThing&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt; class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MIEEThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -227,7 +228,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MIEEThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -242,7 +243,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-key"><span class="type-annotation">K</span> <span class="parameter-name">key</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">V</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -251,7 +252,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MIEEThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/MixMeIn-class.html b/testing/test_package_docs_dev/fake/MixMeIn-class.html
index b2608029c5..04439eacd3 100644
--- a/testing/test_package_docs_dev/fake/MixMeIn-class.html
+++ b/testing/test_package_docs_dev/fake/MixMeIn-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>MixMeIn class</h1>
+      <h1>MixMeIn class </h1>
 
     <section class="desc markdown">
       <p>Perfect for mix-ins.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/MixMeIn/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/MixMeIn/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -221,7 +222,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MixMeIn/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -230,7 +231,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/MixMeIn/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -245,7 +246,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/MixMeIn/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
index bf37997c71..32d6460408 100644
--- a/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NAME_SINGLEUNDERSCORE top-level constant</h1>
+    <h1>NAME_SINGLEUNDERSCORE top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">NAME_SINGLEUNDERSCORE</span>
diff --git a/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index e699f0f0f2..4bdb4136fd 100644
--- a/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NAME_WITH_TWO_UNDERSCORES top-level constant</h1>
+    <h1>NAME_WITH_TWO_UNDERSCORES top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">NAME_WITH_TWO_UNDERSCORES</span>
diff --git a/testing/test_package_docs_dev/fake/NewGenericTypedef.html b/testing/test_package_docs_dev/fake/NewGenericTypedef.html
index 9a33b76863..9d6a219514 100644
--- a/testing/test_package_docs_dev/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs_dev/fake/NewGenericTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef</h1>
+    <h1>NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt; typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/NotAMixin-class.html b/testing/test_package_docs_dev/fake/NotAMixin-class.html
index f46bac6296..0d1bcd9a5c 100644
--- a/testing/test_package_docs_dev/fake/NotAMixin-class.html
+++ b/testing/test_package_docs_dev/fake/NotAMixin-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>NotAMixin class</h1>
+      <h1>NotAMixin class </h1>
 
     
     <section>
@@ -194,7 +195,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="superString" class="property">
           <span class="name"><a href="fake/NotAMixin/superString.html">superString</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -202,7 +203,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -210,7 +211,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -235,7 +236,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/Oops-class.html b/testing/test_package_docs_dev/fake/Oops-class.html
index eec8f0002b..0e957ba679 100644
--- a/testing/test_package_docs_dev/fake/Oops-class.html
+++ b/testing/test_package_docs_dev/fake/Oops-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Oops class</h1>
+      <h1>Oops class </h1>
 
     <section class="desc markdown">
       <p>My bad!</p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="message" class="property">
           <span class="name"><a href="fake/Oops/message.html">message</a></span>
-          <span class="signature">&#8594; String</span>
+          <span class="signature">&#8594; String</span> 
         </dt>
         <dd>
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/Oops/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -215,7 +216,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/Oops/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -231,7 +232,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Oops/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -240,7 +241,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/Oops/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -255,7 +256,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/Oops/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html b/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
index 633675274d..f8517fe13f 100644
--- a/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OperatorReferenceClass class</h1>
+      <h1>OperatorReferenceClass class </h1>
 
     <section class="desc markdown">
       <p>Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.</p>
@@ -185,7 +186,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/OperatorReferenceClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -193,7 +194,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/OperatorReferenceClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -209,7 +210,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -218,7 +219,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -233,7 +234,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/OperatorReferenceClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
diff --git a/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html b/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
index 76e6c584f9..17de2ff97b 100644
--- a/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; class</h1>
+      <h1>OtherGenericsThing&lt;<wbr><span class="type-parameter">A</span>&gt; class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/OtherGenericsThing/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/OtherGenericsThing/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/convert.html">convert</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; <a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter"><a href="fake/Cool-class.html">Cool</a></span>, <span class="type-parameter">String</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -215,7 +216,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -224,7 +225,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/OtherGenericsThing/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -239,7 +240,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/OtherGenericsThing/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/PI-constant.html b/testing/test_package_docs_dev/fake/PI-constant.html
index 81f58dad65..a12cff97f3 100644
--- a/testing/test_package_docs_dev/fake/PI-constant.html
+++ b/testing/test_package_docs_dev/fake/PI-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>PI top-level constant</h1>
+    <h1>PI top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">PI</span>
diff --git a/testing/test_package_docs_dev/fake/ReferringClass-class.html b/testing/test_package_docs_dev/fake/ReferringClass-class.html
index cf70baa9c0..3093f02230 100644
--- a/testing/test_package_docs_dev/fake/ReferringClass-class.html
+++ b/testing/test_package_docs_dev/fake/ReferringClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ReferringClass class</h1>
+      <h1>ReferringClass class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/ReferringClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/ReferringClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -206,7 +207,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/notAMethodFromPrivateClass.html">notAMethodFromPrivateClass</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Here I am referring by full names, to <a href="fake/InheritingClassOne/aMethod.html">fake.InheritingClassOne.aMethod</a>,
 and to <a href="fake/InheritingClassTwo/aMethod.html">fake.InheritingClassTwo.aMethod</a>.  With luck, both of these
@@ -217,7 +218,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -226,7 +227,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/ReferringClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/ReferringClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/SpecialList-class.html b/testing/test_package_docs_dev/fake/SpecialList-class.html
index f7d64aae55..931b50a677 100644
--- a/testing/test_package_docs_dev/fake/SpecialList-class.html
+++ b/testing/test_package_docs_dev/fake/SpecialList-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class</h1>
+      <h1>SpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Extends <code>ListBase</code></p>
@@ -203,7 +204,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="length" class="property">
           <span class="name"><a href="fake/SpecialList/length.html">length</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
@@ -211,7 +212,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="first" class="property inherited">
           <span class="name"><a href="fake/SpecialList/first.html">first</a></span>
-          <span class="signature">&#8596; E</span>
+          <span class="signature">&#8596; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -219,7 +220,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SpecialList/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -227,7 +228,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isEmpty.html">isEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -235,7 +236,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="isNotEmpty" class="property inherited">
           <span class="name"><a href="fake/SpecialList/isNotEmpty.html">isNotEmpty</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd class="inherited">
           
@@ -243,7 +244,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="iterator" class="property inherited">
           <span class="name"><a href="fake/SpecialList/iterator.html">iterator</a></span>
-          <span class="signature">&#8594; Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="signature">&#8594; Iterator<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -251,7 +252,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="last" class="property inherited">
           <span class="name"><a href="fake/SpecialList/last.html">last</a></span>
-          <span class="signature">&#8596; E</span>
+          <span class="signature">&#8596; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -259,7 +260,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="reversed" class="property inherited">
           <span class="name"><a href="fake/SpecialList/reversed.html">reversed</a></span>
-          <span class="signature">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="signature">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd class="inherited">
           
@@ -267,7 +268,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SpecialList/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -275,7 +276,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="single" class="property inherited">
           <span class="name"><a href="fake/SpecialList/single.html">single</a></span>
-          <span class="signature">&#8594; E</span>
+          <span class="signature">&#8594; E</span> 
         </dt>
         <dd class="inherited">
           
@@ -291,7 +292,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/add.html">add</a></span><span class="signature">(<wbr><span class="parameter" id="add-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -300,7 +301,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/addAll.html">addAll</a></span><span class="signature">(<wbr><span class="parameter" id="addAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -309,7 +310,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/any.html">any</a></span><span class="signature">(<wbr><span class="parameter" id="any-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -318,7 +319,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/asMap.html">asMap</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -327,7 +328,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/cast.html">cast</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -336,7 +337,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/clear.html">clear</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -345,7 +346,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/contains.html">contains</a></span><span class="signature">(<wbr><span class="parameter" id="contains-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -354,7 +355,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/elementAt.html">elementAt</a></span><span class="signature">(<wbr><span class="parameter" id="elementAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -363,7 +364,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/every.html">every</a></span><span class="signature">(<wbr><span class="parameter" id="every-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -372,7 +373,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/expand.html">expand</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="expand-param-f"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -381,7 +382,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fillRange.html">fillRange</a></span><span class="signature">(<wbr><span class="parameter" id="fillRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="fillRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, [</span> <span class="parameter" id="fillRange-param-fill"><span class="type-annotation">E</span> <span class="parameter-name">fill</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -390,7 +391,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/firstWhere.html">firstWhere</a></span><span class="signature">(<wbr><span class="parameter" id="firstWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="firstWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -399,7 +400,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/fold.html">fold</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="fold-param-initialValue"><span class="type-annotation">T</span> <span class="parameter-name">initialValue</span>, </span> <span class="parameter" id="fold-param-combine"><span class="type-annotation">T</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">T</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -408,7 +409,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/followedBy.html">followedBy</a></span><span class="signature">(<wbr><span class="parameter" id="followedBy-param-other"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -417,7 +418,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/forEach.html">forEach</a></span><span class="signature">(<wbr><span class="parameter" id="forEach-param-action"><span class="type-annotation">void</span> <span class="parameter-name">action</span>(<span class="parameter" id="action-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -426,7 +427,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/getRange.html">getRange</a></span><span class="signature">(<wbr><span class="parameter" id="getRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="getRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -435,7 +436,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexOf.html">indexOf</a></span><span class="signature">(<wbr><span class="parameter" id="indexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="indexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -444,7 +445,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/indexWhere.html">indexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="indexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="indexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -453,7 +454,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insert.html">insert</a></span><span class="signature">(<wbr><span class="parameter" id="insert-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insert-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -462,7 +463,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/insertAll.html">insertAll</a></span><span class="signature">(<wbr><span class="parameter" id="insertAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="insertAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -471,7 +472,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/join.html">join</a></span><span class="signature">(<wbr>[<span class="parameter" id="join-param-separator"><span class="type-annotation">String</span> <span class="parameter-name">separator</span> = <span class="default-value">""</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -480,7 +481,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexOf.html">lastIndexOf</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexOf-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span>, [</span> <span class="parameter" id="lastIndexOf-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -489,7 +490,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastIndexWhere.html">lastIndexWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastIndexWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), [</span> <span class="parameter" id="lastIndexWhere-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span></span> ])
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -498,7 +499,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/lastWhere.html">lastWhere</a></span><span class="signature">(<wbr><span class="parameter" id="lastWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="lastWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -507,7 +508,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/map.html">map</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="map-param-f"><span class="type-annotation">T</span> <span class="parameter-name">f</span>(<span class="parameter" id="f-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -516,7 +517,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -525,7 +526,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/reduce.html">reduce</a></span><span class="signature">(<wbr><span class="parameter" id="reduce-param-combine"><span class="type-annotation">E</span> <span class="parameter-name">combine</span>(<span class="parameter" id="combine-param-previousValue"><span class="type-annotation">E</span> <span class="parameter-name">previousValue</span>, </span> <span class="parameter" id="combine-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -534,7 +535,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/remove.html">remove</a></span><span class="signature">(<wbr><span class="parameter" id="remove-param-element"><span class="type-annotation">Object</span> <span class="parameter-name">element</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -543,7 +544,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeAt.html">removeAt</a></span><span class="signature">(<wbr><span class="parameter" id="removeAt-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -552,7 +553,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeLast.html">removeLast</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -561,7 +562,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeRange.html">removeRange</a></span><span class="signature">(<wbr><span class="parameter" id="removeRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="removeRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -570,7 +571,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></span><span class="signature">(<wbr><span class="parameter" id="removeWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -579,7 +580,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></span><span class="signature">(<wbr><span class="parameter" id="replaceRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="replaceRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="replaceRange-param-newContents"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">newContents</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -588,7 +589,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></span><span class="signature">(<wbr><span class="parameter" id="retainWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -597,7 +598,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -606,7 +607,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/setRange.html">setRange</a></span><span class="signature">(<wbr><span class="parameter" id="setRange-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, </span> <span class="parameter" id="setRange-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span>, </span> <span class="parameter" id="setRange-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span>, [</span> <span class="parameter" id="setRange-param-skipCount"><span class="type-annotation">int</span> <span class="parameter-name">skipCount</span> = <span class="default-value">0</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -615,7 +616,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/shuffle.html">shuffle</a></span><span class="signature">(<wbr>[<span class="parameter" id="shuffle-param-random"><span class="type-annotation">Random</span> <span class="parameter-name">random</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -624,7 +625,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/singleWhere.html">singleWhere</a></span><span class="signature">(<wbr><span class="parameter" id="singleWhere-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>), {</span> <span class="parameter" id="singleWhere-param-orElse"><span class="type-annotation">E</span> <span class="parameter-name">orElse</span>()</span> })
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -633,7 +634,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skip.html">skip</a></span><span class="signature">(<wbr><span class="parameter" id="skip-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -642,7 +643,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></span><span class="signature">(<wbr><span class="parameter" id="skipWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -651,7 +652,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sort.html">sort</a></span><span class="signature">(<wbr>[<span class="parameter" id="sort-param-compare"><span class="type-annotation">int</span> <span class="parameter-name">compare</span>(<span class="parameter" id="compare-param-a"><span class="type-annotation">E</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="compare-param-b"><span class="type-annotation">E</span> <span class="parameter-name">b</span></span>)</span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -660,7 +661,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/sublist.html">sublist</a></span><span class="signature">(<wbr><span class="parameter" id="sublist-param-start"><span class="type-annotation">int</span> <span class="parameter-name">start</span>, [</span> <span class="parameter" id="sublist-param-end"><span class="type-annotation">int</span> <span class="parameter-name">end</span></span> ])
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -669,7 +670,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/take.html">take</a></span><span class="signature">(<wbr><span class="parameter" id="take-param-count"><span class="type-annotation">int</span> <span class="parameter-name">count</span></span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -678,7 +679,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></span><span class="signature">(<wbr><span class="parameter" id="takeWhile-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -687,7 +688,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toList.html">toList</a></span><span class="signature">(<wbr>{<span class="parameter" id="toList-param-growable"><span class="type-annotation">bool</span> <span class="parameter-name">growable</span>: <span class="default-value">true</span></span> })
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -696,7 +697,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toSet.html">toSet</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Set<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -705,7 +706,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -714,7 +715,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/where.html">where</a></span><span class="signature">(<wbr><span class="parameter" id="where-param-test"><span class="type-annotation">bool</span> <span class="parameter-name">test</span>(<span class="parameter" id="test-param-element"><span class="type-annotation">E</span> <span class="parameter-name">element</span></span>)</span>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -723,7 +724,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SpecialList/whereType.html">whereType</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Iterable<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -738,7 +739,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
             <span class="returntype parameter">&#8594; E</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -747,7 +748,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_put.html">operator []=</a></span><span class="signature">(<wbr><span class="parameter" id="[]=-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="[]=-param-value"><span class="type-annotation">E</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -756,7 +757,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_plus.html">operator +</a></span><span class="signature">(<wbr><span class="parameter" id="+-param-other"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -765,7 +766,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SpecialList/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/SubForDocComments-class.html b/testing/test_package_docs_dev/fake/SubForDocComments-class.html
index cfa6c3fb94..6e24cb5a59 100644
--- a/testing/test_package_docs_dev/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs_dev/fake/SubForDocComments-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SubForDocComments class</h1>
+      <h1>SubForDocComments class </h1>
 
     <section class="desc markdown">
       <p>Testing if docs for inherited method are correct.</p>
@@ -199,7 +200,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -207,7 +208,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/BaseForDocComments/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SubForDocComments/localMethod.html">localMethod</a></span><span class="signature">(<wbr><span class="parameter" id="localMethod-param-foo"><span class="type-annotation">String</span> <span class="parameter-name">foo</span>, </span> <span class="parameter" id="localMethod-param-bar"><span class="type-annotation">dynamic</span> <span class="parameter-name">bar</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Reference to <code>foo</code> and <code>bar</code>
           
@@ -232,7 +233,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/anotherMethod.html">anotherMethod</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -241,7 +242,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/doAwesomeStuff.html">doAwesomeStuff</a></span><span class="signature">(<wbr><span class="parameter" id="doAwesomeStuff-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           Takes a <code>value</code> and returns a String. <a href="fake/BaseForDocComments/doAwesomeStuff.html">[...]</a>
           <div class="features">inherited</div>
@@ -250,7 +251,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -259,7 +260,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/BaseForDocComments/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -274,7 +275,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -283,7 +284,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/BaseForDocComments/operator_get.html">operator []</a></span><span class="signature">(<wbr><span class="parameter" id="[]-param-key"><span class="type-annotation">String</span> <span class="parameter-name">key</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html b/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
index 56d36a5177..3cd6090a41 100644
--- a/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SuperAwesomeClass class</h1>
+      <h1>SuperAwesomeClass class </h1>
 
     <section class="desc markdown">
       <p>A super class, with many powers. Link to <a href="ex/Apple-class.html">Apple</a> from another library.</p>
@@ -201,7 +202,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="powers" class="property">
           <span class="name"><a href="fake/SuperAwesomeClass/powers.html">powers</a></span>
-          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; List<span class="signature">&lt;<wbr><span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           In the super class.
@@ -209,7 +210,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -217,7 +218,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/SuperAwesomeClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -233,7 +234,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span>, </span> <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span>, {</span> <span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           In the super class. <a href="fake/SuperAwesomeClass/fly.html">[...]</a>
           
@@ -242,7 +243,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -251,7 +252,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -266,7 +267,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_minus.html">operator -</a></span><span class="signature">(<wbr><span class="parameter" id="--param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; <a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -275,7 +276,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/SuperAwesomeClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html b/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
index b10d928778..ef8f669211 100644
--- a/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>TypedefUsingClass class</h1>
+      <h1>TypedefUsingClass class </h1>
 
     
 
@@ -182,7 +183,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="x" class="property">
           <span class="name"><a href="fake/TypedefUsingClass/x.html">x</a></span>
-          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span>
+          <span class="signature">&#8596; <a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;<wbr><span class="type-parameter">double</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -190,7 +191,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/TypedefUsingClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -198,7 +199,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/TypedefUsingClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -214,7 +215,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/TypedefUsingClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -223,7 +224,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/TypedefUsingClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/TypedefUsingClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/UP-constant.html b/testing/test_package_docs_dev/fake/UP-constant.html
index 1ed4e25e0d..d0564baa57 100644
--- a/testing/test_package_docs_dev/fake/UP-constant.html
+++ b/testing/test_package_docs_dev/fake/UP-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>UP top-level constant</h1>
+    <h1>UP top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">UP</span>
diff --git a/testing/test_package_docs_dev/fake/VoidCallback.html b/testing/test_package_docs_dev/fake/VoidCallback.html
index 0416745ee2..6ae946acdd 100644
--- a/testing/test_package_docs_dev/fake/VoidCallback.html
+++ b/testing/test_package_docs_dev/fake/VoidCallback.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>VoidCallback typedef</h1>
+    <h1>VoidCallback typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html b/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
index ce5a192b66..3327847b3c 100644
--- a/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>WithGetterAndSetter class</h1>
+      <h1>WithGetterAndSetter class </h1>
 
     <section class="desc markdown">
       <p>Tests a single field with explict getter and setter.</p>
@@ -197,7 +198,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="lengthX" class="property">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -205,7 +206,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -213,7 +214,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -229,7 +230,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -238,7 +239,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -253,7 +254,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/fake/ZERO-constant.html b/testing/test_package_docs_dev/fake/ZERO-constant.html
index dcf82e06ee..5d97d74a95 100644
--- a/testing/test_package_docs_dev/fake/ZERO-constant.html
+++ b/testing/test_package_docs_dev/fake/ZERO-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ZERO top-level constant</h1>
+    <h1>ZERO top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">ZERO</span>
diff --git a/testing/test_package_docs_dev/fake/aCoolVariable.html b/testing/test_package_docs_dev/fake/aCoolVariable.html
index 6471277a3e..093466907b 100644
--- a/testing/test_package_docs_dev/fake/aCoolVariable.html
+++ b/testing/test_package_docs_dev/fake/aCoolVariable.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aCoolVariable top-level property</h1>
+    <h1>aCoolVariable top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype"><a href="fake/Cool-class.html">Cool</a></span>
diff --git a/testing/test_package_docs_dev/fake/aVoidParameter.html b/testing/test_package_docs_dev/fake/aVoidParameter.html
index 6e6ef7a5be..9627057c68 100644
--- a/testing/test_package_docs_dev/fake/aVoidParameter.html
+++ b/testing/test_package_docs_dev/fake/aVoidParameter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>aVoidParameter function</h1>
+    <h1>aVoidParameter function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/addCallback.html b/testing/test_package_docs_dev/fake/addCallback.html
index 703b1763cd..f7c22d0d8b 100644
--- a/testing/test_package_docs_dev/fake/addCallback.html
+++ b/testing/test_package_docs_dev/fake/addCallback.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>addCallback function</h1>
+    <h1>addCallback function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/addCallback2.html b/testing/test_package_docs_dev/fake/addCallback2.html
index d085ff03d6..03917fde7d 100644
--- a/testing/test_package_docs_dev/fake/addCallback2.html
+++ b/testing/test_package_docs_dev/fake/addCallback2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>addCallback2 function</h1>
+    <h1>addCallback2 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/bulletDoced-constant.html b/testing/test_package_docs_dev/fake/bulletDoced-constant.html
index 9123c5349c..b4158fe434 100644
--- a/testing/test_package_docs_dev/fake/bulletDoced-constant.html
+++ b/testing/test_package_docs_dev/fake/bulletDoced-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>bulletDoced top-level constant</h1>
+    <h1>bulletDoced top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">bulletDoced</span>
diff --git a/testing/test_package_docs_dev/fake/complicatedReturn.html b/testing/test_package_docs_dev/fake/complicatedReturn.html
index fe225f79c4..cc0fcdc7de 100644
--- a/testing/test_package_docs_dev/fake/complicatedReturn.html
+++ b/testing/test_package_docs_dev/fake/complicatedReturn.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>complicatedReturn top-level property</h1>
+    <h1>complicatedReturn top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/dynamicGetter.html b/testing/test_package_docs_dev/fake/dynamicGetter.html
index 3929ec1c0d..0ec4826ab5 100644
--- a/testing/test_package_docs_dev/fake/dynamicGetter.html
+++ b/testing/test_package_docs_dev/fake/dynamicGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>dynamicGetter top-level property</h1>
+    <h1>dynamicGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/fake-library.html b/testing/test_package_docs_dev/fake/fake-library.html
index 1cacdc273c..2163ba270b 100644
--- a/testing/test_package_docs_dev/fake/fake-library.html
+++ b/testing/test_package_docs_dev/fake/fake-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>fake library</h1>
+    <h1>fake library </h1>
 
     <section class="desc markdown">
       <h1 id="wow-fake-package-is-__best__-packagepkg">WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a></h1>
@@ -88,201 +93,210 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="ABaseClass">
-          <span class="name "><a href="fake/ABaseClass-class.html">ABaseClass</a></span>
+          <span class="name "><a href="fake/ABaseClass-class.html">ABaseClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="AClassUsingASuperMixin">
-          <span class="name "><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></span>
+          <span class="name "><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></span> 
         </dt>
         <dd>
           Verify super-mixins don't break Dartdoc.
         </dd>
         <dt id="AClassWithFancyProperties">
-          <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span>
+          <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="AMixinCallingSuper">
-          <span class="name "><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></span>
+          <span class="name "><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Annotation">
-          <span class="name "><a href="fake/Annotation-class.html">Annotation</a></span>
+          <span class="name "><a href="fake/Annotation-class.html">Annotation</a></span> 
         </dt>
         <dd>
           Useful for annotations.
         </dd>
         <dt id="AnotherInterface">
-          <span class="name "><a href="fake/AnotherInterface-class.html">AnotherInterface</a></span>
+          <span class="name "><a href="fake/AnotherInterface-class.html">AnotherInterface</a></span> 
         </dt>
         <dd>
           Yet another interface that can be implemented.
         </dd>
         <dt id="ATypeTakingClass">
-          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           This class takes a type, and it might be void.
         </dd>
         <dt id="ATypeTakingClassMixedIn">
-          <span class="name "><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></span>
+          <span class="name "><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="BaseForDocComments">
-          <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>
+          <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
         </dt>
         <dd>
-          
+          Category information should not follow inheritance.
         </dd>
         <dt id="BaseThingy">
-          <span class="name "><a href="fake/BaseThingy-class.html">BaseThingy</a></span>
+          <span class="name "><a href="fake/BaseThingy-class.html">BaseThingy</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="BaseThingy2">
-          <span class="name "><a href="fake/BaseThingy2-class.html">BaseThingy2</a></span>
+          <span class="name "><a href="fake/BaseThingy2-class.html">BaseThingy2</a></span> 
         </dt>
         <dd>
           Test for MultiplyInheritedExecutableElement handling.
         </dd>
         <dt id="ClassWithUnusualProperties">
-          <span class="name "><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></span>
+          <span class="name "><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></span> 
         </dt>
         <dd>
           Classes with unusual properties?  I don't think they exist. <a href="fake/ClassWithUnusualProperties-class.html">[...]</a>
         </dd>
         <dt id="ConstantClass">
-          <span class="name "><a href="fake/ConstantClass-class.html">ConstantClass</a></span>
+          <span class="name "><a href="fake/ConstantClass-class.html">ConstantClass</a></span> 
         </dt>
         <dd>
           For make-better testing of constants. <a href="fake/ConstantClass-class.html">[...]</a>
         </dd>
         <dt id="ConstructorTester">
-          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></span>
+          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>, <span class="type-parameter">B</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Cool">
-          <span class="name "><a href="fake/Cool-class.html">Cool</a></span>
+          <span class="name "><a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           This class is cool!
         </dd>
         <dt id="DocumentWithATable">
-          <span class="name "><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span>
+          <span class="name "><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></span> 
         </dt>
         <dd>
           This is a class with a table. <a href="fake/DocumentWithATable-class.html">[...]</a>
         </dd>
         <dt id="ExtendsFutureVoid">
-          <span class="name "><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></span>
+          <span class="name "><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></span> 
         </dt>
         <dd>
           This class extends Future<void></void>
         </dd>
         <dt id="ExtraSpecialList">
-          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="name "><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd>
           This inherits operators.
         </dd>
         <dt id="Foo2">
-          <span class="name "><a href="fake/Foo2-class.html">Foo2</a></span>
+          <span class="name "><a href="fake/Foo2-class.html">Foo2</a></span> 
         </dt>
         <dd>
           link to method from class <a href="ex/Apple/m.html">Apple.m</a>
         </dd>
         <dt id="HasGenerics">
-          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span>
+          <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="HasGenericWithExtends">
-          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span></span>
+          <span class="name "><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a><span class="signature">&lt;<wbr><span class="type-parameter">T extends <a href="fake/Foo2-class.html">Foo2</a></span>&gt;</span></span> 
         </dt>
         <dd>
           I have a generic and it extends <a href="fake/Foo2-class.html">Foo2</a>
         </dd>
         <dt id="HasPragma">
-          <span class="name "><a href="fake/HasPragma-class.html">HasPragma</a></span>
+          <span class="name "><a href="fake/HasPragma-class.html">HasPragma</a></span> 
         </dt>
         <dd>
           This class uses a pragma annotation.
         </dd>
+        <dt id="IAmAClassWithCategories">
+          <span class="name "><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+
+        </dt>
+        <dd>
+          Categories test for auto-include-dependencies (Flutter).
+        </dd>
         <dt id="ImplementingThingy">
-          <span class="name "><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span>
+          <span class="name "><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ImplementingThingy2">
-          <span class="name "><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span>
+          <span class="name "><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ImplementsFutureVoid">
-          <span class="name "><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></span>
+          <span class="name "><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></span> 
         </dt>
         <dd>
           This class implements Future<void></void>
         </dd>
         <dt id="ImplicitProperties">
-          <span class="name "><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></span>
+          <span class="name "><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></span> 
         </dt>
         <dd>
           Names are actually wrong in this class, but when we extend it,
 they are correct.
         </dd>
         <dt id="InheritingClassOne">
-          <span class="name "><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></span>
+          <span class="name "><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="InheritingClassTwo">
-          <span class="name "><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></span>
+          <span class="name "><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="Interface">
-          <span class="name "><a href="fake/Interface-class.html">Interface</a></span>
+          <span class="name "><a href="fake/Interface-class.html">Interface</a></span> 
         </dt>
         <dd>
           An interface that can be implemented.
         </dd>
         <dt id="LongFirstLine">
-          <span class="name "><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span>
+          <span class="name "><a href="fake/LongFirstLine-class.html">LongFirstLine</a></span> 
         </dt>
         <dd>
           This is a very long line spread
 across... wait for it... two physical lines. <a href="fake/LongFirstLine-class.html">[...]</a>
         </dd>
         <dt id="MIEEBase">
-          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEBase-class.html">MIEEBase</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixin">
-          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixin-class.html">MIEEMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MIEEMixinWithOverride">
-          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           Test an edge case for cases where inherited ExecutableElements can come
@@ -290,67 +304,67 @@ <h2>Classes</h2>
 class still takes precedence (#1561).
         </dd>
         <dt id="MIEEThing">
-          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span>
+          <span class="name "><a href="fake/MIEEThing-class.html">MIEEThing</a><span class="signature">&lt;<wbr><span class="type-parameter">K</span>, <span class="type-parameter">V</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="MixMeIn">
-          <span class="name "><a href="fake/MixMeIn-class.html">MixMeIn</a></span>
+          <span class="name "><a href="fake/MixMeIn-class.html">MixMeIn</a></span> 
         </dt>
         <dd>
           Perfect for mix-ins.
         </dd>
         <dt id="NotAMixin">
-          <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span>
+          <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="OperatorReferenceClass">
-          <span class="name "><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></span>
+          <span class="name "><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></span> 
         </dt>
         <dd>
           Test operator references: <a href="fake/OperatorReferenceClass/operator_equals.html">OperatorReferenceClass.==</a>.
         </dd>
         <dt id="OtherGenericsThing">
-          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span>
+          <span class="name "><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a><span class="signature">&lt;<wbr><span class="type-parameter">A</span>&gt;</span></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ReferringClass">
-          <span class="name "><a href="fake/ReferringClass-class.html">ReferringClass</a></span>
+          <span class="name "><a href="fake/ReferringClass-class.html">ReferringClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SpecialList">
-          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span>
+          <span class="name "><a href="fake/SpecialList-class.html">SpecialList</a><span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> 
         </dt>
         <dd>
           Extends <code>ListBase</code>
         </dd>
         <dt id="SubForDocComments">
-          <span class="name "><a href="fake/SubForDocComments-class.html">SubForDocComments</a></span>
+          <span class="name "><a href="fake/SubForDocComments-class.html">SubForDocComments</a></span> 
         </dt>
         <dd>
           Testing if docs for inherited method are correct.
         </dd>
         <dt id="SuperAwesomeClass">
-          <span class="name deprecated"><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span>
+          <span class="name deprecated"><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></span> 
         </dt>
         <dd>
           A super class, with many powers. Link to <a href="ex/Apple-class.html">Apple</a> from another library.
         </dd>
         <dt id="TypedefUsingClass">
-          <span class="name "><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></span>
+          <span class="name "><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="WithGetterAndSetter">
-          <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span>
+          <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span> 
         </dt>
         <dd>
           Tests a single field with explict getter and setter.
@@ -365,7 +379,7 @@ <h2>Constants</h2>
         <dt id="bulletDoced" class="constant">
           <span class="name "><a href="fake/bulletDoced-constant.html">bulletDoced</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Bullet point documentation. <a href="fake/bulletDoced-constant.html">[...]</a>
           
@@ -376,7 +390,7 @@ <h2>Constants</h2>
         <dt id="CUSTOM_CLASS" class="constant">
           <span class="name "><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></span>
           <span class="signature">&#8594; const <a href="fake/ConstantClass-class.html">ConstantClass</a></span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -387,7 +401,7 @@ <h2>Constants</h2>
         <dt id="CUSTOM_CLASS_PRIVATE" class="constant">
           <span class="name "><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></span>
           <span class="signature">&#8594; const _APrivateConstClass</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -398,7 +412,7 @@ <h2>Constants</h2>
         <dt id="DOWN" class="constant">
           <span class="name deprecated"><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Dynamic-typed down.
           
@@ -409,7 +423,7 @@ <h2>Constants</h2>
         <dt id="greatAnnotation" class="constant">
           <span class="name "><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is a great thing.
           
@@ -420,7 +434,7 @@ <h2>Constants</h2>
         <dt id="greatestAnnotation" class="constant">
           <span class="name "><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           This is the greatest thing.
           
@@ -431,7 +445,7 @@ <h2>Constants</h2>
         <dt id="incorrectDocReference" class="constant">
           <span class="name "><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Referencing something that <code>doesn't exist</code>.
           
@@ -442,7 +456,7 @@ <h2>Constants</h2>
         <dt id="myMap" class="constant">
           <span class="name "><a href="fake/myMap-constant.html">myMap</a></span>
           <span class="signature">&#8594; const Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">String</span>&gt;</span></span>
-        </dt>
+          </dt>
         <dd>
           A map initialization making use of optional const.
           
@@ -453,7 +467,7 @@ <h2>Constants</h2>
         <dt id="NAME_SINGLEUNDERSCORE" class="constant">
           <span class="name "><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -464,7 +478,7 @@ <h2>Constants</h2>
         <dt id="NAME_WITH_TWO_UNDERSCORES" class="constant">
           <span class="name "><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -475,7 +489,7 @@ <h2>Constants</h2>
         <dt id="PI" class="constant">
           <span class="name "><a href="fake/PI-constant.html">PI</a></span>
           <span class="signature">&#8594; const double</span>
-        </dt>
+          </dt>
         <dd>
           Constant property.
           
@@ -486,7 +500,7 @@ <h2>Constants</h2>
         <dt id="required" class="constant">
           <span class="name "><a href="fake/required-constant.html">required</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -497,7 +511,7 @@ <h2>Constants</h2>
         <dt id="testingCodeSyntaxInOneLiners" class="constant">
           <span class="name "><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           These are code syntaxes: <code>true</code> and <code>false</code>
           
@@ -508,7 +522,7 @@ <h2>Constants</h2>
         <dt id="UP" class="constant">
           <span class="name "><a href="fake/UP-constant.html">UP</a></span>
           <span class="signature">&#8594; const String</span>
-        </dt>
+          </dt>
         <dd>
           Up is a direction. <a href="fake/UP-constant.html">[...]</a>
           
@@ -519,7 +533,7 @@ <h2>Constants</h2>
         <dt id="ZERO" class="constant">
           <span class="name "><a href="fake/ZERO-constant.html">ZERO</a></span>
           <span class="signature">&#8594; const int</span>
-        </dt>
+          </dt>
         <dd>
           A constant integer value,
 which is a bit redundant.
@@ -537,7 +551,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="aCoolVariable" class="property">
           <span class="name"><a href="fake/aCoolVariable.html">aCoolVariable</a></span>
-          <span class="signature">&#8596; <a href="fake/Cool-class.html">Cool</a></span>
+          <span class="signature">&#8596; <a href="fake/Cool-class.html">Cool</a></span> 
         </dt>
         <dd>
           A variable initalization making use of optional new.
@@ -545,7 +559,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="complicatedReturn" class="property">
           <span class="name"><a href="fake/complicatedReturn.html">complicatedReturn</a></span>
-          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span>
+          <span class="signature">&#8594; <a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="-param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span></span> 
         </dt>
         <dd>
           A complicated type parameter to ATypeTakingClass.
@@ -553,7 +567,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="dynamicGetter" class="property">
           <span class="name"><a href="fake/dynamicGetter.html">dynamicGetter</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           A dynamic getter.
@@ -561,7 +575,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="getterSetterNodocGetter" class="property">
           <span class="name"><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></span>
-          <span class="signature">&#8592; int</span>
+          <span class="signature">&#8592; int</span> 
         </dt>
         <dd>
           Setter docs should be shown.
@@ -569,7 +583,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="getterSetterNodocSetter" class="property">
           <span class="name"><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           Getter docs should be shown.
@@ -577,7 +591,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="importantComputations" class="property">
           <span class="name"><a href="fake/importantComputations.html">importantComputations</a></span>
-          <span class="signature">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
+          <span class="signature">&#8594; Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span> 
         </dt>
         <dd>
           Type inference mixing with anonymous functions.
@@ -585,7 +599,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="justGetter" class="property">
           <span class="name"><a href="fake/justGetter.html">justGetter</a></span>
-          <span class="signature">&#8594; bool</span>
+          <span class="signature">&#8594; bool</span> 
         </dt>
         <dd>
           Just a getter. No partner setter.
@@ -593,7 +607,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="justSetter" class="property">
           <span class="name"><a href="fake/justSetter.html">justSetter</a></span>
-          <span class="signature">&#8592; <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span></span></span>
+          <span class="signature">&#8592; <span class="parameter" id="justSetter=-param-value"><span class="type-annotation">int</span></span></span> 
         </dt>
         <dd>
           Just a setter. No partner getter.
@@ -601,7 +615,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="mapWithDynamicKeys" class="property">
           <span class="name"><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></span>
-          <span class="signature">&#8596; Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
+          <span class="signature">&#8596; Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span> 
         </dt>
         <dd>
           
@@ -609,7 +623,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="meaningOfLife" class="property">
           <span class="name"><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd>
           Final property.
@@ -617,7 +631,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="mustGetThis" class="property">
           <span class="name"><a href="fake/mustGetThis.html">mustGetThis</a></span>
-          <span class="signature">&#8594; dynamic</span>
+          <span class="signature">&#8594; dynamic</span> 
         </dt>
         <dd>
           A doc reference mentioning <code>dynamic</code>.
@@ -625,7 +639,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="setAndGet" class="property">
           <span class="name"><a href="fake/setAndGet.html">setAndGet</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           The getter for setAndGet.
@@ -633,7 +647,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="simpleProperty" class="property">
           <span class="name"><a href="fake/simpleProperty.html">simpleProperty</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           Simple property
@@ -641,7 +655,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="useSomethingInAnotherPackage" class="property">
           <span class="name"><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></span>
-          <span class="signature">&#8596; Required</span>
+          <span class="signature">&#8596; Required</span> 
         </dt>
         <dd>
           
@@ -649,7 +663,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="useSomethingInTheSdk" class="property">
           <span class="name"><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></span>
-          <span class="signature">&#8596; String</span>
+          <span class="signature">&#8596; String</span> 
         </dt>
         <dd>
           
@@ -666,7 +680,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/addCallback.html">addCallback</a></span><span class="signature">(<wbr><span class="parameter" id="addCallback-param-callback"><span class="type-annotation"><a href="fake/VoidCallback.html">VoidCallback</a></span> <span class="parameter-name">callback</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds a callback.
           
@@ -675,7 +689,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/addCallback2.html">addCallback2</a></span><span class="signature">(<wbr><span class="parameter" id="addCallback2-param-callback"><span class="type-annotation"><a href="fake/Callback2.html">Callback2</a></span> <span class="parameter-name">callback</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Adds another callback.
           
@@ -684,7 +698,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/aVoidParameter.html">aVoidParameter</a></span><span class="signature">(<wbr><span class="parameter" id="aVoidParameter-param-p1"><span class="type-annotation">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span> <span class="parameter-name">p1</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function requires a Future<void> as a parameter</void>
           
@@ -693,7 +707,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></span><span class="signature">(<wbr><span class="parameter" id="functionWithFunctionParameters-param-number"><span class="type-annotation">int</span> <span class="parameter-name">number</span>, </span> <span class="parameter" id="functionWithFunctionParameters-param-thing"><span class="type-annotation">void</span> <span class="parameter-name">thing</span>(<span class="parameter" id="thing-param-one"><span class="type-annotation">dynamic</span> <span class="parameter-name">one</span>, </span> <span class="parameter" id="thing-param-two"><span class="type-annotation">dynamic</span> <span class="parameter-name">two</span></span>), </span> <span class="parameter" id="functionWithFunctionParameters-param-string"><span class="type-annotation">String</span> <span class="parameter-name">string</span>, </span> <span class="parameter" id="functionWithFunctionParameters-param-asyncThing"><span class="type-annotation">Future</span> <span class="parameter-name">asyncThing</span>(<span class="parameter" id="asyncThing-param-three"><span class="type-annotation">dynamic</span> <span class="parameter-name">three</span>, </span> <span class="parameter" id="asyncThing-param-four"><span class="type-annotation">dynamic</span> <span class="parameter-name">four</span>, </span> <span class="parameter" id="asyncThing-param-five"><span class="type-annotation">dynamic</span> <span class="parameter-name">five</span>, </span> <span class="parameter" id="asyncThing-param-six"><span class="type-annotation">dynamic</span> <span class="parameter-name">six</span>, </span> <span class="parameter" id="asyncThing-param-seven"><span class="type-annotation">dynamic</span> <span class="parameter-name">seven</span></span>)</span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function has two parameters that are functions. <a href="fake/functionWithFunctionParameters.html">[...]</a>
           
@@ -702,7 +716,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/myGenericFunction.html">myGenericFunction</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="myGenericFunction-param-a"><span class="type-annotation">int</span> <span class="parameter-name">a</span>, </span> <span class="parameter" id="myGenericFunction-param-b"><span class="type-annotation">bool</span> <span class="parameter-name">b</span>, </span> <span class="parameter" id="myGenericFunction-param-c"><span class="type-annotation">S</span> <span class="parameter-name">c</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A generic function with a type parameter.
           
@@ -711,7 +725,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></span><span class="signature">(<wbr>[<span class="parameter" id="onlyPositionalWithNoDefaultNoType-param-anything"><span class="type-annotation">dynamic</span> <span class="parameter-name">anything</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A single optional positional param, no type annotation, no default value.
           <div class="features">@greatAnnotation</div>
@@ -720,7 +734,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paintImage1.html">paintImage1</a></span><span class="signature">(<wbr>{<span class="parameter" id="paintImage1-param-canvas"><span class="type-annotation">String</span> <span class="parameter-name">canvas</span>, </span> <span class="parameter" id="paintImage1-param-rect"><span class="type-annotation">int</span> <span class="parameter-name">rect</span>, </span> <span class="parameter" id="paintImage1-param-image"><span class="type-annotation"><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></span> <span class="parameter-name">image</span>, </span> <span class="parameter" id="paintImage1-param-colorFilter"><span class="type-annotation"><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span> <span class="parameter-name">colorFilter</span>, </span> <span class="parameter" id="paintImage1-param-repeat"><span class="type-annotation">String</span> <span class="parameter-name">repeat</span>: <span class="default-value">LongFirstLine.THING</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Paints an image into the given rectangle in the canvas.
           
@@ -729,7 +743,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paintImage2.html">paintImage2</a></span><span class="signature">(<wbr><span class="parameter" id="paintImage2-param-fooParam"><span class="type-annotation">String</span> <span class="parameter-name">fooParam</span>, [</span> <span class="parameter" id="paintImage2-param-canvas"><span class="type-annotation">String</span> <span class="parameter-name">canvas</span>, </span> <span class="parameter" id="paintImage2-param-rect"><span class="type-annotation">int</span> <span class="parameter-name">rect</span>, </span> <span class="parameter" id="paintImage2-param-image"><span class="type-annotation"><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></span> <span class="parameter-name">image</span>, </span> <span class="parameter" id="paintImage2-param-colorFilter"><span class="type-annotation"><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span> <span class="parameter-name">colorFilter</span>, </span> <span class="parameter" id="paintImage2-param-repeat"><span class="type-annotation">String</span> <span class="parameter-name">repeat</span> = <span class="default-value">LongFirstLine.THING</span></span> ])
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Paints an image into the given rectangle in the canvas.
           
@@ -738,7 +752,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></span><span class="signature">(<wbr><span class="parameter" id="paramFromAnotherLib-param-thing"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">thing</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           <code>FooBar</code> comes from another library.
           
@@ -747,7 +761,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></span><span class="signature">(<wbr><span class="parameter" id="paramOfFutureOrNull-param-future"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span> <span class="parameter-name">future</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Has a parameter explicitly typed <code>FutureOr&lt;Null&gt;</code>.
           
@@ -756,7 +770,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/returningFutureVoid.html">returningFutureVoid</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           This function returns Future<void></void>
           
@@ -765,7 +779,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/short.html">short</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Testing <a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a> should not be italicized. <a href="fake/short.html">[...]</a>
           
@@ -774,7 +788,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/soIntense.html">soIntense</a></span><span class="signature">(<wbr><span class="parameter" id="soIntense-param-anything"><span class="type-annotation">dynamic</span> <span class="parameter-name">anything</span>, {</span> <span class="parameter" id="soIntense-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span>: <span class="default-value">true</span>, </span> <span class="parameter" id="soIntense-param-value"><span class="type-annotation">int</span> <span class="parameter-name">value</span></span> })
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Top-level function with 1 param and 2 optional named params, 1 with a
 default value.
@@ -784,7 +798,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly returns a Future and is marked async.
           
@@ -793,7 +807,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsAsync.html">thisIsAsync</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; Future</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           An async function. It should look like I return a <code>Future</code>.
           
@@ -802,7 +816,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr</code>.
           
@@ -811,7 +825,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr&lt;Null&gt;</code>.
           
@@ -820,7 +834,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Explicitly return a <code>FutureOr&lt;T&gt;</code>.
           
@@ -829,7 +843,7 @@ <h2>Functions</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></span><span class="signature">(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span>, </span> <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span>, </span> <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span>, [</span> <span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span> ])
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Top-level function 3 params and 1 optional positional param. <a href="fake/topLevelFunction.html">[...]</a>
           
@@ -838,7 +852,7 @@ <h2>Functions</h2>
           <span class="name"><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T extends FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">List</span>&gt;</span></span>&gt;</span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Has a type parameter bound to <code>FutureOr&lt;List&gt;</code>.
           
@@ -851,7 +865,7 @@ <h2>Enums</h2>
 
       <dl>
         <dt id="Color">
-          <span class="name "><a href="fake/Color-class.html">Color</a></span>
+          <span class="name "><a href="fake/Color-class.html">Color</a></span> 
         </dt>
         <dd>
           An <code>enum</code> for ROYGBIV constants.
@@ -867,7 +881,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/Callback2.html">Callback2</a></span><span class="signature">(<wbr><span class="parameter" id="Callback2-param-String"><span class="type-annotation">dynamic</span> <span class="parameter-name">String</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -876,7 +890,7 @@ <h2>Typedefs</h2>
           <span class="name deprecated"><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></span><span class="signature">(<wbr><span class="parameter" id="FakeProcesses-param-input"><span class="type-annotation">String</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Takes input, returns output.
           
@@ -885,7 +899,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/GenericTypedef.html">GenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="GenericTypedef-param-input"><span class="type-annotation">T</span> <span class="parameter-name">input</span></span>)
             <span class="returntype parameter">&#8594; T</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A typedef with a type parameter.
           
@@ -894,7 +908,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></span><span class="signature">(<wbr><span class="parameter" id="LotsAndLotsOfParameters-param-so"><span class="type-annotation">dynamic</span> <span class="parameter-name">so</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-many"><span class="type-annotation">dynamic</span> <span class="parameter-name">many</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-parameters"><span class="type-annotation">dynamic</span> <span class="parameter-name">parameters</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-it"><span class="type-annotation">dynamic</span> <span class="parameter-name">it</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-should"><span class="type-annotation">dynamic</span> <span class="parameter-name">should</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-wrap"><span class="type-annotation">dynamic</span> <span class="parameter-name">wrap</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-when"><span class="type-annotation">dynamic</span> <span class="parameter-name">when</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-converted"><span class="type-annotation">dynamic</span> <span class="parameter-name">converted</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-to"><span class="type-annotation">dynamic</span> <span class="parameter-name">to</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-html"><span class="type-annotation">dynamic</span> <span class="parameter-name">html</span>, </span> <span class="parameter" id="LotsAndLotsOfParameters-param-documentation"><span class="type-annotation">dynamic</span> <span class="parameter-name">documentation</span></span>)
             <span class="returntype parameter">&#8594; int</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           Lots and lots of parameters.
           
@@ -903,7 +917,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/myCoolTypedef.html">myCoolTypedef</a></span><span class="signature">(<wbr><span class="parameter" id="myCoolTypedef-param-x"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="myCoolTypedef-param-y"><span class="type-annotation">bool</span> <span class="parameter-name">y</span></span>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -912,7 +926,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></span><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">T</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">int</span>, </span> <span class="parameter" id="NewGenericTypedef-param-"><span class="type-annotation">bool</span></span>)
             <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
           </span>
-        </dt>
+          </dt>
         <dd>
           A typedef with the new style generic function syntax.
           
@@ -921,7 +935,7 @@ <h2>Typedefs</h2>
           <span class="name"><a href="fake/VoidCallback.html">VoidCallback</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; void</span>
           </span>
-        </dt>
+          </dt>
         <dd>
           
           
@@ -934,13 +948,13 @@ <h2>Exceptions / Errors</h2>
 
       <dl>
         <dt id="Doh">
-          <span class="name deprecated"><a class="deprecated" href="fake/Doh-class.html">Doh</a></span>
+          <span class="name deprecated"><a class="deprecated" href="fake/Doh-class.html">Doh</a></span> 
         </dt>
         <dd>
           Also, my bad.
         </dd>
         <dt id="Oops">
-          <span class="name "><a href="fake/Oops-class.html">Oops</a></span>
+          <span class="name "><a href="fake/Oops-class.html">Oops</a></span> 
         </dt>
         <dd>
           My bad!
@@ -976,6 +990,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
diff --git a/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html b/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
index 4ef9406e62..c3a0e73da4 100644
--- a/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>functionWithFunctionParameters function</h1>
+    <h1>functionWithFunctionParameters function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html b/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
index b3850c3604..8b2f31ec6f 100644
--- a/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getterSetterNodocGetter top-level property</h1>
+    <h1>getterSetterNodocGetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html b/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
index d9168879ce..4b1ef63dbf 100644
--- a/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>getterSetterNodocSetter top-level property</h1>
+    <h1>getterSetterNodocSetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/greatAnnotation-constant.html b/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
index 5054c1d4be..5c0a74706e 100644
--- a/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greatAnnotation top-level constant</h1>
+    <h1>greatAnnotation top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">greatAnnotation</span>
diff --git a/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html b/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
index db15d5a2d4..84982871b9 100644
--- a/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>greatestAnnotation top-level constant</h1>
+    <h1>greatestAnnotation top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">greatestAnnotation</span>
diff --git a/testing/test_package_docs_dev/fake/importantComputations.html b/testing/test_package_docs_dev/fake/importantComputations.html
index 7a02f9b92e..7b3bdc7207 100644
--- a/testing/test_package_docs_dev/fake/importantComputations.html
+++ b/testing/test_package_docs_dev/fake/importantComputations.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>importantComputations top-level property</h1>
+    <h1>importantComputations top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">int</span>, <span class="type-parameter">(<span class="parameter" id="null-param-a"><span class="type-annotation">List<span class="signature">&lt;<wbr><span class="type-parameter">num</span>&gt;</span></span></span>) → dynamic</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html b/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
index 956d960fe0..18c059e768 100644
--- a/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>incorrectDocReference top-level constant</h1>
+    <h1>incorrectDocReference top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">incorrectDocReference</span>
diff --git a/testing/test_package_docs_dev/fake/justGetter.html b/testing/test_package_docs_dev/fake/justGetter.html
index e12e5049df..70314b8eaa 100644
--- a/testing/test_package_docs_dev/fake/justGetter.html
+++ b/testing/test_package_docs_dev/fake/justGetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>justGetter top-level property</h1>
+    <h1>justGetter top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/justSetter.html b/testing/test_package_docs_dev/fake/justSetter.html
index 4e611ed75c..24ee98ffcc 100644
--- a/testing/test_package_docs_dev/fake/justSetter.html
+++ b/testing/test_package_docs_dev/fake/justSetter.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>justSetter top-level property</h1>
+    <h1>justSetter top-level property </h1>
 
 
 
diff --git a/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html b/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
index 5faa1c95e9..55037fb4f7 100644
--- a/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>mapWithDynamicKeys top-level property</h1>
+    <h1>mapWithDynamicKeys top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Map<span class="signature">&lt;<wbr><span class="type-parameter">dynamic</span>, <span class="type-parameter">String</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/meaningOfLife.html b/testing/test_package_docs_dev/fake/meaningOfLife.html
index e5f0f77087..1807eec8f4 100644
--- a/testing/test_package_docs_dev/fake/meaningOfLife.html
+++ b/testing/test_package_docs_dev/fake/meaningOfLife.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>meaningOfLife top-level property</h1>
+    <h1>meaningOfLife top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/fake/mustGetThis.html b/testing/test_package_docs_dev/fake/mustGetThis.html
index 633778da8d..368f633f9d 100644
--- a/testing/test_package_docs_dev/fake/mustGetThis.html
+++ b/testing/test_package_docs_dev/fake/mustGetThis.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>mustGetThis top-level property</h1>
+    <h1>mustGetThis top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/myCoolTypedef.html b/testing/test_package_docs_dev/fake/myCoolTypedef.html
index 483ce8686a..d532e9caef 100644
--- a/testing/test_package_docs_dev/fake/myCoolTypedef.html
+++ b/testing/test_package_docs_dev/fake/myCoolTypedef.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myCoolTypedef typedef</h1>
+    <h1>myCoolTypedef typedef </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/myGenericFunction.html b/testing/test_package_docs_dev/fake/myGenericFunction.html
index a6fdb8035e..7a2e92b988 100644
--- a/testing/test_package_docs_dev/fake/myGenericFunction.html
+++ b/testing/test_package_docs_dev/fake/myGenericFunction.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function</h1>
+    <h1>myGenericFunction&lt;<wbr><span class="type-parameter">S</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/myMap-constant.html b/testing/test_package_docs_dev/fake/myMap-constant.html
index 41915f3d50..861751248d 100644
--- a/testing/test_package_docs_dev/fake/myMap-constant.html
+++ b/testing/test_package_docs_dev/fake/myMap-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>myMap top-level constant</h1>
+    <h1>myMap top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">myMap</span>
diff --git a/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
index 18fc9918df..b7d81b45f9 100644
--- a/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>onlyPositionalWithNoDefaultNoType function</h1>
+    <h1>onlyPositionalWithNoDefaultNoType function </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs_dev/fake/paintImage1.html b/testing/test_package_docs_dev/fake/paintImage1.html
index bea499d4de..2a0e89410e 100644
--- a/testing/test_package_docs_dev/fake/paintImage1.html
+++ b/testing/test_package_docs_dev/fake/paintImage1.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paintImage1 function</h1>
+    <h1>paintImage1 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/paintImage2.html b/testing/test_package_docs_dev/fake/paintImage2.html
index 396b54d991..60848b9b10 100644
--- a/testing/test_package_docs_dev/fake/paintImage2.html
+++ b/testing/test_package_docs_dev/fake/paintImage2.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paintImage2 function</h1>
+    <h1>paintImage2 function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/paramFromAnotherLib.html b/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
index 9b79c7bd09..1afdd83815 100644
--- a/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paramFromAnotherLib function</h1>
+    <h1>paramFromAnotherLib function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html b/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
index 808bcad632..3cc766057b 100644
--- a/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>paramOfFutureOrNull function</h1>
+    <h1>paramOfFutureOrNull function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/required-constant.html b/testing/test_package_docs_dev/fake/required-constant.html
index 263e2ba822..bd6e264ea1 100644
--- a/testing/test_package_docs_dev/fake/required-constant.html
+++ b/testing/test_package_docs_dev/fake/required-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>required top-level constant</h1>
+    <h1>required top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">required</span>
diff --git a/testing/test_package_docs_dev/fake/returningFutureVoid.html b/testing/test_package_docs_dev/fake/returningFutureVoid.html
index 67ee537293..1b20e89c2d 100644
--- a/testing/test_package_docs_dev/fake/returningFutureVoid.html
+++ b/testing/test_package_docs_dev/fake/returningFutureVoid.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>returningFutureVoid function</h1>
+    <h1>returningFutureVoid function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">void</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/setAndGet.html b/testing/test_package_docs_dev/fake/setAndGet.html
index 203173b9f4..56dca5d1e8 100644
--- a/testing/test_package_docs_dev/fake/setAndGet.html
+++ b/testing/test_package_docs_dev/fake/setAndGet.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>setAndGet top-level property</h1>
+    <h1>setAndGet top-level property </h1>
 
 
     <section id="getter">
diff --git a/testing/test_package_docs_dev/fake/short.html b/testing/test_package_docs_dev/fake/short.html
index 524692135a..0b01646d2a 100644
--- a/testing/test_package_docs_dev/fake/short.html
+++ b/testing/test_package_docs_dev/fake/short.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>short function</h1>
+    <h1>short function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/simpleProperty.html b/testing/test_package_docs_dev/fake/simpleProperty.html
index 7c4c47adb5..9dbbcc8a1d 100644
--- a/testing/test_package_docs_dev/fake/simpleProperty.html
+++ b/testing/test_package_docs_dev/fake/simpleProperty.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>simpleProperty top-level property</h1>
+    <h1>simpleProperty top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/fake/soIntense.html b/testing/test_package_docs_dev/fake/soIntense.html
index 21927491be..cf3c5c582c 100644
--- a/testing/test_package_docs_dev/fake/soIntense.html
+++ b/testing/test_package_docs_dev/fake/soIntense.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>soIntense function</h1>
+    <h1>soIntense function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
index 5fc022c378..ccc0d9d9ef 100644
--- a/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>testingCodeSyntaxInOneLiners top-level constant</h1>
+    <h1>testingCodeSyntaxInOneLiners top-level constant </h1>
 
     <section class="multi-line-signature">
       const <span class="name ">testingCodeSyntaxInOneLiners</span>
diff --git a/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html b/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
index b63277c392..449597a8db 100644
--- a/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsAlsoAsync function</h1>
+    <h1>thisIsAlsoAsync function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
diff --git a/testing/test_package_docs_dev/fake/thisIsAsync.html b/testing/test_package_docs_dev/fake/thisIsAsync.html
index e421ddaa58..d060d2ee0a 100644
--- a/testing/test_package_docs_dev/fake/thisIsAsync.html
+++ b/testing/test_package_docs_dev/fake/thisIsAsync.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsAsync function</h1>
+    <h1>thisIsAsync function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">Future</span>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOr.html b/testing/test_package_docs_dev/fake/thisIsFutureOr.html
index 0f88874ee4..e629db8ee4 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOr.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOr.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOr function</h1>
+    <h1>thisIsFutureOr function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr</span>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html b/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
index a4eeda31ef..88f132eaa3 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOrNull function</h1>
+    <h1>thisIsFutureOrNull function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">Null</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOrT.html b/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
index 1814a5d170..8b444ae7da 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function</h1>
+    <h1>thisIsFutureOrT&lt;<wbr><span class="type-parameter">T</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
diff --git a/testing/test_package_docs_dev/fake/topLevelFunction.html b/testing/test_package_docs_dev/fake/topLevelFunction.html
index 068e5d8418..de1dcaaa1c 100644
--- a/testing/test_package_docs_dev/fake/topLevelFunction.html
+++ b/testing/test_package_docs_dev/fake/topLevelFunction.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>topLevelFunction function</h1>
+    <h1>topLevelFunction function </h1>
 
     <section class="multi-line-signature">
         <div>
diff --git a/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html b/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
index b6c7b8e38a..296dc361a6 100644
--- a/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function</h1>
+    <h1>typeParamOfFutureOr&lt;<wbr><span class="type-parameter">T extends FutureOr&lt;<wbr><span class="type-parameter">List</span>&gt;</span>&gt; function </h1>
 
     <section class="multi-line-signature">
         <span class="returntype">void</span>
diff --git a/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html b/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
index 55988f7d3f..9100519e54 100644
--- a/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
+++ b/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>useSomethingInAnotherPackage top-level property</h1>
+    <h1>useSomethingInAnotherPackage top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">Required</span>
diff --git a/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html b/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
index e711f23bb4..73484d18e8 100644
--- a/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
+++ b/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
@@ -61,6 +61,7 @@ <h5>fake library</h5>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
       <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
       <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
       <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
@@ -159,7 +160,7 @@ <h5>fake library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>useSomethingInTheSdk top-level property</h1>
+    <h1>useSomethingInTheSdk top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
diff --git a/testing/test_package_docs_dev/index.html b/testing/test_package_docs_dev/index.html
index 4265511e5c..e41af2075d 100644
--- a/testing/test_package_docs_dev/index.html
+++ b/testing/test_package_docs_dev/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.20.4">
+  <meta name="generator" content="made with love by dartdoc 0.21.0-dev.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
@@ -34,6 +34,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -42,6 +45,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -50,6 +54,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
@@ -106,17 +111,17 @@ <h2 id="another-section">Another Section</h2>
             <h2>Libraries</h2>
           <dl>
             <dt id="anonymous_library">
-              <span class="name"><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></span>
+              <span class="name"><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></span> 
             </dt>
             <dd>
               
             </dd>            <dt id="another_anonymous_lib">
-              <span class="name"><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></span>
+              <span class="name"><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></span> 
             </dt>
             <dd>
               
             </dd>            <dt id="code_in_comments">
-              <span class="name"><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></span>
+              <span class="name"><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></span> 
             </dt>
             <dd>
               <code class="language-dart">void main() {
@@ -124,41 +129,48 @@ <h2>Libraries</h2>
 }
 </code> <a href="code_in_comments/code_in_comments-library.html">[...]</a>
             </dd>            <dt id="is_deprecated">
-              <span class="name"><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></span>
+              <span class="name"><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></span> 
             </dt>
             <dd>
               This lib is deprecated. It never had a chance
             </dd>            <h3>Real Libraries</h3>
               <dt id="ex">
-                <span class="name"><a href="ex/ex-library.html">ex</a></span>
+                <span class="name"><a href="ex/ex-library.html">ex</a></span> 
               </dt>
               <dd>
                 a library. testing string escaping: <code>var s = 'a string'</code> <cool></cool>
               </dd>              <dt id="fake">
-                <span class="name"><a href="fake/fake-library.html">fake</a></span>
+                <span class="name"><a href="fake/fake-library.html">fake</a></span> 
               </dt>
               <dd>
                 WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a> <a href="fake/fake-library.html">[...]</a>
+              </dd>              <dt id="two_exports">
+                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span> 
+              </dt>
+              <dd>
+                
               </dd>            <h3>Unreal</h3>
               <dt id="reexport_one">
-                <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>
+                <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
               </dt>
               <dd>
                 
               </dd>              <dt id="reexport_two">
-                <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>
+                <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
               </dt>
               <dd>
                 
               </dd>            <h3>Misc</h3>
               <dt id="two_exports">
-                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span>
+                <span class="name"><a href="two_exports/two_exports-library.html">two_exports</a></span> 
               </dt>
               <dd>
                 
               </dd>            <h3>Other</h3>
               <dt id="css">
-                <span class="name"><a href="css/css-library.html">css</a></span>
+                <span class="name"><a href="css/css-library.html">css</a></span> 
               </dt>
               <dd>
                 Testing that a library name doesn't conflict
@@ -168,8 +180,13 @@ <h2>Libraries</h2>
         <section class="summary">
             <h2>test_package_imported</h2>
           <dl>
-            <dt id="test_package_imported.main">
-              <span class="name"><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></span>
+            <dt id="categoriesExported">
+              <span class="name"><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></span> 
+            </dt>
+            <dd>
+              
+            </dd>            <dt id="test_package_imported.main">
+              <span class="name"><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></span> 
             </dt>
             <dd>
               
diff --git a/testing/test_package_docs_dev/index.json b/testing/test_package_docs_dev/index.json
index 2df90fbca9..0ec336ca36 100644
--- a/testing/test_package_docs_dev/index.json
+++ b/testing/test_package_docs_dev/index.json
@@ -1,4 +1,18 @@
 [
+ {
+  "name": "Superb",
+  "qualifiedName": "Superb",
+  "href": "topics/Superb-topic.html",
+  "type": "Topic",
+  "overriddenDepth": 0
+ },
+ {
+  "name": "Unreal",
+  "qualifiedName": "Unreal",
+  "href": "topics/Unreal-topic.html",
+  "type": "Topic",
+  "overriddenDepth": 0
+ },
  {
   "name": "anonymous_library",
   "qualifiedName": "anonymous_library",
@@ -35,6 +49,90 @@
    "type": "library"
   }
  },
+ {
+  "name": "categoriesExported",
+  "qualifiedName": "categoriesExported",
+  "href": "categoriesExported/categoriesExported-library.html",
+  "type": "library",
+  "overriddenDepth": 0
+ },
+ {
+  "name": "IAmAClassWithCategories",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+  "href": "categoriesExported/IAmAClassWithCategories-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "categoriesExported",
+   "type": "library"
+  }
+ },
+ {
+  "name": "IAmAClassWithCategories",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories",
+  "href": "categoriesExported/IAmAClassWithCategories/IAmAClassWithCategories.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "operator ==",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.==",
+  "href": "categoriesExported/IAmAClassWithCategories/operator_equals.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "hashCode",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.hashCode",
+  "href": "categoriesExported/IAmAClassWithCategories/hashCode.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "noSuchMethod",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.noSuchMethod",
+  "href": "categoriesExported/IAmAClassWithCategories/noSuchMethod.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "runtimeType",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.runtimeType",
+  "href": "categoriesExported/IAmAClassWithCategories/runtimeType.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
+ {
+  "name": "toString",
+  "qualifiedName": "categoriesExported.IAmAClassWithCategories.toString",
+  "href": "categoriesExported/IAmAClassWithCategories/toString.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "IAmAClassWithCategories",
+   "type": "class"
+  }
+ },
  {
   "name": "code_in_comments",
   "qualifiedName": "code_in_comments",
diff --git a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
index c918e0134d..cb23111923 100644
--- a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>is_deprecated library</h1>
+    <h1>is_deprecated library </h1>
 
     <section class="desc markdown">
       <p>This lib is deprecated. It never had a chance</p>
diff --git a/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
index e1e9d5f90c..6974015a20 100644
--- a/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
+++ b/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_one library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SomeOtherClass class</h1>
+      <h1>SomeOtherClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_one/SomeOtherClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_one/SomeOtherClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_one/SomeOtherClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
index baadb44e0f..2ffe60667f 100644
--- a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,14 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>reexport_one library</h1>
+    <h1>reexport_one library   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
     <section class="desc markdown">
       
@@ -69,25 +75,25 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AUnicornClass">
-          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span>
+          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeClass">
-          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span>
+          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeOtherClass">
-          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span>
+          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="YetAnotherClass">
-          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span>
+          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html b/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
index f41b3deb7a..5b7a42df18 100644
--- a/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>AUnicornClass class</h1>
+      <h1>AUnicornClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/AUnicornClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/AUnicornClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/AUnicornClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/reexport_two/SomeClass-class.html b/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
index f559855600..2cff883f72 100644
--- a/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>SomeClass class</h1>
+      <h1>SomeClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/SomeClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/SomeClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/SomeClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/SomeClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/SomeClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
index 44e6fcf076..e9153f403c 100644
--- a/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
@@ -53,7 +53,7 @@ <h5>reexport_two library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>YetAnotherClass class</h1>
+      <h1>YetAnotherClass class </h1>
 
     
 
@@ -76,7 +76,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="reexport_two/YetAnotherClass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -84,7 +84,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="reexport_two/YetAnotherClass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -100,7 +100,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -109,7 +109,7 @@ <h2>Methods</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -124,7 +124,7 @@ <h2>Operators</h2>
           <span class="name"><a href="reexport_two/YetAnotherClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
index 6355f9bc2a..5636cfba4a 100644
--- a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,14 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>reexport_two library</h1>
+    <h1>reexport_two library   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+</h1>
 
     <section class="desc markdown">
       
@@ -69,25 +75,25 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="AUnicornClass">
-          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span>
+          <span class="name "><a href="reexport_two/AUnicornClass-class.html">AUnicornClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeClass">
-          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span>
+          <span class="name "><a href="reexport_two/SomeClass-class.html">SomeClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="SomeOtherClass">
-          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span>
+          <span class="name "><a href="reexport_one/SomeOtherClass-class.html">SomeOtherClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="YetAnotherClass">
-          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span>
+          <span class="name "><a href="reexport_two/YetAnotherClass-class.html">YetAnotherClass</a></span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_docs_dev/static-assets/styles.css b/testing/test_package_docs_dev/static-assets/styles.css
index 3ac01890db..07ac4ae0ec 100644
--- a/testing/test_package_docs_dev/static-assets/styles.css
+++ b/testing/test_package_docs_dev/static-assets/styles.css
@@ -394,6 +394,55 @@ dl dt.callable .name {
   text-decoration: line-through;
 }
 
+.category.linked {
+  font-weight: bold;
+  opacity: 1;
+}
+
+/* Colors for category based on categoryOrder in dartdoc_options.config. */
+.category.cp-0 {
+  background-color: #54b7c4
+}
+
+.category.cp-1 {
+  background-color: #54c47f
+}
+
+.category.cp-2 {
+  background-color: #c4c254
+}
+
+.category.cp-3 {
+  background-color: #c49f54
+}
+
+.category.cp-4 {
+  background-color: #c45465
+}
+
+.category.cp-5 {
+  background-color: #c454c4
+}
+
+.category a {
+  color: white;
+}
+
+.category {
+  vertical-align: text-top;
+  padding: 4px;
+  font-size: 12px;
+  border-radius: 4px;
+  background-color: #B6B6B6;
+  text-transform: uppercase;
+  color: white;
+  opacity: .5;
+}
+
+h1 .category {
+  vertical-align: middle;
+}
+
 p.firstline {
   font-weight: bold;
 }
diff --git a/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
index 376eabc9f4..4d073ac567 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
@@ -51,7 +51,7 @@ <h5>test_package_imported.main library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; class</h1>
+      <h1>Whataclass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass</p>
@@ -77,7 +77,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -85,7 +85,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -101,7 +101,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -110,7 +110,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -125,7 +125,7 @@ <h2>Operators</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html b/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
index 5b8a89cbf7..0732e6e6c8 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
@@ -51,7 +51,7 @@ <h5>test_package_imported.main library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>Whataclass2 class</h1>
+      <h1>Whataclass2 class </h1>
 
     <section class="desc markdown">
       <p>Some docs for whataclass 2</p>
@@ -77,7 +77,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass2/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -85,7 +85,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="test_package_imported.main/Whataclass2/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -101,7 +101,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -110,7 +110,7 @@ <h2>Methods</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -125,7 +125,7 @@ <h2>Operators</h2>
           <span class="name"><a href="test_package_imported.main/Whataclass2/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
index de4d5e4b2f..6378e5ae86 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>test_package_imported.main library</h1>
+    <h1>test_package_imported.main library </h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -66,13 +71,13 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="Whataclass">
-          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
         </dt>
         <dd>
           Some docs for whataclass
         </dd>
         <dt id="Whataclass2">
-          <span class="name "><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></span>
+          <span class="name "><a href="test_package_imported.main/Whataclass2-class.html">Whataclass2</a></span> 
         </dt>
         <dd>
           Some docs for whataclass 2
diff --git a/testing/test_package_docs_dev/topics/Superb-topic.html b/testing/test_package_docs_dev/topics/Superb-topic.html
new file mode 100644
index 0000000000..b04ff3b68a
--- /dev/null
+++ b/testing/test_package_docs_dev/topics/Superb-topic.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="Superb Topic docs, for the Dart programming language.">
+  <title>Superb Topic - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">Superb Topic</li>
+  </ol>
+  <div class="self-name">Superb</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>Superb Topic</h1>
+      <section class="desc markdown">
+        <p>This is the documentation for our category.</p>
+<p>Wheee!</p>
+      </section>
+      
+
+        <section class="summary offset-anchor" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+            <dt id="BaseForDocComments">
+              <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              Category information should not follow inheritance.
+            </dd>
+        </dl>
+      </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>Superb Topic</h5>
+    <ol>
+    
+      <li class="section-title"><a href="topics/Superb-topic.html#classes">Classes</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/topics/Unreal-topic.html b/testing/test_package_docs_dev/topics/Unreal-topic.html
new file mode 100644
index 0000000000..3cce04d471
--- /dev/null
+++ b/testing/test_package_docs_dev/topics/Unreal-topic.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="Unreal Topic docs, for the Dart programming language.">
+  <title>Unreal Topic - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li class="self-crumb">Unreal Topic</li>
+  </ol>
+  <div class="self-name">Unreal</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
+    <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
+          <li class="section-title">Libraries</li>
+          <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
+          <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
+          <li><a href="code_in_comments/code_in_comments-library.html">code_in_comments</a></li>
+          <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+          <li class="section-subtitle">Real Libraries</li>
+            <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
+            <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Unreal</li>
+            <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+            <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+          <li class="section-subtitle">Misc</li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
+          <li class="section-subtitle">Other</li>
+            <li class="section-subitem"><a href="css/css-library.html">css</a></li>
+          <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
+          <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>Unreal Topic</h1>
+      <section class="desc markdown">
+        <p>This is the documentation for the Unreal category,
+not to be confused with <code>Real Libraries</code>.  Unreal holds
+more than just libraries.</p>
+      </section>
+      
+        <section class="summary offset-anchor" id="libraries">
+        <h2>Libraries</h2>
+
+        <dl>
+            <dt id="reexport_one">
+              <span class="name"><a href="reexport_one/reexport_one-library.html">reexport_one</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              
+            </dd>            <dt id="reexport_two">
+              <span class="name"><a href="reexport_two/reexport_two-library.html">reexport_two</a></span>   <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              
+            </dd>        </dl>
+        </section>
+
+        <section class="summary offset-anchor" id="classes">
+        <h2>Classes</h2>
+
+        <dl>
+            <dt id="BaseForDocComments">
+              <span class="name "><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></span>   <span class="category superb cp-0 linked" title="This is part of the Superb Topic."><a href="topics/Superb-topic.html">Superb</a></span>
+  <span class="category unreal cp-2 linked" title="This is part of the Unreal Topic."><a href="topics/Unreal-topic.html">Unreal</a></span>
+
+            </dt>
+            <dd>
+              Category information should not follow inheritance.
+            </dd>
+        </dl>
+      </section>
+
+
+
+
+
+
+
+  </div> <!-- /.main-content -->
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>Unreal Topic</h5>
+    <ol>
+      <li class="section-title"><a href="topics/Unreal-topic.html#libraries">Libraries</a></li>
+      <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
+      <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
+    
+      <li class="section-title"><a href="topics/Unreal-topic.html#classes">Classes</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+    
+    
+    
+    
+    
+    
+    </ol>
+  </div><!--/sidebar-offcanvas-right-->
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/two_exports/BaseClass-class.html b/testing/test_package_docs_dev/two_exports/BaseClass-class.html
index a7db8670d9..b71aeda118 100644
--- a/testing/test_package_docs_dev/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs_dev/two_exports/BaseClass-class.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>BaseClass class</h1>
+      <h1>BaseClass class </h1>
 
     
     <section>
@@ -94,7 +94,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -102,7 +102,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="lengthX" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -110,7 +110,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -126,7 +126,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -135,7 +135,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -150,7 +150,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html b/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
index 219848fe67..eeebb58c53 100644
--- a/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>ExtendingClass class</h1>
+      <h1>ExtendingClass class </h1>
 
     <section class="desc markdown">
       <p>Extending class extends <a href="two_exports/BaseClass-class.html">BaseClass</a>.</p>
@@ -96,7 +96,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="hashCode" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/hashCode.html">hashCode</a></span>
-          <span class="signature">&#8594; int</span>
+          <span class="signature">&#8594; int</span> 
         </dt>
         <dd class="inherited">
           
@@ -104,7 +104,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="lengthX" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/lengthX.html">lengthX</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd class="inherited">
           Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>
@@ -112,7 +112,7 @@ <h2>Properties</h2>
 </dd>
         <dt id="runtimeType" class="property inherited">
           <span class="name"><a href="fake/WithGetterAndSetter/runtimeType.html">runtimeType</a></span>
-          <span class="signature">&#8594; Type</span>
+          <span class="signature">&#8594; Type</span> 
         </dt>
         <dd class="inherited">
           
@@ -128,7 +128,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
             <span class="returntype parameter">&#8594; dynamic</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -137,7 +137,7 @@ <h2>Methods</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/toString.html">toString</a></span><span class="signature">(<wbr>)
             <span class="returntype parameter">&#8594; String</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
@@ -152,7 +152,7 @@ <h2>Operators</h2>
           <span class="name"><a href="fake/WithGetterAndSetter/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
             <span class="returntype parameter">&#8594; bool</span>
           </span>
-        </dt>
+          </dt>
         <dd class="inherited">
           
           <div class="features">inherited</div>
diff --git a/testing/test_package_docs_dev/two_exports/topLevelVariable.html b/testing/test_package_docs_dev/two_exports/topLevelVariable.html
index 6e548501bd..2286b5481e 100644
--- a/testing/test_package_docs_dev/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs_dev/two_exports/topLevelVariable.html
@@ -53,7 +53,7 @@ <h5>two_exports library</h5>
   </div><!--/.sidebar-offcanvas-left-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>topLevelVariable top-level property</h1>
+    <h1>topLevelVariable top-level property </h1>
 
     <section class="multi-line-signature">
       <span class="returntype">int</span>
diff --git a/testing/test_package_docs_dev/two_exports/two_exports-library.html b/testing/test_package_docs_dev/two_exports/two_exports-library.html
index 410e513a73..4d81759f77 100644
--- a/testing/test_package_docs_dev/two_exports/two_exports-library.html
+++ b/testing/test_package_docs_dev/two_exports/two_exports-library.html
@@ -37,6 +37,9 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
     <ol>
+          <li class="section-title">Topics</li>
+            <li><a href="topics/Superb-topic.html">Superb</a></li>
+            <li><a href="topics/Unreal-topic.html">Unreal</a></li>
           <li class="section-title">Libraries</li>
           <li><a href="anonymous_library/anonymous_library-library.html">anonymous_library</a></li>
           <li><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_anonymous_lib</a></li>
@@ -45,6 +48,7 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Real Libraries</li>
             <li class="section-subitem"><a href="ex/ex-library.html">ex</a></li>
             <li class="section-subitem"><a href="fake/fake-library.html">fake</a></li>
+            <li class="section-subitem"><a href="two_exports/two_exports-library.html">two_exports</a></li>
           <li class="section-subtitle">Unreal</li>
             <li class="section-subitem"><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
             <li class="section-subitem"><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
@@ -53,12 +57,13 @@ <h5><span class="package-name">test_package</span> <span class="package-kind">pa
           <li class="section-subtitle">Other</li>
             <li class="section-subitem"><a href="css/css-library.html">css</a></li>
           <li class="section-title">test_package_imported</li>
+          <li><a href="categoriesExported/categoriesExported-library.html">categoriesExported</a></li>
           <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
     </ol>
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>two_exports library</h1>
+    <h1>two_exports library </h1>
 
     
     <section class="summary offset-anchor" id="classes">
@@ -66,13 +71,13 @@ <h2>Classes</h2>
 
       <dl>
         <dt id="BaseClass">
-          <span class="name "><a href="two_exports/BaseClass-class.html">BaseClass</a></span>
+          <span class="name "><a href="two_exports/BaseClass-class.html">BaseClass</a></span> 
         </dt>
         <dd>
           
         </dd>
         <dt id="ExtendingClass">
-          <span class="name "><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></span>
+          <span class="name "><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></span> 
         </dt>
         <dd>
           Extending class extends <a href="two_exports/BaseClass-class.html">BaseClass</a>. <a href="two_exports/ExtendingClass-class.html">[...]</a>
@@ -87,7 +92,7 @@ <h2>Properties</h2>
       <dl class="properties">
         <dt id="topLevelVariable" class="property">
           <span class="name"><a href="two_exports/topLevelVariable.html">topLevelVariable</a></span>
-          <span class="signature">&#8596; int</span>
+          <span class="signature">&#8596; int</span> 
         </dt>
         <dd>
           
diff --git a/testing/test_package_imported/lib/categoryExporting.dart b/testing/test_package_imported/lib/categoryExporting.dart
new file mode 100644
index 0000000000..f84e7a56df
--- /dev/null
+++ b/testing/test_package_imported/lib/categoryExporting.dart
@@ -0,0 +1,6 @@
+library categoriesExported;
+
+/// Categories test for auto-include-dependencies (Flutter).
+///
+/// {@category Excellent}
+class IAmAClassWithCategories {}
diff --git a/tool/grind.dart b/tool/grind.dart
index 8ff66aa67c..5d39ce52a3 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -13,7 +13,7 @@ import 'package:io/io.dart';
 import 'package:path/path.dart' as pathLib;
 import 'package:yaml/yaml.dart' as yaml;
 
-main([List<String> args]) => grind(args);
+void main([List<String> args]) => grind(args);
 
 /// Thrown on failure to find something in a file.
 class GrindTestFailure {
@@ -22,7 +22,7 @@ class GrindTestFailure {
 }
 
 /// Kind of an inefficient grepper for now.
-expectFileContains(String path, List<Pattern> items) {
+void expectFileContains(String path, List<Pattern> items) {
   File source = new File(path);
   if (!source.existsSync())
     throw new GrindTestFailure('file not found: ${path}');
@@ -167,7 +167,7 @@ final FilePath _mustache4dartDir =
 final RegExp _mustache4dartPatches =
     new RegExp(r'^\d\d\d-mustache4dart-.*[.]patch$');
 @Task('Update third_party forks')
-updateThirdParty() async {
+void updateThirdParty() async {
   run('rm', arguments: ['-rf', _mustache4dartDir.path]);
   new Directory(_pkgDir.path).createSync(recursive: true);
   run('git', arguments: [
@@ -196,7 +196,7 @@ updateThirdParty() async {
 }
 
 @Task('Analyze dartdoc to ensure there are no errors and warnings')
-analyze() async {
+void analyze() async {
   await new SubprocessLauncher('analyze').runStreamed(
     sdkBin('dartanalyzer'),
     [
@@ -211,7 +211,7 @@ analyze() async {
 
 @Task('analyze, test, and self-test dartdoc')
 @Depends(analyze, checkBuild, test, testDartdoc, tryPublish)
-buildbot() => null;
+void buildbot() => null;
 
 @Task('Generate docs for the Dart SDK')
 Future buildSdkDocs() async {
@@ -410,14 +410,14 @@ Future<List<Map>> _buildTestPackageDocs(
 }
 
 @Task('Build generated test package docs (with inherited docs and source code)')
-Future buildTestPackageDocs() async {
+Future<void> buildTestPackageDocs() async {
   await _buildTestPackageDocs(testPackageDocsDir.absolute.path,
       new Future.value(Directory.current.path));
 }
 
 @Task('Serve test package docs locally with dhttpd on port 8002')
 @Depends(buildTestPackageDocs)
-Future serveTestPackageDocs() async {
+Future<void> serveTestPackageDocs() async {
   log('launching dhttpd on port 8002 for SDK');
   var launcher = new SubprocessLauncher('serve-test-package-docs');
   await launcher.runStreamed(sdkBin('pub'), [
@@ -430,7 +430,7 @@ Future serveTestPackageDocs() async {
   ]);
 }
 
-_serveDocsFrom(String servePath, int port, String context) async {
+Future<void> _serveDocsFrom(String servePath, int port, String context) async {
   log('launching dhttpd on port $port for $context');
   var launcher = new SubprocessLauncher(context);
   await launcher.runStreamed(sdkBin('pub'), ['get']);
@@ -441,7 +441,7 @@ _serveDocsFrom(String servePath, int port, String context) async {
 
 @Task('Serve generated SDK docs locally with dhttpd on port 8000')
 @Depends(buildSdkDocs)
-Future serveSdkDocs() async {
+Future<void> serveSdkDocs() async {
   log('launching dhttpd on port 8000 for SDK');
   var launcher = new SubprocessLauncher('serve-sdk-docs');
   await launcher.runStreamed(sdkBin('pub'), [
@@ -455,7 +455,7 @@ Future serveSdkDocs() async {
 }
 
 @Task('Compare warnings in Dartdoc for Flutter')
-Future compareFlutterWarnings() async {
+Future<void> compareFlutterWarnings() async {
   Directory originalDartdocFlutter =
       Directory.systemTemp.createTempSync('dartdoc-comparison-flutter');
   Future originalDartdoc = createComparisonDartdoc();
@@ -507,7 +507,7 @@ Future compareFlutterWarnings() async {
 
 @Task('Serve generated Flutter docs locally with dhttpd on port 8001')
 @Depends(buildFlutterDocs)
-Future serveFlutterDocs() async {
+Future<void> serveFlutterDocs() async {
   log('launching dhttpd on port 8001 for Flutter');
   var launcher = new SubprocessLauncher('serve-flutter-docs');
   await launcher.runStreamed(sdkBin('pub'), ['get']);
@@ -523,10 +523,10 @@ Future serveFlutterDocs() async {
 
 @Task('Validate flutter docs')
 @Depends(testDartdocFlutterPlugin, buildFlutterDocs)
-validateFlutterDocs() {}
+void validateFlutterDocs() {}
 
 @Task('Build flutter docs')
-Future buildFlutterDocs() async {
+Future<void> buildFlutterDocs() async {
   log('building flutter docs into: $flutterDir');
   Map<String, String> env = _createThrowawayPubCache();
   await _buildFlutterDocs(
@@ -661,12 +661,12 @@ Future<String> buildPubPackage() async {
 
 @Task(
     'Serve an arbitrary pub package based on PACKAGE_NAME and PACKAGE_VERSION environment variables')
-servePubPackage() async {
+Future<void> servePubPackage() async {
   _serveDocsFrom(await buildPubPackage(), 9000, 'serve-pub-package');
 }
 
 @Task('Checks that CHANGELOG mentions current version')
-checkChangelogHasVersion() async {
+Future<void> checkChangelogHasVersion() async {
   var changelog = new File('CHANGELOG.md');
   if (!changelog.existsSync()) {
     fail('ERROR: No CHANGELOG.md found in ${Directory.current}');
@@ -679,7 +679,7 @@ checkChangelogHasVersion() async {
   }
 }
 
-_getPackageVersion() {
+String _getPackageVersion() {
   var pubspec = new File('pubspec.yaml');
   var yamlDoc;
   if (pubspec.existsSync()) {
@@ -693,7 +693,7 @@ _getPackageVersion() {
 }
 
 @Task('Rebuild generated files')
-build() async {
+Future<void> build() async {
   var launcher = new SubprocessLauncher('build');
   await launcher.runStreamed(sdkBin('pub'),
       ['run', 'build_runner', 'build', '--delete-conflicting-outputs']);
@@ -706,7 +706,7 @@ final _generated_files_list = <String>[
 ].map((s) => pathLib.joinAll(pathLib.posix.split(s)));
 
 @Task('Verify generated files are up to date')
-checkBuild() async {
+Future<void> checkBuild() async {
   var originalFileContents = new Map<String, String>();
   var differentFiles = <String>[];
   var launcher = new SubprocessLauncher('check-build');
@@ -744,13 +744,13 @@ checkBuild() async {
 
 @Task('Dry run of publish to pub.dartlang')
 @Depends(checkChangelogHasVersion)
-tryPublish() async {
+Future<void> tryPublish() async {
   var launcher = new SubprocessLauncher('try-publish');
   await launcher.runStreamed(sdkBin('pub'), ['publish', '-n']);
 }
 
 @Task('Run all the tests.')
-test() async {
+Future<void> test() async {
   await testDart2();
   await testFutures.wait();
 }
@@ -767,7 +767,7 @@ List<File> get testFiles => new Directory('test')
     .cast<File>()
     .toList();
 
-testDart2() async {
+Future<void> testDart2() async {
   List<String> parameters = ['--enable-asserts'];
 
   for (File dartFile in testFiles) {
@@ -793,7 +793,7 @@ testDart2() async {
 }
 
 @Task('Generate docs for dartdoc')
-testDartdoc() async {
+Future<void> testDartdoc() async {
   var launcher = new SubprocessLauncher('test-dartdoc');
   await launcher.runStreamed(Platform.resolvedExecutable, [
     '--enable-asserts',
@@ -810,7 +810,7 @@ testDartdoc() async {
 }
 
 @Task('Generate docs for dartdoc with remote linking')
-testDartdocRemote() async {
+Future<void> testDartdocRemote() async {
   var launcher = new SubprocessLauncher('test-dartdoc-remote');
   final RegExp object = new RegExp(
       '<a href="https://api.dartlang.org/(dev|stable)/[^/]*/dart-core/Object-class.html">Object</a>',
@@ -831,7 +831,7 @@ testDartdocRemote() async {
 
 @Task('serve docs for a package that requires flutter with remote linking')
 @Depends(buildDartdocFlutterPluginDocs)
-Future serveDartdocFlutterPluginDocs() async {
+Future<void> serveDartdocFlutterPluginDocs() async {
   await _serveDocsFrom(
       pluginPackageDocsDir.path, 8005, 'serve-dartdoc-flutter-plugin-docs');
 }
@@ -858,12 +858,12 @@ Future<WarningsCollection> _buildDartdocFlutterPluginDocs() async {
 }
 
 @Task('Build docs for a package that requires flutter with remote linking')
-buildDartdocFlutterPluginDocs() async {
+Future<void> buildDartdocFlutterPluginDocs() async {
   await _buildDartdocFlutterPluginDocs();
 }
 
 @Task('Verify docs for a package that requires flutter with remote linking')
-testDartdocFlutterPlugin() async {
+Future<void> testDartdocFlutterPlugin() async {
   WarningsCollection warnings = await _buildDartdocFlutterPluginDocs();
   if (!warnings.warningKeyCounts.isEmpty) {
     fail('No warnings should exist in : ${warnings.warningKeyCounts}');
@@ -879,7 +879,7 @@ testDartdocFlutterPlugin() async {
 }
 
 @Task('update test_package_docs')
-updateTestPackageDocs() async {
+Future<void> updateTestPackageDocs() async {
   var launcher = new SubprocessLauncher('update-test-package-docs');
   var testPackageDocs = new Directory(pathLib.join(
       'testing',
@@ -913,7 +913,7 @@ updateTestPackageDocs() async {
 
 @Task('Validate the SDK doc build.')
 @Depends(buildSdkDocs)
-validateSdkDocs() {
+void validateSdkDocs() {
   const expectedLibCount = 0;
   const expectedSubLibCount = 19;
   File indexHtml = joinFile(sdkDocsDir, ['index.html']);