diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a8f7ffe..565c28c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,15 +16,15 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                dc: [dmd-latest, ldc-latest]
+                dc: [dmd-latest, ldc-latest, dmd-master]
                 arch: [x86, x86_64]
 
         runs-on: ${{ matrix.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Install D compiler
-              uses: dlang-community/setup-dlang@v1
+              uses: dlang-community/setup-dlang@v2
               with:
                   compiler: ${{ matrix.dc }}
 
@@ -37,10 +37,11 @@ jobs:
               run: DC= ./travis-ci.sh
 
             - name: Upload PhantomCSS failures
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               if: always()
               with:
                 name: phantomcss-failures
+                overwrite: true
                 path: |
                   test/screenshots/*.diff.png
                   test/screenshots/*.fail.png
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index cc4a2deb..d0ad82db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .dub
 /ddox
 /__*
+/libddox.a
+/ddox.dll
 node_modules
 ddox-test-library
 test/screenshots/*.diff.png
@@ -9,3 +11,4 @@ tests/*/test.json
 tests/*/__dummy.html
 tests/*/docs/file_hashes.json
 tests/timestamp/docs/
+__dummy_html
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index e35b2195..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: d
-d: dmd-2.085.1
-addons:
-  apt:
-    packages:
-    - libevent-dev
-    - libssl-dev
-
-script: ./travis-ci.sh
diff --git a/dub.sdl b/dub.sdl
index 8bc5f379..59cb8ecf 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -3,9 +3,9 @@ description "Powerful alternative to DMD's DDOC engine."
 authors "Sönke Ludwig"
 license "MIT"
 
-dependency "vibe-d:web" version=">=0.8.0 <0.11.0-0"
+dependency "vibe-d:web" version=">=0.9.8 <0.11.0-0"
 dependency "hyphenate" version="~>1.1.0"
-dependency "libdparse" version="~>0.15.4"
+dependency "libdparse" version="~>0.25.0"
 
 configuration "application" {
 	targetType "executable"
diff --git a/dub.selections.json b/dub.selections.json
index 109422db..63df021e 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -3,24 +3,26 @@
 	"versions": {
 		"botan": "1.12.19",
 		"botan-math": "1.0.3",
-		"diet-ng": "1.8.1",
-		"eventcore": "0.9.28",
+		"diet-ng": "1.8.4",
+		"during": "0.3.0",
+		"eventcore": "0.9.38",
 		"hyphenate": "1.1.4",
 		"libasync": "0.8.6",
-		"libdparse": "0.15.4",
+		"libdparse": "0.25.0",
 		"libevent": "2.0.2+2.0.16",
 		"memutils": "1.0.10",
-		"mir-linux-kernel": "1.0.1",
-		"openssl": "3.3.3",
-		"openssl-static": "1.0.2+3.0.8",
+		"mir-linux-kernel": "1.2.1",
+		"openssl": "3.4.0",
+		"openssl-static": "1.0.5+3.0.8",
+		"silly": "1.1.1",
 		"stdx-allocator": "2.77.5",
-		"taggedalgebraic": "0.11.22",
-		"vibe-container": "1.3.0",
-		"vibe-core": "2.8.2",
-		"vibe-d": "0.10.0",
-		"vibe-http": "1.0.0",
-		"vibe-inet": "1.0.0",
-		"vibe-serialization": "1.0.1",
-		"vibe-stream": "1.1.0"
+		"taggedalgebraic": "1.0.1",
+		"vibe-container": "1.7.0",
+		"vibe-core": "2.13.1",
+		"vibe-d": "0.10.2",
+		"vibe-http": "1.3.1",
+		"vibe-inet": "1.2.0",
+		"vibe-serialization": "1.1.3",
+		"vibe-stream": "1.3.0"
 	}
 }
diff --git a/tests/issue110_xref_to_package_d/docs/mod.html b/tests/issue110_xref_to_package_d/docs/mod.html
index ee82c62e..ece5a25d 100644
--- a/tests/issue110_xref_to_package_d/docs/mod.html
+++ b/tests/issue110_xref_to_package_d/docs/mod.html
@@ -40,8 +40,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module mod</h1><p></p>
-			<section></section>
+			<h1>Module mod</h1><p></p><section></section>
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue110_xref_to_package_d/docs/mod/foo.html b/tests/issue110_xref_to_package_d/docs/mod/foo.html
index fe61d7ef..2f877d85 100644
--- a/tests/issue110_xref_to_package_d/docs/mod/foo.html
+++ b/tests/issue110_xref_to_package_d/docs/mod/foo.html
@@ -40,8 +40,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module mod.foo</h1><p></p>
-			<section></section>
+			<h1>Module mod.foo</h1><p></p><section></section>
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue110_xref_to_package_d/docs/test.html b/tests/issue110_xref_to_package_d/docs/test.html
index ce392fdf..fe14aa1a 100644
--- a/tests/issue110_xref_to_package_d/docs/test.html
+++ b/tests/issue110_xref_to_package_d/docs/test.html
@@ -40,8 +40,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue110_xref_to_package_d/docs/test/foo.html b/tests/issue110_xref_to_package_d/docs/test/foo.html
index 8ab38a06..ec9cd293 100644
--- a/tests/issue110_xref_to_package_d/docs/test/foo.html
+++ b/tests/issue110_xref_to_package_d/docs/test/foo.html
@@ -44,13 +44,11 @@ <h1>Function foo</h1><p>Link to <code class="lang-d"><a href="../mod.html"><span
 </p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue116_inherit_macros/docs/test.html b/tests/issue116_inherit_macros/docs/test.html
index f8560ac3..62e9b170 100644
--- a/tests/issue116_inherit_macros/docs/test.html
+++ b/tests/issue116_inherit_macros/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue116_inherit_macros/docs/test/S.g.html b/tests/issue116_inherit_macros/docs/test/S.g.html
index 9198715b..b0b221e6 100644
--- a/tests/issue116_inherit_macros/docs/test/S.g.html
+++ b/tests/issue116_inherit_macros/docs/test/S.g.html
@@ -32,13 +32,11 @@ <h1>Function S.g</h1><p>module macro struct macro
 </p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">g</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">g</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue116_inherit_macros/docs/test/S.html b/tests/issue116_inherit_macros/docs/test/S.html
index 4f41049c..08290a2e 100644
--- a/tests/issue116_inherit_macros/docs/test/S.html
+++ b/tests/issue116_inherit_macros/docs/test/S.html
@@ -32,8 +32,7 @@ <h1>Struct S</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">struct</span> <span class="typ">S</span>
-			<span class="pun">;</span>
+			<span class="kwd">struct</span> <span class="typ">S</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -56,7 +55,6 @@ <h1>Struct S</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue116_inherit_macros/docs/test/f.html b/tests/issue116_inherit_macros/docs/test/f.html
index 909dc6d4..aae45ae9 100644
--- a/tests/issue116_inherit_macros/docs/test/f.html
+++ b/tests/issue116_inherit_macros/docs/test/f.html
@@ -32,13 +32,11 @@ <h1>Function f</h1><p>module macro
 </p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">f</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">f</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test.html b/tests/issue151_derived/docs/test.html
index 2a3f63d8..a26d511c 100644
--- a/tests/issue151_derived/docs/test.html
+++ b/tests/issue151_derived/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Interfaces</h2>
 				<table>
diff --git a/tests/issue151_derived/docs/test/CBase.func.html b/tests/issue151_derived/docs/test/CBase.func.html
index 0bf53c0d..9da33275 100644
--- a/tests/issue151_derived/docs/test/CBase.func.html
+++ b/tests/issue151_derived/docs/test/CBase.func.html
@@ -31,13 +31,11 @@
 			<h1>Function CBase.func</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/CBase.html b/tests/issue151_derived/docs/test/CBase.html
index ec05232d..b4d7c444 100644
--- a/tests/issue151_derived/docs/test/CBase.html
+++ b/tests/issue151_derived/docs/test/CBase.html
@@ -33,8 +33,7 @@ <h1>Class CBase</h1><p>CBase
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">class</span> <span class="typ">CBase</span>(T)
-			<span class="pun">;</span>
+			<span class="kwd">class</span> <span class="typ">CBase</span>(T)<span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -56,7 +55,6 @@ <h1>Class CBase</h1><p>CBase
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/CDerived.func2.html b/tests/issue151_derived/docs/test/CDerived.func2.html
index dcad8d97..bb02ca66 100644
--- a/tests/issue151_derived/docs/test/CDerived.func2.html
+++ b/tests/issue151_derived/docs/test/CDerived.func2.html
@@ -31,13 +31,11 @@
 			<h1>Function CDerived.func2</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/CDerived.html b/tests/issue151_derived/docs/test/CDerived.html
index 875cb86c..a0259d7a 100644
--- a/tests/issue151_derived/docs/test/CDerived.html
+++ b/tests/issue151_derived/docs/test/CDerived.html
@@ -33,9 +33,7 @@ <h1>Class CDerived</h1><p>CDerived
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">class</span> <span class="typ">CDerived</span>
-			<br>&nbsp;&nbsp;: <a href="../test/CBase.html"><span class="typ">CBase</span></a>!int
-			<span class="pun">;</span>
+			<span class="kwd">class</span> <span class="typ">CDerived</span><br>&nbsp;&nbsp;: <a href="../test/CBase.html"><span class="typ">CBase</span></a>!int<span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -66,7 +64,6 @@ <h1>Class CDerived</h1><p>CDerived
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/IBase.func.html b/tests/issue151_derived/docs/test/IBase.func.html
index b0e5fe1a..63a4d5c0 100644
--- a/tests/issue151_derived/docs/test/IBase.func.html
+++ b/tests/issue151_derived/docs/test/IBase.func.html
@@ -31,13 +31,11 @@
 			<h1>Function IBase.func</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">func</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/IBase.html b/tests/issue151_derived/docs/test/IBase.html
index dfee7715..212b40b5 100644
--- a/tests/issue151_derived/docs/test/IBase.html
+++ b/tests/issue151_derived/docs/test/IBase.html
@@ -33,8 +33,7 @@ <h1>Interface IBase</h1><p>IBase
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">interface</span> <span class="typ">IBase</span>(T)
-			<span class="pun">;</span>
+			<span class="kwd">interface</span> <span class="typ">IBase</span>(T)<span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -56,7 +55,6 @@ <h1>Interface IBase</h1><p>IBase
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/IDerived.func2.html b/tests/issue151_derived/docs/test/IDerived.func2.html
index 34043fec..fdde6c03 100644
--- a/tests/issue151_derived/docs/test/IDerived.func2.html
+++ b/tests/issue151_derived/docs/test/IDerived.func2.html
@@ -31,13 +31,11 @@
 			<h1>Function IDerived.func2</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="kwd">abstract </span><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="kwd">abstract </span><span class="typ">void</span> <span class="pln">func2</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue151_derived/docs/test/IDerived.html b/tests/issue151_derived/docs/test/IDerived.html
index 307e71d8..09c8d873 100644
--- a/tests/issue151_derived/docs/test/IDerived.html
+++ b/tests/issue151_derived/docs/test/IDerived.html
@@ -33,9 +33,7 @@ <h1>Interface IDerived</h1><p>IDerived
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">interface</span> <span class="typ">IDerived</span>
-			<br>&nbsp;&nbsp;: <a href="../test/IBase.html"><span class="typ">IBase</span></a>!int
-			<span class="pun">;</span>
+			<span class="kwd">interface</span> <span class="typ">IDerived</span><br>&nbsp;&nbsp;: <a href="../test/IBase.html"><span class="typ">IBase</span></a>!int<span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -66,7 +64,6 @@ <h1>Interface IDerived</h1><p>IDerived
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue15_templates/docs/test.html b/tests/issue15_templates/docs/test.html
index 8b6e541b..36a43d00 100644
--- a/tests/issue15_templates/docs/test.html
+++ b/tests/issue15_templates/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Manifest constants</h2>
 				<table>
diff --git a/tests/issue15_templates/docs/test/isEqual.html b/tests/issue15_templates/docs/test/isEqual.html
index a2c3880b..95f93f1e 100644
--- a/tests/issue15_templates/docs/test/isEqual.html
+++ b/tests/issue15_templates/docs/test/isEqual.html
@@ -33,25 +33,20 @@ <h1>Enum member isEqual</h1><p>doc 3
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, alias B)
-			 <span class="pun">=</span> <span class="pln">A </span><span class="pun">== </span><span class="pln">B</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, alias B) <span class="pun">=</span> <span class="pln">A </span><span class="pun">== </span><span class="pln">B</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, B)
-			 <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isEqual</span>(alias A, B) <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, alias B)
-			 <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, alias B) <span class="pun">=</span> <span class="kwd">false</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, B)
-			 <span class="pun">=</span> <span class="pln">isSameType</span><span class="pun">!(</span><span class="pln">A</span><span class="pun">, </span><span class="pln">B</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isEqual</span>(A, B) <span class="pun">=</span> <span class="pln">isSameType</span><span class="pun">!(</span><span class="pln">A</span><span class="pun">, </span><span class="pln">B</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue15_templates/docs/test/isValue.html b/tests/issue15_templates/docs/test/isValue.html
index 8b5ebcc4..64c97a7f 100644
--- a/tests/issue15_templates/docs/test/isValue.html
+++ b/tests/issue15_templates/docs/test/isValue.html
@@ -47,24 +47,20 @@ <h1>isValue - multiple declarations</h1>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isValue</span>(T)
-			 <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isValue</span>(T) <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
-			
 			<h2 id="1">Enum member isValue</h2><p>doc 2
 </p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isValue</span>(alias T)
-			 <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isValue</span>(alias T) <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue174_enum_members/docs/test.html b/tests/issue174_enum_members/docs/test.html
index 9e09a7cf..27b15d07 100644
--- a/tests/issue174_enum_members/docs/test.html
+++ b/tests/issue174_enum_members/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Enums</h2>
 				<table>
diff --git a/tests/issue174_enum_members/docs/test/Enum.html b/tests/issue174_enum_members/docs/test/Enum.html
index 9ac0108a..c7830afb 100644
--- a/tests/issue174_enum_members/docs/test/Enum.html
+++ b/tests/issue174_enum_members/docs/test/Enum.html
@@ -32,8 +32,7 @@ <h1>Enum Enum</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="typ">Enum</span>
-			 <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
+			<span class="kwd">enum</span> <span class="typ">Enum</span> <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
 					</div>
 				</code>
 			</div>
@@ -51,8 +50,7 @@ <h1>Enum Enum</h1><p></p>
 						<td></td>
 					</tr>
 				</table>
-			</section>
-			<section><h2>Example</h2>
+			</section><section><h2>Example</h2>
 
 <pre class="code"><code class="lang-d"><span class="kwd">auto </span><span class="pln">val </span><span class="pun">= <a href="../test/Enum.html#member"></span><span class="typ">Enum<wbr/></span><span class="pun">.</span><span class="pln">member</span></a><span class="pun">;
 </span></code></pre>
diff --git a/tests/issue174_enum_members_2/docs/test.html b/tests/issue174_enum_members_2/docs/test.html
index 9e09a7cf..27b15d07 100644
--- a/tests/issue174_enum_members_2/docs/test.html
+++ b/tests/issue174_enum_members_2/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Enums</h2>
 				<table>
diff --git a/tests/issue174_enum_members_2/docs/test/Enum.html b/tests/issue174_enum_members_2/docs/test/Enum.html
index af95bd5b..2be10591 100644
--- a/tests/issue174_enum_members_2/docs/test/Enum.html
+++ b/tests/issue174_enum_members_2/docs/test/Enum.html
@@ -32,8 +32,7 @@ <h1>Enum Enum</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="typ">Enum</span>
-			 <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
+			<span class="kwd">enum</span> <span class="typ">Enum</span> <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
 					</div>
 				</code>
 			</div>
@@ -53,8 +52,7 @@ <h1>Enum Enum</h1><p></p>
 						<td></td>
 					</tr>
 				</table>
-			</section>
-			<section><h2>Example</h2>
+			</section><section><h2>Example</h2>
 
 <pre class="code"><code class="lang-d"><span class="kwd">auto </span><span class="pln">val </span><span class="pun">= <a href="../test/Enum.member.html"></span><span class="typ">Enum<wbr/></span><span class="pun">.</span><span class="pln">member</span></a><span class="pun">;
 </span></code></pre>
diff --git a/tests/issue174_enum_members_2/docs/test/Enum.member.html b/tests/issue174_enum_members_2/docs/test/Enum.member.html
index 0af0eb15..3a713a6b 100644
--- a/tests/issue174_enum_members_2/docs/test/Enum.member.html
+++ b/tests/issue174_enum_members_2/docs/test/Enum.member.html
@@ -40,8 +40,7 @@ <h1>Enum member Enum.member</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="pln">member</span>
-			 <span class="pun">=</span> <span class="lit">0</span><span class="pun">,</span>
+			&nbsp;&nbsp;<span class="pln">member</span> <span class="pun">=</span> <span class="lit">0</span><span class="pun">,</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Enum member Enum.member</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test.html b/tests/issue177_variadic/docs/test.html
index 0d658ac5..a54af412 100644
--- a/tests/issue177_variadic/docs/test.html
+++ b/tests/issue177_variadic/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue177_variadic/docs/test/C.html b/tests/issue177_variadic/docs/test/C.html
index f9a7e003..7dbe1e2c 100644
--- a/tests/issue177_variadic/docs/test/C.html
+++ b/tests/issue177_variadic/docs/test/C.html
@@ -32,13 +32,11 @@ <h1>Class C</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">class</span> <span class="typ">C</span>
-			<span class="pun">;</span>
+			<span class="kwd">class</span> <span class="typ">C</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/FT1.html b/tests/issue177_variadic/docs/test/FT1.html
index 6c15d662..d174ce91 100644
--- a/tests/issue177_variadic/docs/test/FT1.html
+++ b/tests/issue177_variadic/docs/test/FT1.html
@@ -32,13 +32,11 @@ <h1>Alias FT1</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">FT1</span>
-			 <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">FT1</span> <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/FT2.html b/tests/issue177_variadic/docs/test/FT2.html
index b2615a72..50cb8092 100644
--- a/tests/issue177_variadic/docs/test/FT2.html
+++ b/tests/issue177_variadic/docs/test/FT2.html
@@ -32,13 +32,11 @@ <h1>Alias FT2</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">FT2</span>
-			 <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[]</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">FT2</span> <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[]</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/FT3.html b/tests/issue177_variadic/docs/test/FT3.html
index 54592bd7..8ac65bed 100644
--- a/tests/issue177_variadic/docs/test/FT3.html
+++ b/tests/issue177_variadic/docs/test/FT3.html
@@ -32,13 +32,11 @@ <h1>Alias FT3</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">FT3</span>
-			 <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><a href="../test/C.html"><span class="pln">C</span></a><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">FT3</span> <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><a href="../test/C.html"><span class="pln">C</span></a><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/FT4.html b/tests/issue177_variadic/docs/test/FT4.html
index 643b4aa6..a4183d16 100644
--- a/tests/issue177_variadic/docs/test/FT4.html
+++ b/tests/issue177_variadic/docs/test/FT4.html
@@ -32,13 +32,11 @@ <h1>Alias FT4</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">FT4</span>
-			 <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">FT4</span> <span class="pun">=</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/FT5.html b/tests/issue177_variadic/docs/test/FT5.html
index f557ce9b..8361827c 100644
--- a/tests/issue177_variadic/docs/test/FT5.html
+++ b/tests/issue177_variadic/docs/test/FT5.html
@@ -32,13 +32,11 @@ <h1>Alias FT5</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">FT5</span>
-			 <span class="pun">=</span> <span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">)</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">, ...</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">FT5</span> <span class="pun">=</span> <span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">)</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">, ...</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/bug.html b/tests/issue177_variadic/docs/test/bug.html
index 76931f20..97e0e9ea 100644
--- a/tests/issue177_variadic/docs/test/bug.html
+++ b/tests/issue177_variadic/docs/test/bug.html
@@ -32,44 +32,34 @@ <h1>Function bug</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">bug</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span> <span class="pln">args</span><span class="pun">...</span>
+			<span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span> <span class="pln">args</span><span class="pun">...</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 			<br/>
 			<br/>
-			<span class="typ">void</span> <span class="pln">bug</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">scope </span><span class="typ">int</span><span class="pun">[]</span> <span class="pln">args</span><span class="pun">...</span>
+			<span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">scope </span><span class="typ">int</span><span class="pun">[]</span> <span class="pln">args</span><span class="pun">...</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 			<br/>
 			<br/>
-			<span class="typ">void</span> <span class="pln">bug</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">scope </span><a href="../test/C.html"><span class="pln">C</span></a> <span class="pln">c</span><span class="pun">...</span>
+			<span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">scope </span><a href="../test/C.html"><span class="pln">C</span></a> <span class="pln">c</span><span class="pun">...</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 			<br/>
+			<br/><span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 			<br/>
-			<span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span><span class="pun">;</span>
 			<br/>
-			<br/>
-			<span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">) </span><span class="typ">void</span> <span class="pln">bug</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">cnt</span><span class="pun">, ...</span>
+			<span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">) </span><span class="typ">void</span> <span class="pln">bug</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">cnt</span><span class="pun">, ...</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/var1.html b/tests/issue177_variadic/docs/test/var1.html
index 92da9128..262951fe 100644
--- a/tests/issue177_variadic/docs/test/var1.html
+++ b/tests/issue177_variadic/docs/test/var1.html
@@ -32,13 +32,11 @@ <h1>Variable var1</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var1</span>
-			<span class="pun">;</span>
+			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[</span><span class="lit">4</span><span class="pun">]</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var1</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/var2.html b/tests/issue177_variadic/docs/test/var2.html
index 5ff347ed..b1ed8559 100644
--- a/tests/issue177_variadic/docs/test/var2.html
+++ b/tests/issue177_variadic/docs/test/var2.html
@@ -32,13 +32,11 @@ <h1>Variable var2</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[]</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var2</span>
-			<span class="pun">;</span>
+			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">[]</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var2</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/var3.html b/tests/issue177_variadic/docs/test/var3.html
index ed532598..5afbd36d 100644
--- a/tests/issue177_variadic/docs/test/var3.html
+++ b/tests/issue177_variadic/docs/test/var3.html
@@ -32,13 +32,11 @@ <h1>Variable var3</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><a href="../test/C.html"><span class="pln">C</span></a><span class="pun">...</span><span class="pun">)</span> <span class="pln">var3</span>
-			<span class="pun">;</span>
+			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><a href="../test/C.html"><span class="pln">C</span></a><span class="pun">...</span><span class="pun">)</span> <span class="pln">var3</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/var4.html b/tests/issue177_variadic/docs/test/var4.html
index 9be019b7..d894553b 100644
--- a/tests/issue177_variadic/docs/test/var4.html
+++ b/tests/issue177_variadic/docs/test/var4.html
@@ -32,13 +32,11 @@ <h1>Variable var4</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var4</span>
-			<span class="pun">;</span>
+			<span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="pun">...</span><span class="pun">)</span> <span class="pln">var4</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue177_variadic/docs/test/var5.html b/tests/issue177_variadic/docs/test/var5.html
index 0865b64b..8be5c8d0 100644
--- a/tests/issue177_variadic/docs/test/var5.html
+++ b/tests/issue177_variadic/docs/test/var5.html
@@ -32,13 +32,11 @@ <h1>Variable var5</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">)</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">, ...</span><span class="pun">)</span> <span class="pln">var5</span>
-			<span class="pun">;</span>
+			<span class="kwd">extern</span><span class="pun">(</span><span class="pln">C</span><span class="pun">)</span> <span class="typ">void</span> <span class="kwd">function</span><span class="pun">(</span><span class="typ">int</span><span class="pun">, ...</span><span class="pun">)</span> <span class="pln">var5</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue180_return/docs/test.html b/tests/issue180_return/docs/test.html
index 49d248ad..672488d8 100644
--- a/tests/issue180_return/docs/test.html
+++ b/tests/issue180_return/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue180_return/docs/test/S.bar.html b/tests/issue180_return/docs/test/S.bar.html
new file mode 100644
index 00000000..5ff55528
--- /dev/null
+++ b/tests/issue180_return/docs/test/S.bar.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8"/>
+		<title>Function S.bar</title>
+		<link rel="stylesheet" type="text/css" href="../styles/ddox.css"/>
+		<link rel="stylesheet" href="../prettify/prettify.css" type="text/css"/>
+		<script type="text/javascript" src="../scripts/jquery.js">/**/</script><script type="text/javascript" src="../scripts/ddox.js">/**/</script>
+	</head>
+	<body onload="setupDdox();">
+		<nav id="main-nav">
+			<noscript>
+				<p style="color: red">The search functionality needs JavaScript enabled</p>
+			</noscript>
+			<div id="symbolSearchPane" style="display: none">
+				<form action="#" method="GET">
+					<input id="symbolSearch" type="text" name="q" placeholder="Search for symbols" autocomplete="off" onchange="performSymbolSearch(40);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
+				</form>
+				<ul id="symbolSearchResults" class="symbolList" style="display: none"></ul><script type="application/javascript" src="../symbols.js"></script><script type="application/javascript">var symbolSearchRootDir = "../";
+$('#symbolSearchPane').show();</script>
+			</div>
+			<ul class="tree-view">
+				<li>
+					<div class="module selected">
+						<a href="../test.html">test</a>
+					</div>
+				</li>
+			</ul>
+		</nav>
+		<div id="main-contents">
+			<h1>Function S.bar</h1><p></p>
+			<div class="prototype">
+				<code class="lang-d">
+					<div class="single-prototype"><span class="kwd">ref </span><a href="../test/S.html"><span class="pln">S</span></a> <span class="pln">bar</span><span class="pun">(</span><span class="pun">)</span><span class="pln"> </span><span class="kwd">scope return @safe</span><span class="pun">;</span>
+					</div>
+				</code>
+			</div>
+			
+			<footer>
+				<table class="license-info">
+					<tr>
+						<th>Authors</th>
+						<td>
+							
+						</td>
+					</tr>
+					<tr>
+						<th>Copyright</th>
+						<td>
+							
+						</td>
+					</tr>
+					<tr>
+						<th>License</th>
+						<td>
+							
+						</td>
+					</tr>
+				</table>
+				<p class="faint">Generated using the DDOX documentation generator</p>
+			</footer>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/tests/issue180_return/docs/test/S.baz.html b/tests/issue180_return/docs/test/S.baz.html
new file mode 100644
index 00000000..2229b78e
--- /dev/null
+++ b/tests/issue180_return/docs/test/S.baz.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8"/>
+		<title>Function S.baz</title>
+		<link rel="stylesheet" type="text/css" href="../styles/ddox.css"/>
+		<link rel="stylesheet" href="../prettify/prettify.css" type="text/css"/>
+		<script type="text/javascript" src="../scripts/jquery.js">/**/</script><script type="text/javascript" src="../scripts/ddox.js">/**/</script>
+	</head>
+	<body onload="setupDdox();">
+		<nav id="main-nav">
+			<noscript>
+				<p style="color: red">The search functionality needs JavaScript enabled</p>
+			</noscript>
+			<div id="symbolSearchPane" style="display: none">
+				<form action="#" method="GET">
+					<input id="symbolSearch" type="text" name="q" placeholder="Search for symbols" autocomplete="off" onchange="performSymbolSearch(40);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
+				</form>
+				<ul id="symbolSearchResults" class="symbolList" style="display: none"></ul><script type="application/javascript" src="../symbols.js"></script><script type="application/javascript">var symbolSearchRootDir = "../";
+$('#symbolSearchPane').show();</script>
+			</div>
+			<ul class="tree-view">
+				<li>
+					<div class="module selected">
+						<a href="../test.html">test</a>
+					</div>
+				</li>
+			</ul>
+		</nav>
+		<div id="main-contents">
+			<h1>Function S.baz</h1><p></p>
+			<div class="prototype">
+				<code class="lang-d">
+					<div class="single-prototype"><a href="../test/S.html"><span class="pln">S</span></a> <span class="pln">baz</span><span class="pun">(</span><span class="pun">)</span><span class="pln"> </span><span class="kwd">return scope @safe</span><span class="pun">;</span>
+					</div>
+				</code>
+			</div>
+			
+			<footer>
+				<table class="license-info">
+					<tr>
+						<th>Authors</th>
+						<td>
+							
+						</td>
+					</tr>
+					<tr>
+						<th>Copyright</th>
+						<td>
+							
+						</td>
+					</tr>
+					<tr>
+						<th>License</th>
+						<td>
+							
+						</td>
+					</tr>
+				</table>
+				<p class="faint">Generated using the DDOX documentation generator</p>
+			</footer>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/tests/issue180_return/docs/test/S.foo.html b/tests/issue180_return/docs/test/S.foo.html
index ac8fef09..e2cf78ca 100644
--- a/tests/issue180_return/docs/test/S.foo.html
+++ b/tests/issue180_return/docs/test/S.foo.html
@@ -31,13 +31,11 @@
 			<h1>Function S.foo</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="kwd">ref </span><a href="../test/S.html"><span class="pln">S</span></a> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pln"> </span><span class="kwd">return @safe</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="kwd">ref </span><a href="../test/S.html"><span class="pln">S</span></a> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pln"> </span><span class="kwd">return @safe</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue180_return/docs/test/S.html b/tests/issue180_return/docs/test/S.html
index 5c8adc54..ea2ef2d0 100644
--- a/tests/issue180_return/docs/test/S.html
+++ b/tests/issue180_return/docs/test/S.html
@@ -32,8 +32,7 @@ <h1>Struct S</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">struct</span> <span class="typ">S</span>
-			<span class="pun">;</span>
+			<span class="kwd">struct</span> <span class="typ">S</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -87,7 +86,6 @@ <h1>Struct S</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue180_return/docs/test/S.p.html b/tests/issue180_return/docs/test/S.p.html
index ec068a84..cdcfba1d 100644
--- a/tests/issue180_return/docs/test/S.p.html
+++ b/tests/issue180_return/docs/test/S.p.html
@@ -40,8 +40,7 @@ <h1>Variable S.p</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span><span class="pun">*</span> <span class="pln">p</span>
-			<span class="pun">;</span>
+			&nbsp;&nbsp;<span class="typ">int</span><span class="pun">*</span> <span class="pln">p</span><span class="pun">;</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Variable S.p</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue180_return/docs/test/foo.html b/tests/issue180_return/docs/test/foo.html
index 220b750a..688f92de 100644
--- a/tests/issue180_return/docs/test/foo.html
+++ b/tests/issue180_return/docs/test/foo.html
@@ -32,33 +32,26 @@ <h1>Function foo</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">ref </span><span class="typ">int</span> <span class="pln">foo</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">ref return </span><span class="typ">int</span> <span class="pln">a</span>
+			<span class="kwd">ref </span><span class="typ">int</span> <span class="pln">foo</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">ref return </span><span class="typ">int</span> <span class="pln">a</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
 			<br/>
 			<br/>
-			<span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">scope return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
+			<span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">scope return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
 			<br/>
 			<br/>
-			<span class="kwd">ref </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">scope ref return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
+			<span class="kwd">ref </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">foo</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">scope ref return </span><span class="typ">int</span><span class="pun">*</span> <span class="pln">a</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">@safe</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue184_tmplt_spec_val/docs/test.html b/tests/issue184_tmplt_spec_val/docs/test.html
index 7d3a1146..a5844ca0 100644
--- a/tests/issue184_tmplt_spec_val/docs/test.html
+++ b/tests/issue184_tmplt_spec_val/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Aliases</h2>
 				<table>
diff --git a/tests/issue184_tmplt_spec_val/docs/test/Type.html b/tests/issue184_tmplt_spec_val/docs/test/Type.html
index 0536abd3..3cf54a0b 100644
--- a/tests/issue184_tmplt_spec_val/docs/test/Type.html
+++ b/tests/issue184_tmplt_spec_val/docs/test/Type.html
@@ -33,25 +33,20 @@ <h1>Alias Type</h1><p>templates with specialization and default values
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val)
-			 <span class="pun">=</span> <span class="typ">int</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val) <span class="pun">=</span> <span class="typ">int</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">1</span>)
-			 <span class="pun">=</span> <span class="typ">float</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">1</span>) <span class="pun">=</span> <span class="typ">float</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">2</span><span class="pln"> </span><span class="pun">= </span><span class="lit">2</span>)
-			 <span class="pun">=</span> <span class="typ">double</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">2</span><span class="pln"> </span><span class="pun">= </span><span class="lit">2</span>) <span class="pun">=</span> <span class="typ">double</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">3</span>)
-			 <span class="pun">=</span> <span class="typ">byte</span><span class="pun">;</span>
+			<span class="kwd">alias</span> <span class="pln">Type</span>(<span class="typ">int</span> val<span class="pln"> </span><span class="pun">: </span><span class="lit">3</span>) <span class="pun">=</span> <span class="typ">byte</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue196_double_auto/docs/test.html b/tests/issue196_double_auto/docs/test.html
index d9163a44..635f0599 100644
--- a/tests/issue196_double_auto/docs/test.html
+++ b/tests/issue196_double_auto/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue196_double_auto/docs/test/bar.html b/tests/issue196_double_auto/docs/test/bar.html
index 87fa7052..50f00606 100644
--- a/tests/issue196_double_auto/docs/test/bar.html
+++ b/tests/issue196_double_auto/docs/test/bar.html
@@ -32,19 +32,15 @@ <h1>Function bar</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">auto</span> <span class="pln">bar</span>(T1, T2)
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="pln">T1</span> <span class="pln">a</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="pln">T2</span> <span class="pln">b</span>
+			<span class="kwd">auto</span> <span class="pln">bar</span>(T1, T2)<span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="pln">T1</span> <span class="pln">a</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="pln">T2</span> <span class="pln">b</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue196_double_auto/docs/test/baz.html b/tests/issue196_double_auto/docs/test/baz.html
index 3dbc6760..e5c4c152 100644
--- a/tests/issue196_double_auto/docs/test/baz.html
+++ b/tests/issue196_double_auto/docs/test/baz.html
@@ -32,21 +32,16 @@ <h1>Function baz</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">ref </span><span class="kwd">auto</span> <span class="pln">baz</span>(T)
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">ref </span><span class="pln">T</span> <span class="pln">a</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">ref </span><span class="pln">T</span> <span class="pln">b</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">bool</span> <span class="pln">what</span>
+			<span class="kwd">ref </span><span class="kwd">auto</span> <span class="pln">baz</span>(T)<span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">ref </span><span class="pln">T</span> <span class="pln">a</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">ref </span><span class="pln">T</span> <span class="pln">b</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="typ">bool</span> <span class="pln">what</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue196_double_auto/docs/test/foo.html b/tests/issue196_double_auto/docs/test/foo.html
index 52238dff..923b1643 100644
--- a/tests/issue196_double_auto/docs/test/foo.html
+++ b/tests/issue196_double_auto/docs/test/foo.html
@@ -32,19 +32,15 @@ <h1>Function foo</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">int</span> <span class="pln">foo</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">a</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">b</span>
+			<span class="typ">int</span> <span class="pln">foo</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">a</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">b</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">pure nothrow @property @nogc @safe</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue24_parens/docs/test.html b/tests/issue24_parens/docs/test.html
index 7ba24b39..fae817c7 100644
--- a/tests/issue24_parens/docs/test.html
+++ b/tests/issue24_parens/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Global variables</h2>
 				<table>
diff --git a/tests/issue24_parens/docs/test/a.html b/tests/issue24_parens/docs/test/a.html
index 01b53c9b..b9581f2e 100644
--- a/tests/issue24_parens/docs/test/a.html
+++ b/tests/issue24_parens/docs/test/a.html
@@ -32,12 +32,10 @@ <h1>Variable a</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">int</span> <span class="pln">a</span>
-			<span class="pun">;</span>
+			<span class="typ">int</span> <span class="pln">a</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
-			
 			<section><h2>Example</h2>
 <pre class="code"><code class="lang-d"><span class="com">// Find an ')' in a buffer of 1024 bytes using an additional sentinel.
 </span><span class="pln">size_t length </span><span class="pun">= </span><span class="lit">1024</span><span class="pun">;
diff --git a/tests/issue31_template_spec/docs/test.html b/tests/issue31_template_spec/docs/test.html
index 5e869ff3..70dff984 100644
--- a/tests/issue31_template_spec/docs/test.html
+++ b/tests/issue31_template_spec/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue31_template_spec/docs/test/consume.html b/tests/issue31_template_spec/docs/test/consume.html
index be4b8f47..7d660d7e 100644
--- a/tests/issue31_template_spec/docs/test/consume.html
+++ b/tests/issue31_template_spec/docs/test/consume.html
@@ -45,22 +45,18 @@ <h1>consume - multiple declarations</h1>
 			</nav><h2 id="0">Function consume</h2><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="pln">T</span> <span class="pln">consume</span>(T, <span class="typ">ubyte</span> N)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="pln">T</span> <span class="pln">consume</span>(T, <span class="typ">ubyte</span> N)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
-			
 			<h2 id="1">Function consume</h2><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="pln">T</span> <span class="pln">consume</span>(T, <span class="typ">ubyte</span> N)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="pln">T</span> <span class="pln">consume</span>(T, <span class="typ">ubyte</span> N)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue33_global_ref/docs/test.html b/tests/issue33_global_ref/docs/test.html
index 986f6191..5fc1bb31 100644
--- a/tests/issue33_global_ref/docs/test.html
+++ b/tests/issue33_global_ref/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Classes</h2>
 				<table>
diff --git a/tests/issue33_global_ref/docs/test/Test.f.html b/tests/issue33_global_ref/docs/test/Test.f.html
index 691e815c..2cd01332 100644
--- a/tests/issue33_global_ref/docs/test/Test.f.html
+++ b/tests/issue33_global_ref/docs/test/Test.f.html
@@ -40,8 +40,7 @@ <h1>Variable Test.f</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="typ">float</span> <span class="pln">f</span>
-			<span class="pun">;</span>
+			&nbsp;&nbsp;<span class="typ">float</span> <span class="pln">f</span><span class="pun">;</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Variable Test.f</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue33_global_ref/docs/test/Test.html b/tests/issue33_global_ref/docs/test/Test.html
index 00086fc9..e6caefbd 100644
--- a/tests/issue33_global_ref/docs/test/Test.html
+++ b/tests/issue33_global_ref/docs/test/Test.html
@@ -32,8 +32,7 @@ <h1>Class Test</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">class</span> <span class="typ">Test</span>
-			<span class="pun">;</span>
+			<span class="kwd">class</span> <span class="typ">Test</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -70,7 +69,6 @@ <h1>Class Test</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue33_global_ref/docs/test/Test.test.html b/tests/issue33_global_ref/docs/test/Test.test.html
index 48f70eb1..53fe7fd6 100644
--- a/tests/issue33_global_ref/docs/test/Test.test.html
+++ b/tests/issue33_global_ref/docs/test/Test.test.html
@@ -32,13 +32,11 @@ <h1>Function Test.test</h1><p>Test function referencing global integer <code cla
 </p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">test</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">test</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue33_global_ref/docs/test/f.html b/tests/issue33_global_ref/docs/test/f.html
index bc96f7a8..e6ec9cb7 100644
--- a/tests/issue33_global_ref/docs/test/f.html
+++ b/tests/issue33_global_ref/docs/test/f.html
@@ -32,13 +32,11 @@ <h1>Variable f</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">int</span> <span class="pln">f</span>
-			<span class="pun">;</span>
+			<span class="typ">int</span> <span class="pln">f</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue3_template_overloads/docs/test.html b/tests/issue3_template_overloads/docs/test.html
index d3cd5c7b..567c2832 100644
--- a/tests/issue3_template_overloads/docs/test.html
+++ b/tests/issue3_template_overloads/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Manifest constants</h2>
 				<table>
diff --git a/tests/issue3_template_overloads/docs/test/isSymbol.html b/tests/issue3_template_overloads/docs/test/isSymbol.html
index 60f6565d..153c5a8e 100644
--- a/tests/issue3_template_overloads/docs/test/isSymbol.html
+++ b/tests/issue3_template_overloads/docs/test/isSymbol.html
@@ -32,16 +32,13 @@ <h1>Enum member isSymbol</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isSymbol</span>(T)
-			 <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isSymbol</span>(T) <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="pln">isSymbol</span>(alias T)
-			 <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
+			<span class="kwd">enum</span> <span class="pln">isSymbol</span>(alias T) <span class="pun">=</span> <span class="pun">!</span><span class="kwd">is</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
-			
 			<section><h2>Returns</h2>
 <p>true if T is a symbol or literal
 </p>
diff --git a/tests/issue42_size_t/docs/test.html b/tests/issue42_size_t/docs/test.html
index 3cf84180..b4e07373 100644
--- a/tests/issue42_size_t/docs/test.html
+++ b/tests/issue42_size_t/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue42_size_t/docs/test/test.html b/tests/issue42_size_t/docs/test/test.html
index 5de50468..66b39677 100644
--- a/tests/issue42_size_t/docs/test/test.html
+++ b/tests/issue42_size_t/docs/test/test.html
@@ -32,19 +32,15 @@ <h1>Function test</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">test</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">ulong</span> <span class="pln">a</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">uint</span> <span class="pln">b</span>
+			<span class="typ">void</span> <span class="pln">test</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="typ">ulong</span> <span class="pln">a</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="typ">uint</span> <span class="pln">b</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue47_escape_filename/docs/test.html b/tests/issue47_escape_filename/docs/test.html
index 5781de3b..198e6417 100644
--- a/tests/issue47_escape_filename/docs/test.html
+++ b/tests/issue47_escape_filename/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue47_escape_filename/docs/test/test.html b/tests/issue47_escape_filename/docs/test/test.html
index a9163243..38b41f16 100644
--- a/tests/issue47_escape_filename/docs/test/test.html
+++ b/tests/issue47_escape_filename/docs/test/test.html
@@ -31,13 +31,11 @@
 			<h1>Function test</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">test</span>(<span class="typ">string</span> ARG<span class="pln"> </span><span class="pun">= </span><span class="str">"test"</span>)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">test</span>(<span class="typ">string</span> ARG<span class="pln"> </span><span class="pun">= </span><span class="str">"test"</span>)<span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue52_typeof_null/docs/test.html b/tests/issue52_typeof_null/docs/test.html
index 205e966b..bcbba1d9 100644
--- a/tests/issue52_typeof_null/docs/test.html
+++ b/tests/issue52_typeof_null/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue52_typeof_null/docs/test/foo.html b/tests/issue52_typeof_null/docs/test/foo.html
index 0700e05e..83300e0a 100644
--- a/tests/issue52_typeof_null/docs/test/foo.html
+++ b/tests/issue52_typeof_null/docs/test/foo.html
@@ -32,21 +32,16 @@ <h1>Function foo</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">foo</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">typeof</span><span class="pun">(</span><span class="kwd">null</span><span class="pun">)</span> <span class="pln">a</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">b</span><span class="pun">,</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">typeof</span><span class="pun">(</span><span class="kwd">null</span><span class="pun">)</span> <span class="pln">c</span>
+			<span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">typeof</span><span class="pun">(</span><span class="kwd">null</span><span class="pun">)</span> <span class="pln">a</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="typ">int</span> <span class="pln">b</span><span class="pun">,</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">typeof</span><span class="pun">(</span><span class="kwd">null</span><span class="pun">)</span> <span class="pln">c</span>
 			<br/>
 			<span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue58_linedoc/docs/test.html b/tests/issue58_linedoc/docs/test.html
index a8307ca1..ad3f4eb1 100644
--- a/tests/issue58_linedoc/docs/test.html
+++ b/tests/issue58_linedoc/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Functions</h2>
 				<table>
diff --git a/tests/issue58_linedoc/docs/test/foo.html b/tests/issue58_linedoc/docs/test/foo.html
index c8bd91f4..91c01f29 100644
--- a/tests/issue58_linedoc/docs/test/foo.html
+++ b/tests/issue58_linedoc/docs/test/foo.html
@@ -33,13 +33,11 @@ <h1>Function foo</h1><p>This function is here to aid in making your
 </p>
 			<div class="prototype">
 				<code class="lang-d">
-					<div class="single-prototype">
-			<span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
+					<div class="single-prototype"><span class="typ">void</span> <span class="pln">foo</span><span class="pun">(</span><span class="pun">)</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue6_uda/docs/test.html b/tests/issue6_uda/docs/test.html
index baef83b0..d4e4cb22 100644
--- a/tests/issue6_uda/docs/test.html
+++ b/tests/issue6_uda/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Structs</h2>
 				<table>
diff --git a/tests/issue6_uda/docs/test/E.a.html b/tests/issue6_uda/docs/test/E.a.html
index 3d1a0255..bfbe5009 100644
--- a/tests/issue6_uda/docs/test/E.a.html
+++ b/tests/issue6_uda/docs/test/E.a.html
@@ -40,8 +40,7 @@ <h1>Enum member E.a</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="pln">a</span>
-			 <span class="pun">=</span> <span class="lit">0</span><span class="pun">,</span>
+			&nbsp;&nbsp;<span class="pln">a</span> <span class="pun">=</span> <span class="lit">0</span><span class="pun">,</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Enum member E.a</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue6_uda/docs/test/E.html b/tests/issue6_uda/docs/test/E.html
index c9ff378b..ece84c16 100644
--- a/tests/issue6_uda/docs/test/E.html
+++ b/tests/issue6_uda/docs/test/E.html
@@ -32,8 +32,7 @@ <h1>Enum E</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="typ">E</span>
-			 <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
+			<span class="kwd">enum</span> <span class="typ">E</span> <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
 					</div>
 				</code>
 			</div>
@@ -54,7 +53,6 @@ <h1>Enum E</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue6_uda/docs/test/UDA.html b/tests/issue6_uda/docs/test/UDA.html
index 7b31f0cc..541c40a0 100644
--- a/tests/issue6_uda/docs/test/UDA.html
+++ b/tests/issue6_uda/docs/test/UDA.html
@@ -32,13 +32,11 @@ <h1>Struct UDA</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">struct</span> <span class="typ">UDA</span>
-			<span class="pun">;</span>
+			<span class="kwd">struct</span> <span class="typ">UDA</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue71_type_parse/docs/test.html b/tests/issue71_type_parse/docs/test.html
index 2b1d5fc6..d2b23e5d 100644
--- a/tests/issue71_type_parse/docs/test.html
+++ b/tests/issue71_type_parse/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Structs</h2>
 				<table>
diff --git a/tests/issue71_type_parse/docs/test/Test.arr.dimensions.html b/tests/issue71_type_parse/docs/test/Test.arr.dimensions.html
index 2a927bad..09e5e257 100644
--- a/tests/issue71_type_parse/docs/test/Test.arr.dimensions.html
+++ b/tests/issue71_type_parse/docs/test/Test.arr.dimensions.html
@@ -40,8 +40,7 @@ <h1>Enum member Test.arr.dimensions</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="kwd">enum</span> <span class="pln">dimensions</span>
-			 <span class="pun">=</span> <span class="lit">2</span><span class="pun">;</span>
+			&nbsp;&nbsp;<span class="kwd">enum</span> <span class="pln">dimensions</span> <span class="pun">=</span> <span class="lit">2</span><span class="pun">;</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Enum member Test.arr.dimensions</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue71_type_parse/docs/test/Test.arr.html b/tests/issue71_type_parse/docs/test/Test.arr.html
index 9ef44ae9..39d75cea 100644
--- a/tests/issue71_type_parse/docs/test/Test.arr.html
+++ b/tests/issue71_type_parse/docs/test/Test.arr.html
@@ -32,13 +32,11 @@ <h1>Struct Test.arr</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">struct</span> <span class="typ">arr</span>
-			<span class="pun">;</span>
+			<span class="kwd">struct</span> <span class="typ">arr</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue71_type_parse/docs/test/Test.html b/tests/issue71_type_parse/docs/test/Test.html
index 0195a9cc..e992305a 100644
--- a/tests/issue71_type_parse/docs/test/Test.html
+++ b/tests/issue71_type_parse/docs/test/Test.html
@@ -32,8 +32,7 @@ <h1>Struct Test</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">struct</span> <span class="typ">Test</span>(T)
-			<span class="pun">;</span>
+			<span class="kwd">struct</span> <span class="typ">Test</span>(T)<span class="pun">;</span>
 					</div>
 				</code>
 			</div>
@@ -80,7 +79,6 @@ <h1>Struct Test</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue71_type_parse/docs/test/Test.opApply.html b/tests/issue71_type_parse/docs/test/Test.opApply.html
index dceac159..be20fcc3 100644
--- a/tests/issue71_type_parse/docs/test/Test.opApply.html
+++ b/tests/issue71_type_parse/docs/test/Test.opApply.html
@@ -46,31 +46,25 @@ <h1>Test.opApply - multiple declarations</h1>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">int</span> <span class="pln">opApply</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">nothrow</span> <span class="kwd">@nogc</span> <span class="kwd">@safe</span> <span class="typ">int</span> <span class="kwd">delegate</span><span class="pun">(</span><span class="kwd">immutable</span> <span class="pln">ptrdiff_t</span><span class="pun">[</span><span class="pln">arr<wbr/></span><span class="pun">.</span><span class="pln">dimensions</span><span class="pun">]</span><span class="pun">, </span><span class="kwd">ref</span> <span class="pln">T</span><span class="pun">)</span> <span class="pln">dg</span>
+			<span class="typ">int</span> <span class="pln">opApply</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">nothrow</span> <span class="kwd">@nogc</span> <span class="kwd">@safe</span> <span class="typ">int</span> <span class="kwd">delegate</span><span class="pun">(</span><span class="kwd">immutable</span> <span class="pln">ptrdiff_t</span><span class="pun">[</span><span class="pln">arr<wbr/></span><span class="pun">.</span><span class="pln">dimensions</span><span class="pun">]</span><span class="pun">, </span><span class="kwd">ref</span> <span class="pln">T</span><span class="pun">)</span> <span class="pln">dg</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">nothrow @nogc @safe</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
-			
 			<h2 id="1">Function Test.opApply</h2><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="typ">int</span> <span class="pln">opApply</span>
-			<span class="pun">(</span>
-			<br/>
-			&nbsp;&nbsp;<span class="kwd">nothrow</span> <span class="kwd">@nogc</span> <span class="kwd">@safe</span> <span class="typ">int</span> <span class="kwd">delegate</span><span class="pun">(</span><span class="kwd">immutable</span> <span class="pln">ptrdiff_t</span><span class="pun">[</span><span class="pln">arr<wbr/></span><span class="pun">.</span><span class="pln">dimensions</span><span class="pun">]</span><span class="pun">, </span><span class="kwd">ref</span> <span class="kwd">const</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">)</span> <span class="pln">dg</span>
+			<span class="typ">int</span> <span class="pln">opApply</span><span class="pun">(</span>
+			<br/>&nbsp;&nbsp;<span class="kwd">nothrow</span> <span class="kwd">@nogc</span> <span class="kwd">@safe</span> <span class="typ">int</span> <span class="kwd">delegate</span><span class="pun">(</span><span class="kwd">immutable</span> <span class="pln">ptrdiff_t</span><span class="pun">[</span><span class="pln">arr<wbr/></span><span class="pun">.</span><span class="pln">dimensions</span><span class="pun">]</span><span class="pun">, </span><span class="kwd">ref</span> <span class="kwd">const</span><span class="pun">(</span><span class="pln">T</span><span class="pun">)</span><span class="pun">)</span> <span class="pln">dg</span>
 			<br/>
 			<span class="pun">)</span><span class="pln"> </span><span class="kwd">const nothrow @nogc @safe</span><span class="pun">;</span>
 					</div>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue7_enum_value/docs/test.html b/tests/issue7_enum_value/docs/test.html
index 0eab23eb..a6ecdff1 100644
--- a/tests/issue7_enum_value/docs/test.html
+++ b/tests/issue7_enum_value/docs/test.html
@@ -28,8 +28,7 @@
 			</ul>
 		</nav>
 		<div id="main-contents">
-			<h1>Module test</h1><p></p>
-			<section></section>
+			<h1>Module test</h1><p></p><section></section>
 			<section>
 				<h2>Enums</h2>
 				<table>
diff --git a/tests/issue7_enum_value/docs/test/E.html b/tests/issue7_enum_value/docs/test/E.html
index eafa1679..3b193124 100644
--- a/tests/issue7_enum_value/docs/test/E.html
+++ b/tests/issue7_enum_value/docs/test/E.html
@@ -32,8 +32,7 @@ <h1>Enum E</h1><p></p>
 			<div class="prototype">
 				<code class="lang-d">
 					<div class="single-prototype">
-			<span class="kwd">enum</span> <span class="typ">E</span>
-			 <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
+			<span class="kwd">enum</span> <span class="typ">E</span> <span class="pun">:</span> <span class="typ">int</span> <span class="pun">{ ... }</span>
 					</div>
 				</code>
 			</div>
@@ -54,7 +53,6 @@ <h1>Enum E</h1><p></p>
 					</tr>
 				</table>
 			</section>
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/tests/issue7_enum_value/docs/test/E.v1.html b/tests/issue7_enum_value/docs/test/E.v1.html
index 587deddb..4ef7cc3c 100644
--- a/tests/issue7_enum_value/docs/test/E.v1.html
+++ b/tests/issue7_enum_value/docs/test/E.v1.html
@@ -40,8 +40,7 @@ <h1>Enum member E.v1</h1><p></p>
 			</span>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
-			&nbsp;&nbsp;<span class="pln">v1</span>
-			 <span class="pun">=</span> <span class="lit">1</span><span class="pun">,</span>
+			&nbsp;&nbsp;<span class="pln">v1</span> <span class="pun">=</span> <span class="lit">1</span><span class="pun">,</span>
 			<br/>
 			&nbsp;&nbsp;<span class="com">// ...</span>
 			<br/>
@@ -50,7 +49,6 @@ <h1>Enum member E.v1</h1><p></p>
 				</code>
 			</div>
 			
-			
 			<footer>
 				<table class="license-info">
 					<tr>
diff --git a/travis-ci.sh b/travis-ci.sh
index bc350202..13c539ad 100755
--- a/travis-ci.sh
+++ b/travis-ci.sh
@@ -36,6 +36,8 @@ shopt -u globstar
 # test for changes breaking the vibed.org build
 rm -rf vibed.org
 git clone https://github.com/vibe-d/vibed.org.git
+dparsever=`sed ':a;N;$!ba; s/.*\"libdparse\":\ \"\([^\"]*\)\",.*/\1/' dub.selections.json`
+sed -i 's/\"libdparse\":\ \".*",/\"libdparse\":\ \"$(dparsever)\",/' vibed.org/dub.selections.json
 sed -i 's/\"ddox\":\ \".*",/\"ddox\":\ {\"path\":\"..\"},/' vibed.org/dub.selections.json
 if ! dub build --root vibed.org; then
     echo "FAILED: vibed.org produced build errors"