diff --git a/assets/sass/print.scss b/assets/sass/print.scss
index 8470842..26baccc 100644
--- a/assets/sass/print.scss
+++ b/assets/sass/print.scss
@@ -33,7 +33,7 @@ footer {
     background-color: $white;
   }
 
-  [role='main'] {
+  .main {
     width: 100%;
   }
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index c64f8c7..f227d90 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -13,7 +13,7 @@
 
 <body>
 <div class="page layout__page{{ if $.Param "sidebar" | default true }} layout__sidebar-second{{ end }}">
-<header class="header layout__header" role="banner">
+<header class="header layout__header">
 {{ if $.Param "logo" | default true }}<a href="{{ "/" | relLangURL }}" title="Home" rel="home" class="header__logo"><img src="{{ "/images/logo.png" | relURL }}" alt="Home" class="header__logo-image"></a>{{ end }}
 <h1 class="header__site-name">
 <a href="{{ "/" | relLangURL }}" title="Home" class="header__site-link" rel="home"><span>{{ .Site.Title }}</span></a>
@@ -30,7 +30,7 @@
 
 {{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . -}}{{ end }}
 
-<footer class="footer layout__footer" role="contentinfo">
+<footer class="footer layout__footer">
 {{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
 <p>{{ with $.Param "copyright" }}{{ . | markdownify }}{{ else }}<span>© {{ .Site.Title }}</span>{{ end }}</p>
 {{ with $.Param "footer" }}<p>{{ . | markdownify }}</p>{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9425246..a4f569a 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -8,7 +8,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="main layout__main" role="main">
+<main class="main layout__main">
 <h1 class="title">{{ .Title }}</h1>
 {{ $paginator := .Paginate (.Data.Pages) -}}
 {{ range $paginator.Pages -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d4484a0..5a77d0d 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,7 +8,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="main layout__main" role="main">
+<main class="main layout__main">
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}">{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <header>
diff --git a/layouts/index.html b/layouts/index.html
index 74abd0d..ed078c8 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -11,7 +11,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="main layout__main" role="main">
+<main class="main layout__main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <div class="content">
 {{ .Content }}
diff --git a/layouts/micro/single.html b/layouts/micro/single.html
index a264c9a..110908a 100644
--- a/layouts/micro/single.html
+++ b/layouts/micro/single.html
@@ -7,7 +7,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="main layout__main" role="main">
+<main class="main layout__main">
 <h1 class="title hidden">{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 {{ if $.Param "submitted" | default false }}<a href="{{ .RelPermalink }}">{{ partial "submitted.html" . -}}</a>{{ end }}
diff --git a/layouts/partials/language-selector.html b/layouts/partials/language-selector.html
index c60186f..b9a9e4d 100644
--- a/layouts/partials/language-selector.html
+++ b/layouts/partials/language-selector.html
@@ -1,5 +1,5 @@
 <h2 class="visually-hidden">{{ i18n "lang_select_title" }}</h2>
-<nav class="language-selector layout__language-selector" role="navigation">
+<nav class="language-selector layout__language-selector">
 <ul class="navbar">
 {{ if .IsTranslated -}}
 {{ range .Translations }}
diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html
index 8b72ad3..c1e1288 100644
--- a/layouts/partials/matomo.html
+++ b/layouts/partials/matomo.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script>
   var _paq = window._paq || [];
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
@@ -7,6 +7,6 @@
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '{{ .Site.Params.piwikSiteID }}']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 695de54..4a39f60 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,7 +1,7 @@
 {{ $home := relLangURL "/" }}
 {{ $currentSection := .Section }}
 {{ $currentID := .UniqueID }}
-<nav class="main-menu layout__navigation" role="navigation">
+<nav class="main-menu layout__navigation">
 <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
 <ul class="navbar">
 <li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index e0081df..9c4fa76 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -9,7 +9,7 @@
     {{ $home := relLangURL "/" }}
     {{ $currentSection := .Section }}
     {{ $currentID := .UniqueID }}
-    <nav class="mobile-nav__main-menu" role="navigation">
+    <nav class="mobile-nav__main-menu">
     <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
     <ul class="mobile-nav__navbar">
     <li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 03eede3..e16b9d5 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,5 +1,5 @@
 {{ $currentID := .UniqueID }}
-<aside class="sidebar layout__second-sidebar" role="complementary">
+<aside class="sidebar layout__second-sidebar">
 {{ range $.Site.Home.Sections -}}
 <section>
 <h4 class="menu"><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>