diff --git a/.gitignore b/.gitignore
index a6dcbcc..c2caf3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.hugo_build.lock
 public/
 themes/
diff --git a/README.md b/README.md
index 0d84e00..8a41a11 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,24 @@ make server
 When you are done with your changes just create a pull request, after merging
 the pull request the website will be updated automatically.
 
+## HOWTO manage sponsors
+
+Gitea sponsors who donate the [minimal required amount for Gold](https://opencollective.com/gitea) have, during a year:
+
+* Their logo is displayed on GitHub
+* Their logo is on the gitea.io home page
+
+This is done by:
+
+* Adding their logo to the themes/gitea/static/images directory
+* Adding a link with their logo to the home page at themes/gitea/layouts/home/index.html
+
+The date of the addition must be recorded with a reminder to verify
+the sponsorship has been renewed at the anniversary date. If not the links and logo can be removed.
+
+Note that the `themes` directory is [located in another repository](https://gitea.com/gitea/theme) and that updates
+are only deployed when the [website](https://gitea.com/gitea/website) repository is updated.
+
 ## Contributing
 
 Fork -> Patch -> Push -> Pull Request
diff --git a/config.yaml b/config.yaml
index 4b46cf8..c031a89 100644
--- a/config.yaml
+++ b/config.yaml
@@ -20,6 +20,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://gitea.io
+  custom_css: ['css/custom.css']
 
 menu:
   page:
@@ -56,18 +57,32 @@ menu:
       url: https://github.com/go-gitea/
       weight: 60
       pre: github
-    - name: Discord Chat
-      url: https://discord.gg/Gitea
-      weight: 70
-      pre: comment
     - name: Forum
       url: https://discourse.gitea.io/
-      weight: 80
+      weight: 70
       pre: group
     - name: Twitter
       url: https://twitter.com/giteaio
+      weight: 80
+      pre: twitter
+    - name: Chatroom
       weight: 90
-      pre: group
+      pre: caret-down
+    - name: Discord Chat
+      url: https://discord.gg/Gitea
+      weight: 100
+      pre: comment
+      parent: Chatroom
+    - name: Matrix
+      url: https://matrix.to/#/#gitea:matrix.org
+      weight: 110
+      pre: matrix-org
+      parent: Chatroom
+    - name: QQ Group(Chinese)
+      url: https://qm.qq.com/cgi-bin/qm/qr?k=Ex-kCxSnTyxf-RM4oDihhPofPzLoDbXp&jump_from=webapi
+      weight: 110
+      pre: qq-group
+      parent: Chatroom
 
 languages:
   en-us:
@@ -112,18 +127,32 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord Chat
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
-        - name: Forum
+        - name: 论坛
           url: https://discourse.gitea.io/
           weight: 80
           pre: group
         - name: Twitter
           url: https://twitter.com/giteaio
           weight: 90
-          pre: group
+          pre: twitter
+        - name: 聊天室
+          weight: 90
+          pre: caret-down
+        - name: QQ群
+          url: https://qm.qq.com/cgi-bin/qm/qr?k=Ex-kCxSnTyxf-RM4oDihhPofPzLoDbXp&jump_from=webapi
+          weight: 110
+          pre: qq-group
+          parent: 聊天室
+        - name: Discord 聊天室
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: 聊天室
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: 聊天室
 
   zh-tw:
     weight: 2
@@ -163,10 +192,6 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord 聊天室
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
         - name: 討論區
           url: https://discourse.gitea.io/
           weight: 80
@@ -174,7 +199,25 @@ languages:
         - name: Twitter
           url: https://twitter.com/giteaio
           weight: 90
-          pre: group
+          pre: twitter
+        - name: 聊天室
+          weight: 90
+          pre: caret-down
+        - name: QQ群
+          url: https://qm.qq.com/cgi-bin/qm/qr?k=Ex-kCxSnTyxf-RM4oDihhPofPzLoDbXp&jump_from=webapi
+          weight: 110
+          pre: QQ
+          parent: 聊天室
+        - name: Discord 聊天室
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: 聊天室
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: 聊天室
 
   pt-br:
     weight: 3
@@ -214,18 +257,27 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Chat no Discord
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
         - name: Forum
           url: https://discourse.gitea.io/
-          weight: 80
+          weight: 70
           pre: group
         - name: Twitter
           url: https://twitter.com/giteaio
+          weight: 80
+          pre: twitter
+        - name: Chatroom
           weight: 90
-          pre: group
+          pre: caret-down
+        - name: Discord Chat
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: Chatroom
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: Chatroom
 
   nl-nl:
     weight: 4
@@ -265,18 +317,27 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord Chat
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
         - name: Forum
           url: https://discourse.gitea.io/
-          weight: 80
+          weight: 70
           pre: group
         - name: Twitter
           url: https://twitter.com/giteaio
+          weight: 80
+          pre: twitter
+        - name: Chatroom
           weight: 90
-          pre: group
+          pre: caret-down
+        - name: Discord Chat
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: Chatroom
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: Chatroom
 
   ko-kr:
     weight: 5
@@ -316,18 +377,27 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord 채팅
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
         - name: 포럼
           url: https://discourse.gitea.io/
-          weight: 80
+          weight: 70
           pre: group
         - name: Twitter
           url: https://twitter.com/giteaio
+          weight: 80
+          pre: twitter
+        - name: Chatroom
           weight: 90
-          pre: group
+          pre: caret-down
+        - name: Discord 채팅
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: Chatroom
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: Chatroom
 
   ja-jp:
     weight: 6
@@ -367,18 +437,27 @@ languages:
           url: https://github.com/go-gitea/
           weight: 60
           pre: github
-        - name: Discord チャット
-          url: https://discord.gg/Gitea
-          weight: 70
-          pre: comment
         - name: フォーラム
           url: https://discourse.gitea.io/
-          weight: 80
+          weight: 70
           pre: group
         - name: Twitter
           url: https://twitter.com/giteaio
+          weight: 80
+          pre: twitter
+        - name: Chatroom
           weight: 90
-          pre: group
+          pre: caret-down
+        - name: Discord チャット
+          url: https://discord.gg/Gitea
+          weight: 100
+          pre: comment
+          parent: Chatroom
+        - name: Matrix
+          url: https://matrix.to/#/#gitea:matrix.org
+          weight: 110
+          pre: matrix-org
+          parent: Chatroom
 
   ru-ru:
     weight: 7
@@ -418,15 +497,24 @@ languages:
         url: https://github.com/go-gitea/
         weight: 60
         pre: github
-      - name: Чат в Discord
-        url: https://discord.gg/Gitea
-        weight: 70
-        pre: comment
       - name: Форум
         url: https://discourse.gitea.io/
-        weight: 80
+        weight: 70
         pre: group
       - name: Twitter
         url: https://twitter.com/giteaio
+        weight: 80
+        pre: twitter
+      - name: Chatroom
         weight: 90
-        pre: group
+        pre: caret-down
+      - name: Чат в Discord
+        url: https://discord.gg/Gitea
+        weight: 100
+        pre: comment
+        parent: Chatroom
+      - name: Matrix
+        url: https://matrix.to/#/#gitea:matrix.org
+        weight: 110
+        pre: matrix-org
+        parent: Chatroom
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..a87d6c6
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+		<meta http-equiv="x-ua-compatible" content="ie=edge">
+		<meta property="og:title" content="{{ if not .IsHome }}{{ .Title }} - {{ end }}{{ .Site.Title }}"></meta>
+ 		{{ if .IsPage }}
+		<meta property="og:description" content="{{ if .IsPage }}{{ .Description }}{{end}}" />
+		{{ end }}
+		<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}"></meta>
+		<meta property="og:url" content="{{ .Permalink }}"></meta>
+		<meta property="og:image" content="https://docs.gitea.io/images/gitea.png"></meta>
+		{{ hugo.Generator }}
+
+		<title>{{ if and (not .IsHome) .Title }}{{ .Title }} - {{ end }}{{ .Site.Title }}</title>
+
+		{{ with .Params.goimport }}<meta name="go-import" content="{{ . }}">{{ end }}
+		{{ with .Params.gosource }}<meta name="go-source" content="{{ . }}">{{ end }}
+
+		{{ with .OutputFormats.Get "RSS" }}
+			<link href="{{ .RelPermalink }}" rel="alternate" type="application/rss+xml" title="{{ $.Site.Title }}" />
+			<link href="{{ .RelPermalink }}" rel="feed" type="application/rss+xml" title="{{ $.Site.Title }}" />
+		{{ end }}
+
+		<link rel="canonical" href="{{ .Permalink }}">
+
+		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.2.0/css/fork-awesome.min.css" />
+		<link rel="stylesheet" href="{{ .Site.BaseURL }}styles/main.css">
+		{{ range .Site.Params.custom_css }}
+		<link rel="stylesheet" href="{{ . | absURL }}"></script>
+		{{ end }}
+
+		<link rel="shortcut icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+		<link rel="icon" type="image/x-icon" href="{{ .Site.BaseURL }}images/favicon.png">
+	</head>
+	<body>
diff --git a/layouts/partials/toplinks.html b/layouts/partials/toplinks.html
new file mode 100644
index 0000000..3ea6149
--- /dev/null
+++ b/layouts/partials/toplinks.html
@@ -0,0 +1,22 @@
+<span class="navbar-item logo"><img src="{{ .Site.BaseURL }}images/gitea.png" alt="{{ .Site.Title }}"></span>
+{{ range .Site.Menus.page }}
+	{{ if .HasChildren }}
+		<div class="navbar-item dropdown">
+			<i class="fa fa-{{ .Pre }}"></i>&nbsp;
+			<span>{{ .Name }}</span>
+			<div class="dropdown-content">
+				{{ range .Children }}
+					<a class="navbar-item" href="{{ .URL }}">
+						<i class="fa fa-{{ .Pre }}"></i>&nbsp;
+						{{ .Name }}
+					</a>
+				{{ end }}
+			</div>
+		</div>
+	{{ else }}
+		<a class="navbar-item" href="{{ .URL }}">
+			<i class="fa fa-{{ .Pre }}"></i>&nbsp;
+			{{ .Name }}
+		</a>
+	{{ end }}
+{{ end }}
diff --git a/static/_headers b/static/_headers
index a5de172..d97520b 100644
--- a/static/_headers
+++ b/static/_headers
@@ -1,5 +1,5 @@
 /*
-  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' https://fonts.googleapis.com https://cdnjs.cloudflare.com; font-src 'self' data: https://cdnjs.cloudflare.com https://fonts.gstatic.com
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' https://fonts.googleapis.com https://cdn.jsdelivr.net; font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com
   X-Frame-Options: DENY
   X-Xss-Protection: 1; mode=block
   X-Content-Type-Options: nosniff
diff --git a/static/css/custom.css b/static/css/custom.css
new file mode 100644
index 0000000..9ff7ed0
--- /dev/null
+++ b/static/css/custom.css
@@ -0,0 +1,39 @@
+.dropdown-content {
+    background-color: #f9f9f9;
+    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    display: none;
+    margin-left: -15px;
+    margin-top: 145px;
+    min-width: 160px;
+    position: absolute;
+}
+
+.dropdown:hover .dropdown-content {
+    display: block;
+}
+.hero.is-primary .navbar .navbar-item.dropdown:not(.non_existent) {
+    color: inherit;
+    cursor: pointer;
+}
+
+.hero.is-primary .navbar-item:hover {
+    background-color: #e5eaec;
+}
+
+@media screen and (max-width: 1023px) {
+    .dropdown-content {
+        background-color: #395068;
+        margin-left: -15px;
+        margin-top: 0;
+    }
+
+    .hero.is-primary a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),
+    .hero.is-primary div.dropdown:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current) {
+        color: rgb(241, 234, 234);
+    }
+
+    .hero.is-primary a.navbar-item:hover,
+    .hero.is-primary div.navbar-item:hover {
+        background-color: #225164;
+    }
+}
\ No newline at end of file