diff --git a/website/layouts/_default/_markup/render-codeblock-mermaid.html b/website/layouts/_default/_markup/render-codeblock-mermaid.html
deleted file mode 100644
index 440f81a13..000000000
--- a/website/layouts/_default/_markup/render-codeblock-mermaid.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
{{- .Inner | safeHTML }}
-{{ .Page.Store.Set "hasMermaid" true }}
diff --git a/website/layouts/_default/baseof.html b/website/layouts/_default/baseof.html
deleted file mode 100644
index f0c4a1a50..000000000
--- a/website/layouts/_default/baseof.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- partial "head.html" . -}}
-
- Skip to main
-
- {{ partialCached "header.html" . }} {{ partialCached "menu.html" . }}
-
- {{ block "main" . }} {{ end }}
-
-
- {{- partialCached "foot.html" . -}}
-
-
diff --git a/website/layouts/_default/list.html b/website/layouts/_default/list.html
deleted file mode 100644
index 701932786..000000000
--- a/website/layouts/_default/list.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ define "main" }}
-
-{{ with .Content }}
-{{.}}
-{{ end}} {{ partial "cells.html" .}} {{ end}}
diff --git a/website/layouts/_default/single.html b/website/layouts/_default/single.html
deleted file mode 100644
index 65757db97..000000000
--- a/website/layouts/_default/single.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{ define "main" }}
-
-
-
-
-
-
- {{ partial "page-footer.html" .}}
-
-
-{{ end }}
diff --git a/website/layouts/partials/breadcrumbs.html b/website/layouts/partials/breadcrumbs.html
deleted file mode 100644
index a3692c75d..000000000
--- a/website/layouts/partials/breadcrumbs.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{{ with .Parent }}
-
-{{end}}
diff --git a/website/layouts/partials/foot.html b/website/layouts/partials/foot.html
deleted file mode 100644
index d3a97acae..000000000
--- a/website/layouts/partials/foot.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-{{ $scripts := resources.Get "scripts/app.js" | resources.Minify }} {{ partial
-"random-bg" .}}
-
-
-
-{{ if .Page.Store.Get "hasMermaid" }}
-
-
-{{ end }}
diff --git a/website/layouts/partials/head.html b/website/layouts/partials/head.html
deleted file mode 100644
index b79b376a5..000000000
--- a/website/layouts/partials/head.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{.Site.Title}}
-
-
-
-
- {{ $sass := resources.Match "styles/**.scss" | resources.Concat
- "bundled.css" }} {{ $style := $sass | toCSS | minify | fingerprint "md5" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/website/layouts/partials/header.html b/website/layouts/partials/header.html
deleted file mode 100644
index 0bdc1b119..000000000
--- a/website/layouts/partials/header.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
diff --git a/website/layouts/partials/lastmod.html b/website/layouts/partials/lastmod.html
deleted file mode 100644
index 1cd5bf70e..000000000
--- a/website/layouts/partials/lastmod.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{$p := path.Base (path.Split .Path).Dir }}
-
-{{$fallBackDate := dict "date" "1970"}} {{$fallBackAuthor := dict "author"
-$fallBackDate}} {{$commitObject := slice (dict "commit" $fallBackAuthor )}}
-
-{{
-$api:="https://api.github.com/repos/CodeYourFuture/immersive-go-course/commits"
-}} {{ $url := print $api "?path=" $p }} {{ $commitObject := getJSON $url }}
-
-{{ range first 1 $commitObject }}
-
-{{ end}}
diff --git a/website/layouts/partials/menu.html b/website/layouts/partials/menu.html
deleted file mode 100644
index f2f9917ae..000000000
--- a/website/layouts/partials/menu.html
+++ /dev/null
@@ -1,101 +0,0 @@
-
diff --git a/website/layouts/partials/timeline.html b/website/layouts/partials/timeline.html
deleted file mode 100644
index 37456f530..000000000
--- a/website/layouts/partials/timeline.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- {{.Title}}
-
-
diff --git a/website/layouts/shortcodes/contributors.html b/website/layouts/shortcodes/contributors.html
deleted file mode 100644
index c2e18bc04..000000000
--- a/website/layouts/shortcodes/contributors.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ $contributors := getJSON
-"https://api.github.com/repos/CodeYourFuture/immersive-go-course/contributors"}}
-
-
- {{ range sort $contributors ".contributions" "desc"}}
- -
-
- {{.contributions}}
-
-
- {{ end }}
-
diff --git a/website/layouts/shortcodes/details.html b/website/layouts/shortcodes/details.html
deleted file mode 100644
index 2ffd470ef..000000000
--- a/website/layouts/shortcodes/details.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {{$.Params.summary}}
- {{.Inner | markdownify }}
-
diff --git a/website/layouts/versions/list.html b/website/layouts/versions/list.html
index c6433d5d6..6ef27465c 100644
--- a/website/layouts/versions/list.html
+++ b/website/layouts/versions/list.html
@@ -32,7 +32,13 @@
{{ range .Pages }}
-
- {{ partial "timeline.html" . }} {{ if $hasDetails}}
+ {
+
{{.Title}}
+
+
+ {{ if $hasDetails}}
Details