diff --git a/layouts/404.html b/layouts/404.html
index 5d5132a..7fd04c0 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,9 @@
 {{ define "main" }}
-<div class="page404 block center">
-	<h1 class="page404__title">{{ T "page404_title" }}</h1>
-	<p class="page404__lead">{{ T "page404_lead" }}</p>
-	<a class="page404__link" href="">{{ T "page404_link" }}</a>
-</div>
+	<main class="main">
+		<div class="page404 block center">
+			<h1 class="page404__title">{{ T "page404_title" }}</h1>
+			<p class="page404__lead">{{ T "page404_lead" }}</p>
+			<a class="page404__link" href="">{{ T "page404_link" }}</a>
+		</div>
+	</main>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0208370..a7a0bca 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -26,7 +26,7 @@
 </head>
 <body>
 	{{ partial "header" . }}
-	<div class="main">
+	<div class="primary">
 	{{ block "main" . }}
 		{{- if or .Title .Content }}
 		<div class="page block">
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index bd8a291..07d2608 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,10 +1,12 @@
 {{ define "main" }}
-	<div class="cards">
-		{{ range .Paginator.Pages }}
-			<div class="card{{ if $.Param "cardsPerRow" }} card--{{ $.Param "cardsPerRow" }}col{{ else }} card--2col{{ end }}">
-				{{ .Render "summary" }}
-			</div>
-		{{ end }}
-	</div>
+	<main class="main">
+		<div class="cards">
+			{{ range .Paginator.Pages }}
+				<div class="card{{ if $.Param "cardsPerRow" }} card--{{ $.Param "cardsPerRow" }}col{{ else }} card--2col{{ end }}">
+					{{ .Render "summary" }}
+				</div>
+			{{ end }}
+		</div>
+	</main>
 	{{ partial "pagination.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b841ac2..c862940 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,19 +1,21 @@
 {{ define "main" }}
-	<div class="single block">
-		<article class="post">
-			{{- partial "post_thumbnail.html" (dict "page" . ) }}
-			<div class="post__meta meta mb">{{ partial "post_meta.html" . }}</div>
-			<h1 class="post__title">{{ .Title }}</h1>
-			{{- partial "post_toc.html" . }}
-			<div class="post__content">{{ .Content }}</div>
-			{{ if or (.Param "share") (isset $.Params "tags") }}
-			<footer class="post__footer">
-				{{ partial "post_tags.html" . }}
-				{{ partial "post_share.html" . }}
-			</footer>
-			{{ end }}
-		</article>
-	</div>
+	<main class="main">
+		<div class="single block">
+			<article class="post">
+				{{- partial "post_thumbnail.html" (dict "page" . ) }}
+				<div class="post__meta meta mb">{{ partial "post_meta.html" . }}</div>
+				<h1 class="post__title">{{ .Title }}</h1>
+				{{- partial "post_toc.html" . }}
+				<div class="post__content">{{ .Content }}</div>
+				{{ if or (.Param "share") (isset $.Params "tags") }}
+				<footer class="post__footer">
+					{{ partial "post_tags.html" . }}
+					{{ partial "post_share.html" . }}
+				</footer>
+				{{ end }}
+			</article>
+		</div>
+	</main>
 	{{ partial "related.html" . }}
 	{{ partial "comments.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 6ec6de9..9b76715 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,20 +1,22 @@
 {{ define "main" }}
-	<div class="cards">
-	{{ $mainSections := .Site.Params.mainSections | default (slice "post") }}
-	{{ $paginator := .Paginate ( where .Data.Pages "Section" "in" $mainSections ) }}
-	{{ range $paginator.Pages }}
-		<div class="card{{ if $.Param "cardsPerRow" }} card--{{ $.Param "cardsPerRow" }}col{{ else }} card--2col{{ end }}">
-		{{ .Render "summary" }}
+	<main class="main">
+		<div class="cards">
+		{{ $mainSections := .Site.Params.mainSections | default (slice "post") }}
+		{{ $paginator := .Paginate ( where .Data.Pages "Section" "in" $mainSections ) }}
+		{{ range $paginator.Pages }}
+			<div class="card{{ if $.Param "cardsPerRow" }} card--{{ $.Param "cardsPerRow" }}col{{ else }} card--2col{{ end }}">
+			{{ .Render "summary" }}
+			</div>
+		{{ end }}
 		</div>
-	{{ end }}
-	</div>
-	{{- if eq $paginator.TotalNumberOfElements 0 }}
-		<div class="empty block center">
-			<div class="empty__icon">¯\_(ツ)_/¯</div>
-			<h3 class="empty__title">{{ T "empty_title" }}</h3>
-			<p class="empty__text">{{ T "empty_text_start" | safeHTML }} ({{ delimit (apply $mainSections "printf" "<code>content/%s</code>" ".") ", " | safeHTML }}), {{ T "empty_text_end" }}.</p>
-			<p class="empty__tip">{{ T "empty_tip" | safeHTML }}</p>
-		</div>
-	{{- end }}
+		{{- if eq $paginator.TotalNumberOfElements 0 }}
+			<div class="empty block center">
+				<div class="empty__icon">¯\_(ツ)_/¯</div>
+				<h3 class="empty__title">{{ T "empty_title" }}</h3>
+				<p class="empty__text">{{ T "empty_text_start" | safeHTML }} ({{ delimit (apply $mainSections "printf" "<code>content/%s</code>" ".") ", " | safeHTML }}), {{ T "empty_text_end" }}.</p>
+				<p class="empty__tip">{{ T "empty_tip" | safeHTML }}</p>
+			</div>
+		{{- end }}
+	</main>
 	{{ partial "pagination.html" . }}
 {{ end }}
\ No newline at end of file
