diff --git a/.gitmodules b/.gitmodules
index ed7f0d76c..dd15650d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "themes/docsy"]
 	path = themes/docsy
 	url = https://github.com/google/docsy
+	branch = 9f55cf34808d720bcfff9398c9f9bb7fd8fce4ec
diff --git a/config/_default/config.toml b/config/_default/config.toml
index 01b904559..8df4e11de 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -208,7 +208,7 @@ sidebar_menu_compact = false
 #  Set to true to disable breadcrumb navigation.
 breadcrumb_disable = false
 #  Set to true to hide the sidebar search box (the top nav search box will still be displayed if search is enabled)
-sidebar_search_disable = false
+sidebar_search_disable = true
 #  Set to false if you don't want to display a logo (/assets/icons/logo.svg) in the top nav bar
 navbar_logo = true
 
@@ -296,15 +296,15 @@ languageName ="English"
 weight = 1
 languagedirection = "ltr"
 
-[languages.zh]
+[languages.zh-cn]
 title = "Falco"
 description = "运行时安全"
 languageName = "中文 Chinese"
 weight = 2
-contentDir = "content/zh"
+contentDir = "content/zh-cn"
 languagedirection = "ltr"
 
-[languages.zh.params]
+[languages.zh-cn.params]
 time_format_blog = "2006.01.02"
 language_alternatives = ["en"]
 
diff --git a/content/ja/training/_index.md b/content/ja/training/_index.md
new file mode 100644
index 000000000..49b5466f0
--- /dev/null
+++ b/content/ja/training/_index.md
@@ -0,0 +1,5 @@
+---
+title: Falco Training
+description: Learn about Falco with free training
+weight: 1
+---
diff --git a/content/ko/training/_index.md b/content/ko/training/_index.md
new file mode 100644
index 000000000..49b5466f0
--- /dev/null
+++ b/content/ko/training/_index.md
@@ -0,0 +1,5 @@
+---
+title: Falco Training
+description: Learn about Falco with free training
+weight: 1
+---
diff --git a/content/zh/blog/_index.md b/content/ml/blog/_index.md
similarity index 100%
rename from content/zh/blog/_index.md
rename to content/ml/blog/_index.md
diff --git a/content/zh/community/_index.md b/content/ml/community/_index.md
similarity index 100%
rename from content/zh/community/_index.md
rename to content/ml/community/_index.md
diff --git a/content/ml/training/_index.md b/content/ml/training/_index.md
new file mode 100644
index 000000000..49b5466f0
--- /dev/null
+++ b/content/ml/training/_index.md
@@ -0,0 +1,5 @@
+---
+title: Falco Training
+description: Learn about Falco with free training
+weight: 1
+---
diff --git a/content/zh/videos/_index.md b/content/ml/videos/_index.md
similarity index 100%
rename from content/zh/videos/_index.md
rename to content/ml/videos/_index.md
diff --git a/content/zh/_index.md b/content/zh-cn/_index.md
similarity index 97%
rename from content/zh/_index.md
rename to content/zh-cn/_index.md
index 5920c8366..10ebcb70d 100644
--- a/content/zh/_index.md
+++ b/content/zh-cn/_index.md
@@ -1,5 +1,7 @@
 ---
 title: Falco
+ailases: 
+  - /zh/
 ---
 
 {{< blocks/section >}}
diff --git a/content/zh-cn/blog/_index.md b/content/zh-cn/blog/_index.md
new file mode 100644
index 000000000..e35c99074
--- /dev/null
+++ b/content/zh-cn/blog/_index.md
@@ -0,0 +1,3 @@
+---
+title: The Falco blog
+---
diff --git a/content/zh/blog/announcing_plugins_and_cloud_security_with_falco.md b/content/zh-cn/blog/announcing_plugins_and_cloud_security_with_falco.md
similarity index 100%
rename from content/zh/blog/announcing_plugins_and_cloud_security_with_falco.md
rename to content/zh-cn/blog/announcing_plugins_and_cloud_security_with_falco.md
diff --git a/content/zh/blog/choosing-a-driver.md b/content/zh-cn/blog/choosing-a-driver.md
similarity index 100%
rename from content/zh/blog/choosing-a-driver.md
rename to content/zh-cn/blog/choosing-a-driver.md
diff --git a/content/zh/blog/cloud-native-security-hub.md b/content/zh-cn/blog/cloud-native-security-hub.md
similarity index 100%
rename from content/zh/blog/cloud-native-security-hub.md
rename to content/zh-cn/blog/cloud-native-security-hub.md
diff --git a/content/zh/blog/contribution-drivers-kmod-ebpf-libraries.md b/content/zh-cn/blog/contribution-drivers-kmod-ebpf-libraries.md
similarity index 100%
rename from content/zh/blog/contribution-drivers-kmod-ebpf-libraries.md
rename to content/zh-cn/blog/contribution-drivers-kmod-ebpf-libraries.md
diff --git a/content/zh/blog/detect-cve-2020-8557.md b/content/zh-cn/blog/detect-cve-2020-8557.md
similarity index 100%
rename from content/zh/blog/detect-cve-2020-8557.md
rename to content/zh-cn/blog/detect-cve-2020-8557.md
diff --git a/content/zh/blog/exceptions.md b/content/zh-cn/blog/exceptions.md
similarity index 100%
rename from content/zh/blog/exceptions.md
rename to content/zh-cn/blog/exceptions.md
diff --git a/content/zh/extend-falco-inputs-with-a-plugin-the-basics.md b/content/zh-cn/blog/extend-falco-inputs-with-a-plugin-the-basics.md
similarity index 100%
rename from content/zh/extend-falco-inputs-with-a-plugin-the-basics.md
rename to content/zh-cn/blog/extend-falco-inputs-with-a-plugin-the-basics.md
diff --git a/content/zh/extend-falco-outputs-with-falcosidekick.md b/content/zh-cn/blog/extend-falco-outputs-with-falcosidekick.md
similarity index 100%
rename from content/zh/extend-falco-outputs-with-falcosidekick.md
rename to content/zh-cn/blog/extend-falco-outputs-with-falcosidekick.md
diff --git a/content/zh/blog/falco-0-20-0.md b/content/zh-cn/blog/falco-0-20-0.md
similarity index 100%
rename from content/zh/blog/falco-0-20-0.md
rename to content/zh-cn/blog/falco-0-20-0.md
diff --git a/content/zh/blog/falco-0-21-0.md b/content/zh-cn/blog/falco-0-21-0.md
similarity index 100%
rename from content/zh/blog/falco-0-21-0.md
rename to content/zh-cn/blog/falco-0-21-0.md
diff --git a/content/zh/falco-0-22-x.md b/content/zh-cn/blog/falco-0-22-x.md
similarity index 100%
rename from content/zh/falco-0-22-x.md
rename to content/zh-cn/blog/falco-0-22-x.md
diff --git a/content/zh/falco-0-23-0.md b/content/zh-cn/blog/falco-0-23-0.md
similarity index 100%
rename from content/zh/falco-0-23-0.md
rename to content/zh-cn/blog/falco-0-23-0.md
diff --git a/content/zh/blog/falco-0-24-0.md b/content/zh-cn/blog/falco-0-24-0.md
similarity index 100%
rename from content/zh/blog/falco-0-24-0.md
rename to content/zh-cn/blog/falco-0-24-0.md
diff --git a/content/zh/falco-0-25-0.md b/content/zh-cn/blog/falco-0-25-0.md
similarity index 100%
rename from content/zh/falco-0-25-0.md
rename to content/zh-cn/blog/falco-0-25-0.md
diff --git a/content/zh/blog/falco-0-26-1.md b/content/zh-cn/blog/falco-0-26-1.md
similarity index 100%
rename from content/zh/blog/falco-0-26-1.md
rename to content/zh-cn/blog/falco-0-26-1.md
diff --git a/content/zh/blog/falco-0-26-2.md b/content/zh-cn/blog/falco-0-26-2.md
similarity index 100%
rename from content/zh/blog/falco-0-26-2.md
rename to content/zh-cn/blog/falco-0-26-2.md
diff --git a/content/zh/blog/falco-0-27-0.md b/content/zh-cn/blog/falco-0-27-0.md
similarity index 100%
rename from content/zh/blog/falco-0-27-0.md
rename to content/zh-cn/blog/falco-0-27-0.md
diff --git a/content/zh/blog/falco-0-28-1.md b/content/zh-cn/blog/falco-0-28-1.md
similarity index 100%
rename from content/zh/blog/falco-0-28-1.md
rename to content/zh-cn/blog/falco-0-28-1.md
diff --git a/content/zh/blog/falco-2020.md b/content/zh-cn/blog/falco-2020.md
similarity index 100%
rename from content/zh/blog/falco-2020.md
rename to content/zh-cn/blog/falco-2020.md
diff --git a/content/zh-cn/community/_index.md b/content/zh-cn/community/_index.md
new file mode 100644
index 000000000..22c08288d
--- /dev/null
+++ b/content/zh-cn/community/_index.md
@@ -0,0 +1,3 @@
+---
+title: The Falco Community
+---
diff --git a/content/zh/docs/_index.md b/content/zh-cn/docs/_index.md
similarity index 100%
rename from content/zh/docs/_index.md
rename to content/zh-cn/docs/_index.md
diff --git a/content/zh/docs/installation.md b/content/zh-cn/docs/installation.md
similarity index 100%
rename from content/zh/docs/installation.md
rename to content/zh-cn/docs/installation.md
diff --git a/content/zh-cn/training/_index.md b/content/zh-cn/training/_index.md
new file mode 100644
index 000000000..49b5466f0
--- /dev/null
+++ b/content/zh-cn/training/_index.md
@@ -0,0 +1,5 @@
+---
+title: Falco Training
+description: Learn about Falco with free training
+weight: 1
+---
diff --git a/content/zh-cn/videos/_index.md b/content/zh-cn/videos/_index.md
new file mode 100644
index 000000000..a3a3b1e4c
--- /dev/null
+++ b/content/zh-cn/videos/_index.md
@@ -0,0 +1,5 @@
+---
+title: Videos
+description: 
+weight: 9
+---
diff --git a/i18n/zh.yaml b/i18n/zh-cn.yaml
similarity index 100%
rename from i18n/zh.yaml
rename to i18n/zh-cn.yaml
diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html
index 11dfcdc22..b690dfff6 100644
--- a/layouts/blog/baseof.html
+++ b/layouts/blog/baseof.html
@@ -13,7 +13,7 @@
           <div class="col-12 col-md-3 col-xl-2 td-sidebar d-print-none">
             {{ partial "sidebar.html" . }}
           </div>
-          <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
+          <div class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             {{ partial "toc.html" . }}
           </div>
           <main class="col-12 col-md-9 col-xl-8 pl-md-5 pr-md-4" role="main">
@@ -31,4 +31,4 @@
     </div>
     {{ partial "scripts.html" . }}
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 329876225..c2e82d7cb 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -6,33 +6,33 @@
 {{ end }}
 
 <div class="row">
-	<div class="col-12">
-		{{- if .Pages -}}
-		{{ $pag := .Paginate (( $.Scratch.Get "blog-pages").GroupByDate "2006")}}
-			{{ range $pag.PageGroups }}
-			<h2>{{ T "post_posts_in" }} {{ .Key }}</h2>
-			<ul class="list-unstyled mt-4">
-				{{ range .Pages }}
-				<li class="media mb-4">
-					<div class="media-body">
-						<h5 class="mt-0 mb-1"><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h5>
-						<p class="mb-2 mb-md-3"><small class="text-muted">{{ .Date.Format ($.Param "time_format_blog") }} {{ T "post_byline_by"}} {{ .Params.author }}</small></p>
-						{{ partial "featured-image.html" (dict "p" . "w" 250 "h" 125 "class" "float-left mr-3 pt-1 d-none d-md-block") }}
-						<p class="pt-0 mt-0">{{ .Plain | safeHTML | truncate 250 }}</p>
-						<p class="pt-0"><a href="{{ .RelPermalink }}">{{ T "ui_read_more"}}</a></p>
-					</div>
-				</li>
-				{{ end }}
-			</ul>
-			{{ end }}
-		{{ end }}
-	</div>
+  <div class="col-12">
+    {{- if .Pages -}}
+    {{ $pag := .Paginate (( $.Scratch.Get "blog-pages").GroupByDate "2006")}}
+      {{ range $pag.PageGroups }}
+      <h2>{{ T "post_posts_in" }} {{ .Key }}</h2>
+      <ul class="list-unstyled mt-4">
+        {{ range .Pages }}
+        <li class="media mb-4">
+          <div class="media-body">
+            <h5 class="mt-0 mb-1"><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h5>
+            <p class="mb-2 mb-md-3"><small class="text-muted">{{ .Date.Format ($.Param "time_format_blog") }} {{ T "post_byline_by"}} {{ .Params.author }}</small></p>
+            {{ partial "featured-image.html" (dict "p" . "w" 250 "h" 125 "class" "float-left mr-3 pt-1 d-none d-md-block") }}
+            <p class="pt-0 mt-0">{{ .Plain | safeHTML | truncate 250 }}</p>
+            <p class="pt-0"><a href="{{ .RelPermalink }}">{{ T "ui_read_more"}}</a></p>
+          </div>
+        </li>
+        {{ end }}
+      </ul>
+      {{ end }}
+    {{ end }}
+  </div>
 </div>
 <div class="row pl-2 pt-2">
-	<div class="col">
-		{{ if .Pages }}
-			{{ template "_internal/pagination.html" . }}
-		{{ end }}
-	</div>
+  <div class="col">
+    {{ if .Pages }}
+      {{ template "_internal/pagination.html" . }}
+    {{ end }}
+  </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/index.headers b/layouts/index.headers
new file mode 100644
index 000000000..e69de29bb
diff --git a/layouts/index.zh.html b/layouts/index.zh-cn.html
similarity index 100%
rename from layouts/index.zh.html
rename to layouts/index.zh-cn.html
diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html
index 2f959ddc8..d78401160 100644
--- a/layouts/partials/page-meta-links.html
+++ b/layouts/partials/page-meta-links.html
@@ -1,39 +1,42 @@
-{{ if .Path }}
-{{ $pathFormatted := replace .Path "\\" "/" }}
-{{ $gh_repo := ($.Param "github_repo") }}
-{{ $gh_subdir := ($.Param "github_subdir") }}
-{{ $gh_project_repo := ($.Param "github_project_repo") }}
-{{ $gh_branch := (default "master" ($.Param "github_branch")) }}
-{{ if $gh_repo }}
+{{ if .File }}
+{{ $pathFormatted := replace .File.Path "\\" "/" -}}
+{{ $gh_repo := ($.Param "github_repo") -}}
+{{ $gh_subdir := ($.Param "github_subdir") -}}
+{{ $gh_project_repo := ($.Param "github_project_repo") -}}
+{{ $gh_branch := (default "master" ($.Param "github_branch")) -}}
+
+{{ if $gh_repo -}}
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-{{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted }}
-{{ if and ($gh_subdir) (.Site.Language.Lang) }}
-{{ $gh_repo_path = printf "%s/%s/content/%s/%s" $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted }}
-{{ else if .Site.Language.Lang }}
-{{ $gh_repo_path = printf "%s/content/%s/%s" $gh_branch ($.Site.Language.Lang) $pathFormatted }}
+{{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}}
+{{ if and ($gh_subdir) (.Site.Language.Lang) -}}
+{{ $gh_repo_path = printf "%s/%s/content/%s/%s" $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted -}}
+{{ else if .Site.Language.Lang -}}
+{{ $gh_repo_path = printf "%s/content/%s/%s" $gh_branch ($.Site.Language.Lang) $pathFormatted -}}
 {{ else if $gh_subdir }}
-{{ $gh_repo_path = printf "%s/%s/content/%s" $gh_branch $gh_subdir $pathFormatted }}
-{{ end }}
-{{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path }}
-{{ $createURL := printf "%s/edit/%s" $gh_repo $gh_repo_path }}
-{{ $issuesURL := printf "%s/issues/new?labels=%s&template=%s&title=%s" $gh_repo "kind/content" "content-request.md" (htmlEscape $.Title )}}
-{{ $newPageStub := resources.Get "stubs/new-page-template.md" }}
-{{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL }}
-{{ $newPageURL := printf "%s/new/%s?%s"  $gh_repo $gh_repo_path $newPageQS }}
+{{ $gh_repo_path = printf "%s/%s/content/%s" $gh_branch $gh_subdir $pathFormatted -}}
+{{ end -}}
+{{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+{{ $createURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+{{ $issuesURL := printf "%s/issues/new?labels=%s&template=%s&title=%s" $gh_repo "kind/content" "content-request.md" (htmlEscape $.Title ) -}}
+{{ $newPageStub := resources.Get "stubs/new-page-template.md" -}}
+{{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}}
+{{ $newPageURL := printf "%s/new/%s?%s"  $gh_repo $gh_repo_path $newPageQS -}}
 
 <a href="{{ $editURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
 <a href="{{ $newPageURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_create_child_page" }}</a>
 <a href="{{ $issuesURL }}" target="_blank"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a>
-{{ if $gh_project_repo }}
+
+{{ if $gh_project_repo -}}
 {{ $project_issueURL := printf "%s/issues/new/choose" $gh_project_repo }}
 <a href="{{ $project_issueURL }}" target="_blank"><i class="fas fa-tasks fa-fw"></i> {{ T "post_create_project_issue" }}</a>
-{{ end }}
+{{ end -}}
 
-{{ with .CurrentSection.AlternativeOutputFormats.Get "print" }}
+{{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}}
 <a id="print" href="{{ .Permalink | safeURL }}"><i class="fa fa-print fa-fw"></i> {{ T "print_entire_section" }}</a>
-{{ end }}
+{{ end -}}
 
 
 </div>
-{{ end }}
-{{ end }}
+{{ end -}}
+
+{{ end -}}
diff --git a/netlify.toml b/netlify.toml
index 06a0827c1..7e534edfe 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -3,7 +3,7 @@ publish = "public"
 command = "make production-build"
 
 [build.environment]
-HUGO_VERSION = "0.74.3"
+HUGO_VERSION = "0.101.0"
 NODE_VERSION = "10.20.0"
 
 [context.production.environment]
diff --git a/themes/docsy b/themes/docsy
index d37156f67..9f55cf348 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit d37156f67eff5f223bd849a7edc4ecb74a8e2efc
+Subproject commit 9f55cf34808d720bcfff9398c9f9bb7fd8fce4ec