diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 7476544b..35ca5d08 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -12,28 +12,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ['ubuntu-20.04', 'ubuntu-22.04']
+        platform: ['ubuntu-slim', 'ubuntu-24.04']
     runs-on: ${{ matrix.platform }}
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
     steps:
       - name: Checkout the repository to generate the site
-        uses: actions/checkout@v4
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
-          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
+          fetch-depth: 1    # Fetch all history for .GitInfo and .Lastmod
 
-      - name: Setup Latest Hugo version
-        uses: peaceiris/actions-hugo@v2
-        with:
-          hugo-version: 'latest'
-          # extended: true
+      - name: Setup Hugo version
+        run: |
+          make hugo-env
 
-      - name: Build with Hugo, output version
+      - name: Build with Hugo
         run: |
-          hugo version
-          hugo --minify --templateMetrics --templateMetricsHints --printPathWarnings --printUnusedTemplates
+          make generate-min
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        if: (github.ref == 'refs/heads/main' && matrix.platform == 'ubuntu-20.04')
+        uses: peaceiris/actions-gh-pages@f4984ce547e7de88896c1d092ae7e008fed5ba31 # v4
+        if: (github.ref == 'refs/heads/main' && matrix.platform == 'ubuntu-24.04')
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public
diff --git a/.gitmodules b/.gitmodules
index c9028f68..a5e75458 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "themes/universal"]
 	path = themes/universal
 	url = https://github.com/devcows/hugo-universal-theme
-[submodule "themes/introduction"]
-	path = themes/introduction
-	url = https://github.com/victoriadrake/hugo-theme-introduction.git
+# [submodule "themes/introduction"]
+# 	path = themes/introduction
+# 	url = https://github.com/victoriadrake/hugo-theme-introduction.git
diff --git a/Makefile b/Makefile
index 3596b543..d41d107b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,15 +36,16 @@ help: ## Display this help section
 SHELL:=/bin/bash
 UNAME:=$(shell uname -s)
 HUGO:=bin/hugo
-HUGO_VERSION:=0.118.2
+HUGO_VERSION:=0.162.1
 
 # Set path to Extended version of Hugo
 ifeq (${UNAME},Darwin)
-HUGO_DOWNLOAD_PATH:=https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_darwin-universal.tar.gz
+$(HUGO):
+	GOBIN=${LOCAL_BASE_PATH}/bin go install github.com/gohugoio/hugo@v$(HUGO_VERSION)
+.PRECIOUS: ${HUGO}
 endif
 ifeq (${UNAME},Linux)
 HUGO_DOWNLOAD_PATH:=https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz
-endif
 
 # https://gohugo.io/getting-started/installing
 ${HUGO}.tar.gz:
@@ -55,6 +56,7 @@ $(HUGO):
 	${MAKE} ${HUGO}.tar.gz ;				\
 	cd bin && tar xvzf hugo.tar.gz ;
 .PRECIOUS: ${HUGO}
+endif
 
 .PHONY: hugo-env
 hugo-env: $(HUGO)
@@ -66,7 +68,6 @@ hugo-env: $(HUGO)
 CVDownloadPath:=https://dl.bintray.com/jgoldfar/ResumePublic/
 CVPath:=static/cv
 
-
 CVBibFiles:=cont-talks.bib inv-talks.bib posters.bib pubs.bib
 CVFiles:=cv-default.pdf res-default.pdf $(CVBibFiles)
 
@@ -194,9 +195,21 @@ img-deps: $(addprefix static/img/banners/,${IMG_BANNERS}) $(addprefix static/img
 .PHONY: img-deps
 
 ### Generate site
-generate: $(HUGO) $(HUGOFILE) img-deps ## Generate website
-	$(HUGO) --minify --printI18nWarnings --printMemoryUsage --printPathWarnings --printUnusedTemplates --templateMetrics --templateMetricsHints
-.PHONY: generate
+generate-debug: $(HUGO) $(HUGOFILE) img-deps ## Generate website in debug mode
+	$(HUGO)										\
+		--minify								\
+		--templateMetrics						\
+		--templateMetricsHints					\
+		--printUnusedTemplates					\
+		--printMemoryUsage						\
+		--printPathWarnings
+.PHONY: generate-debug
+
+generate-min: $(HUGO) $(HUGOFILE)
+	$(HUGO)										\
+		--minify								\
+		--panicOnWarning
+.PHONY: generate-min
 
 # https://gohugo.io/hosting-and-deployment/hosting-on-github/
 ### Below here not needed when pushing directly to Github
diff --git a/README.md b/README.md
index 196167b9..80938dbf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Personal Website Generator for Jonathan Goldfarb
 
-* v2025.0
+* v2026.06.07
 
 Generated using [Hugo](http://gohugo.io/), orchestrated using Github Actions on a Unix-like platform with `make`, `curl`, and `git`.
 
@@ -17,7 +17,7 @@ For the most part, the build is "vanilla" Hugo, so a standard Hugo integration w
 The theme is a vendored and customized version of the [universal theme](//github.com/devcows/hugo-universal-theme), with all due credit to the creator.
 Support their work!
 
-As documented in the CI file [`bitbucket-pipelines.yml`](./bitbucket-pipelines.yml) or the [`.github`](./.github) workflow, it is enough to run `hugo --verbose --minify`, equivalent to `make generate`, to generate the static pages.
+As documented in the CI file [`bitbucket-pipelines.yml`](./bitbucket-pipelines.yml) or the [`.github`](./.github) workflow, it is enough to run `hugo --minify`, equivalent to `make generate-min`, to generate the static pages.
 
 ### Other Useful Commands
 
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 02324f95..8ba411c7 100755
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,5 +1,5 @@
 # You can specify a custom docker image from Docker Hub as your build environment.
-image: debian:12.2-slim
+image: debian:trixie-20260518-slim@sha256:b6e2a152f22a40ff69d92cb397223c906017e1391a73c952b588e51af8883bf8
 pipelines:
   default:
     - step:
@@ -7,4 +7,4 @@ pipelines:
           # https://packages.debian.org/search?suite=bookworm&keywords=...
           - apt-get -qq update && apt-get -qq -y install shellcheck build-essential curl inkscape git
           - make hugo-env
-          - make generate
+          - make generate-debug
diff --git a/content/_index.html b/content/_index.md
similarity index 100%
rename from content/_index.html
rename to content/_index.md
diff --git a/content/about/_index.html b/content/about/_index.md
similarity index 100%
rename from content/about/_index.html
rename to content/about/_index.md
diff --git a/content/blog/_index.html b/content/blog/_index.md
similarity index 100%
rename from content/blog/_index.html
rename to content/blog/_index.md
diff --git a/content/contact.md b/content/contact.md
index 6ec6b837..808df394 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -8,8 +8,8 @@ layout: "single"
 > I love understanding new problems and domains through conversations with individuals with diverse perspectives and backgrounds.
 > I have expertise across a broad spectrum of competencies, and bring depth and dedication to your top priority projects.
 
-- *2016--Present*: Working professionally in domains including Commerce, Defense, Finance, and Medical Data industries in roles from engineering to product management, I have discovered a passion for delivering value to the stakeholders and clients I work with. I enjoy mediating requirements from stakeholders and principals, balancing constraints and resources with quality through metrics, and building for delightful outcomes. See [LinkedIn](https://www.linkedin.com/in/jonathan-goldfarb/) or [a somewhat recent resume (PDF)](/res.pdf).
+- Working professionally in domains including Commerce, Defense, Finance, and Medical Data industries in roles from engineering to product management, I have discovered a passion for delivering value to the stakeholders and clients I work with. I enjoy mediating requirements from stakeholders and principals, balancing constraints and resources with quality through metrics, and building for delightful outcomes. See [LinkedIn](https://www.linkedin.com/in/jonathan-goldfarb/) or [a somewhat recent resume (PDF)](/res.pdf).
 
-I offer [services](/about/services) for non-profits and businesses; in addition to clients I work with on a repeat basis, I have delivered value at all stages of organizational initiatives as a freelancer and contractor, from solution discovery to system implementation, operations, and management.
+- I offer [services](/about/services) for non-profits and businesses; in addition to clients I work with on a repeat basis, I have delivered value at all stages of organizational initiatives as a freelancer and contractor, from solution discovery to system implementation, operations, and management.
 
 Building relationships is a an essential part of my work - I welcome communication via the form below, or even better, by [email at jgoldfar@gmail.com](mailto:jgoldfar@gmail.com), or by [phone at (321) 895-4184](tel:+1-321-895-4184).
diff --git a/content/glossary/_index.html b/content/glossary/_index.md
similarity index 100%
rename from content/glossary/_index.html
rename to content/glossary/_index.md
diff --git a/data/clients/1.yaml b/data/clients/1.yaml
index db191d08..05eb6637 100644
--- a/data/clients/1.yaml
+++ b/data/clients/1.yaml
@@ -1,3 +1,3 @@
 name: "Florida Tech"
-image: "img/clients/florida-tech.jpg"
+image: "img/clients/florida-tech.png"
 # url: "https://www.fit.edu"
diff --git a/data/clients/7.yaml b/data/clients/7.yaml
new file mode 100644
index 00000000..4fb25433
--- /dev/null
+++ b/data/clients/7.yaml
@@ -0,0 +1,3 @@
+name: "Montecito Medical"
+image: "img/clients/partner-logo-montecito-medical-no-square.webp"
+# url: "https://curi.com/advisory"
diff --git a/data/clients/8.yaml b/data/clients/8.yaml
new file mode 100644
index 00000000..49bd60e3
--- /dev/null
+++ b/data/clients/8.yaml
@@ -0,0 +1,3 @@
+name: "Arrowlytics"
+image: "img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.png"
+# url: "https://curi.com/advisory"
diff --git a/hugo.toml b/hugo.toml
index ec01195b..c35dc29a 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -1,44 +1,52 @@
 baseURL = "https://jgoldfar.github.io"
-languageCode = "en-us"
+locale = "en-US"
 # Site language. Available translations in the theme's `/i18n` directory.
 defaultContentLanguage = "en"
 title = "Jonathan Goldfarb"
 metaDataFormat = "yaml"
-enableGitInfo = true
-paginate = 4
+enableGitInfo = false
+
 # Enable comments by entering your Disqus shortname
 # disqusShortname = "jgoldfar-blog"
 
+
+theme = "vzero"
+
 # https://gohugo.io/templates/internal/
 # Enable Google Analytics by entering your tracking code
 # GAv3 - UA-33721305-2
 # https://analytics.google.com/analytics/web/?utm_source=marketingplatform.google.com&utm_medium=et&utm_campaign=marketingplatform.google.com%2Fabout%2Fanalytics%2F#/a33721305p274388243/admin/streams/table/
 # Property named jgoldfar - Marketing Pages - GA4 (274388243)
-googleAnalytics = "G-WPL5NCVTN1"
+[services]
+  [services.googleAnalytics]
+    ID = "G-WPL5NCVTN1"
 
-theme = "vzero"
-
-pygmentsCodeFences = true
-pygmentsOptions = "nobackground=True"
-pygmentsStyle = "emacs"
-pygmentsCodefencesGuessSyntax = true
+[markup.highlight]
+    style = "emacs"
+    guessSyntax = true
+    noClasses = false
 
+[pagination]
+    pagerSize = 4
 
 [CarouselCustomers]
     items = 4
 
+[markup.goldmark.renderer]
+    unsafe = true
+
 # https://github.com/luizdepra/hugo-coder/wiki/Configurations
 [params]
-    viewMorePostLink = "/blog/"
+    # viewMorePostLink = "/blog/"
     author = "Jonathan Goldfarb, Ph.D."
     info = "Intention, Collaboration, Innovation"
     defaultDescription = "Jonathan Goldfarb, Online."
     keywords = "blog,personal,technology"
     avatarurl = "https://raw.githubusercontent.com/jgoldfar/jgoldfar.github.io/master/img/max.jpg"
     gravatarurl = "jgoldfar@gmail.com"
-    mainSections = ["blog"]
+    # mainSections = ["blog"]
 
-    twitter_site = "jgoldfar" # the Twitter handle of your site (without the '@')
+    # twitter_site = "jgoldfar" # the Twitter handle of your site (without the '@')
     default_sharing_image = "img/sharing-default.png"
 
     footercontent = "Amor Fati"
@@ -52,7 +60,7 @@ pygmentsCodefencesGuessSyntax = true
     # https://en.wikiquote.org/wiki/Voltaire
     # Whatever you do, crush the despicable [superstition], and love those who love you.
     about_us = "<p>Quoi que vous fassiez, écrasez l'infâme, et aimez qui vous aime. - Voltaire</p><p>Always open to challenging new problems.</p>"
-    copyright = "Copyright (c) 2018 - 2025, Jonathan Goldfarb; all rights reserved."
+    copyright = "Copyright © 2018 - 2026, Jonathan Goldfarb; all rights reserved."
     enableGoogleMaps = false
     googleMapsApiKey = "AIzaSyCFhtWLJcE30xOAjcbSFi-0fnoVmQZPb1Y"
 
@@ -91,7 +99,7 @@ pygmentsCodefencesGuessSyntax = true
 
     rtl = false
 
-    math = true
+    math = false
 
 	# Custom CSS
     custom_css = []
@@ -99,8 +107,8 @@ pygmentsCodefencesGuessSyntax = true
 	# Custom JS
     custom_js = []
 
-[Permalinks]
-    blog = "/blog/:year/:month/:day/:filename/"
+[permalinks]
+    blog = "/blog/:year/:month/:day/:contentbasename/"
 
 # Setup taxonomies
 [taxonomies]
@@ -154,11 +162,11 @@ pygmentsCodefencesGuessSyntax = true
     title = "Clients"
     # subtitle = "I am client focused "
 
-[params.recent_posts]
-    enable = false
-    title = "From the blog"
-    # title = "Open Discussions"
-    # subtitle = "Prompts, articles, opportunities for dialogue, ..."
+# [params.recent_posts]
+#     enable = false
+#     title = "From the blog"
+#     # title = "Open Discussions"
+#     # subtitle = "Prompts, articles, opportunities for dialogue, ..."
 
 # Social links for top bar
 [[menu.topbar]]
diff --git a/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.png b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.png
new file mode 100644
index 00000000..c14731a3
Binary files /dev/null and b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.png differ
diff --git a/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.webp b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.webp
new file mode 100644
index 00000000..c6b93fee
Binary files /dev/null and b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.webp differ
diff --git a/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.xcf b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.xcf
new file mode 100644
index 00000000..3c1e27c7
Binary files /dev/null and b/static/img/clients/Arrowlytics_R_A-Montecito-Solution_COLOR.xcf differ
diff --git a/static/img/clients/florida-tech.jpg b/static/img/clients/florida-tech.jpg
index 1d4272b0..8332b1e7 100644
Binary files a/static/img/clients/florida-tech.jpg and b/static/img/clients/florida-tech.jpg differ
diff --git a/static/img/clients/florida-tech.png b/static/img/clients/florida-tech.png
new file mode 100644
index 00000000..9f7cd3f0
Binary files /dev/null and b/static/img/clients/florida-tech.png differ
diff --git a/static/img/clients/florida-tech.xcf b/static/img/clients/florida-tech.xcf
new file mode 100644
index 00000000..a53890d4
Binary files /dev/null and b/static/img/clients/florida-tech.xcf differ
diff --git a/static/img/clients/montecito-medical-tag-only.png b/static/img/clients/montecito-medical-tag-only.png
new file mode 100644
index 00000000..fbc3cb71
Binary files /dev/null and b/static/img/clients/montecito-medical-tag-only.png differ
diff --git a/static/img/clients/montecito-medical-tag.png b/static/img/clients/montecito-medical-tag.png
new file mode 100644
index 00000000..68121e30
Binary files /dev/null and b/static/img/clients/montecito-medical-tag.png differ
diff --git a/static/img/clients/partner-logo-montecito-medical-no-square.webp b/static/img/clients/partner-logo-montecito-medical-no-square.webp
new file mode 100644
index 00000000..cf1562dc
Binary files /dev/null and b/static/img/clients/partner-logo-montecito-medical-no-square.webp differ
diff --git a/static/res.pdf b/static/res.pdf
index 4f9a76e2..1fdea46e 100644
Binary files a/static/res.pdf and b/static/res.pdf differ
diff --git a/themes/vzero/layouts/404.html b/themes/vzero/layouts/404.html
index 4bea486d..3f96fb83 100644
--- a/themes/vzero/layouts/404.html
+++ b/themes/vzero/layouts/404.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html lang="{{ .Site.Language.Locale }}">
 
   <head>
     {{ partial "headers.html" . }}
diff --git a/themes/vzero/layouts/_default/baseof.html b/themes/vzero/layouts/_default/baseof.html
deleted file mode 100644
index 5233b283..00000000
--- a/themes/vzero/layouts/_default/baseof.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-
-  <head>
-    {{ partial "headers.html" . }}
-    {{ partial "custom_headers.html" . }}
-  </head>
-
-  <body>
-
-    <div id="all">
-
-        {{ partial "top.html" . }}
-
-        {{ partial "nav.html" . }}
-
-        {{ partial "breadcrumbs.html" . }}
-
-        <div id="content">
-            <div class="container">
-
-                <div class="row">
-
-                    <!-- *** LEFT COLUMN *** -->
-
-                    <div class="col-md-9" id="blog-post">
-
-                        {{ if or .Params.author .Params.date }}
-                          <p class="text-muted text-uppercase mb-small text-right">
-                            {{ if isset .Params "authors" }}
-			      {{ i18n "authorBy" }} {{ range $index, $author := .Params.authors }}{{ if $index }}, {{ end }}<a href="{{ (printf "%s/%s" ("authors" | relLangURL) ($author | urlize)) }}">{{ $author }}</a>{{ end }}
-                            {{ end }}
-                            {{ if and .Params.author .Params.date }} | {{ end }}
-                            {{ if .Params.date }}
-                              {{ $createdAt := .Date.Format .Site.Params.date_format }}
-                              {{ range $index, $month := slice "January" "February" "March" "April" "May" "June" "July" "August" "September" "October" "November" "December" }}
-                                  {{ $createdAt = replace $createdAt $month (i18n $month) }}
-                              {{ end }}
-                              {{ $createdAt }}
-                            {{ end }}
-                          </p>
-                        {{ end }}
-
-                        <div id="post-content">
-                          {{ .Content }}
-                        </div>
-                        <!-- /#post-content -->
-                        {{ if .Site.DisqusShortname }}
-                        <div id="comments">
-                            {{ template "_internal/disqus.html" . }}
-                        </div>
-                        {{ end }}
-
-                    </div>
-                    <!-- /#blog-post -->
-
-                    <!-- *** LEFT COLUMN END *** -->
-
-                    <!-- *** RIGHT COLUMN *** -->
-
-                    <div class="col-md-3">
-
-                        <!-- *** MENUS AND WIDGETS *** -->
-
-                        {{ partial "sidebar.html" . }}
-
-                        <!-- *** MENUS AND FILTERS END *** -->
-
-                    </div>
-                    <!-- /.col-md-3 -->
-
-                    <!-- *** RIGHT COLUMN END *** -->
-
-                </div>
-                <!-- /.row -->
-
-            </div>
-            <!-- /.container -->
-        </div>
-        <!-- /#content -->
-        TESTING TESTING
-
-        {{ partial "footer.html" . }}
-
-    </div>
-    <!-- /#all -->
-
-    {{ partial "scripts.html" . }}
-
-  </body>
-</html>
diff --git a/themes/vzero/layouts/_default/list.html b/themes/vzero/layouts/_default/list.html
index 4bfe2069..bc76c01a 100644
--- a/themes/vzero/layouts/_default/list.html
+++ b/themes/vzero/layouts/_default/list.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html lang="{{ .Site.Language.Locale }}">
 
   <head>
     {{ partial "headers.html" . }}
@@ -47,7 +47,7 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
                                           {{ end }}
                                           {{ if isset .Params "categories" }}
                                           {{ if gt (len .Params.categories) 0 }}
-                                          in 
+                                          in
                                           {{ range $index, $category := .Params.categories }}{{ if $index }}, {{ end }}
                                               <a href="{{ "categories/" | relLangURL }}{{ . | urlize | lower }}">{{ $category }}</a>{{ end }}
                                           {{ end }}
diff --git a/themes/vzero/layouts/_default/single.html b/themes/vzero/layouts/_default/single.html
index 9eb5a622..74debdc3 100644
--- a/themes/vzero/layouts/_default/single.html
+++ b/themes/vzero/layouts/_default/single.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html lang="{{ .Site.Language.Locale }}">
 
   <head>
     {{ partial "headers.html" . }}
diff --git a/themes/vzero/layouts/_shortcodes/gist.html b/themes/vzero/layouts/_shortcodes/gist.html
new file mode 100644
index 00000000..8d0cc681
--- /dev/null
+++ b/themes/vzero/layouts/_shortcodes/gist.html
@@ -0,0 +1 @@
+<script src="https://gist.github.com/{{ index .Params 0 }}/{{ index .Params 1 }}.js{{ if eq (len .Params) 3 }}?file={{ index .Params 2 }}{{ end }}"></script>
diff --git a/themes/vzero/layouts/archetypes/default.md b/themes/vzero/layouts/archetypes/default.md
deleted file mode 100644
index 1ccf64c9..00000000
--- a/themes/vzero/layouts/archetypes/default.md
+++ /dev/null
@@ -1,10 +0,0 @@
-+++
-tags = []
-categories = []
-description = ""
-menu = ""
-banner = ""
-images = []
-+++
-
-<!--more-->
diff --git a/themes/vzero/layouts/index.html b/themes/vzero/layouts/index.html
index 96209d46..0ab715bb 100644
--- a/themes/vzero/layouts/index.html
+++ b/themes/vzero/layouts/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
+<html lang="{{ .Site.Language.Locale }}">
 
   <head>
     {{ partial "headers.html" . }}
diff --git a/themes/vzero/layouts/page/baseof.html b/themes/vzero/layouts/page/baseof.html
deleted file mode 100644
index 09f3fefe..00000000
--- a/themes/vzero/layouts/page/baseof.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-
-  <head>
-    {{ partial "headers.html" . }}
-    {{ partial "custom_headers.html" . }}
-  </head>
-
-  <body>
-
-    <div id="all">
-        {{ partial "top.html" . }}
-
-        {{ partial "nav.html" . }}
-
-        {{ partial "breadcrumbs.html" . }}
-
-        <div id="content">
-            {{ if isset .Params "id" }}
-
-              {{ partial .Params.id . }}
-
-            {{ else }}
-
-            <div class="container">
-
-                <div class="row">
-
-                    <div class="col-md-12">
-
-                        <div>
-                          {{ .Content }}
-                        </div>
-
-                    </div>
-
-                </div>
-                <!-- /.row -->
-
-            </div>
-            <!-- /.container -->
-
-            {{ end }}
-        </div>
-        <!-- /#content -->
-
-        {{ partial "footer.html" . }}
-
-    </div>
-    <!-- /#all -->
-
-    {{ partial "scripts.html" . }}
-
-  </body>
-</html>
diff --git a/themes/vzero/layouts/page/single.html b/themes/vzero/layouts/page/single.html
deleted file mode 100644
index 09f3fefe..00000000
--- a/themes/vzero/layouts/page/single.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}">
-
-  <head>
-    {{ partial "headers.html" . }}
-    {{ partial "custom_headers.html" . }}
-  </head>
-
-  <body>
-
-    <div id="all">
-        {{ partial "top.html" . }}
-
-        {{ partial "nav.html" . }}
-
-        {{ partial "breadcrumbs.html" . }}
-
-        <div id="content">
-            {{ if isset .Params "id" }}
-
-              {{ partial .Params.id . }}
-
-            {{ else }}
-
-            <div class="container">
-
-                <div class="row">
-
-                    <div class="col-md-12">
-
-                        <div>
-                          {{ .Content }}
-                        </div>
-
-                    </div>
-
-                </div>
-                <!-- /.row -->
-
-            </div>
-            <!-- /.container -->
-
-            {{ end }}
-        </div>
-        <!-- /#content -->
-
-        {{ partial "footer.html" . }}
-
-    </div>
-    <!-- /#all -->
-
-    {{ partial "scripts.html" . }}
-
-  </body>
-</html>
diff --git a/themes/vzero/layouts/partials/carousel.html b/themes/vzero/layouts/partials/carousel.html
index e3b25c56..9961836b 100644
--- a/themes/vzero/layouts/partials/carousel.html
+++ b/themes/vzero/layouts/partials/carousel.html
@@ -1,6 +1,6 @@
 {{ if default true .Site.Params.CarouselHomepage.enable }}
-{{ if isset .Site.Data "carousel" }}
-{{ if gt (len .Site.Data.carousel) 0 }}
+{{ if isset hugo.Data "carousel" }}
+{{ if gt (len hugo.Data.carousel) 0 }}
 <section>
     <div class="home-carousel">
         <div class="dark-mask"></div>
@@ -9,7 +9,7 @@
                 data-autoplay="{{ default true .Site.Params.CarouselHomepage.auto_play }}"
                 data-slide-speed="{{ default 2000 .Site.Params.CarouselHomepage.slide_speed }}"
                 data-pagination-speed="{{ default 1000 .Site.Params.CarouselHomepage.pagination_speed }}">
-                {{ range sort .Site.Data.carousel "weight" }}
+                {{ range sort hugo.Data.carousel "weight" }}
                 <div class="item">
                     {{ if .href }}
                     <a href="{{ .href }}" target="_blank" title="{{ .title | safeHTML }}">
diff --git a/themes/vzero/layouts/partials/clients.html b/themes/vzero/layouts/partials/clients.html
index 3608e5e1..5b19f9c6 100644
--- a/themes/vzero/layouts/partials/clients.html
+++ b/themes/vzero/layouts/partials/clients.html
@@ -1,7 +1,7 @@
 {{ if isset .Site.Params "clients" }}
 {{ if .Site.Params.clients.enable }}
-{{ if isset .Site.Data "clients" }}
-{{ if gt (len .Site.Data.clients) 0 }}
+{{ if isset hugo.Data "clients" }}
+{{ if gt (len hugo.Data.clients) 0 }}
 <section class="bar background-gray no-mb">
     <div class="container">
         <div class="row">
@@ -19,7 +19,7 @@ <h2>{{ .Site.Params.clients.title | markdownify }}</h2>
                     data-autoplay="{{ default false .Site.Params.CarouselCustomers.auto_play }}"
                     data-slide-speed="{{ default 2000 .Site.Params.CarouselCustomers.slide_speed }}"
                     data-pagination-speed="{{ default 1000 .Site.Params.CarouselCustomers.pagination_speed }}">
-                    {{ range .Site.Data.clients }}
+                    {{ range hugo.Data.clients }}
                     <li class="item" title="{{ .name }}">
                         {{ if .url }}
                           <a href="{{ .url }}" target="_blank">
diff --git a/themes/vzero/layouts/partials/features.html b/themes/vzero/layouts/partials/features.html
index d370d3ea..2e0106bd 100644
--- a/themes/vzero/layouts/partials/features.html
+++ b/themes/vzero/layouts/partials/features.html
@@ -1,11 +1,11 @@
 {{ if isset .Site.Params "features" }}
 {{ if .Site.Params.features.enable }}
-{{ if isset .Site.Data "features" }}
-{{ if gt (len .Site.Data.features) 0 }}
+{{ if isset hugo.Data "features" }}
+{{ if gt (len hugo.Data.features) 0 }}
 <section class="bar background-white">
     <div class="container">
         {{ $elements := default 3 .Site.Params.features.cols }}
-        {{ $features := sort .Site.Data.features "weight" }}
+        {{ $features := sort hugo.Data.features "weight" }}
 
         {{ $total_rows := div (len $features) $elements }}
 
diff --git a/themes/vzero/layouts/partials/head.html b/themes/vzero/layouts/partials/head.html
deleted file mode 100755
index a368d165..00000000
--- a/themes/vzero/layouts/partials/head.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta name="robots" content="all,follow">
-  <meta name="googlebot" content="index,follow,snippet,archive">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  {{ $title_plain := .Title | markdownify | plainify }}
-  <title>{{ $title_plain }}</title>
-  <meta name="author" content="{{ .Param "author" }}" />
-  {{ $keywords := .Site.Params.defaultKeywords | default (slice "" | first 0) }}
-  {{ if isset .Params "tags" }}{{ range .Params.tags }}{{ $keywords = $keywords | append . }}{{ end }}{{ end }}
-  {{ if isset .Params "keywords" }}{{ range .Params.keywords }}{{ $keywords = $keywords | append . }}{{ end }}{{ end }}
-  {{ if gt (len $keywords) 0 }}
-  <meta name="keywords" content="{{ delimit (uniq $keywords) ", " }}">
-  {{ end }}
-  {{ $description_plain := default .Site.Params.defaultDescription .Description | markdownify | plainify }}
-  <meta name="description" content="{{ $description_plain }}">
-
-  {{ hugo.Generator }}
-
-  <!-- Font -->
-  <link href='//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800' rel='stylesheet' type='text/css'>
-
-  <!-- Bootstrap and Font Awesome CSS -->
-  <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.11.2/css/all.css">
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-  <!-- CSS animations  -->
-  <link href="{{ "css/animate.css" | relURL}}" rel="stylesheet">
-
-  <!-- Theme stylesheet, if possible do not edit this stylesheet -->
-  {{ with .Site.Params.style }}
-    <link href="{{ "css/style" | relURL}}.{{ . }}.css" rel="stylesheet" id="theme-stylesheet">
-  {{ else }}
-    <link href="{{ "css/style.default.css" | relURL}}" rel="stylesheet" id="theme-stylesheet">
-  {{ end }}
-
-  <!-- Custom stylesheet - for your changes -->
-  <link href="{{ "css/custom.css" | relURL}}" rel="stylesheet">
-
-  <!-- Responsivity for older IE -->
-  {{ `
-    <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-  ` | safeHTML }}
-
-  <!-- Favicon and Apple touch icons-->
-  <link rel="shortcut icon" href="{{ "img/favicon.ico" | relURL }}" type="image/x-icon" />
-  <link rel="apple-touch-icon" href="{{ "img/apple-touch-icon.png" | relURL }}" />
-
-  <!-- owl carousel CSS -->
-  <link href="{{ "css/owl.carousel.css" | relURL}}" rel="stylesheet">
-  <link href="{{ "css/owl.theme.css" | relURL}}" rel="stylesheet">
-
-  <!-- RSS feed -->
-  <link rel="alternate" href="{{ "/index.xml" | absURL }}" type="application/rss+xml" title="{{ .Site.Title }}">
-
-  <!-- Facebook OpenGraph tags -->
-  {{ $is_blog := and (eq .Type "blog") (eq .Kind "page") }}
-  {{ $has_image :=  isset .Params "banner" }}
-  {{ $image := cond $has_image .Params.banner (.Site.Params.default_sharing_image | default "img/sharing-default.png") }}
-  {{ $is_valid_image := print "static/" $image | fileExists }}
-  {{ if $is_valid_image }}
-  {{ $image_ext := path.Ext $image }}
-  <meta property="og:locale" content="{{ replace .Site.LanguageCode "-" "_" }}">
-  <meta property="og:site_name" content="{{ .Site.Title }}">
-  <meta property="og:title" content="{{ $title_plain }}">
-  <meta property="og:type" content="{{ cond $is_blog "article" "website" }}">
-  <meta property="og:url" content="{{ .Permalink }}" />
-  <meta property="og:description" content="{{ $description_plain }}">
-  <meta property="og:image" content="{{ $image | absURL }}">
-  <meta property="og:image:type" content="image/{{ if eq $image_ext ".svg" }}svg+xml{{ else }}{{ trim $image_ext "." }}{{ end }}">
-  {{ with .Params.banner_alt }}<meta property="og:image:alt" content="{{ . | markdownify | plainify }}">{{ end }}
-  {{ $image_local :=  printf "/static/%s" $image}}
-  {{ with (imageConfig $image_local) }}
-    <meta property="og:image:width" content="{{ .Width }}">
-    <meta property="og:image:height" content="{{ .Height }}">
-  {{ end }}
-  {{ end }}
-  {{ with .Lastmod }}<meta property="og:updated_time" content="{{ .Format "2006-01-02T15:04:05Z0700" }}">{{ end }}
-  {{ if $is_blog }}
-    {{ with .Param "facebook_site" }}<meta property="article:publisher" content="https://www.facebook.com/{{ . }}/">{{ end }}
-    {{ with .Param "facebook_author" }}<meta property="article:author" content="https://www.facebook.com/{{ . }}/">{{ end }}
-    {{ with .Params.categories }}<meta property="article:section" content="{{ index . 0 }}">{{ end }}
-    {{ range .Params.tags }}<meta property="article:tag" content="{{ . }}">
-    {{ end }}
-    {{ if gt .ExpiryDate .PublishDate }}<meta property="article:expiration_time" content="{{ .ExpiryDate.Format "2006-01-02T15:04:05Z0700" }}">{{ end }}
-    {{ with .PublishDate }}<meta property="article:published_time" content="{{ .Format "2006-01-02T15:04:05Z0700" }}">{{ end }}
-    {{ with .Lastmod }}<meta property="article:modified_time" content="{{ .Format "2006-01-02T15:04:05Z0700" }}">{{ end }}
-  {{ end }}
-
-  <!-- Twitter Card meta tags -->
-  <meta name="twitter:card" content="summary{{ if (and $is_blog (and $has_image $is_valid_image)) }}_large_image{{ end }}">
-  {{ with .Param "twitter_site" }}<meta name="twitter:site" content="@{{ . }}">{{ end }}
-  <meta name="twitter:title" content="{{ $title_plain | truncate 70 }}">
-  {{ if $is_valid_image }}
-  <meta name="twitter:image" content="{{ $image | absURL }}">
-  {{ end }}
-  <meta name="twitter:description" content="{{ $description_plain | truncate 200 }}">
-  {{ with .Param "twitter_author" }}<meta name="twitter:creator" content="@{{ . }}">{{ end }}
-
-</head>
diff --git a/themes/vzero/layouts/partials/headers.html b/themes/vzero/layouts/partials/headers.html
index 225e3263..61e7c06b 100644
--- a/themes/vzero/layouts/partials/headers.html
+++ b/themes/vzero/layouts/partials/headers.html
@@ -62,7 +62,7 @@
 {{ $is_valid_image := print "static/" $image | fileExists }}
 {{ if $is_valid_image }}
 {{ $image_ext := path.Ext $image }}
-<meta property="og:locale" content="{{ replace .Site.LanguageCode "-" "_" }}">
+<meta property="og:locale" content="{{ replace .Site.Language.Locale "-" "_" }}">
 <meta property="og:site_name" content="{{ .Site.Title }}">
 <meta property="og:title" content="{{ $title_plain }}">
 <meta property="og:type" content="{{ cond $is_blog "article" "website" }}">
diff --git a/themes/vzero/layouts/partials/page.html b/themes/vzero/layouts/partials/page.html
deleted file mode 100644
index e0eb4df4..00000000
--- a/themes/vzero/layouts/partials/page.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="container" role="main">
-  <div class="row">
-    <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-      {{ .Content }}
-      {{ if .Site.DisqusShortname }}
-        <div class="disqus-comments">
-        {{ template "_internal/disqus.html" . }}
-        </div>
-      {{ end }}
-    </div>
-  </div>
-</div>
diff --git a/themes/vzero/layouts/partials/testimonials.html b/themes/vzero/layouts/partials/testimonials.html
index c6af7820..34a7e5ab 100644
--- a/themes/vzero/layouts/partials/testimonials.html
+++ b/themes/vzero/layouts/partials/testimonials.html
@@ -1,7 +1,7 @@
 {{ if isset .Site.Params "testimonials" }}
 {{ if .Site.Params.testimonials.enable }}
-{{ if isset .Site.Data "testimonials" }}
-{{ if gt (len .Site.Data.testimonials) 0 }}
+{{ if isset hugo.Data "testimonials" }}
+{{ if gt (len hugo.Data.testimonials) 0 }}
 <section class="bar background-pentagon no-mb">
     <div class="container">
         <div class="row">
@@ -21,7 +21,7 @@ <h2>{{ .Site.Params.testimonials.title }}</h2>
                     data-autoplay="{{ default false .Site.Params.CarouselTestimonials.auto_play }}"
                     data-slide-speed="{{ default 2000 .Site.Params.CarouselTestimonials.slide_speed }}"
                     data-pagination-speed="{{ default 1000 .Site.Params.CarouselTestimonials.pagination_speed }}">
-                    {{ range .Site.Data.testimonials }}
+                    {{ range hugo.Data.testimonials }}
                     <li class="item">
                         <div class="testimonial same-height-always">
                             <div class="text">