diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index d525d3b..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# This image is to latest than which one is running online
-# FROM klakegg/hugo:ext-alpine
-FROM klakegg/hugo@sha256:b66d1bca06dea66dc713a960b290e8df193cb922e09051aecb0fe932e799d652 as hugo_0-88-1
-
-RUN apk add git
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 608144c..d701880 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,11 +1,7 @@
-version: "3.3"
-
 services:
 
   site:
-    image: docsy/cdf-best-practices
-    build:
-      context: .
+    image: hugomods/hugo:dart-sass-go-git-0.147.9
     command: server
     ports:
       - "1313:1313"
diff --git a/go.mod b/go.mod
index 9296317..d6ad240 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,8 @@
 module github.com/cdfoundation/best-practices-site
 
-go 1.20
+go 1.24
 
-require github.com/google/docsy v0.7.1 // indirect
+require (
+	github.com/google/docsy v0.12.0 // indirect
+	github.com/google/docsy/dependencies v0.7.2 // indirect
+)
diff --git a/go.sum b/go.sum
index d9ed4c5..a130a73 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,8 @@
 github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy v0.7.1 h1:DUriA7Nr3lJjNi9Ulev1SfiG1sUYmvyDeU4nTp7uDxY=
-github.com/google/docsy v0.7.1/go.mod h1:JCmE+c+izhE0Rvzv3y+AzHhz1KdwlA9Oj5YBMklJcfc=
-github.com/google/docsy/dependencies v0.7.1/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
+github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.12.0 h1:CddZKL39YyJzawr8GTVaakvcUTCJRAAYdz7W0qfZ2P4=
+github.com/google/docsy v0.12.0/go.mod h1:1bioDqA493neyFesaTvQ9reV0V2vYy+xUAnlnz7+miM=
+github.com/google/docsy/dependencies v0.7.2 h1:+t5ufoADQAj4XneFphz4A+UU0ICAxmNaRHVWtMYXPSI=
+github.com/google/docsy/dependencies v0.7.2/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
 github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/twbs/bootstrap v5.3.6+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/hugo.toml b/hugo.toml
index a08a620..7263589 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -156,9 +156,6 @@ github_branch= "main"
 # Google Custom Search Engine ID. Remove or comment out to disable search.
 # gcs_engine_id = "d72aa9b2712488cc3"
 
-# Enable Algolia DocSearch
-algolia_docsearch = false
-
 # Enable Lunr.js offline search
 offlineSearch = false
 
@@ -170,7 +167,7 @@ prism_syntax_highlighting = false
 #  Set to true to disable breadcrumb navigation.
 breadcrumb_disable = false
 # Set to true to disable the About link in the site footer
-footer_about_disable = false
+footer_about_enable = true
 # Set to false if you don't want to display a logo (/assets/icons/logo.svg) in the top navbar
 navbar_logo = true
 # Set to true if you don't want the top navbar to be translucent when over a `block/cover`, like on the homepage.
@@ -205,3 +202,7 @@ enable = false
 	icon = "fab fa-github"
         desc = "Development takes place here!"
 
+[params.search.algolia]
+appId = ""
+apiKey = ""
+indexName = "docsearch"
\ No newline at end of file
diff --git a/layouts/shortcodes/cdf/br.html b/layouts/_shortcodes/cdf/br.html
similarity index 100%
rename from layouts/shortcodes/cdf/br.html
rename to layouts/_shortcodes/cdf/br.html
diff --git a/layouts/shortcodes/cdf/dblbr.html b/layouts/_shortcodes/cdf/dblbr.html
similarity index 100%
rename from layouts/shortcodes/cdf/dblbr.html
rename to layouts/_shortcodes/cdf/dblbr.html
diff --git a/layouts/shortcodes/cdf/pad.html b/layouts/_shortcodes/cdf/pad.html
similarity index 100%
rename from layouts/shortcodes/cdf/pad.html
rename to layouts/_shortcodes/cdf/pad.html
diff --git a/layouts/architecture/list.html b/layouts/architecture/list.html
index 376ed81..684cd33 100644
--- a/layouts/architecture/list.html
+++ b/layouts/architecture/list.html
@@ -14,7 +14,7 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{- partial "disqus-comment.html" . -}}
 	{{ end -}}
diff --git a/layouts/architecture/single.html b/layouts/architecture/single.html
index 00cb3ab..684cd33 100644
--- a/layouts/architecture/single.html
+++ b/layouts/architecture/single.html
@@ -1,3 +1,23 @@
 {{ define "main" }}
-{{ .Render "content" }}
-{{ end }}
\ No newline at end of file
+<div class="td-content">
+	<h1>{{ .Title }}</h1>
+  {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
+	<header class="article-meta">
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
+	</header>
+	{{ .Content }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
+		<br />
+	{{ end -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
+		<br />
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
+</div>
+{{ end -}}
diff --git a/layouts/community/list.html b/layouts/community/list.html
index 376ed81..684cd33 100644
--- a/layouts/community/list.html
+++ b/layouts/community/list.html
@@ -14,7 +14,7 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{- partial "disqus-comment.html" . -}}
 	{{ end -}}
diff --git a/layouts/community/single.html b/layouts/community/single.html
index 00cb3ab..684cd33 100644
--- a/layouts/community/single.html
+++ b/layouts/community/single.html
@@ -1,3 +1,23 @@
 {{ define "main" }}
-{{ .Render "content" }}
-{{ end }}
\ No newline at end of file
+<div class="td-content">
+	<h1>{{ .Title }}</h1>
+  {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
+	<header class="article-meta">
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
+	</header>
+	{{ .Content }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
+		<br />
+	{{ end -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
+		<br />
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
+</div>
+{{ end -}}
diff --git a/layouts/learn/list.html b/layouts/learn/list.html
index 376ed81..684cd33 100644
--- a/layouts/learn/list.html
+++ b/layouts/learn/list.html
@@ -14,7 +14,7 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{- partial "disqus-comment.html" . -}}
 	{{ end -}}
diff --git a/layouts/learn/single.html b/layouts/learn/single.html
index 00cb3ab..684cd33 100644
--- a/layouts/learn/single.html
+++ b/layouts/learn/single.html
@@ -1,3 +1,23 @@
 {{ define "main" }}
-{{ .Render "content" }}
-{{ end }}
\ No newline at end of file
+<div class="td-content">
+	<h1>{{ .Title }}</h1>
+  {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
+	<header class="article-meta">
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
+	</header>
+	{{ .Content }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
+		<br />
+	{{ end -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
+		<br />
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
+</div>
+{{ end -}}
diff --git a/layouts/resources/list.html b/layouts/resources/list.html
index 376ed81..684cd33 100644
--- a/layouts/resources/list.html
+++ b/layouts/resources/list.html
@@ -14,7 +14,7 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{- partial "disqus-comment.html" . -}}
 	{{ end -}}
diff --git a/layouts/resources/single.html b/layouts/resources/single.html
index 00cb3ab..684cd33 100644
--- a/layouts/resources/single.html
+++ b/layouts/resources/single.html
@@ -1,3 +1,23 @@
 {{ define "main" }}
-{{ .Render "content" }}
-{{ end }}
\ No newline at end of file
+<div class="td-content">
+	<h1>{{ .Title }}</h1>
+  {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
+	<header class="article-meta">
+		{{ partial "taxonomy_terms_article_wrapper.html" . -}}
+		{{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) -}}
+			{{ partial "reading-time.html" . -}}
+		{{ end -}}
+	</header>
+	{{ .Content }}
+  {{ partial "section-index.html" . -}}
+	{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) -}}
+		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
+		<br />
+	{{ end -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
+		<br />
+		{{- partial "disqus-comment.html" . -}}
+	{{ end -}}
+	{{ partial "page-meta-lastmod.html" . -}}
+</div>
+{{ end -}}
diff --git a/netlify.toml b/netlify.toml
index 054e422..bfd2094 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,3 +1,3 @@
 [build]
 [build.environment]
-HUGO_VERSION = "0.115.4"
+HUGO_VERSION = "0.147.9"