From 15c035775a9684cf409ec8bf8a082ae5293a03ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Leopoldo=20Sologuren=20Guti=C3=A9rrez?=
 <fsologureng@users.noreply.github.com>
Date: Wed, 1 Feb 2023 19:56:10 -0300
Subject: [PATCH] Add main landmark to templates and adjust titles (#22670)

* Add main aria landmark to templates
 * Adjust some titles to improve understanding of location in navigation

Contributed by @Forgejo
---
 routers/web/admin/hooks.go                                | 1 +
 routers/web/repo/setting.go                               | 6 +++---
 routers/web/repo/setting_protected_branch.go              | 4 ++--
 routers/web/repo/tag.go                                   | 2 +-
 routers/web/user/setting/account.go                       | 2 +-
 routers/web/user/setting/adopt.go                         | 2 +-
 routers/web/user/setting/applications.go                  | 2 +-
 routers/web/user/setting/keys.go                          | 2 +-
 routers/web/user/setting/profile.go                       | 8 ++++----
 routers/web/user/setting/security/security.go             | 2 +-
 templates/admin/applications/list.tmpl                    | 2 +-
 templates/admin/applications/oauth2_edit.tmpl             | 2 +-
 templates/admin/auth/edit.tmpl                            | 2 +-
 templates/admin/auth/list.tmpl                            | 2 +-
 templates/admin/auth/new.tmpl                             | 2 +-
 templates/admin/config.tmpl                               | 2 +-
 templates/admin/dashboard.tmpl                            | 2 +-
 templates/admin/emails/list.tmpl                          | 2 +-
 templates/admin/hook_new.tmpl                             | 2 +-
 templates/admin/hooks.tmpl                                | 2 +-
 templates/admin/monitor.tmpl                              | 2 +-
 templates/admin/notice.tmpl                               | 2 +-
 templates/admin/org/list.tmpl                             | 2 +-
 templates/admin/packages/list.tmpl                        | 2 +-
 templates/admin/queue.tmpl                                | 2 +-
 templates/admin/repo/list.tmpl                            | 2 +-
 templates/admin/repo/unadopted.tmpl                       | 2 +-
 templates/admin/stacktrace.tmpl                           | 2 +-
 templates/admin/user/edit.tmpl                            | 2 +-
 templates/admin/user/list.tmpl                            | 2 +-
 templates/admin/user/new.tmpl                             | 2 +-
 templates/explore/code.tmpl                               | 2 +-
 templates/explore/organizations.tmpl                      | 2 +-
 templates/explore/repos.tmpl                              | 2 +-
 templates/explore/users.tmpl                              | 2 +-
 templates/home.tmpl                                       | 2 +-
 templates/install.tmpl                                    | 2 +-
 templates/org/create.tmpl                                 | 2 +-
 templates/org/home.tmpl                                   | 2 +-
 templates/org/member/members.tmpl                         | 2 +-
 templates/org/projects/list.tmpl                          | 2 +-
 templates/org/projects/new.tmpl                           | 2 +-
 templates/org/projects/view.tmpl                          | 2 +-
 templates/org/settings/applications.tmpl                  | 2 +-
 templates/org/settings/applications_oauth2_edit.tmpl      | 2 +-
 templates/org/settings/delete.tmpl                        | 2 +-
 templates/org/settings/hook_new.tmpl                      | 2 +-
 templates/org/settings/hooks.tmpl                         | 2 +-
 templates/org/settings/labels.tmpl                        | 2 +-
 templates/org/settings/options.tmpl                       | 2 +-
 templates/org/settings/packages.tmpl                      | 2 +-
 templates/org/settings/packages_cleanup_rules_edit.tmpl   | 2 +-
 .../org/settings/packages_cleanup_rules_preview.tmpl      | 2 +-
 templates/org/settings/secrets.tmpl                       | 2 +-
 templates/org/team/invite.tmpl                            | 2 +-
 templates/org/team/members.tmpl                           | 2 +-
 templates/org/team/new.tmpl                               | 2 +-
 templates/org/team/repositories.tmpl                      | 2 +-
 templates/org/team/teams.tmpl                             | 2 +-
 templates/package/settings.tmpl                           | 2 +-
 templates/package/view.tmpl                               | 2 +-
 templates/post-install.tmpl                               | 2 +-
 templates/projects/list.tmpl                              | 2 +-
 templates/projects/new.tmpl                               | 2 +-
 templates/projects/view.tmpl                              | 2 +-
 templates/repo/activity.tmpl                              | 2 +-
 templates/repo/branch/list.tmpl                           | 2 +-
 templates/repo/commit_page.tmpl                           | 2 +-
 templates/repo/commits.tmpl                               | 2 +-
 templates/repo/create.tmpl                                | 2 +-
 templates/repo/diff/compare.tmpl                          | 2 +-
 templates/repo/editor/cherry_pick.tmpl                    | 2 +-
 templates/repo/editor/delete.tmpl                         | 2 +-
 templates/repo/editor/edit.tmpl                           | 2 +-
 templates/repo/editor/patch.tmpl                          | 2 +-
 templates/repo/editor/upload.tmpl                         | 2 +-
 templates/repo/empty.tmpl                                 | 2 +-
 templates/repo/find/files.tmpl                            | 2 +-
 templates/repo/forks.tmpl                                 | 2 +-
 templates/repo/graph.tmpl                                 | 2 +-
 templates/repo/home.tmpl                                  | 2 +-
 templates/repo/issue/choose.tmpl                          | 2 +-
 templates/repo/issue/labels.tmpl                          | 2 +-
 templates/repo/issue/list.tmpl                            | 2 +-
 templates/repo/issue/milestone_issues.tmpl                | 2 +-
 templates/repo/issue/milestone_new.tmpl                   | 2 +-
 templates/repo/issue/milestones.tmpl                      | 2 +-
 templates/repo/issue/new.tmpl                             | 2 +-
 templates/repo/issue/view.tmpl                            | 2 +-
 templates/repo/migrate/codebase.tmpl                      | 2 +-
 templates/repo/migrate/git.tmpl                           | 2 +-
 templates/repo/migrate/gitbucket.tmpl                     | 2 +-
 templates/repo/migrate/gitea.tmpl                         | 2 +-
 templates/repo/migrate/github.tmpl                        | 2 +-
 templates/repo/migrate/gitlab.tmpl                        | 2 +-
 templates/repo/migrate/gogs.tmpl                          | 2 +-
 templates/repo/migrate/migrate.tmpl                       | 2 +-
 templates/repo/migrate/migrating.tmpl                     | 2 +-
 templates/repo/migrate/onedev.tmpl                        | 2 +-
 templates/repo/packages.tmpl                              | 2 +-
 templates/repo/projects/list.tmpl                         | 2 +-
 templates/repo/projects/new.tmpl                          | 2 +-
 templates/repo/projects/view.tmpl                         | 2 +-
 templates/repo/pulls/commits.tmpl                         | 2 +-
 templates/repo/pulls/files.tmpl                           | 2 +-
 templates/repo/pulls/fork.tmpl                            | 2 +-
 templates/repo/release/list.tmpl                          | 2 +-
 templates/repo/release/new.tmpl                           | 2 +-
 templates/repo/search.tmpl                                | 2 +-
 templates/repo/settings/branches.tmpl                     | 2 +-
 templates/repo/settings/collaboration.tmpl                | 2 +-
 templates/repo/settings/deploy_keys.tmpl                  | 2 +-
 templates/repo/settings/githook_edit.tmpl                 | 2 +-
 templates/repo/settings/githooks.tmpl                     | 2 +-
 templates/repo/settings/lfs.tmpl                          | 2 +-
 templates/repo/settings/lfs_file.tmpl                     | 2 +-
 templates/repo/settings/lfs_file_find.tmpl                | 2 +-
 templates/repo/settings/lfs_locks.tmpl                    | 2 +-
 templates/repo/settings/lfs_pointers.tmpl                 | 2 +-
 templates/repo/settings/options.tmpl                      | 2 +-
 templates/repo/settings/protected_branch.tmpl             | 2 +-
 templates/repo/settings/tags.tmpl                         | 2 +-
 templates/repo/settings/webhook/base.tmpl                 | 2 +-
 templates/repo/settings/webhook/new.tmpl                  | 2 +-
 templates/repo/watchers.tmpl                              | 2 +-
 templates/repo/wiki/new.tmpl                              | 2 +-
 templates/repo/wiki/pages.tmpl                            | 2 +-
 templates/repo/wiki/revision.tmpl                         | 2 +-
 templates/repo/wiki/start.tmpl                            | 2 +-
 templates/repo/wiki/view.tmpl                             | 2 +-
 templates/status/404.tmpl                                 | 2 +-
 templates/status/500.tmpl                                 | 2 +-
 templates/user/auth/activate.tmpl                         | 2 +-
 templates/user/auth/change_passwd.tmpl                    | 2 +-
 templates/user/auth/finalize_openid.tmpl                  | 2 +-
 templates/user/auth/forgot_passwd.tmpl                    | 2 +-
 templates/user/auth/grant.tmpl                            | 2 +-
 templates/user/auth/grant_error.tmpl                      | 2 +-
 templates/user/auth/link_account.tmpl                     | 2 +-
 templates/user/auth/prohibit_login.tmpl                   | 2 +-
 templates/user/auth/reset_passwd.tmpl                     | 2 +-
 templates/user/auth/signin.tmpl                           | 2 +-
 templates/user/auth/signin_openid.tmpl                    | 2 +-
 templates/user/auth/signup.tmpl                           | 2 +-
 templates/user/auth/signup_openid_connect.tmpl            | 2 +-
 templates/user/auth/signup_openid_register.tmpl           | 2 +-
 templates/user/auth/twofa.tmpl                            | 2 +-
 templates/user/auth/twofa_scratch.tmpl                    | 2 +-
 templates/user/code.tmpl                                  | 2 +-
 templates/user/dashboard/dashboard.tmpl                   | 2 +-
 templates/user/dashboard/issues.tmpl                      | 2 +-
 templates/user/dashboard/milestones.tmpl                  | 2 +-
 templates/user/notification/notification_div.tmpl         | 2 +-
 .../user/notification/notification_subscriptions.tmpl     | 2 +-
 templates/user/overview/package_versions.tmpl             | 2 +-
 templates/user/overview/packages.tmpl                     | 2 +-
 templates/user/profile.tmpl                               | 2 +-
 templates/user/project.tmpl                               | 2 +-
 templates/user/settings/account.tmpl                      | 2 +-
 templates/user/settings/appearance.tmpl                   | 2 +-
 templates/user/settings/applications.tmpl                 | 2 +-
 templates/user/settings/applications_oauth2_edit.tmpl     | 2 +-
 templates/user/settings/keys.tmpl                         | 2 +-
 templates/user/settings/organization.tmpl                 | 2 +-
 templates/user/settings/packages.tmpl                     | 2 +-
 templates/user/settings/packages_cleanup_rules_edit.tmpl  | 2 +-
 .../user/settings/packages_cleanup_rules_preview.tmpl     | 2 +-
 templates/user/settings/profile.tmpl                      | 2 +-
 templates/user/settings/repos.tmpl                        | 2 +-
 templates/user/settings/security/security.tmpl            | 2 +-
 templates/user/settings/security/twofa_enroll.tmpl        | 2 +-
 171 files changed, 177 insertions(+), 176 deletions(-)

diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go
index 57cf5f49e5b..46dc734d252 100644
--- a/routers/web/admin/hooks.go
+++ b/routers/web/admin/hooks.go
@@ -22,6 +22,7 @@ const (
 func DefaultOrSystemWebhooks(ctx *context.Context) {
 	var err error
 
+	ctx.Data["Title"] = ctx.Tr("admin.hooks")
 	ctx.Data["PageIsAdminSystemHooks"] = true
 	ctx.Data["PageIsAdminDefaultHooks"] = true
 
diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go
index e970dab3ebe..da52957548b 100644
--- a/routers/web/repo/setting.go
+++ b/routers/web/repo/setting.go
@@ -60,7 +60,7 @@ const (
 // SettingsCtxData is a middleware that sets all the general context data for the
 // settings template.
 func SettingsCtxData(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.settings")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.options")
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate
 	ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
@@ -879,7 +879,7 @@ func handleSettingRemoteAddrError(ctx *context.Context, err error, form *forms.R
 
 // Collaboration render a repository's collaboration page
 func Collaboration(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.settings")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.collaboration")
 	ctx.Data["PageIsSettingsCollaboration"] = true
 
 	users, err := repo_model.GetCollaborators(ctx, ctx.Repo.Repository.ID, db.ListOptions{})
@@ -1119,7 +1119,7 @@ func GitHooksEditPost(ctx *context.Context) {
 
 // DeployKeys render the deploy keys list of a repository page
 func DeployKeys(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") + " / " + ctx.Tr("secrets.secrets")
 	ctx.Data["PageIsSettingsKeys"] = true
 	ctx.Data["DisableSSH"] = setting.SSH.Disabled
 
diff --git a/routers/web/repo/setting_protected_branch.go b/routers/web/repo/setting_protected_branch.go
index 31abde1ef68..a54565c1f15 100644
--- a/routers/web/repo/setting_protected_branch.go
+++ b/routers/web/repo/setting_protected_branch.go
@@ -31,7 +31,7 @@ const (
 
 // ProtectedBranchRules render the page to protect the repository
 func ProtectedBranchRules(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.settings")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.branches")
 	ctx.Data["PageIsSettingsBranches"] = true
 
 	rules, err := git_model.FindRepoProtectedBranchRules(ctx, ctx.Repo.Repository.ID)
@@ -46,7 +46,7 @@ func ProtectedBranchRules(ctx *context.Context) {
 
 // SetDefaultBranchPost set default branch
 func SetDefaultBranchPost(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.settings")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.branches.update_default_branch")
 	ctx.Data["PageIsSettingsBranches"] = true
 
 	repo := ctx.Repo.Repository
diff --git a/routers/web/repo/tag.go b/routers/web/repo/tag.go
index aa9edc73755..95bc6dfce7f 100644
--- a/routers/web/repo/tag.go
+++ b/routers/web/repo/tag.go
@@ -133,7 +133,7 @@ func DeleteProtectedTagPost(ctx *context.Context) {
 }
 
 func setTagsContext(ctx *context.Context) error {
-	ctx.Data["Title"] = ctx.Tr("repo.settings")
+	ctx.Data["Title"] = ctx.Tr("repo.settings.tags")
 	ctx.Data["PageIsSettingsTags"] = true
 
 	protectedTags, err := git_model.GetProtectedTags(ctx, ctx.Repo.Repository.ID)
diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index 95b3b4040d9..dbaa8fd351b 100644
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -30,7 +30,7 @@ const (
 
 // Account renders change user's password, user's email and user suicide page
 func Account(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.account")
 	ctx.Data["PageIsSettingsAccount"] = true
 	ctx.Data["Email"] = ctx.Doer.Email
 	ctx.Data["EnableNotifyMail"] = setting.Service.EnableNotifyMail
diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go
index 0aaf5920bc6..844d6fa166a 100644
--- a/routers/web/user/setting/adopt.go
+++ b/routers/web/user/setting/adopt.go
@@ -17,7 +17,7 @@ import (
 
 // AdoptOrDeleteRepository adopts or deletes a repository
 func AdoptOrDeleteRepository(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.adopt")
 	ctx.Data["PageIsSettingsRepos"] = true
 	allowAdopt := ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories
 	ctx.Data["allowAdopt"] = allowAdopt
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index b66806ff2de..ac935e51bbb 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -21,7 +21,7 @@ const (
 
 // Applications render manage access token page
 func Applications(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.applications")
 	ctx.Data["PageIsSettingsApplications"] = true
 
 	loadApplicationsData(ctx)
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
index ec50eef9c18..0ecc39ecd17 100644
--- a/routers/web/user/setting/keys.go
+++ b/routers/web/user/setting/keys.go
@@ -23,7 +23,7 @@ const (
 
 // Keys render user's SSH/GPG public keys page
 func Keys(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.ssh_gpg_keys")
 	ctx.Data["PageIsSettingsKeys"] = true
 	ctx.Data["DisableSSH"] = setting.SSH.Disabled
 	ctx.Data["BuiltinSSH"] = setting.SSH.StartBuiltinServer
diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go
index af161952501..e01f3cdeea9 100644
--- a/routers/web/user/setting/profile.go
+++ b/routers/web/user/setting/profile.go
@@ -42,7 +42,7 @@ const (
 
 // Profile render user's profile page
 func Profile(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.profile")
 	ctx.Data["PageIsSettingsProfile"] = true
 	ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice()
 
@@ -219,7 +219,7 @@ func DeleteAvatar(ctx *context.Context) {
 
 // Organization render all the organization of the user
 func Organization(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.organization")
 	ctx.Data["PageIsSettingsOrganization"] = true
 
 	opts := organization.FindOrgOptions{
@@ -254,7 +254,7 @@ func Organization(ctx *context.Context) {
 
 // Repos display a list of all repositories of the user
 func Repos(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.repos")
 	ctx.Data["PageIsSettingsRepos"] = true
 	ctx.Data["allowAdopt"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories
 	ctx.Data["allowDelete"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowDeleteOfUnadoptedRepositories
@@ -360,7 +360,7 @@ func Repos(ctx *context.Context) {
 
 // Appearance render user's appearance settings
 func Appearance(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.appearance")
 	ctx.Data["PageIsSettingsAppearance"] = true
 
 	var hiddenCommentTypes *big.Int
diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go
index db6faaed6e1..6e6e7efb0b2 100644
--- a/routers/web/user/setting/security/security.go
+++ b/routers/web/user/setting/security/security.go
@@ -22,7 +22,7 @@ const (
 
 // Security render change user's password page and 2FA
 func Security(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["Title"] = ctx.Tr("settings.security")
 	ctx.Data["PageIsSettingsSecurity"] = true
 
 	if ctx.FormString("openid.return_to") != "" {
diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 6d627129df0..4da6cb04465 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin config">
+<div role="main" aria-label="{{.Title}}" class="page-content admin config">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		<div class="twelve wide column content">
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index 84d821eccac..20231c4b1ca 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin config">
+<div role="main" aria-label="{{.Title}}" class="page-content admin config">
 	{{template "admin/navbar" .}}
 
 	{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index bf9d53152c2..91e4b1df525 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin edit authentication">
+<div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index c43287ee1ae..afe814cc6cb 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin authentication">
+<div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index 213c621b42f..ab84dfccaf9 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin new authentication">
+<div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index c2ab31862d9..8f572c83961 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin config">
+<div role="main" aria-label="{{.Title}}" class="page-content admin config">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 80eea91210c..40f28068d7d 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin dashboard">
+<div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index f5f6a86dc8a..091f5011f95 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 407eae9646c..0c018ff2939 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin settings new webhook">
+<div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index a23cff43426..26f92c70641 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin hooks">
+<div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index f11d071ea43..d53e9e18dcc 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin monitor">
+<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 36752d47b26..a2c7ca2f6ae 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin notice">
+<div role="main" aria-label="{{.Title}}" class="page-content admin notice">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 11dc23c60eb..9bf7a6268e5 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 4c96d2bf105..bb36ca1ae35 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 675ec417e40..19dd70da121 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin monitor">
+<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 837802f0d0c..11216b8c863 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 0c27c80e930..ca0b4c3bb9a 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 91929deaa88..4e16036ae3a 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin monitor">
+<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 9e0f1d89fd1..ef436c718a6 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin edit user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 67a726eb3f6..88af2172b76 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 9fdf0dce93d..e5ca864cb77 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content admin new user">
+<div role="main" aria-label="{{.Title}}" class="page-content admin new user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
index f4e46d11987..924a3e62748 100644
--- a/templates/explore/code.tmpl
+++ b/templates/explore/code.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content explore users">
+<div role="main" aria-label="{{.Title}}" class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "code/searchform" .}}
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index 36267baf339..56c6ee56a07 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content explore users">
+<div role="main" aria-label="{{.Title}}" class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index 457ad74115e..dfede2ffcc0 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content explore repositories">
+<div role="main" aria-label="{{.Title}}" class="page-content explore repositories">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/repo_search" .}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 5fb79c0dd02..336daea7c8a 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content explore users">
+<div role="main" aria-label="{{.Title}}" class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 87192fa55b6..52ad1b12dfc 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content home">
+<div role="main" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}" class="page-content home">
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div>
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 0625f43cc4e..3d33dcbcb76 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content install">
+<div role="main" aria-label="{{.Title}}" class="page-content install">
 	<div class="ui middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<h3 class="ui top attached header">
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 26c432303ce..8da46fb325b 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization new org">
+<div role="main" aria-label="{{.Title}}" class="page-content organization new org">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index eea5a076db6..b3724e7a63f 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization profile">
+<div role="main" aria-label="{{.Title}}" class="page-content organization profile">
 	<div class="ui container df">
 		{{avatar .Org 140 "org-avatar"}}
 		<div id="org-info">
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index fceb0801341..b4f788e5230 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization members">
+<div role="main" aria-label="{{.Title}}" class="page-content organization members">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl
index 544ed387423..1f113b28c84 100644
--- a/templates/org/projects/list.tmpl
+++ b/templates/org/projects/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "user/overview/header" .}}
 	{{template "projects/list" .}}
 </div>
diff --git a/templates/org/projects/new.tmpl b/templates/org/projects/new.tmpl
index b3d6c6001e3..f550cdc828d 100644
--- a/templates/org/projects/new.tmpl
+++ b/templates/org/projects/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "user/overview/header" .}}
 	{{template "projects/new" .}}
 </div>
diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl
index 03327e25300..c2d8f015f10 100644
--- a/templates/org/projects/view.tmpl
+++ b/templates/org/projects/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "user/overview/header" .}}
 	{{template "projects/view" .}}
 </div>
diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl
index 8bdd99deb86..35736df591e 100644
--- a/templates/org/settings/applications.tmpl
+++ b/templates/org/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings options">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl
index 2c7fa842b3b..861651a15e7 100644
--- a/templates/org/settings/applications_oauth2_edit.tmpl
+++ b/templates/org/settings/applications_oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings options">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
 	{{template "org/header" .}}
 
 	{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 8a38dcafe35..669e393e1de 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings delete">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings delete">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 081f5a28394..4685225f4c8 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings new webhook">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings new webhook">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index cb0243bb1eb..3abbc62ecf8 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings webhooks">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
index a6b5405a428..5436bcba05c 100644
--- a/templates/org/settings/labels.tmpl
+++ b/templates/org/settings/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings labels">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings labels">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 1b12c1221b9..b52639fb19b 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings options">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/packages.tmpl b/templates/org/settings/packages.tmpl
index bb5d95e1072..412a9813c21 100644
--- a/templates/org/settings/packages.tmpl
+++ b/templates/org/settings/packages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings packages">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/packages_cleanup_rules_edit.tmpl b/templates/org/settings/packages_cleanup_rules_edit.tmpl
index 8c3725f4d7e..195c21da0c5 100644
--- a/templates/org/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings packages">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/packages_cleanup_rules_preview.tmpl b/templates/org/settings/packages_cleanup_rules_preview.tmpl
index e0e4652c367..771e6cb8f3d 100644
--- a/templates/org/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_preview.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings packages admin">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages admin">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl
index 70add15f50f..909c16f4484 100644
--- a/templates/org/settings/secrets.tmpl
+++ b/templates/org/settings/secrets.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization settings webhooks">
+<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl
index a696d994980..ef365dee3a0 100644
--- a/templates/org/team/invite.tmpl
+++ b/templates/org/team/invite.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization invite">
+<div role="main" aria-label="{{.Title}}" class="page-content organization invite">
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<div class="ui centered card">
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index 1a58dc5339e..13bd6c5b5db 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization teams">
+<div role="main" aria-label="{{.Title}}" class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 005d7ce4e51..d9d3902fe1a 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization new team">
+<div role="main" aria-label="{{.Title}}" class="page-content organization new team">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 80bdf7b3dbf..0391a762faf 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization teams">
+<div role="main" aria-label="{{.Title}}" class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 5399f3a5940..66ac4a42119 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content organization teams">
+<div role="main" aria-label="{{.Title}}" class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index d1475be593c..a2c4bd4c282 100644
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings options">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings options">
 	{{template "user/overview/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 2222480e7cd..4611cdb8d84 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository view issue packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository view issue packages">
 	{{template "user/overview/header" .}}
 	<div class="ui container">
 		<div>
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl
index 4abfe171ddd..e098f43fda8 100644
--- a/templates/post-install.tmpl
+++ b/templates/post-install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content install">
+<div role="main" aria-label="{{.Title}}" class="page-content install">
 	<div class="ui container">
 		<div class="ui grid">
 			<div class="sixteen wide column content">
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index ae2eaec6eaa..21a3350a75d 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -1,4 +1,4 @@
-<div class="page-content repository projects">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects">
 	<div class="ui container">
 		{{if .CanWriteProjects}}
 			<div class="navbar">
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index 1069102792b..04192c64c26 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -1,4 +1,4 @@
-<div class="page-content repository projects edit-project new milestone">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects edit-project new milestone">
 	<div class="ui container">
 		<div class="navbar">
 			{{if and .CanWriteProjects .PageIsEditProject}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index ac72acb82b6..42eb578074d 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -1,4 +1,4 @@
-<div class="page-content repository projects view-project">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
 	<div class="ui container">
 		<div class="ui two column stackable grid">
 			<div class="column">
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index cc6ca95edbd..255951824d2 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository commits">
+<div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header"><time data-format="date" datetime="{{.DateFrom}}">{{.DateFrom}}</time> - <time data-format="date" datetime="{{.DateUntil}}">{{.DateUntil}}</time>
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index abce6591bd4..ee844299ab6 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content ui repository branches">
+<div role="main" aria-label="{{.Title}}" class="page-content ui repository branches">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 6a40d5fbee5..b847a282bdd 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository diff">
+<div role="main" aria-label="{{.Title}}" class="page-content repository diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		{{$class := ""}}
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 9282e1d387e..0188a39281d 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository commits">
+<div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "repo/sub_menu" .}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 455bbf757e6..115d829e4f9 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new repo">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new repo">
 	<div class="ui middle very relaxed page one column grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 029e7717a44..1010863b799 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 
diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl
index 7f016f4649b..55c6252991a 100644
--- a/templates/repo/editor/cherry_pick.tmpl
+++ b/templates/repo/editor/cherry_pick.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file editor edit">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl
index 08493944bf2..2c0c2fc792e 100644
--- a/templates/repo/editor/delete.tmpl
+++ b/templates/repo/editor/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file editor delete">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file editor delete">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index ebe56ec477f..3bc9da99b04 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file editor edit">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index ad72a256e7a..892adf957b6 100644
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file editor edit">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl
index f8496d5911a..211859113f7 100644
--- a/templates/repo/editor/upload.tmpl
+++ b/templates/repo/editor/upload.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file editor upload">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file editor upload">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 24547758a7f..cb883e8df5a 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository quickstart">
+<div role="main" aria-label="{{.Title}}" class="page-content repository quickstart">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl
index 00fa6dc8ff6..ab6f03f4ada 100644
--- a/templates/repo/find/files.tmpl
+++ b/templates/repo/find/files.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository">
+<div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="df ac">
diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl
index 56e60d4229e..b328dc0c196 100644
--- a/templates/repo/forks.tmpl
+++ b/templates/repo/forks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository forks">
+<div role="main" aria-label="{{.Title}}" class="page-content repository forks">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl
index 7efd6ec023d..52c013a5d1d 100644
--- a/templates/repo/graph.tmpl
+++ b/templates/repo/graph.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository commits">
+<div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div id="git-graph-container" class="ui segment{{if eq .Mode "monochrome"}} monochrome{{end}}">
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 82e6626e333..bdca346f8b2 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file list {{if .IsBlame}}blame{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl
index 609cd484368..192754f5f77 100644
--- a/templates/repo/issue/choose.tmpl
+++ b/templates/repo/issue/choose.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new issue">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl
index 88cfd124a72..82cfcd07120 100644
--- a/templates/repo/issue/labels.tmpl
+++ b/templates/repo/issue/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository labels">
+<div role="main" aria-label="{{.Title}}" class="page-content repository labels">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index b9ae3620167..23bcc60f94f 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository">
+<div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column grid issue-list-headers">
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index f3e28208adb..f0d6ae6bfe9 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository">
+<div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui two column stackable grid">
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 06469c4b54c..ac34fb0f0d1 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new milestone">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 3282e895ebc..0d0a18b631f 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository milestones">
+<div role="main" aria-label="{{.Title}}" class="page-content repository milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl
index 496b4b5a701..6abff2adde7 100644
--- a/templates/repo/issue/new.tmpl
+++ b/templates/repo/issue/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new issue">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index e2d1d7ed95c..c92b50444c5 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository view issue pull">
+<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui two column grid">
diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl
index 0f9b377f212..e20bd70e718 100644
--- a/templates/repo/migrate/codebase.tmpl
+++ b/templates/repo/migrate/codebase.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
index 1ef031ee1f8..0757948a6c4 100644
--- a/templates/repo/migrate/git.tmpl
+++ b/templates/repo/migrate/git.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl
index 5e6b3b45283..020115be6cc 100644
--- a/templates/repo/migrate/gitbucket.tmpl
+++ b/templates/repo/migrate/gitbucket.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index f56f9df5ec7..ef28e15ee5f 100644
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index c4249f8904b..b6c39134f0b 100644
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index a959833e966..454194542e4 100644
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
index 6d331b9e8fe..acd7ec950eb 100644
--- a/templates/repo/migrate/gogs.tmpl
+++ b/templates/repo/migrate/gogs.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl
index ff96e6793ba..e69cb5724b1 100644
--- a/templates/repo/migrate/migrate.tmpl
+++ b/templates/repo/migrate/migrate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			{{template "repo/migrate/helper" .}}
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index c06f4b57292..e6d329a1ab7 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository">
+<div role="main" aria-label="{{.Title}}" class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl
index 18256aca5dc..ec8c06cc70d 100644
--- a/templates/repo/migrate/onedev.tmpl
+++ b/templates/repo/migrate/onedev.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new migrate">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/packages.tmpl b/templates/repo/packages.tmpl
index 69bea014d7e..47fa338a440 100644
--- a/templates/repo/packages.tmpl
+++ b/templates/repo/packages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "repo/header" .}}
 	{{template "package/shared/list" .}}
 </div>
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 274734f515a..f717934b337 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository projects milestones">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index 5edca90886b..79f9380dce6 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository projects edit-project new milestone">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects edit-project new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 262efd2e0e8..1c09aade352 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository projects view-project">
+<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui two column stackable grid">
diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl
index 64f377d7a4b..bb113da268f 100644
--- a/templates/repo/pulls/commits.tmpl
+++ b/templates/repo/pulls/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository view issue pull commits">
+<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl
index 9b240000028..e5e91bf5c33 100644
--- a/templates/repo/pulls/files.tmpl
+++ b/templates/repo/pulls/files.tmpl
@@ -3,7 +3,7 @@
 <input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
 <input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/>
 
-<div class="page-content repository view issue pull files diff">
+<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull files diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		<div class="navbar">
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index 4e20642cf61..d3e017aa03b 100644
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new fork">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new fork">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 9f4104bec5c..f38106cfdfd 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository release">
+<div role="main" aria-label="{{.Title}}" class="page-content repository release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 1781a36cfca..b4b7186a9a7 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new release">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl
index c68d20cdd2d..e4f1d01a08b 100644
--- a/templates/repo/search.tmpl
+++ b/templates/repo/search.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository file list">
+<div role="main" aria-label="{{.Title}}" class="page-content repository file list">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui repo-search">
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index ad3b3275e88..f7127fd7934 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings edit">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 2f932b4c395..1d0c6603672 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings collaboration">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 44c916eefbd..ff9628d3502 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 69421d2cb03..a4f87782252 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings edit githook">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit githook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 9fa396c8d57..81d61fcd169 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings githooks">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings githooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 405fc624bea..566a701efb2 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings lfs">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 6d20aaddef1..eb67de20a01 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings lfs">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index fb0ad98667a..d5983ca1cc8 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings lfs">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index 26d5688106d..73bfe08adae 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings lfs">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 07633e33428..8eebc6e870a 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings lfs">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 0383364279d..cc298ddd849 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings options">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings options">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 7a4405efb7b..030b9d02569 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings branches">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings branches">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 56ce278e586..1b2d6f7c88b 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings edit">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index a9404790dc4..442434007dd 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings webhooks">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings webhooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 2722e099bee..5102390db9b 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository settings new webhook">
+<div role="main" aria-label="{{.Title}}" class="page-content repository settings new webhook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl
index 6afb89b268d..ebd8f0faadf 100644
--- a/templates/repo/watchers.tmpl
+++ b/templates/repo/watchers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository watchers">
+<div role="main" aria-label="{{.Title}}" class="page-content repository watchers">
 	{{template "repo/header" .}}
 	{{template "repo/user_cards" .}}
 </div>
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index 26c19c0a43f..194e40122b9 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository wiki new">
+<div role="main" aria-label="{{.Title}}" class="page-content repository wiki new">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index 3c53fe1e8ad..ea5b9709c47 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository wiki pages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository wiki pages">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header df ac sb">
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index b49441f4eb8..c5256ab5347 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository wiki revisions">
+<div role="main" aria-label="{{.Title}}" class="page-content repository wiki revisions">
 	{{template "repo/header" .}}
 	{{$title := .title}}
 	<div class="ui container">
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl
index e353fcab41b..c98ee6f3c90 100644
--- a/templates/repo/wiki/start.tmpl
+++ b/templates/repo/wiki/start.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository wiki start">
+<div role="main" aria-label="{{.Title}}" class="page-content repository wiki start">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui center segment">
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 3cd6617dd9a..b5e65dffcf2 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository wiki view">
+<div role="main" aria-label="{{.Title}}" class="page-content repository wiki view">
 	{{template "repo/header" .}}
 	{{$title := .title}}
 	<div class="ui container">
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 8dd4cfb8ae3..fcef783f682 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content ui container center full-screen-width {{if .IsRepo}}repository{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content ui container center full-screen-width {{if .IsRepo}}repository{{end}}">
 	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	<div class="ui container center">
 		<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"/></p>
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index cdedd947a08..89dfeac3f2c 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content ui container full-screen-width center">
+<div role="main" aria-label="{{.Title}}" class="page-content ui container full-screen-width center">
 	<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/500.png" alt="500"/></p>
 	<div class="ui divider"></div>
 	<br>
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index ef72ef1e545..5a44529d18d 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user activate">
+<div role="main" aria-label="{{.Title}}" class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
diff --git a/templates/user/auth/change_passwd.tmpl b/templates/user/auth/change_passwd.tmpl
index b1d8c9db2cb..e05f46fa6b2 100644
--- a/templates/user/auth/change_passwd.tmpl
+++ b/templates/user/auth/change_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui container">
 		{{template "user/auth/change_passwd_inner" .}}
 	</div>
diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl
index 39163b30bee..2b833d9b326 100644
--- a/templates/user/auth/finalize_openid.tmpl
+++ b/templates/user/auth/finalize_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin">
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "user/auth/finalize_openid_navbar" .}}
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index cd42085e283..f80e28937e1 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user forgot password">
+<div role="main" aria-label="{{.Title}}" class="page-content user forgot password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl
index 682614dee58..c906db3e0a1 100644
--- a/templates/user/auth/grant.tmpl
+++ b/templates/user/auth/grant.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box">
+<div role="main" aria-label="{{.Title}}" class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box">
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
 			<h3 class="ui top attached header">
diff --git a/templates/user/auth/grant_error.tmpl b/templates/user/auth/grant_error.tmpl
index b775ac9b922..cfb7e8663b0 100644
--- a/templates/user/auth/grant_error.tmpl
+++ b/templates/user/auth/grant_error.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box {{if .IsRepo}}repository{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box {{if .IsRepo}}repository{{end}}">
 	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl
index 4525bf551af..1e059f68144 100644
--- a/templates/user/auth/link_account.tmpl
+++ b/templates/user/auth/link_account.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user link-account">
+<div role="main" aria-label="{{.Title}}" class="page-content user link-account">
 	<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
 		<div class="new-menu-inner">
 			<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
diff --git a/templates/user/auth/prohibit_login.tmpl b/templates/user/auth/prohibit_login.tmpl
index d002ad7ae0a..ddb16a7f265 100644
--- a/templates/user/auth/prohibit_login.tmpl
+++ b/templates/user/auth/prohibit_login.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user activate">
+<div role="main" aria-label="{{.Title}}" class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form">
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index e55eb8d330e..44937786989 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user reset password">
+<div role="main" aria-label="{{.Title}}" class="page-content user reset password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index d6cb7cc949f..b0e9ce8c74f 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui middle very relaxed page grid">
 		<div class="ui container column fluid">
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index 87004eda92c..7a54589fd9e 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin openid">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin openid">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 7b11731c806..1d03f610dce 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui middle very relaxed page grid">
 		{{template "user/auth/signup_inner" .}}
 	</div>
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index 36f0277b402..89a2e410e89 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signup">
+<div role="main" aria-label="{{.Title}}" class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index e54600ec822..a490ea5a74d 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signup">
+<div role="main" aria-label="{{.Title}}" class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
index 5c735b27b6c..4002266054e 100644
--- a/templates/user/auth/twofa.tmpl
+++ b/templates/user/auth/twofa.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index bb3bbaa07f0..4ed7fce55e9 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user signin">
+<div role="main" aria-label="{{.Title}}" class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl
index ecd6aa566ca..338aae2be16 100644
--- a/templates/user/code.tmpl
+++ b/templates/user/code.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository code-search">
+<div role="main" aria-label="{{.Title}}" class="page-content repository code-search">
 	{{template "user/overview/header" .}}
 	<div class="ui container">
 		{{template "code/searchform" .}}
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 3eb8294e772..d4553ea61ba 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content dashboard feeds">
+<div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 4ff6772a729..ab7a403fa3a 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content dashboard issues">
+<div role="main" aria-label="{{.Title}}" class="page-content dashboard issues">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index fc9c92278fc..736d703ee8e 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content dashboard issues repository milestones">
+<div role="main" aria-label="{{.Title}}" class="page-content dashboard issues repository milestones">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index 7c9f4d4a9be..702dd419a39 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -1,4 +1,4 @@
-<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}">
+<div role="main" aria-label="{{.Title}}" class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}">
 	<div class="ui container">
 		<h1 class="ui dividing header">{{.locale.Tr "notification.notifications"}}</h1>
 		<div class="ui top attached tabular menu">
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl
index aa89c12dded..2083902c5af 100644
--- a/templates/user/notification/notification_subscriptions.tmpl
+++ b/templates/user/notification/notification_subscriptions.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user notification" id="notification_subscriptions" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}">
+<div role="main" aria-label="{{.Title}}" class="page-content user notification" id="notification_subscriptions" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}">
 	<div class="ui container">
 		<div class="ui top attached tabular menu">
 			<a href="{{AppSubUrl}}/notifications/subscriptions" class="{{if eq .Status 1}}active {{end}}item">
diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl
index c647d5a71cd..0bab740f5c2 100644
--- a/templates/user/overview/package_versions.tmpl
+++ b/templates/user/overview/package_versions.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "user/overview/header" .}}
 	{{template "package/shared/versionlist" .}}
 </div>
diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl
index 8c3ca36c319..8f8597c42d1 100644
--- a/templates/user/overview/packages.tmpl
+++ b/templates/user/overview/packages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository packages">
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
 	{{template "user/overview/header" .}}
 	{{template "package/shared/list" .}}
 </div>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 74211eb67b8..512e1187cd0 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user profile">
+<div role="main" aria-label="{{.Title}}" class="page-content user profile">
 	<div class="ui container">
 		<div class="ui stackable grid">
 			<div class="ui five wide column">
diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl
index d38d84d95cf..59eff13aa71 100644
--- a/templates/user/project.tmpl
+++ b/templates/user/project.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content repository new repo">
+<div role="main" aria-label="{{.Title}}" class="page-content repository new repo">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 3070e8889c0..9a57bd57226 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings account">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings account">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index 233e682621b..528fe52f2b4 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings sshkeys">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 5cea142238f..29d76862f54 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings applications">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index eb40976fb19..d2ca83b90d1 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings applications">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 
 	{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index c88868d000f..9a4be2b2c2c 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings sshkeys">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 703ac8ad8ed..8f1f682abf4 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings organization">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings organization">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index 2612313454e..9aae14f9343 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings packages">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_edit.tmpl b/templates/user/settings/packages_cleanup_rules_edit.tmpl
index 4cf642b7e16..114c825a483 100644
--- a/templates/user/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings packages">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_preview.tmpl b/templates/user/settings/packages_cleanup_rules_preview.tmpl
index 20041f9a42f..d37e5148b38 100644
--- a/templates/user/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_preview.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings packages admin">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings packages admin">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "package/shared/cleanup_rules/preview" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 87b6e37ed52..a362bf2c2d9 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings profile">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings profile">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 54ea7ad2e16..c655aa86d71 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings repos">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index d93be9f6401..d412a4f4e84 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings security">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings security">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index 0eb543f7471..b7e1f4b7cc2 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="page-content user settings twofa">
+<div role="main" aria-label="{{.Title}}" class="page-content user settings twofa">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}