diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 99427f5c50..36baf2816f 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -1,4 +1,11 @@
 <header id="_header">
-  <h1><a href="/"><img onload="window.document.getElementById('_header').classList.add('onload');" src="//cldup.com/xFVFxOioAU.svg"></a></h1>
-  <p id="tag"><em>simple</em>, <em>flexible</em>, <em>fun</em></p>
+  <h1>
+    <a href="/">
+      <img src="/images/mocha-logo.svg" alt="Mocha" width="192" height="192">
+    </a>
+  </h1>
+
+  <p id="tag">
+    <em>simple</em>, <em>flexible</em>, <em>fun</em>
+  </p>
 </header>
diff --git a/docs/css/style.css b/docs/css/style.css
index 4df465e56a..dfc018ba63 100644
--- a/docs/css/style.css
+++ b/docs/css/style.css
@@ -7,21 +7,54 @@ body {
   border-top: 2px solid #ddd;
 }
 
-#content {
-  padding: 0 110px 60px 110px;
+@keyframes fadein {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes slideright {
+  from {
+    transform: translateX(-45px);
+  }
+
+  to {
+    transform: translateX(0);
+  }
 }
 
 header {
   padding: 140px 110px 0 110px;
 }
 
-h1 {
+#_header h1 {
   margin-left: -19px;
   opacity: 0;
-  -webkit-transition: opacity 1s;
-  -moz-transition: opacity 1s;
-  -o-transition: opacity 1s;
-  transition: opacity 1s;
+  animation: fadein 1s forwards;
+}
+
+#tag {
+  color: #c29d7f;
+  font-weight: 100;
+  font-size: 30px;
+  margin-top: -158px;
+  margin-left: 185px;
+  margin-bottom: 125px;
+  letter-spacing: 2px;
+
+  animation: fadein 1s forwards, slideright 1s forwards;
+}
+
+#content {
+  padding: 0 110px 60px 110px;
+}
+
+#tag em {
+  font-style: normal
 }
 
 #_backers a, #_sponsors a {
@@ -61,30 +94,6 @@ h3 > code {
   font-size: 14px;
 }
 
-#tag {
-  opacity: 0;
-  color: #c29d7f;
-  font-weight: 100;
-  font-size: 30px;
-  margin-top: -155px;
-  margin-left: 140px;
-  margin-bottom: 125px;
-  letter-spacing: 2px;
-  -webkit-transition: opacity 1s, margin-top 200ms, margin-bottom 200ms, margin-left 1s;
-  -moz-transition: opacity 1s, margin-top 200ms, margin-bottom 200ms, margin-left 1s;
-  -o-transition: opacity 1s, margin-top 200ms, margin-bottom 200ms, margin-left 1s;
-  transition: opacity 1s, margin-top 200ms, margin-bottom 200ms, margin-left 1s;
-}
-
-#tag em {
-  font-style: normal
-}
-
-.onload #tag {
-  opacity: 1;
-  margin-left: 185px;
-}
-
 #content > p:first-child {
   font-size: 20px;
   font-weight: 200;
diff --git a/docs/images/mocha-logo.svg b/docs/images/mocha-logo.svg
new file mode 100644
index 0000000000..115b9bd6c2
--- /dev/null
+++ b/docs/images/mocha-logo.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 192 191.99999"
+   enable-background="new 0 0 193 208"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mocha-logo.svg"
+   width="192"
+   height="192"
+   inkscape:export-filename="/Users/boneskull/Downloads/mocha-logo-192.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><title
+     id="title4160">Mocha Logo</title><metadata
+     id="metadata32"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Mocha Logo</dc:title><dc:date>08-21-2015</dc:date><dc:creator><cc:Agent><dc:title>Dick DeLeon &lt;ddeleon@decipherinc.com&gt;</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>CC BY-SA 4.0</dc:title></cc:Agent></dc:rights><dc:subject><rdf:Bag><rdf:li>mocha</rdf:li><rdf:li>mochajs</rdf:li></rdf:Bag></dc:subject><dc:contributor><cc:Agent><dc:title>Christopher Hiller &lt;boneskull@boneskull.com&gt;</dc:title></cc:Agent></dc:contributor><cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+     id="defs30" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     id="namedview28"
+     showgrid="false"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5"
+     inkscape:zoom="1"
+     inkscape:cx="96"
+     inkscape:cy="98.137283"
+     inkscape:window-x="1360"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     id="XMLID_229_"
+     d="m 169.47386,143.90113 -68.70282,39.69498 c -2.958045,1.71756 -6.584028,1.71756 -9.542066,0 L 22.52614,143.90113 c -2.958038,-1.71757 -4.77103,-4.86645 -4.77103,-8.20617 l 0,-79.389939 c 0,-3.435142 1.812992,-6.488601 4.77103,-8.206172 L 91.228974,8.403878 c 2.958038,-1.717571 6.584021,-1.717571 9.542056,0 l 68.70282,39.694971 c 2.95804,1.717571 4.77104,4.866451 4.77104,8.206172 l 0,79.389939 c -0.0954,3.33972 -1.90842,6.4886 -4.77104,8.20617 z"
+     inkscape:connector-curvature="0"
+     style="clip-rule:evenodd;fill:#8d6748;fill-rule:evenodd" /><path
+     id="XMLID_262_"
+     d="m 95.904583,22.049024 0,0 c 0.954207,0 1.812992,0.286262 2.671781,0.763365 l 59.351606,34.255996 c 1.62216,0.954206 2.67177,2.767198 2.67177,4.67561 l 0,68.511985 c 0,1.90842 -1.04962,3.72141 -2.67177,4.67562 l -59.351606,34.25599 c -0.858789,0.47711 -1.717574,0.76336 -2.671781,0.76336 -0.954206,0 -1.908412,-0.28625 -2.671777,-0.76336 L 33.881192,134.9316 c -1.62215,-0.95421 -2.671778,-2.7672 -2.671778,-4.67562 l 0,-68.511985 c 0,-1.908412 1.049628,-3.721404 2.671778,-4.67561 L 93.232806,22.812389 c 0.858785,-0.477103 1.812992,-0.763365 2.671777,-0.763365 m 0,-2.862618 c -1.431309,0 -2.862618,0.381683 -4.103085,1.145048 L 32.449883,54.58745 c -2.576357,1.431309 -4.103086,4.198506 -4.103086,7.061124 l 0,68.511996 c 0,2.95803 1.526729,5.62981 4.103086,7.06112 l 59.351615,34.25599 c 1.240467,0.76337 2.671776,1.14506 4.103085,1.14506 1.431309,0 2.862617,-0.38169 4.103097,-1.14506 l 59.35159,-34.25599 c 2.57636,-1.43131 4.10309,-4.1985 4.10309,-7.06112 l 0,-68.511996 c 0,-2.958038 -1.52673,-5.629815 -4.10309,-7.061124 L 100.00768,20.331454 C 98.7672,19.568089 97.335892,19.186406 95.904583,19.186406 l 0,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><g
+     id="XMLID_228_"
+     transform="matrix(0.95420602,0,0,0.95420602,5.4935566,-4.7641653)"><g
+       id="XMLID_223_"><g
+         id="XMLID_295_"><path
+           d="m 103.6,69.6 c 0,-0.5 -0.4,-1 -1,-1 l -9.4,0 -9.4,0 c -0.5,0 -1,0.4 -1,1 0,3.4 0.5,15.1 5.5,20.8 0.2,0.2 0.4,0.3 0.7,0.3 l 8.4,0 c 0.3,0 0.5,-0.1 0.7,-0.3 5,-5.6 5.5,-17.3 5.5,-20.8 z m -7.4,18.2 -5.9,0 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -3.4,-4 -3.8,-12 -3.9,-14.8 0,-0.5 0.4,-1 1,-1 l 6.6,0 6.6,0 c 0.5,0 1,0.4 1,1 0,2.8 -0.5,10.7 -3.9,14.8 -0.3,0.2 -0.5,0.3 -0.8,0.3 z"
+           id="path8"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff" /></g></g><path
+       id="XMLID_225_"
+       d="m 95.1,66.6 c 0,0 3.6,-2.1 1.4,-5.9 -1.3,-2 -1.9,-3.7 -1.4,-4.4 -1.3,1.6 -3.5,3.3 -1.1,6.9 0.8,0.9 1.2,2.8 1.1,3.4 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       id="XMLID_224_"
+       d="m 91.1,66.9 c 0,0 2.4,-1.4 0.9,-4 -0.9,-1.3 -1.3,-2.5 -0.9,-2.9 -0.9,1.1 -2.3,2.2 -0.7,4.7 0.5,0.5 0.7,1.8 0.7,2.2 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       id="XMLID_227_"
+       d="m 99.3,78.5 c -0.4,2.7 -1.2,5.8 -2.9,7.8 -0.2,0.2 -0.4,0.3 -0.6,0.3 l -5,0 c -0.2,0 -0.5,-0.1 -0.6,-0.3 -1.2,-1.5 -2,-3.5 -2.5,-5.6 0,0 5.8,0.8 9.1,-0.4 2.4,-0.9 2.5,-1.8 2.5,-1.8 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><g
+     id="g13"
+     transform="matrix(0.95420602,0,0,0.95420602,5.4935566,-4.7641653)"><path
+       d="m 33.6,94.7 3.7,0 6.1,9.4 6.1,-9.4 3.7,0 0,20 -3.5,0 0,-14.3 -6.3,9.4 -0.1,0 -6.2,-9.3 0,14.3 -3.5,0 0,-20.1 z"
+       id="path15"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 71.3,115 c -1.5,0 -2.9,-0.3 -4.2,-0.8 -1.3,-0.5 -2.4,-1.3 -3.3,-2.2 -0.9,-0.9 -1.6,-2 -2.1,-3.3 -0.5,-1.2 -0.8,-2.6 -0.8,-4 l 0,-0.1 c 0,-1.4 0.3,-2.7 0.8,-4 0.5,-1.2 1.2,-2.3 2.2,-3.3 0.9,-0.9 2,-1.7 3.3,-2.2 1.3,-0.6 2.7,-0.8 4.2,-0.8 1.5,0 2.9,0.3 4.2,0.8 1.3,0.5 2.4,1.3 3.3,2.2 0.9,0.9 1.6,2 2.1,3.3 0.5,1.2 0.8,2.6 0.8,4 l 0,0.1 c 0,1.4 -0.3,2.7 -0.8,4 -0.5,1.2 -1.2,2.3 -2.2,3.3 -0.9,0.9 -2,1.7 -3.3,2.2 -1.3,0.6 -2.7,0.8 -4.2,0.8 z m 0,-3.2 c 1,0 1.9,-0.2 2.7,-0.6 0.8,-0.4 1.5,-0.9 2.1,-1.5 0.6,-0.6 1,-1.4 1.4,-2.2 0.3,-0.9 0.5,-1.8 0.5,-2.7 l 0,-0.1 c 0,-1 -0.2,-1.9 -0.5,-2.8 -0.3,-0.9 -0.8,-1.6 -1.4,-2.3 -0.6,-0.6 -1.3,-1.1 -2.1,-1.5 -0.8,-0.4 -1.7,-0.6 -2.7,-0.6 -1,0 -1.9,0.2 -2.7,0.6 -0.8,0.4 -1.5,0.9 -2.1,1.5 -0.6,0.6 -1,1.4 -1.4,2.2 -0.3,0.9 -0.5,1.8 -0.5,2.7 l 0,0.1 c 0,1 0.2,1.9 0.5,2.8 0.3,0.9 0.8,1.6 1.4,2.3 0.6,0.6 1.3,1.1 2.1,1.5 0.8,0.4 1.8,0.6 2.7,0.6 z"
+       id="path17"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 98.7,115 c -1.5,0 -2.8,-0.3 -4,-0.8 -1.2,-0.5 -2.3,-1.3 -3.2,-2.2 -0.9,-0.9 -1.6,-2 -2.1,-3.3 -0.5,-1.3 -0.8,-2.6 -0.8,-4 l 0,-0.1 c 0,-1.4 0.3,-2.8 0.8,-4 0.5,-1.2 1.2,-2.3 2.1,-3.3 0.9,-0.9 2,-1.7 3.3,-2.2 1.3,-0.5 2.6,-0.8 4.2,-0.8 0.9,0 1.7,0.1 2.5,0.2 0.8,0.2 1.4,0.4 2.1,0.6 0.6,0.3 1.2,0.6 1.7,1 0.5,0.4 1,0.8 1.5,1.3 l -2.3,2.6 c -0.8,-0.7 -1.6,-1.3 -2.5,-1.8 -0.9,-0.5 -1.9,-0.7 -3.1,-0.7 -1,0 -1.8,0.2 -2.6,0.6 -0.8,0.4 -1.5,0.9 -2.1,1.5 -0.6,0.6 -1,1.4 -1.4,2.2 -0.3,0.9 -0.5,1.8 -0.5,2.7 l 0,0.1 c 0,1 0.2,1.9 0.5,2.8 0.3,0.9 0.8,1.6 1.4,2.3 0.6,0.6 1.3,1.2 2.1,1.5 0.8,0.3 1.7,0.6 2.6,0.6 1.2,0 2.3,-0.2 3.1,-0.7 0.8,-0.5 1.7,-1.1 2.6,-1.9 l 2.3,2.3 c -0.5,0.6 -1,1 -1.6,1.5 -0.6,0.5 -1.2,0.8 -1.8,1.1 -0.6,0.3 -1.4,0.6 -2.1,0.7 -0.9,0.2 -1.8,0.2 -2.7,0.2 z"
+       id="path19"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 113.9,94.7 3.5,0 0,8.3 9.6,0 0,-8.3 3.5,0 0,20 -3.5,0 0,-8.4 -9.6,0 0,8.4 -3.5,0 0,-20 z"
+       id="path21"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /><path
+       d="m 146,94.6 3.2,0 8.8,20.1 -3.7,0 -2,-4.8 -9.4,0 -2.1,4.8 -3.6,0 8.8,-20.1 z m 5,12.2 -3.4,-8 -3.4,8 6.8,0 z"
+       id="path23"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><rect
+     id="XMLID_444_"
+     x="35.169365"
+     y="110.69476"
+     width="121.66127"
+     height="1.0496266"
+     style="fill:#ffffff" /><path
+     id="XMLID_446_"
+     d="m 156.83062,74.816618 -51.71797,0 c 0,0.381682 -0.0954,0.667943 -0.0954,1.049626 l 51.81338,0 0,-1.049626 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /><path
+     id="XMLID_448_"
+     d="m 35.169364,74.816618 0,1.049626 48.759928,0 c 0,-0.381683 -0.09542,-0.667944 -0.09542,-1.049626 l -48.664507,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" /></svg>