Merge commit 'f3cd083961f36dc96d05e98aaf67f650102bc757'

12 files changed, 156 insertions, 182 deletions

diff --git a/docs/themes/gohugoioTheme/data/sponsors.toml b/docs/themes/gohugoioTheme/data/sponsors.toml
new file mode 100644
index 000000000..03e89745f
--- /dev/null
+++ b/docs/themes/gohugoioTheme/data/sponsors.toml
@@ -0,0 +1,17 @@
+[[banners]]
+name = "Forestry.io"
+link = "https://forestry.io/"
+logo = "/images/sponsors/forestry-logotype.svg"
+copy = ""
+
+[[banners]]
+name = ""
+link = ""
+logo = ""
+copy = ""
+
+[[banners]]
+name = ""
+link = ""
+logo = ""
+copy = ""
\ No newline at end of file
diff --git a/docs/themes/gohugoioTheme/layouts/index.html b/docs/themes/gohugoioTheme/layouts/index.html
index 205524d61..5e8ebbdd4 100644
--- a/docs/themes/gohugoioTheme/layouts/index.html
+++ b/docs/themes/gohugoioTheme/layouts/index.html
@@ -14,6 +14,9 @@
   <section class="w-100 ph4 ph5-ns pv4 pv6-ns mid-gray bg-white bb bt b--light-gray">
     {{- partial "home-page-sections/installation" . -}}
   </section>
+
+  {{ partial "home-page-sections/sponsors.html" (dict "cx" . ) }}
+
   <section class="w-100 ph4 ph5-ns pv4 pv6-ns mid-gray bg-accent-color-dark">
     {{- partial "home-page-sections/tweets" . -}}
   </section>
diff --git a/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html
new file mode 100644
index 000000000..4d32fc5d6
--- /dev/null
+++ b/docs/themes/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html
@@ -0,0 +1,30 @@
+{{$classes_box := "ba b--light-gray bg-light-gray br3 flex flex-column flex-wrap items-center justify-center ph3 pv4 mb4 w-100 w-30-l "}}
+{{ with .cx.Site.Data.sponsors }}
+  <section class="{{ $.classes_section | default "bg-primary-color-dark b--light-gray bb bt ph5 pv4 w-100"}}">
+    <div class="center mw9"> 
+      <f3 class="b f3 light-gray">Hugo Sponsors</f3>
+      <div class="flex-ns flex-wrap center justify-between  pt3">
+        {{ range .banners }}
+          {{if .logo}}
+            <div class="{{$classes_box}} o-100">
+              {{with .link -}}
+                <a href="{{.}}?{{ (querify "utm_source" "homepage" "utm_medium" "banner" "utm_campaign" "hugosponsor") | safeURL }}" class="grow">
+              {{- end}}
+              <img src="{{ .logo }}" alt="Logo for {{ .name }}" class="img h3 center" />
+              {{with .link}}</a>{{end}}
+              {{with .copy}}
+                <p class="center lh-copy gray mv1 tc {{$.classes_copy | default "f5 w-70-ns"}}">
+                  {{- . -}}
+                </p>
+              {{end}}
+            </div>
+          {{else}}
+            <div class="{{$classes_box}} o-10">
+              <p class="b black tc">Your Logo Here</p>
+            </div>
+          {{end}}
+        {{end}}
+      </div>
+    </div>
+  </section>
+{{end}}
diff --git a/docs/themes/gohugoioTheme/layouts/partials/nav-mobile.html b/docs/themes/gohugoioTheme/layouts/partials/nav-mobile.html
index 8de3d5c35..00b1a691c 100644
--- a/docs/themes/gohugoioTheme/layouts/partials/nav-mobile.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/nav-mobile.html
@@ -5,8 +5,8 @@
     {{ partial "nav-links-docs-mobile.html" . }}
 </div>
 
-<div class="flex dn-l">
-  <button class="js-toggle flex-auto ml2 dib dn-l f6 tc db mt4-ns ph3 pv2 link white bg-primary-color-dark hover-bg-primary-color ba b--white-40 w-auto" data-target=".globalmenu">Menu</button>
+<div class="flex dn-l justify-between">
+  <button class="js-toggle flex-auto dib dn-l f6 tc db mt4-ns ph3 pv2 link mr2 white bg-primary-color-dark hover-bg-primary-color ba b--white-40 w-auto" data-target=".globalmenu">Menu</button>
 
-  <button class="js-toggle flex-auto ml2 dib dn-l f6 tc db mt4-ns ph3 pv2 link white bg-primary-color-dark hover-bg-primary-color ba b--white-40 w-auto" data-target=".docsmenu">Docs Menu</button>
+  <button class="js-toggle flex-auto dib dn-l f6 tc db mt4-ns ph3 pv2 link white bg-primary-color-dark hover-bg-primary-color ba b--white-40 w-auto" data-target=".docsmenu">Docs Menu</button>
 </div>
diff --git a/docs/themes/gohugoioTheme/layouts/partials/site-footer.html b/docs/themes/gohugoioTheme/layouts/partials/site-footer.html
index f855bea0d..fb5b04b81 100755
--- a/docs/themes/gohugoioTheme/layouts/partials/site-footer.html
+++ b/docs/themes/gohugoioTheme/layouts/partials/site-footer.html
@@ -1,40 +1,48 @@
-<footer class="fixed relative-l bg-primary-color-dark bottom-0 w-100 pa3 pa4-l" role="contentinfo">
-  <!-- TODO: Make sure we don't lose all the footer content on mobile -->
-  <!-- TODO: Add icons https://github.com/rdwatters/hugo-docs-concept/issues/3#issuecomment-287194777
--->
-    <div class="dn db-l flex-ns flex-wrap w-80 center mw9 justify-between">
-      <div class="w-third pv3 dn db-l">
-         <div class="mb3 gray tc nested-links">
+<footer class="bg-primary-color-dark ph4-ns pt4 relative w-100" role="contentinfo">
+    <div class="center flex-ns flex-wrap justify-between mw9 w-90">
+      <div class="pb3 pt4 w-100 w-50-ns">
+      
+         <div class="b f3  light-gray mb3 nested-links tc">
            By the <a href="https://github.com/gohugoio/hugo/contributors" class="link">Hugo Authors</a><br />
-         </div>
-          <div class="w4 center">
-            {{ partialCached "svg/hugo-logo-wide.svg" (dict "size" "100") }}
           </div>
-          <p class="f6 gray tc w-70 center">The Hugo logos are copyright © Steve Francia 2013–{{ now.Year }}.</p>
-          <p class="f6 gray tc w-70 center">The Hugo Gopher is based on an original work by Renée French.</p>
+
+          <div class="center w4">
+            {{ partialCached "svg/hugo-logo-wide.svg" . }}
+          </div>
+
+          <ul class="center f6 list ma0 mv3 pa0 tc">
+            {{- with .Site.Params.github_repo -}}<li class="dib mr3"><a href="{{ . }}" class="dim link light-gray pv2">File an Issue</a></li>{{- end -}}
+            {{- with .Site.Params.forum -}}<li class="dib mr3"><a href="{{ . }}" class="dim link light-gray pv2">Get Help</a></li>{{- end -}}
+            {{- with .Site.Params.gitter -}}<li class="dib"><a href="{{ . }}" class="dim link light-gray pv2">Discuss Source Code</a></li>{{- end -}}
+          </ul>
+
+          <ul class="center f6 list ma0 mv4 pa0 tc">
+            <li class="dib mr3"><a href="https://twitter.com/gohugoio" class="dim link light-gray pv2">@GoHugoIO</a></li>
+            <li class="dib mr3"><a href="https://twitter.com/spf13" class="dim link light-gray pv2">@spf13</a></li>
+            <li class="dib"><a href="https://twitter.com/bepsays" class="dim link light-gray pv2">@bepsays</a></li>
+          </ul>
+
           {{ with  getenv "REPOSITORY_URL" -}}
-          <p class="f6 tc w-70 center"><a href="https://www.netlify.com"><img src="https://www.netlify.com/img/global/badges/netlify-dark.svg"/></a></p>
+          <p class="center f6 tc w-70"><a href="https://www.netlify.com"><img src="https://www.netlify.com/img/global/badges/netlify-dark.svg"/></a></p>
           {{- end }}
-      </div>
 
-      <div class="w-third pv3 dn db-l">
-        <ul class="list ma0 pa0 w-50 center">
-          {{- with .Site.Params.github_repo -}}<li><a href="{{ . }}" class="link white dim pv2 db">File an Issue</a></li>{{- end -}}
-          {{- with .Site.Params.forum -}}<li><a href="{{ . }}" class="link white dim pv2 db">Get Help</a></li>{{- end -}}
-          {{- with .Site.Params.gitter -}}<li><a href="{{ . }}" class="link white dim pv2 db">Discuss the Source Code</a></li>{{- end -}}
-        </ul>
       </div>
 
-      <div class="w-third pv3 dn db-l">
-        <ul class="list ma0 pa0">
-          <li><a href="https://twitter.com/gohugoio" class="link white dim pv2 db">@GoHugoIO</a></li>
-          <li><a href="https://twitter.com/spf13" class="link white dim pv2 db">@spf13</a></li>
-          <li><a href="https://twitter.com/bepsays" class="link white dim pv2 db">@bepsays</a></li>
-        </ul>
+      <div class="w-100 w-50-l"> 
+        {{ partial "home-page-sections/sponsors.html" (dict "cx" . "classes_section" "pb3 w-100" "classes_copy" "f7 w-90-ns") }}
       </div>
+
     </div>
 
+    <div class="f7 gray mb5 mb0-ns ph3 w-100"> 
+      <p class="dib mr4">The Hugo logos are copyright © Steve Francia 2013–{{ now.Year }}.</p>
+      <p class="dib">The Hugo Gopher is based on an original work by Renée French.</p>
+    </div>
 
-    {{ partial "nav-mobile.html" . }}
+    <img src="/images/gopher-side_color.svg" class="absolute-l bottom-0 dn db-l h4 right-0 z-999"/>
+
+    <div class="bg-primary-color-dark bottom-0 dn-ns fixed pb3 ph3 w-100"> 
+      {{ partial "nav-mobile.html" . }}
+    </div>
 
 </footer>
diff --git a/docs/themes/gohugoioTheme/layouts/partials/svg/gopher-side_color.svg b/docs/themes/gohugoioTheme/layouts/partials/svg/gopher-side_color.svg
deleted file mode 100755
index 85f949783..000000000
--- a/docs/themes/gohugoioTheme/layouts/partials/svg/gopher-side_color.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"

-	 y="0px" viewBox="0 0 397.8 535.6" enable-background="new 0 0 397.8 535.6" xml:space="preserve">

-<g>

-	<path fill="#E0DEDC" d="M68.5,64c0,0-45.3-8-56.4,40.2c-11.7,50.6,27,46.7,27,46.7L68.5,64z"/>

-	<g>

-		<path fill="#040000" stroke="#040000" stroke-width="1.3483" stroke-miterlimit="10" d="M23.9,86.2c-8.5-0.3-15.5,25.8-13.1,35.2

-			c0.9,3.5,10,6.3,14-3.7C27.7,110.4,34.5,86.5,23.9,86.2z"/>

-		<path fill="#FFFFFF" d="M17.6,94c-1.9-0.6-4,4.5-4.7,6.3c-1.8,5.3,2.1,5.1,4.4,2C18.5,100.7,19.5,94.7,17.6,94z"/>

-	</g>

-	<path fill="#B8937F" d="M46.3,487.8c5.2,7.3,41.6,6.4,46.1-1.3c4.2-7.1-21.4-14.9-30.7-16.1C47.6,468.6,42.6,482.5,46.3,487.8z"/>

-	<path fill="#B8937F" d="M351,446c5.2,7.3,29.4,3.7,34-4c4.2-7.1-9.3-12.2-18.6-13.4C352.3,426.8,347.3,440.7,351,446z"/>

-	<path fill="#8CC5E7" d="M189.6,13.4c0,0-182.1-8.9-161,217.6c6.3,68-43.8,182.8,29.2,239.8c0,0,102.1,61.7,238.9,41.5

-		c20-3,45.5-10,63.2-57.1c22.3-59.5,6.6-121.5-13.2-165.5c-22.3-49.7-21.2-105.8-19.6-115.3C354.3,14.2,189.6,13.4,189.6,13.4z"/>

-	<path fill="#8CC5E7" d="M282.3,38.8c19.2-5,32.6-10.5,43.4-5c30.5,15.7-4.9,45.4-12.4,51C302.3,93.2,268.4,42.4,282.3,38.8z"/>

-	<path fill="#3C89BF" d="M306,40.5c-18.8,4.2-19.6,13.7-14.8,16.4c2.8,1.6,0.8-8.1,13.6-3.8c5.2,1.7-2.5,14.3,12.1,0.2

-		C324.7,45.6,310.1,39.6,306,40.5z"/>

-	<path fill="#E0DEDC" d="M137.9,29.2c-22.9,1.7-76.1,28.5-50,94.2c9.1,23,104.6,10.3,105.8-54C194.1,42.6,158.1,27.7,137.9,29.2z"/>

-	<path fill="#040000" stroke="#040000" stroke-width="1.3483" stroke-miterlimit="10" d="M109.9,51.8C88.5,53.7,83.3,84,91.3,91.1

-		c4.5,4,20.1,8.6,28.5-19C122.5,63.3,117.8,51,109.9,51.8z"/>

-	<path fill="#FFFFFF" d="M101.7,57.4c-3.1-0.9-8.8,7-7.1,10.3c0.6,1.2,3.2,2.9,5.3,1.3C102.2,67.2,107.8,59.1,101.7,57.4z"/>

-	<path fill="#B8937F" d="M74.6,130.1C34.9,122.3,30,165,43.9,172.3c10.1,5.4,38.8-3.5,43.6-13.4C92.2,148.9,95,134.1,74.6,130.1z"/>

-	<path fill="#040000" d="M48,126.4c-12.5,4.3-11.8,25.4-5.1,26c7.6,0.7,21-14.7,24.2-20.9C69.5,126.9,53,124.7,48,126.4z"/>

-	<path fill="#E0DEDC" d="M52.5,169.9c-3.2,1.4-2.9,18.8,3.3,21.5c19.6,8.3,20.9-20.4,17.1-24.9C70,162.9,54.7,168.9,52.5,169.9z"/>

-	<path fill="#B8937F" d="M272,269.2c-11.2,0.5-19.7,23.3-16.9,34.3c1.5,5.9,12.9,5,11.3,9.6c-2.7,7.6,17.4,12.9,21.2,4.7

-		C306.9,277,282.3,268.8,272,269.2z"/>

-	<path fill="#B8937F" d="M251.8,497.4c-39.7-4.3-51.7,14.7-44.4,21.8c7.7,7.5,38.1,5.3,54.7,3.9

-		C268.7,522.6,261.8,498.5,251.8,497.4z"/>

-</g>

-</svg>

diff --git a/docs/themes/gohugoioTheme/src/css/_chroma.css b/docs/themes/gohugoioTheme/src/css/_chroma.css
index 1ad06604b..b15e07558 100644
--- a/docs/themes/gohugoioTheme/src/css/_chroma.css
+++ b/docs/themes/gohugoioTheme/src/css/_chroma.css
@@ -1,43 +1,67 @@
 /* Background */ .chroma { background-color: #f0f0f0 }
-/* Error */ .chroma .ss4 {  }
+/* Error */ .chroma .err {  }
+/* LineTableTD */ .chroma .lntd { ; vertical-align: top; padding: 0; margin: 0; border: 0; }
+/* LineTable */ .chroma .lntable { ; border-spacing: 0; padding: 0; margin: 0; border: 0; width: 100%; overflow: auto; display: block; }
 /* LineHighlight */ .chroma .hl { background-color: #ffffcc; display: block; width: 100% }
+/* LineNumbersTable */ .chroma .lnt { ; margin-right: 0.4em; padding: 0 0.4em 0 0.4em; display: block; }
 /* LineNumbers */ .chroma .ln { ; margin-right: 0.4em; padding: 0 0.4em 0 0.4em; }
-/* Keyword */ .chroma .s3e8 { color: #007020; font-weight: bold }
-/* KeywordPseudo */ .chroma .s3ec { color: #007020 }
-/* KeywordType */ .chroma .s3ee { color: #902000 }
-/* NameAttribute */ .chroma .s7d1 { color: #4070a0 }
-/* NameBuiltin */ .chroma .s7d2 { color: #007020 }
-/* NameClass */ .chroma .s7d4 { color: #0e84b5; font-weight: bold }
-/* NameConstant */ .chroma .s7d5 { color: #60add5 }
-/* NameDecorator */ .chroma .s7d6 { color: #555555; font-weight: bold }
-/* NameEntity */ .chroma .s7d7 { color: #d55537; font-weight: bold }
-/* NameException */ .chroma .s7d8 { color: #007020 }
-/* NameFunction */ .chroma .s7d9 { color: #06287e }
-/* NameLabel */ .chroma .s7dc { color: #002070; font-weight: bold }
-/* NameNamespace */ .chroma .s7dd { color: #0e84b5; font-weight: bold }
-/* NameTag */ .chroma .s7e2 { color: #062873; font-weight: bold }
-/* NameVariable */ .chroma .s7e3 { color: #bb60d5 }
-/* LiteralString */ .chroma .sc1c { color: #4070a0 }
-/* LiteralStringDoc */ .chroma .sc23 { color: #4070a0; font-style: italic }
-/* LiteralStringEscape */ .chroma .sc25 { color: #4070a0; font-weight: bold }
-/* LiteralStringInterpol */ .chroma .sc27 { color: #70a0d0; font-style: italic }
-/* LiteralStringOther */ .chroma .sc29 { color: #c65d09 }
-/* LiteralStringRegex */ .chroma .sc2a { color: #235388 }
-/* LiteralStringSymbol */ .chroma .sc2c { color: #517918 }
-/* LiteralNumber */ .chroma .sc80 { color: #40a070 }
-/* Operator */ .chroma .sfa0 { color: #666666 }
-/* OperatorWord */ .chroma .sfa1 { color: #007020; font-weight: bold }
-/* Comment */ .chroma .s1770 { color: #60a0b0; font-style: italic }
-/* CommentSpecial */ .chroma .s1774 { color: #60a0b0; background-color: #fff0f0 }
-/* CommentPreproc */ .chroma .s17d4 { color: #007020 }
-/* GenericDeleted */ .chroma .s1b59 { color: #a00000 }
-/* GenericEmph */ .chroma .s1b5a { font-style: italic }
-/* GenericError */ .chroma .s1b5b { color: #ff0000 }
-/* GenericHeading */ .chroma .s1b5c { color: #000080; font-weight: bold }
-/* GenericInserted */ .chroma .s1b5d { color: #00a000 }
-/* GenericOutput */ .chroma .s1b5e { color: #888888 }
-/* GenericPrompt */ .chroma .s1b5f { color: #c65d09; font-weight: bold }
-/* GenericStrong */ .chroma .s1b60 { font-weight: bold }
-/* GenericSubheading */ .chroma .s1b61 { color: #800080; font-weight: bold }
-/* GenericTraceback */ .chroma .s1b62 { color: #0044dd }
-/* TextWhitespace */ .chroma .s1f41 { color: #bbbbbb }
+/* Keyword */ .chroma .k { color: #007020; font-weight: bold }
+/* KeywordConstant */ .chroma .kc { color: #007020; font-weight: bold }
+/* KeywordDeclaration */ .chroma .kd { color: #007020; font-weight: bold }
+/* KeywordNamespace */ .chroma .kn { color: #007020; font-weight: bold }
+/* KeywordPseudo */ .chroma .kp { color: #007020 }
+/* KeywordReserved */ .chroma .kr { color: #007020; font-weight: bold }
+/* KeywordType */ .chroma .kt { color: #902000 }
+/* NameAttribute */ .chroma .na { color: #4070a0 }
+/* NameBuiltin */ .chroma .nb { color: #007020 }
+/* NameClass */ .chroma .nc { color: #0e84b5; font-weight: bold }
+/* NameConstant */ .chroma .no { color: #60add5 }
+/* NameDecorator */ .chroma .nd { color: #555555; font-weight: bold }
+/* NameEntity */ .chroma .ni { color: #d55537; font-weight: bold }
+/* NameException */ .chroma .ne { color: #007020 }
+/* NameFunction */ .chroma .nf { color: #06287e }
+/* NameLabel */ .chroma .nl { color: #002070; font-weight: bold }
+/* NameNamespace */ .chroma .nn { color: #0e84b5; font-weight: bold }
+/* NameTag */ .chroma .nt { color: #062873; font-weight: bold }
+/* NameVariable */ .chroma .nv { color: #bb60d5 }
+/* LiteralString */ .chroma .s { color: #4070a0 }
+/* LiteralStringAffix */ .chroma .sa { color: #4070a0 }
+/* LiteralStringBacktick */ .chroma .sb { color: #4070a0 }
+/* LiteralStringChar */ .chroma .sc { color: #4070a0 }
+/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0 }
+/* LiteralStringDoc */ .chroma .sd { color: #4070a0; font-style: italic }
+/* LiteralStringDouble */ .chroma .s2 { color: #4070a0 }
+/* LiteralStringEscape */ .chroma .se { color: #4070a0; font-weight: bold }
+/* LiteralStringHeredoc */ .chroma .sh { color: #4070a0 }
+/* LiteralStringInterpol */ .chroma .si { color: #70a0d0; font-style: italic }
+/* LiteralStringOther */ .chroma .sx { color: #c65d09 }
+/* LiteralStringRegex */ .chroma .sr { color: #235388 }
+/* LiteralStringSingle */ .chroma .s1 { color: #4070a0 }
+/* LiteralStringSymbol */ .chroma .ss { color: #517918 }
+/* LiteralNumber */ .chroma .m { color: #40a070 }
+/* LiteralNumberBin */ .chroma .mb { color: #40a070 }
+/* LiteralNumberFloat */ .chroma .mf { color: #40a070 }
+/* LiteralNumberHex */ .chroma .mh { color: #40a070 }
+/* LiteralNumberInteger */ .chroma .mi { color: #40a070 }
+/* LiteralNumberIntegerLong */ .chroma .il { color: #40a070 }
+/* LiteralNumberOct */ .chroma .mo { color: #40a070 }
+/* Operator */ .chroma .o { color: #666666 }
+/* OperatorWord */ .chroma .ow { color: #007020; font-weight: bold }
+/* Comment */ .chroma .c { color: #60a0b0; font-style: italic }
+/* CommentHashbang */ .chroma .ch { color: #60a0b0; font-style: italic }
+/* CommentMultiline */ .chroma .cm { color: #60a0b0; font-style: italic }
+/* CommentSingle */ .chroma .c1 { color: #60a0b0; font-style: italic }
+/* CommentSpecial */ .chroma .cs { color: #60a0b0; background-color: #fff0f0 }
+/* CommentPreproc */ .chroma .cp { color: #007020 }
+/* CommentPreprocFile */ .chroma .cpf { color: #007020 }
+/* GenericDeleted */ .chroma .gd { color: #a00000 }
+/* GenericEmph */ .chroma .ge { font-style: italic }
+/* GenericError */ .chroma .gr { color: #ff0000 }
+/* GenericHeading */ .chroma .gh { color: #000080; font-weight: bold }
+/* GenericInserted */ .chroma .gi { color: #00a000 }
+/* GenericOutput */ .chroma .go { color: #888888 }
+/* GenericPrompt */ .chroma .gp { color: #c65d09; font-weight: bold }
+/* GenericStrong */ .chroma .gs { font-weight: bold }
+/* GenericSubheading */ .chroma .gu { color: #800080; font-weight: bold }
+/* GenericTraceback */ .chroma .gt { color: #0044dd }
+/* TextWhitespace */ .chroma .w { color: #bbbbbb }
diff --git a/docs/themes/gohugoioTheme/src/css/_chroma2.css b/docs/themes/gohugoioTheme/src/css/_chroma2.css
deleted file mode 100644
index b15e07558..000000000
--- a/docs/themes/gohugoioTheme/src/css/_chroma2.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Background */ .chroma { background-color: #f0f0f0 }
-/* Error */ .chroma .err {  }
-/* LineTableTD */ .chroma .lntd { ; vertical-align: top; padding: 0; margin: 0; border: 0; }
-/* LineTable */ .chroma .lntable { ; border-spacing: 0; padding: 0; margin: 0; border: 0; width: 100%; overflow: auto; display: block; }
-/* LineHighlight */ .chroma .hl { background-color: #ffffcc; display: block; width: 100% }
-/* LineNumbersTable */ .chroma .lnt { ; margin-right: 0.4em; padding: 0 0.4em 0 0.4em; display: block; }
-/* LineNumbers */ .chroma .ln { ; margin-right: 0.4em; padding: 0 0.4em 0 0.4em; }
-/* Keyword */ .chroma .k { color: #007020; font-weight: bold }
-/* KeywordConstant */ .chroma .kc { color: #007020; font-weight: bold }
-/* KeywordDeclaration */ .chroma .kd { color: #007020; font-weight: bold }
-/* KeywordNamespace */ .chroma .kn { color: #007020; font-weight: bold }
-/* KeywordPseudo */ .chroma .kp { color: #007020 }
-/* KeywordReserved */ .chroma .kr { color: #007020; font-weight: bold }
-/* KeywordType */ .chroma .kt { color: #902000 }
-/* NameAttribute */ .chroma .na { color: #4070a0 }
-/* NameBuiltin */ .chroma .nb { color: #007020 }
-/* NameClass */ .chroma .nc { color: #0e84b5; font-weight: bold }
-/* NameConstant */ .chroma .no { color: #60add5 }
-/* NameDecorator */ .chroma .nd { color: #555555; font-weight: bold }
-/* NameEntity */ .chroma .ni { color: #d55537; font-weight: bold }
-/* NameException */ .chroma .ne { color: #007020 }
-/* NameFunction */ .chroma .nf { color: #06287e }
-/* NameLabel */ .chroma .nl { color: #002070; font-weight: bold }
-/* NameNamespace */ .chroma .nn { color: #0e84b5; font-weight: bold }
-/* NameTag */ .chroma .nt { color: #062873; font-weight: bold }
-/* NameVariable */ .chroma .nv { color: #bb60d5 }
-/* LiteralString */ .chroma .s { color: #4070a0 }
-/* LiteralStringAffix */ .chroma .sa { color: #4070a0 }
-/* LiteralStringBacktick */ .chroma .sb { color: #4070a0 }
-/* LiteralStringChar */ .chroma .sc { color: #4070a0 }
-/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0 }
-/* LiteralStringDoc */ .chroma .sd { color: #4070a0; font-style: italic }
-/* LiteralStringDouble */ .chroma .s2 { color: #4070a0 }
-/* LiteralStringEscape */ .chroma .se { color: #4070a0; font-weight: bold }
-/* LiteralStringHeredoc */ .chroma .sh { color: #4070a0 }
-/* LiteralStringInterpol */ .chroma .si { color: #70a0d0; font-style: italic }
-/* LiteralStringOther */ .chroma .sx { color: #c65d09 }
-/* LiteralStringRegex */ .chroma .sr { color: #235388 }
-/* LiteralStringSingle */ .chroma .s1 { color: #4070a0 }
-/* LiteralStringSymbol */ .chroma .ss { color: #517918 }
-/* LiteralNumber */ .chroma .m { color: #40a070 }
-/* LiteralNumberBin */ .chroma .mb { color: #40a070 }
-/* LiteralNumberFloat */ .chroma .mf { color: #40a070 }
-/* LiteralNumberHex */ .chroma .mh { color: #40a070 }
-/* LiteralNumberInteger */ .chroma .mi { color: #40a070 }
-/* LiteralNumberIntegerLong */ .chroma .il { color: #40a070 }
-/* LiteralNumberOct */ .chroma .mo { color: #40a070 }
-/* Operator */ .chroma .o { color: #666666 }
-/* OperatorWord */ .chroma .ow { color: #007020; font-weight: bold }
-/* Comment */ .chroma .c { color: #60a0b0; font-style: italic }
-/* CommentHashbang */ .chroma .ch { color: #60a0b0; font-style: italic }
-/* CommentMultiline */ .chroma .cm { color: #60a0b0; font-style: italic }
-/* CommentSingle */ .chroma .c1 { color: #60a0b0; font-style: italic }
-/* CommentSpecial */ .chroma .cs { color: #60a0b0; background-color: #fff0f0 }
-/* CommentPreproc */ .chroma .cp { color: #007020 }
-/* CommentPreprocFile */ .chroma .cpf { color: #007020 }
-/* GenericDeleted */ .chroma .gd { color: #a00000 }
-/* GenericEmph */ .chroma .ge { font-style: italic }
-/* GenericError */ .chroma .gr { color: #ff0000 }
-/* GenericHeading */ .chroma .gh { color: #000080; font-weight: bold }
-/* GenericInserted */ .chroma .gi { color: #00a000 }
-/* GenericOutput */ .chroma .go { color: #888888 }
-/* GenericPrompt */ .chroma .gp { color: #c65d09; font-weight: bold }
-/* GenericStrong */ .chroma .gs { font-weight: bold }
-/* GenericSubheading */ .chroma .gu { color: #800080; font-weight: bold }
-/* GenericTraceback */ .chroma .gt { color: #0044dd }
-/* TextWhitespace */ .chroma .w { color: #bbbbbb }
diff --git a/docs/themes/gohugoioTheme/src/css/main.css b/docs/themes/gohugoioTheme/src/css/main.css
index 787b5fdbc..912bf5ce5 100755
--- a/docs/themes/gohugoioTheme/src/css/main.css
+++ b/docs/themes/gohugoioTheme/src/css/main.css
@@ -26,7 +26,6 @@
 
 @import '_svg';
 @import '_chroma';
-@import '_chroma2';
 @import '_variables';
 
 .nested-blockquote blockquote {
diff --git a/docs/themes/gohugoioTheme/src/readme.md b/docs/themes/gohugoioTheme/src/readme.md
index d7318f445..0a30b3e03 100755
--- a/docs/themes/gohugoioTheme/src/readme.md
+++ b/docs/themes/gohugoioTheme/src/readme.md
@@ -24,12 +24,12 @@ This theme uses the [Tachyons CSS Library](http://tachyons.io/). It's about 15kb
 
 You'll find the commands to run in `src/package.json`.
 
-For development, you'll need Node and Yarn installed:
+For development, you'll need Node with NPM installed:
 
 ```
 $ cd themes/gohugo-theme/src/
 
-$ yarn install
+$ npm install
 
 $ npm start
 
@@ -37,13 +37,3 @@ $ npm start
 This will process both the postcss and scripts.
 
 For production, instead of `npm start`, run `npm run build:production,` which will output minified versions of your files.
-
-
----
-To run the NPM "critical" from package.json, you first must run `hugo` from the root of the project to generate a `public` folder.
-
-Make critical better:
-
-- [ ] run for a wider variety of pages. It currently runs off the new Hugo home page, but should run for docs/themes. There's much shared between them though.
-
-- [ ] Minify the CSS. The critical script seems only to minify when running inline, which we don't want to do (because it would change the build process)
diff --git a/docs/themes/gohugoioTheme/static/dist/main.css b/docs/themes/gohugoioTheme/static/dist/main.css
index 2f1c34191..a6a1146e0 100644
--- a/docs/themes/gohugoioTheme/static/dist/main.css
+++ b/docs/themes/gohugoioTheme/static/dist/main.css
@@ -1 +1 @@
-html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit;font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}[hidden],template{display:none}.border-box,a,article,body,code,dd,div,dl,dt,fieldset,footer,form,h1,h2,h3,h4,h5,h6,header,html,input[type=email],input[type=number],input[type=password],input[type=tel],input[type=text],input[type=url],legend,li,main,ol,p,pre,section,table,td,textarea,th,tr,ul{box-sizing:border-box}img{max-width:100%}.cover{background-size:cover!important}.contain{background-size:contain!important}@media screen and (min-width:30em){.cover-ns{background-size:cover!important}.contain-ns{background-size:contain!important}}@media screen and (min-width:30em) and (max-width:60em){.cover-m{background-size:cover!important}.contain-m{background-size:contain!important}}@media screen and (min-width:60em){.cover-l{background-size:cover!important}.contain-l{background-size:contain!important}}.bg-center{background-position:50%}.bg-center,.bg-top{background-repeat:no-repeat}.bg-top{background-position:top}.bg-right{background-position:100%}.bg-bottom,.bg-right{background-repeat:no-repeat}.bg-bottom{background-position:bottom}.bg-left{background-repeat:no-repeat;background-position:0}@media screen and (min-width:30em){.bg-center-ns{background-position:50%}.bg-center-ns,.bg-top-ns{background-repeat:no-repeat}.bg-top-ns{background-position:top}.bg-right-ns{background-position:100%}.bg-bottom-ns,.bg-right-ns{background-repeat:no-repeat}.bg-bottom-ns{background-position:bottom}.bg-left-ns{background-repeat:no-repeat;background-position:0}}@media screen and (min-width:30em) and (max-width:60em){.bg-center-m{background-position:50%}.bg-center-m,.bg-top-m{background-repeat:no-repeat}.bg-top-m{background-position:top}.bg-right-m{background-position:100%}.bg-bottom-m,.bg-right-m{background-repeat:no-repeat}.bg-bottom-m{background-position:bottom}.bg-left-m{background-repeat:no-repeat;background-position:0}}@media screen and (min-width:60em){.bg-center-l{background-position:50%}.bg-center-l,.bg-top-l{background-repeat:no-repeat}.bg-top-l{background-position:top}.bg-right-l{background-position:100%}.bg-bottom-l,.bg-right-l{background-repeat:no-repeat}.bg-bottom-l{background-position:bottom}.bg-left-l{background-repeat:no-repeat;background-position:0}}.ba{border-style:solid;border-width:1px}.bt{border-top-style:solid;border-top-width:1px}.br{border-right-style:solid;border-right-width:1px}.bb{border-bottom-style:solid;border-bottom-width:1px}.bl{border-left-style:solid;border-left-width:1px}.bn{border-style:none;border-width:0}@media screen and (min-width:30em){.ba-ns{border-style:solid;border-width:1px}.bt-ns{border-top-style:solid;border-top-width:1px}.br-ns{border-right-style:solid;border-right-width:1px}.bb-ns{border-bottom-style:solid;border-bottom-width:1px}.bl-ns{border-left-style:solid;border-left-width:1px}.bn-ns{border-style:none;border-width:0}}@media screen and (min-width:30em) and (max-width:60em){.ba-m{border-style:solid;border-width:1px}.bt-m{border-top-style:solid;border-top-width:1px}.br-m{border-right-style:solid;border-right-width:1px}.bb-m{border-bottom-style:s