diff --git a/docs/_includes/default.html b/docs/_includes/default.html
index 0a2a60b11e..baf940c829 100644
--- a/docs/_includes/default.html
+++ b/docs/_includes/default.html
@@ -22,27 +22,36 @@
     <header id="_header">
       <h1>
         <a href="/">
-          <img
-            id="mocha-logo"
-            src="/images/mocha-logo.svg"
-            alt="Mocha logo"
-          />
+          <img id="mocha-logo" src="/images/mocha-logo.svg" alt="Mocha logo" />
         </a>
       </h1>
       <p id="tag"><em>simple</em>, <em>flexible</em>, <em>fun</em></p>
     </header>
 
     <main id="content">{{ content }}</main>
-	
-	<aside class="sponsorship">
-		<a href="https://matomo.org/" rel="external noopener" target="_blank">
-			<img 
-				id="matomoLogo"
-				src="images/matomo-logo.png?trim"
-				alt="Matomo logo"
-			/>
-		</a>
-	</aside>
+
+    <aside class="sponsorship">
+      <a href="https://matomo.org/" rel="external noopener" target="_blank">
+        <img
+          id="matomoLogo"
+          src="images/matomo-logo.png?trim"
+          alt="Matomo logo"
+        />
+      </a>
+      <a
+        title="Mocha is an OpenJS Foundation Project"
+        href="https://openjsf.org"
+        rel="external noopener"
+        target="_blank"
+      >
+        <img
+          src="/images/openjsf-logo.svg"
+          width="300"
+          height="94"
+          alt="OpenJS Foundation Logo"
+        />
+      </a>
+    </aside>
 
     <footer>
       <div>
@@ -50,7 +59,8 @@ <h1>
         is licensed under a
         <a
           rel="license external noopener"
-          href="https://creativecommons.org/licenses/by/4.0/">
+          href="https://creativecommons.org/licenses/by/4.0/"
+        >
           Creative Commons Attribution 4.0 International License</a
         >.
         <dl class="dl-inline last-modified">
@@ -58,7 +68,8 @@ <h1>
           <dd>
             <time
               itemprop="lastModified"
-              datetime="{{ 'now' | date: '%Y-%m-%dT%H:%M:%SZ' }}">
+              datetime="{{ 'now' | date: '%Y-%m-%dT%H:%M:%SZ' }}"
+            >
               {{ 'now' | date: '%a %b %d %H:%M:%S %Y' }}
             </time>
           </dd>
diff --git a/docs/css/style.css b/docs/css/style.css
index a7e6933f0f..d59160b852 100644
--- a/docs/css/style.css
+++ b/docs/css/style.css
@@ -174,10 +174,10 @@ code {
   line-height: 1.8;
 }
 
-:not(pre)>code {
+:not(pre) > code {
   background-color: #f5f2f0;
   border-radius: 3px;
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 
 pre {
@@ -200,14 +200,19 @@ img.screenshot {
 }
 
 #matomoLogo {
-    display: block; 
-    height: 176px;
+  display: block;
+  height: 176px;
 }
 
 .sponsorship {
-    display: flex; 
-    justify-content: center;
-	margin-bottom: 60px;
+  display: flex;
+  justify-content: center;
+  margin-bottom: 60px;
+  align-items: center;
+}
+
+.sponsorship a {
+  padding: 0 40px;
 }
 
 footer {
diff --git a/docs/images/openjsf-logo.svg b/docs/images/openjsf-logo.svg
new file mode 100644
index 0000000000..df9ab1f3b8
--- /dev/null
+++ b/docs/images/openjsf-logo.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ARTWORK"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 314.4" style="enable-background:new 0 0 1000 314.4;" xml:space="preserve">
+  <style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#54565A;}
+  </style>
+  <g>
+    <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="28.7654" y1="49.8307" x2="243.506" y2="264.5713">
+      <stop offset="0.2145" style="stop-color:#0075C9"/>
+      <stop offset="0.7067" style="stop-color:#80BC00"/>
+      <stop offset="1" style="stop-color:#FDE021"/>
+    </linearGradient>
+    <path class="st0" d="M271.4,78.1L137,0.5L136.1,0l-0.9,0.5L1.6,77.7l-0.7,0.4L0,78.6v157.2l0.9,0.5l134.4,77.6l0.9,0.5l0.9-0.5
+		l132.6-76.5l1.8-1l0.9-0.5V78.6L271.4,78.1z M122.7,20.1L89.8,77H24.1L122.7,20.1z M84.4,86.4L69,113.1L22.8,86.4H84.4z
+		 M72.4,125.8l54.3,31.4l-54.3,31.4l-18.1-31.4L72.4,125.8z M64.4,121.2l-15.4,26.7L18.1,94.5L64.4,121.2z M10.7,100.3l32.9,56.9
+		l-32.9,56.9V100.3z M48.9,166.6l15.4,26.7l-46.2,26.7L48.9,166.6z M69,201.3L84.4,228H22.8L69,201.3z M24.1,237.4h65.7l32.9,56.9
+		L24.1,237.4z M131.5,290.8l-30.8-53.4h30.8V290.8z M131.5,228H95.2l-18.1-31.4l54.3-31.4V228z M131.5,149.1l-54.3-31.4l18.1-31.4
+		h36.2V149.1z M131.5,77h-30.8l30.8-53.4V77z M207.9,121.2l46.2-26.7l-30.8,53.4L207.9,121.2z M217.9,157.2l-18.1,31.4l-54.3-31.4
+		l54.3-31.4L217.9,157.2z M203.2,113.1l-15.4-26.7h61.6L203.2,113.1z M248.1,77h-65.7l-32.8-56.9L248.1,77z M140.8,23.6L171.6,77
+		h-30.8V23.6z M140.8,86.4H177l18.1,31.4l-54.3,31.4V86.4z M140.8,165.3l54.3,31.4L177,228h-36.2V165.3z M140.8,237.4h30.8
+		l-30.8,53.4V237.4z M149.6,294.3l32.8-56.9h65.7L149.6,294.3z M187.8,228l15.4-26.7l46.2,26.7H187.8z M207.9,193.2l15.4-26.7
+		l30.8,53.4L207.9,193.2z M261.6,214.1l-32.9-56.9l32.9-56.9V214.1z"/>
+    <polygon class="st1" points="308.4,202.7 372.6,202.7 372.6,208.5 315,208.5 315,257 367.2,257 367.2,263 315,263 315,312.9
+		308.4,312.9 	"/>
+    <path class="st1" d="M383.8,279.7c0-19,15.2-34.4,34.5-34.4c19.3,0,34.2,15.4,34.2,34.4c0,19-14.9,34.5-34.2,34.5
+		C399,314.2,383.8,298.7,383.8,279.7 M446,279.7c0-16.4-11.2-28.7-27.7-28.7c-16.5,0-28,12.3-28,28.7c0,16.4,11.5,28.9,28,28.9
+		C434.8,308.6,446,296.1,446,279.7"/>
+    <path class="st1" d="M469.9,288.5v-41.7h6.3v40.7c0,13.5,6.3,21.1,19,21.1c14.3,0,24.3-9.6,24.3-24.8v-37h6.3v66.2h-6.3l0.2-14.6
+		c-4.4,9.9-13.5,16-25.1,16C479.8,314.4,469.9,304.7,469.9,288.5"/>
+    <path class="st1" d="M543,246.8h6.3l-0.2,14.8c4.4-10,13.6-16.2,25.3-16.2c14.8,0,24.6,9.9,24.6,26.3v41.3h-6.3v-40.2
+		c0-13.6-6.3-21.6-19.1-21.6c-14.3,0-24.3,9.4-24.3,24.8v37H543V246.8z"/>
+    <path class="st1" d="M616.3,279.7c0-19.5,13.8-34.4,32.8-34.4c13.5,0,23.2,7.3,28,17.2v-66.6h6.3v117.1h-6.3l0.3-16.5
+		c-4.7,10.2-15.6,17.8-28.4,17.8C630.1,314.2,616.3,299.2,616.3,279.7 M677.6,279.7c0-16.4-11-28.7-27.7-28.7
+		c-16.4,0-26.9,12.3-26.9,28.7c0,16.4,10.5,28.9,26.9,28.9C666.6,308.6,677.6,296.1,677.6,279.7"/>
+    <path class="st1" d="M748,271.4c0-14.9-6.8-20.6-17.7-20.6c-10.1,0-16.9,4.2-21.6,11.4l-4.5-3.2c5.5-8.6,14.9-13.6,26.3-13.6
+		c13.6,0,23.8,8.3,23.8,25.5v42.2H748l0.3-10.2c-4.2,6.3-11.5,11.5-22.9,11.5c-15.1,0-25-7-25-20.3c0-13.1,11.5-19.3,24.2-19.3H748
+		V271.4z M725.4,279.9c-10.1,0-18.6,3.9-18.6,13.9c0,10.1,6.6,14.8,19.3,14.8c11,0,21.9-6.5,21.9-16.7v-12H725.4z"/>
+    <path class="st1" d="M782.5,295.4v-43.3h-10.4v-5.4h10.4v-23.2h6.3v23.2h19.1v5.4h-19.1v43.1c0,9.7,3.4,13.3,8.9,13.3
+		c5.8,0,8.1-2.3,10.5-4.9l4.1,3.9c-3.2,3.7-7.1,6.6-14.6,6.6C789.3,314.2,782.5,308.9,782.5,295.4"/>
+    <path class="st1" d="M829.5,218.2c0-3.1,2.6-5.4,5.4-5.4c2.8,0,5.4,2.3,5.4,5.4c0,3.2-2.6,5.3-5.4,5.3
+		C832.1,223.6,829.5,221.5,829.5,218.2 M831.8,246.8h6.3v66.2h-6.3V246.8z"/>
+    <path class="st1" d="M857.1,279.7c0-19,15.2-34.4,34.5-34.4c19.3,0,34.2,15.4,34.2,34.4c0,19-14.9,34.5-34.2,34.5
+		C872.4,314.2,857.1,298.7,857.1,279.7 M919.4,279.7c0-16.4-11.2-28.7-27.7-28.7c-16.5,0-28,12.3-28,28.7c0,16.4,11.5,28.9,28,28.9
+		C908.2,308.6,919.4,296.1,919.4,279.7"/>
+    <path class="st1" d="M943.9,246.8h6.3l-0.2,14.8c4.4-10,13.6-16.2,25.3-16.2c14.8,0,24.6,9.9,24.6,26.3v41.3h-6.3v-40.2
+		c0-13.6-6.3-21.6-19.1-21.6c-14.3,0-24.3,9.4-24.3,24.8v37h-6.3V246.8z"/>
+    <path class="st1" d="M308.4,73.1c0-41.4,31.8-71.3,71.7-71.3c39.6,0,71.5,29.8,71.5,71.3c0,41.4-31.9,71.3-71.5,71.3
+		C340.2,144.3,308.4,114.5,308.4,73.1 M429.4,73.1c0-29.6-20.4-51.9-49.4-51.9c-29,0-49.6,22.3-49.6,51.9
+		c0,29.6,20.6,51.9,49.6,51.9C409,124.9,429.4,102.7,429.4,73.1"/>
+    <path class="st1" d="M473.9,56.8h20.8l-0.6,15.9c5.5-10.6,15.7-17.8,30.4-17.8c22,0,39.8,18.6,39.8,44.5c0,25.9-18,44.9-40.2,44.9
+		c-14.3,0-24.5-6.9-29.4-16.5v58h-20.8V56.8z M543.1,99.4c0-15.5-9.4-26.1-24.3-26.1c-15.1,0-24.9,10.6-24.9,26.1
+		c0,16.1,9.8,26.7,24.9,26.7C533.8,126.2,543.1,115.6,543.1,99.4"/>
+    <path class="st1" d="M635,127c11.2,0,19.4-4.5,24.3-9.2l12,12.7c-8,8-19,13.9-36.1,13.9c-29.4,0-48.4-19-48.4-44.7
+		c0-25.5,20-44.7,45.7-44.7c29.2,0,45.7,21.6,44.3,51.7h-69C610.3,119,619.3,127,635,127 M656.1,92.3c-1.8-11.6-9-20.2-23.3-20.2
+		c-13.3,0-22.5,7.3-24.9,20.2H656.1z"/>
+    <path class="st1" d="M699.7,56.8h20.6l-0.4,15.9c5.3-11.2,16.1-17.8,29-17.8c19,0,32.1,13.5,32.1,36.7v50.8h-20.6V93.3
+		c0-12.3-5.7-19.4-17.8-19.4c-13.5,0-22.3,8.2-22.3,22v46.5h-20.6V56.8z"/>
+    <path class="st1" d="M803.5,120.9l17.6-10.8c4.9,8.8,10.6,14.9,20.8,14.9c11.6,0,19.2-5.5,19.2-21.6V3.7h21.6v100
+		c0,27.6-16.5,40.6-39.8,40.6C822.3,144.3,810.1,133.7,803.5,120.9"/>
+    <path class="st1" d="M904.9,115.6l17.8-9.8c6.5,10.8,14.9,19.4,31.8,19.4c14.1,0,24.1-7.6,24.1-19c0-12-8.2-17.4-23.3-24.1
+		l-9.2-4.1c-20.2-9-32.5-19.2-32.5-40.6c0-20.6,15.9-35.3,39-35.3C971,2,983.5,9,991.8,23.9l-16.9,10.4
+		c-5.3-9.2-11.4-13.5-22.3-13.5c-11,0-18,6.7-18,16.1c0,10.4,5.9,15.1,20,21.2l9,4.1c23.7,10.4,36.3,21.4,36.3,43.7
+		c0,24.3-19,38.4-45.1,38.4C928.5,144.3,912.6,131.3,904.9,115.6"/>
+  </g>
+</svg>
diff --git a/docs/index.md b/docs/index.md
index 30613b87bf..c7be25d934 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1911,7 +1911,7 @@ or the [source](https://github.com/mochajs/mocha/blob/master/lib/mocha.js).
 [yargs-configobject-extends]: http://yargs.js.org/docs/#api-configobject-extends-keyword
 [zsh-globbing]: http://zsh.sourceforge.net/Doc/Release/Expansion.html#Recursive-Globbing
 
-<!-- AUTO-GENERATED-CONTENT:START (manifest:template=[Gitter]: ${gitter}) -->
+<!-- AUTO-GENERATED-CONTENT:START (manifest:template=[gitter]: ${gitter}) -->
 
 [gitter]: https://gitter.im/mochajs/mocha