diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 70f9101..79f51d8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -38,7 +38,9 @@
 <body>
 
 {{ partial "header.html" . }}
+<main>
 {{ block "main" . }}{{ end }}
+</main>
 {{ partial "extra_foot.html" . }}
 {{ partial "footer.html" . }}
 </body>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8e30353..9143e7b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,11 +3,11 @@
   <p id="nocolor_list">{{ .Title }}:</p>
   <ul>
     {{- range .Paginator.Pages }}
-    <li>
-      <div class="post-title">
+    <li role="article">
+      <section class="post-title" aria-label="Title">
         {{- if .Draft }}DRAFT: {{ end }}
         <a href="{{ .RelPermalink }}">{{ .Title }}</a>
-      </div>
+      </section>
       {{ partial "post_meta.html" . }}
     </li>
     {{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c6f6fde..5b3e47c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,8 +1,12 @@
 {{- define "main" }}
-<h1 class="post-title">{{ if .Draft }}DRAFT: {{ end }}{{ .Title }}</h1>
-{{ partial "post_meta.html" . }}
+<article aria-labelledby="nocolor_title">
+  <h1 class="post-title" id="nocolor_title">{{ if .Draft }}DRAFT: {{ end }}{{ .Title }}</h1>
+  {{ partial "post_meta.html" . }}
 
-{{ partial "toc.html" . }}
+  {{ partial "toc.html" . }}
 
-<article class="content">{{ .Content }}</article>
+<section class="content" aria-label="Content">
+{{ .Content }}
+</section>
+</article>
 {{- end }}
diff --git a/layouts/index.html b/layouts/index.html
index 42ae24c..7c0e203 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,18 +2,16 @@
 {{- $showfull := default false $.Site.Params.showFullContent }}
 {{- $pagepool := where $.Site.RegularPages "Type" "in" $.Site.Params.mainSections }}
 {{- range $idx, $_ := (.Paginate $pagepool).Pages }}
-<div{{ if and $showfull $idx }} class="post-divider"{{ end }}>
-  <div>
-    <h2 class="post-title">
-      {{ if .Draft }}DRAFT: {{ end }}
-      <a href="{{ .RelPermalink }}">{{ .Title }}</a>
-    </h2>
-    {{ partial "post_meta.html" . }}
-  </div>
-  <div>
+{{- $contentlabel := cond $showfull "Content" "Summary" }}
+<article{{ if and $showfull $idx }} class="post-divider"{{ end }}>
+  <h2 class="post-title">
+    {{ if .Draft }}DRAFT: {{ end }}<a href="{{ .RelPermalink }}">{{ .Title }}</a>
+  </h2>
+  {{ partial "post_meta.html" . }}
+  <section aria-label="{{ $contentlabel }}">
     {{ cond $showfull .Content .Summary }}
-  </div>
-</div>
+  </section>
+</article>
 {{- end }}
 {{ partial "pagination.html" . }}
 {{- end }}
