diff --git a/src/main/assets/package.json b/src/main/assets/package.json
index 85ede7d..b9d1394 100644
--- a/src/main/assets/package.json
+++ b/src/main/assets/package.json
@@ -33,6 +33,6 @@
     "merge-stream": "^1.0.1",
     "require-dir": "^0.3.2",
     "rev-del": "^1.0.5",
-    "hugo-bin": "^0.47.1"
+    "hugo-bin": "^0.62.0"
   }
 }
\ No newline at end of file
diff --git a/src/main/assets/yarn.lock b/src/main/assets/yarn.lock
index cbbf0fe..5ea1425 100644
--- a/src/main/assets/yarn.lock
+++ b/src/main/assets/yarn.lock
@@ -2923,14 +2923,14 @@
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-hugo-bin@^0.47.1:
-  version "0.47.1"
-  resolved "https://registry.yarnpkg.com/hugo-bin/-/hugo-bin-0.47.1.tgz#a8c85cb9ef791a689f59a8877fb81d5f53281a63"
-  integrity sha512-WJ3xMDTe3Qi9vcDguzSOWUVUEIVnPahlvex/Em1k7ig39IZuGAbDqIjkVzCCbtSZMUCjNHDzO35P7xyH7WX7rg==
+hugo-bin@^0.62.0:
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/hugo-bin/-/hugo-bin-0.62.3.tgz#9e09779ec2ea57c024d61aa660887ac3c99edabe"
+  integrity sha512-tWh6SR0g1i0HfpkxBKFEmSuAqDlojYxfP6ecmckmr/VLnjzwRictvZCyHOuRdvls5Dlm1zzzqtWiY1ubszj6+w==
   dependencies:
     bin-wrapper "^4.1.0"
     pkg-conf "^3.1.0"
-    rimraf "^3.0.0"
+    rimraf "^3.0.2"
     signale "^1.4.0"
 
 ieee754@^1.1.4:
@@ -5140,10 +5140,10 @@
   dependencies:
     glob "^7.0.5"
 
-rimraf@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
-  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
diff --git a/src/main/site/content/_index.md b/src/main/site/content/_index.html
similarity index 100%
rename from src/main/site/content/_index.md
rename to src/main/site/content/_index.html
diff --git a/src/main/site/content/about/database-support.md b/src/main/site/content/about/database-support.md
index ba05be8..c85aa59 100644
--- a/src/main/site/content/about/database-support.md
+++ b/src/main/site/content/about/database-support.md
@@ -1,7 +1,7 @@
 ---
 title: Database Support
 url: /database-support.html
-markup: mmark
+markup: md
 ---
 
 This page provides useful information about JDBC driver settings for various database. 
diff --git a/src/main/site/content/about/support.md b/src/main/site/content/about/support.md
index dfa1fed..7a72427 100644
--- a/src/main/site/content/about/support.md
+++ b/src/main/site/content/about/support.md
@@ -7,6 +7,7 @@
         parent: about
         weight: 40  
 weight: 40
+url: /about/support/
 aliases:
     - /support.html
 ---
diff --git a/src/main/site/content/legacy/legacy-ant-unit-tests.md b/src/main/site/content/legacy/legacy-ant-unit-tests.md
index 0259830..d56723a 100644
--- a/src/main/site/content/legacy/legacy-ant-unit-tests.md
+++ b/src/main/site/content/legacy/legacy-ant-unit-tests.md
@@ -1,7 +1,7 @@
 ---
 title: Legacy Ant Unit Tests
 url: /legacy-ant-unit-tests.html
-markup: mmark
+markup: md
 ---
 Cayenne provides a comprehensive suite of unit tests. To execute unit tests
 you must first [get Cayenne from SVN](/dev/code-repository.html)
diff --git a/src/main/site/content/legacy/legacy-eclipse.md b/src/main/site/content/legacy/legacy-eclipse.md
index b32a4c8..e1cf08c 100644
--- a/src/main/site/content/legacy/legacy-eclipse.md
+++ b/src/main/site/content/legacy/legacy-eclipse.md
@@ -1,7 +1,7 @@
 ---
 title: Legacy Eclipse
 url: /legacy-eclipse.html
-markup: mmark
+markup: md
 ---
 <a name="LegacyEclipse-UsingEclipsewithAntCayenne"></a>
 ## Using Eclipse with Ant Cayenne 
diff --git a/src/main/site/layouts/partials/docs_header.html b/src/main/site/layouts/partials/docs_header.html
index 0b7665e..7cc56ee 100644
--- a/src/main/site/layouts/partials/docs_header.html
+++ b/src/main/site/layouts/partials/docs_header.html
@@ -1,11 +1,11 @@
-{{ $urlComponents := split .URL "/" }}
+{{ $urlComponents := split .RelPermalink "/" }}
 {{ if (isset $urlComponents 3) }}
 {{ $.Scratch.Set "cayenneUrlVersion" (index $urlComponents 2) }}
 {{ else }}
 {{ $.Scratch.Set "cayenneUrlVersion" "4.1" }}
 {{ end }}
 {{ $docVersion := ($.Scratch.Get "cayenneUrlVersion") }}
-{{ $currentPageURL := .URL }}
+{{ $currentPageURL := .RelPermalink }}
 
 
 {{- range where $.Site.Data.cayenne.releases "docs" true -}}
@@ -13,7 +13,7 @@
 {{- $.Scratch.SetInMap "indexUrlByVersion" $ver (printf "/docs/%s/api/" $ver) -}}
     {{- range (sort (where $.Site.Pages "Kind" "page") "Weight" "desc") -}}
         {{- if eq .Params.cayenneVersion $ver -}}
-            {{- $.Scratch.SetInMap "indexUrlByVersion" $ver .URL -}}
+            {{- $.Scratch.SetInMap "indexUrlByVersion" $ver .RelPermalink -}}
         {{- end -}}
     {{- end -}}
 {{- end -}}
@@ -52,14 +52,14 @@
                     {{ range (sort (where $.Site.Pages "Kind" "page") "Weight" ) -}}
                     {{- if eq .Params.cayenneVersion $docVersion }}
                     <div class="cd-toc-item">
-                        {{ if eq $currentPageURL .URL }}
+                        {{ if eq $currentPageURL .RelPermalink }}
                         <span class="cd-toc-link active">{{ if .Params.docsMenuTitle }}{{ .Params.docsMenuTitle }}{{ else }}{{ .Title }}{{ end }}</span>
                             {{- $tocFile := printf "content/docs/%s/%s.toc.html" $docVersion .File.BaseFileName -}}
                             {{- if (fileExists $tocFile) -}}
                                 {{ readFile $tocFile | safeHTML }}
                             {{- end -}}
                         {{ else }}
-                            <a class="cd-toc-link" href="{{ .URL }}">{{ if .Params.docsMenuTitle }}{{ .Params.docsMenuTitle }}{{ else }}{{ .Title }}{{ end }}</a>
+                            <a class="cd-toc-link" href="{{ .RelPermalink }}">{{ if .Params.docsMenuTitle }}{{ .Params.docsMenuTitle }}{{ else }}{{ .Title }}{{ end }}</a>
                         {{ end }}
                     </div>
                     {{ end -}}
diff --git a/src/main/site/layouts/partials/footer.html b/src/main/site/layouts/partials/footer.html
index e93c670..32f10fd 100644
--- a/src/main/site/layouts/partials/footer.html
+++ b/src/main/site/layouts/partials/footer.html
@@ -20,7 +20,7 @@
                     {{ range first 3 (where (where $.Page.Site.Pages "Type" "news") "Kind" "page") }}
                     <li>
                         <time datetime="{{ .Date }}" class="xsmall d-block">{{ .Date.Format "Jan 02, 2006" }}</time>
-                        <a href="{{ .URL }}">{{ .Title }}</a>
+                        <a href="{{ .RelPermalink }}">{{ .Title }}</a>
                     </li>
                     {{ end }}
                 </ul>