From e99aefb50ca63e2dbcc95841efbb53cea90151d8 Mon Sep 17 00:00:00 2001
From: Tim Baumann <tim@timbaumann.info>
Date: Sat, 23 Sep 2017 22:02:01 +0200
Subject: Add compile step that bundles and compresses JS files (#684)

* Add compile step that bundles and compresses JS files

Also, manage dependencies on third-party JS libraries using NPM.

* Compile JS from TypeScript

* Enable 'noImplicitAny' in TypeScript

* QuickJump: use JSX syntax

* Generate source maps from TypeScript for easier debugging

* TypeScript: more accurate type

* Separate quick jump css file from ocean theme
---
 html-test/ref/A.html                             | 19 ++-----------------
 html-test/ref/B.html                             | 19 ++-----------------
 html-test/ref/Bold.html                          | 19 ++-----------------
 html-test/ref/Bug1.html                          | 19 ++-----------------
 html-test/ref/Bug195.html                        | 19 ++-----------------
 html-test/ref/Bug2.html                          | 19 ++-----------------
 html-test/ref/Bug201.html                        | 19 ++-----------------
 html-test/ref/Bug253.html                        | 19 ++-----------------
 html-test/ref/Bug26.html                         | 19 ++-----------------
 html-test/ref/Bug280.html                        | 19 ++-----------------
 html-test/ref/Bug294.html                        | 19 ++-----------------
 html-test/ref/Bug298.html                        | 19 ++-----------------
 html-test/ref/Bug3.html                          | 19 ++-----------------
 html-test/ref/Bug308.html                        | 19 ++-----------------
 html-test/ref/Bug308CrossModule.html             | 19 ++-----------------
 html-test/ref/Bug310.html                        | 19 ++-----------------
 html-test/ref/Bug313.html                        | 19 ++-----------------
 html-test/ref/Bug335.html                        | 19 ++-----------------
 html-test/ref/Bug387.html                        | 19 ++-----------------
 html-test/ref/Bug4.html                          | 19 ++-----------------
 html-test/ref/Bug6.html                          | 19 ++-----------------
 html-test/ref/Bug613.html                        | 19 ++-----------------
 html-test/ref/Bug647.html                        | 19 ++-----------------
 html-test/ref/Bug7.html                          | 19 ++-----------------
 html-test/ref/Bug8.html                          | 19 ++-----------------
 html-test/ref/Bug85.html                         | 19 ++-----------------
 html-test/ref/BugDeprecated.html                 | 19 ++-----------------
 html-test/ref/BugExportHeadings.html             | 19 ++-----------------
 html-test/ref/Bugs.html                          | 19 ++-----------------
 html-test/ref/BundledPatterns.html               | 19 ++-----------------
 html-test/ref/BundledPatterns2.html              | 19 ++-----------------
 html-test/ref/ConstructorPatternExport.html      | 19 ++-----------------
 html-test/ref/DeprecatedClass.html               | 19 ++-----------------
 html-test/ref/DeprecatedData.html                | 19 ++-----------------
 html-test/ref/DeprecatedFunction.html            | 19 ++-----------------
 html-test/ref/DeprecatedFunction2.html           | 19 ++-----------------
 html-test/ref/DeprecatedFunction3.html           | 19 ++-----------------
 html-test/ref/DeprecatedModule.html              | 19 ++-----------------
 html-test/ref/DeprecatedModule2.html             | 19 ++-----------------
 html-test/ref/DeprecatedNewtype.html             | 19 ++-----------------
 html-test/ref/DeprecatedReExport.html            | 19 ++-----------------
 html-test/ref/DeprecatedRecord.html              | 19 ++-----------------
 html-test/ref/DeprecatedTypeFamily.html          | 19 ++-----------------
 html-test/ref/DeprecatedTypeSynonym.html         | 19 ++-----------------
 html-test/ref/DuplicateRecordFields.html         | 19 ++-----------------
 html-test/ref/Examples.html                      | 19 ++-----------------
 html-test/ref/Extensions.html                    | 19 ++-----------------
 html-test/ref/FunArgs.html                       | 19 ++-----------------
 html-test/ref/GADTRecords.html                   | 19 ++-----------------
 html-test/ref/Hash.html                          | 19 ++-----------------
 html-test/ref/HiddenInstances.html               | 19 ++-----------------
 html-test/ref/HiddenInstancesB.html              | 19 ++-----------------
 html-test/ref/Hyperlinks.html                    | 19 ++-----------------
 html-test/ref/IgnoreExports.html                 | 19 ++-----------------
 html-test/ref/ImplicitParams.html                | 19 ++-----------------
 html-test/ref/Instances.html                     | 19 ++-----------------
 html-test/ref/Math.html                          | 19 ++-----------------
 html-test/ref/Minimal.html                       | 19 ++-----------------
 html-test/ref/ModuleWithWarning.html             | 19 ++-----------------
 html-test/ref/NamedDoc.html                      | 19 ++-----------------
 html-test/ref/Nesting.html                       | 19 ++-----------------
 html-test/ref/NoLayout.html                      | 19 ++-----------------
 html-test/ref/NonGreedy.html                     | 19 ++-----------------
 html-test/ref/Operators.html                     | 19 ++-----------------
 html-test/ref/OrphanInstances.html               | 19 ++-----------------
 html-test/ref/OrphanInstancesClass.html          | 19 ++-----------------
 html-test/ref/OrphanInstancesType.html           | 19 ++-----------------
 html-test/ref/PR643.html                         | 19 ++-----------------
 html-test/ref/PR643_1.html                       | 19 ++-----------------
 html-test/ref/PatternSyns.html                   | 19 ++-----------------
 html-test/ref/PromotedTypes.html                 | 19 ++-----------------
 html-test/ref/Properties.html                    | 19 ++-----------------
 html-test/ref/PruneWithWarning.html              | 19 ++-----------------
 html-test/ref/QuasiExpr.html                     | 19 ++-----------------
 html-test/ref/QuasiQuote.html                    | 19 ++-----------------
 html-test/ref/SpuriousSuperclassConstraints.html | 19 ++-----------------
 html-test/ref/TH.html                            | 19 ++-----------------
 html-test/ref/TH2.html                           | 19 ++-----------------
 html-test/ref/Test.html                          | 19 ++-----------------
 html-test/ref/Threaded.html                      | 19 ++-----------------
 html-test/ref/Threaded_TH.html                   | 19 ++-----------------
 html-test/ref/Ticket112.html                     | 19 ++-----------------
 html-test/ref/Ticket61.html                      | 19 ++-----------------
 html-test/ref/Ticket75.html                      | 19 ++-----------------
 html-test/ref/TitledPicture.html                 | 19 ++-----------------
 html-test/ref/TypeFamilies.html                  | 19 ++-----------------
 html-test/ref/TypeFamilies2.html                 | 19 ++-----------------
 html-test/ref/TypeOperators.html                 | 19 ++-----------------
 html-test/ref/Unicode.html                       | 19 ++-----------------
 html-test/ref/Visible.html                       | 19 ++-----------------
 90 files changed, 180 insertions(+), 1530 deletions(-)

(limited to 'html-test')

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index daed1aaf..094455f8 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -4,15 +4,11 @@
      /><title
     >A</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -181,17 +177,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index b16babe3..577c7b48 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -4,15 +4,11 @@
      /><title
     >B</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -169,17 +165,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index ba7599f5..305682fe 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -4,15 +4,11 @@
      /><title
     >Bold</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -93,17 +89,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index d2b95503..053c0b8e 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -4,15 +4,11 @@
      /><title
     >Bug1</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -96,17 +92,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 17e2b7d6..17e2e074 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -4,15 +4,11 @@
      /><title
     >Bug195</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -179,17 +175,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 08529a6a..b10195c4 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -4,15 +4,11 @@
      /><title
     >Bug2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -59,17 +55,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 12e8f61f..6902a8b9 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -4,15 +4,11 @@
      /><title
     >Bug201</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -98,17 +94,6 @@ because there's a space before closing @
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index f217782a..a8d232d4 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -4,15 +4,11 @@
      /><title
     >Bug253</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -93,17 +89,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index d5bcf7a4..5dc4bc83 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -4,15 +4,11 @@
      /><title
     >Bug26</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -201,17 +197,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index d5ba688d..da1e6b13 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -4,15 +4,11 @@
      /><title
     >Bug280</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 95a93013..d08b69a9 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -4,15 +4,11 @@
      /><title
     >Bug294</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -227,17 +223,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 5738da0f..efee6ce3 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -4,15 +4,11 @@
      /><title
     >Bug298</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -135,17 +131,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 28d56619..7cb1f431 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -4,15 +4,11 @@
      /><title
     >Bug3</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -76,17 +72,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 816a520f..54343aa6 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -4,15 +4,11 @@
      /><title
     >Bug308</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -107,17 +103,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 3f2ffc38..9c9a2dec 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -4,15 +4,11 @@
      /><title
     >Bug308CrossModule</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -85,17 +81,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index da7990aa..93734800 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -4,15 +4,11 @@
      /><title
     >Bug310</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -95,17 +91,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index e09de048..9afe11eb 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -4,15 +4,11 @@
      /><title
     >Bug313</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -128,17 +124,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 4409919a..8aaf4349 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -4,15 +4,11 @@
      /><title
     >Bug335</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -121,17 +117,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index a46efb6f..e7ecdf62 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -4,15 +4,11 @@
      /><title
     >Bug387</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -107,17 +103,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index fdfff8f8..94d3fdb2 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -4,15 +4,11 @@
      /><title
     >Bug4</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 04eabc9a..5cad0cf1 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -4,15 +4,11 @@
      /><title
     >Bug6</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -333,17 +329,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 29924ddd..45bf7bc4 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -4,15 +4,11 @@
      /><title
     >Bug613</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -255,17 +251,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index da4ce87f..c35127f4 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -4,15 +4,11 @@
      /><title
     >Bug647</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -109,17 +105,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index f7ac658c..862002a0 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -4,15 +4,11 @@
      /><title
     >Bug7</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -188,17 +184,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 989f7648..3149d919 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -4,15 +4,11 @@
      /><title
     >Bug8</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -145,17 +141,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index 89d18f69..ee602f82 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -4,15 +4,11 @@
      /><title
     >Bug85</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -143,17 +139,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 8ea6d3c8..629224e4 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -4,15 +4,11 @@
      /><title
     >BugDeprecated</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -189,17 +185,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 49d4a723..ac121737 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -4,15 +4,11 @@
      /><title
     >BugExportHeadings</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -209,17 +205,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 6fccb350..8922fe9e 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -4,15 +4,11 @@
      /><title
     >Bugs</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index 4f6fce89..7f424a0d 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -4,15 +4,11 @@
      /><title
     >BundledPatterns</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -469,17 +465,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index ccdd2495..3c7b8c89 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -4,15 +4,11 @@
      /><title
     >BundledPatterns2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -467,17 +463,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 1f6c50dc..68e40a5a 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -4,15 +4,11 @@
      /><title
     >ConstructorPatternExport</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -119,17 +115,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index afc04efd..c7ff47dd 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedClass</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -163,17 +159,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index ba7b6659..1216c4e0 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedData</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -185,17 +181,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index efb9ab82..4235df24 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedFunction</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -103,17 +99,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index 979777a6..6e420a74 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedFunction2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -77,17 +73,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 37e14e83..4f398f1c 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedFunction3</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -77,17 +73,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 04ecfa7b..9971adb5 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedModule</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index d0db0ccb..2e390b4f 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedModule2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -69,17 +65,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 53bb911d..9ce1b7f0 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedNewtype</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -151,17 +147,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 255abcd2..38a7d9a7 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedReExport</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -118,17 +114,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index c2ffda7f..24c0542a 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedRecord</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -143,17 +139,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 928c57cc..9a879b36 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedTypeFamily</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -117,17 +113,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 3933d8bb..0bfd7e60 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -4,15 +4,11 @@
      /><title
     >DeprecatedTypeSynonym</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -109,17 +105,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 4dcee372..47b14a41 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -4,15 +4,11 @@
      /><title
     >DuplicateRecordFields</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -155,17 +151,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 94784a2b..a8eeeaf0 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -4,15 +4,11 @@
      /><title
     >Examples</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -168,17 +164,6 @@ bar
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 4ef4d5e6..361c41e6 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -4,15 +4,11 @@
      /><title
     >Extensions</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -83,17 +79,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 28ab10e8..485f7e28 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -4,15 +4,11 @@
      /><title
     >FunArgs</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -279,17 +275,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 1719faad..fffe5bd5 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -4,15 +4,11 @@
      /><title
     >GADTRecords</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -209,17 +205,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 532578b0..7cf99038 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -4,15 +4,11 @@
      /><title
     >Hash</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -406,17 +402,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 060fbe36..5a1329fc 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -4,15 +4,11 @@
      /><title
     >HiddenInstances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -287,17 +283,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 49a2efb8..11e9611f 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -4,15 +4,11 @@
      /><title
     >HiddenInstancesB</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -159,17 +155,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 3a684b6d..bc14415b 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -4,15 +4,11 @@
      /><title
     >Hyperlinks</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -81,17 +77,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index c4290be3..686fac7a 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -4,15 +4,11 @@
      /><title
     >IgnoreExports</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -95,17 +91,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 1e6c7480..30e121b0 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -4,15 +4,11 @@
      /><title
     >ImplicitParams</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -111,17 +107,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 54999636..e4a84a35 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -4,15 +4,11 @@
      /><title
     >Instances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -1983,17 +1979,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index be9e4f4b..4d7cf62e 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -4,15 +4,11 @@
      /><title
     >Math</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -95,17 +91,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index cfa00316..d7797a06 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -4,15 +4,11 @@
      /><title
     >Minimal</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -323,17 +319,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 18a72eab..12d98122 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -4,15 +4,11 @@
      /><title
     >ModuleWithWarning</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index fb2c3acd..95be55d1 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -4,15 +4,11 @@
      /><title
     >NamedDoc</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -59,17 +55,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index db3066b4..ac3e4784 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -4,15 +4,11 @@
      /><title
     >Nesting</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -353,17 +349,6 @@ with more of the indented list content.</p
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index abb3db02..0fbd9762 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -4,15 +4,11 @@
      /><title
     >NoLayout</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -79,17 +75,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 7d5d3266..2ad812ec 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -4,15 +4,11 @@
      /><title
     >NonGreedy</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index c2193b3e..0f1b9554 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -4,15 +4,11 @@
      /><title
     >Operators</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -531,17 +527,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index e6086280..96eb5b3d 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -4,15 +4,11 @@
      /><title
     >OrphanInstances</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -109,17 +105,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 0d1b292b..1fc2f112 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -4,15 +4,11 @@
      /><title
     >OrphanInstancesClass</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -81,17 +77,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 8f25f06c..d5998efe 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -4,15 +4,11 @@
      /><title
     >OrphanInstancesType</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index 9eb62bd7..d59e7f93 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -4,15 +4,11 @@
      /><title
     >PR643</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index cef7ea9c..34f3e947 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -4,15 +4,11 @@
      /><title
     >PR643_1</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 6b5b1109..4b4eea96 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -4,15 +4,11 @@
      /><title
     >PatternSyns</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -388,17 +384,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 828d5224..43736811 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -4,15 +4,11 @@
      /><title
     >PromotedTypes</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -215,17 +211,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index a34c98e6..0193b087 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -4,15 +4,11 @@
      /><title
     >Properties</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -85,17 +81,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index f657ff00..4286831c 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -4,15 +4,11 @@
      /><title
     >PruneWithWarning</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -62,17 +58,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 90ef9d72..6f8255b9 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -4,15 +4,11 @@
      /><title
     >QuasiExpr</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -319,17 +315,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 34899f45..da2ffc4e 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -4,15 +4,11 @@
      /><title
     >QuasiQuote</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -59,17 +55,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 89557969..a1157b5d 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -4,15 +4,11 @@
      /><title
     >SpuriousSuperclassConstraints</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -227,17 +223,6 @@ Fix spurious superclass constraints bug.</pre
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 6a5d867b..403abe62 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -4,15 +4,11 @@
      /><title
     >TH</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -57,17 +53,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 03f89dda..b0d5dc64 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -4,15 +4,11 @@
      /><title
     >TH2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -57,17 +53,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index ad81d14e..23ee2de6 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -4,15 +4,11 @@
      /><title
     >Test</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -2283,17 +2279,6 @@ is at the beginning of the line).</pre
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 323ace5e..0d16ba9a 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -4,15 +4,11 @@
      /><title
     >Threaded</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -88,17 +84,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 4065112e..553ea0e3 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -4,15 +4,11 @@
      /><title
     >Threaded_TH</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -85,17 +81,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 93f50272..25a4b22d 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -4,15 +4,11 @@
      /><title
     >Ticket112</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index cecb5a8a..2581584a 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -4,15 +4,11 @@
      /><title
     >Ticket61</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -83,17 +79,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index d5de827d..e4def849 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -4,15 +4,11 @@
      /><title
     >Ticket75</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -111,17 +107,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 1a0b92c0..3f3cb2e4 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -4,15 +4,11 @@
      /><title
     >TitledPicture</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -105,17 +101,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index a264d9d4..df2a57c2 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -4,15 +4,11 @@
      /><title
     >TypeFamilies</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -1823,17 +1819,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 4eec3253..c976d9b6 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -4,15 +4,11 @@
      /><title
     >TypeFamilies2</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -341,17 +337,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index c6634e8e..d389162e 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -4,15 +4,11 @@
      /><title
     >TypeOperators</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -185,17 +181,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index be55a799..fb04b942 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -4,15 +4,11 @@
      /><title
     >Unicode</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -75,17 +71,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index eb0eeb60..dad23fef 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -4,15 +4,11 @@
      /><title
     >Visible</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
-     /><script src="haddock-util.js" type="text/javascript"
+     /><link rel="stylesheet" type="text/css" href="#"
+     /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
     ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
-    ><script type="text/javascript"
-    >//
-window.onload = function () {pageLoad();};
-//
-</script
     ></head
   ><body
   ><div id="package-header"
@@ -61,17 +57,6 @@ window.onload = function () {pageLoad();};
       ></div
     ><div id="footer"
     ></div
-    ><script src="preact.js" type="text/javascript"
-    ></script
-    ><script src="fuse.js" type="text/javascript"
-    ></script
-    ><script src="index.js" type="text/javascript"
-    ></script
-    ><script type="text/javascript"
-    >//
-quickNav.init();
-//
-</script
     ></body
   ></html
 >
\ No newline at end of file
-- 
cgit v1.2.3