diff --git a/archetypes/docs.md b/archetypes/doc.md
similarity index 87%
rename from archetypes/docs.md
rename to archetypes/doc.md
index 9774f40..9c293df 100644
--- a/archetypes/docs.md
+++ b/archetypes/doc.md
@@ -4,5 +4,4 @@ title: "Title"
weight: 10
toc: true
draft: false
-type: "docs"
---
diff --git a/archetypes/page.md b/archetypes/page.md
index 825c1d6..9c293df 100644
--- a/archetypes/page.md
+++ b/archetypes/page.md
@@ -4,5 +4,4 @@ title: "Title"
weight: 10
toc: true
draft: false
-type: "page"
---
diff --git a/archetypes/post.md b/archetypes/post.md
index b6bb895..901f996 100644
--- a/archetypes/post.md
+++ b/archetypes/post.md
@@ -4,5 +4,4 @@ author: "go-gitea"
title: "Title"
tags: ["tag"]
draft: false
-type: "post"
---
diff --git a/i18n/en-US.yaml b/i18n/en-US.yaml
index b732115..38a0b1c 100644
--- a/i18n/en-US.yaml
+++ b/i18n/en-US.yaml
@@ -1,24 +1,6 @@
- id: navbar_menu
translation: "Menu"
-- id: toplink_website
- translation: "Website"
-
-- id: toplink_blog
- translation: "Blog"
-
-- id: toplink_docs
- translation: "Docs"
-
-- id: toplink_code
- translation: "Import"
-
-- id: toplink_downloads
- translation: "Downloads"
-
-- id: toplink_github
- translation: "GitHub"
-
- id: read_more
translation: "More..."
diff --git a/i18n/zh-CN.yaml b/i18n/zh-CN.yaml
index bf743ab..75256f7 100644
--- a/i18n/zh-CN.yaml
+++ b/i18n/zh-CN.yaml
@@ -1,24 +1,6 @@
- id: navbar_menu
translation: "菜单"
-- id: toplink_website
- translation: "网站"
-
-- id: toplink_blog
- translation: "博客"
-
-- id: toplink_docs
- translation: "文档"
-
-- id: toplink_code
- translation: "导入"
-
-- id: toplink_downloads
- translation: "下载"
-
-- id: toplink_github
- translation: "GitHub"
-
- id: read_more
translation: "更多..."
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b07dd21..f5e07af 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,15 +6,13 @@
{{ .Content }}
-
- {{ if .Site.DisqusShortname }}
-
+ {{ if .Site.DisqusShortname }}
{{ template "_internal/disqus.html" . }}
-
- {{ end }}
+ {{ end }}
+
{{ partial "footer.html" . }}
diff --git a/layouts/docs/list.html b/layouts/doc/list.html
similarity index 100%
rename from layouts/docs/list.html
rename to layouts/doc/list.html
diff --git a/layouts/docs/single.html b/layouts/doc/single.html
similarity index 57%
rename from layouts/docs/single.html
rename to layouts/doc/single.html
index e406103..2b893f5 100644
--- a/layouts/docs/single.html
+++ b/layouts/doc/single.html
@@ -6,18 +6,16 @@
{{ partial "menu" . }}
-
+
{{ .Content }}
+
+ {{ if .Site.DisqusShortname }}
+
+ {{ template "_internal/disqus.html" . }}
+
+ {{ end }}
-
- {{ if .Site.DisqusShortname }}
-
-
- {{ template "_internal/disqus.html" . }}
-
-
- {{ end }}
{{ partial "footer.html" . }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
index 8f76692..2b893f5 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -3,21 +3,19 @@
-
+
{{ partial "menu" . }}
-
+
{{ .Content }}
+
+ {{ if .Site.DisqusShortname }}
+
+ {{ template "_internal/disqus.html" . }}
+
+ {{ end }}
-
- {{ if .Site.DisqusShortname }}
-
-
- {{ template "_internal/disqus.html" . }}
-
-
- {{ end }}
{{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3f0600a..e650edc 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,7 +3,7 @@
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index fc5f8fe..d58f276 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,6 +1,5 @@
{{ end }}
-
- {{ if .Site.DisqusShortname }}
-
+ {{ if .Site.DisqusShortname }}
{{ template "_internal/disqus.html" . }}
-
- {{ end }}
+ {{ end }}
+
{{ partial "footer.html" . }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 0905c7d..c9b324d 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -25,15 +25,13 @@
{{ .Content }}
-
- {{ if .Site.DisqusShortname }}
-
+ {{ if .Site.DisqusShortname }}
{{ template "_internal/disqus.html" . }}
-
- {{ end }}
+ {{ end }}
+
{{ partial "footer.html" . }}
diff --git a/theme.toml b/theme.toml
index a862d7a..ea2bdd6 100644
--- a/theme.toml
+++ b/theme.toml
@@ -3,6 +3,7 @@ license = "Apache-2.0"
licenselink = "https://github.com/go-gitea/theme/blob/master/LICENSE"
description = "General theme for Gitea pages"
homepage = "https://github.com/go-gitea/theme"
+min_version = 0.17
[author]
name = "The Gitea Authors"