diff --git a/issues/_common/footer b/issues/_common/footer
index 845a0fc..000b18e 100644
--- a/issues/_common/footer
+++ b/issues/_common/footer
@@ -1,4 +1,3 @@
-        </section>
         </main>
         <footer>
             <hr />
diff --git a/issues/_common/header b/issues/_common/header
index 92f5445..d00ff89 100644
--- a/issues/_common/header
+++ b/issues/_common/header
@@ -13,7 +13,7 @@
         <meta property="og:image" content="https://webzine.puffy.cafe/images/logo.png" />
         <meta property="og:type" content="website" />
         <meta property="og:locale" content="en_EN" />
-        <title>OpenBSD_WEBZINE_ISSUE #__ISSUE__</title>
+        <title>OpenBSD Webzine #__ISSUE__</title>
         <style>
 
 #title {
diff --git a/issues/_index/00_METADATA.html b/issues/_index/00_METADATA.html
index 408884e..9331c45 100644
--- a/issues/_index/00_METADATA.html
+++ b/issues/_index/00_METADATA.html
@@ -1,8 +1,7 @@
-<div id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></div>
+<header>
+<h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
 <div id="banner">
-    <span aria-hidden="true">☕</span>
-	<em>Your tasty dose of OpenBSD news</em>
-    <span aria-hidden="true">☕</span>
+<span aria-hidden="true">☕</span><em>Your tasty dose of OpenBSD news</em><span aria-hidden="true">☕</span>
 </div>
+</header>
 <main>
-<section>
diff --git a/issues/_index/20_ISSUES.html b/issues/_index/20_ISSUES.html
index 56bbea7..40f11a0 100644
--- a/issues/_index/20_ISSUES.html
+++ b/issues/_index/20_ISSUES.html
@@ -1,4 +1,6 @@
+<article id="issues">
 <h2>Issues published</h2>
 <ul>
     <li>Issue #1 <a class="permalink" href="issue-1.html">[html]</a></li>
 </ul>
+</article>
diff --git a/issues/_index/30_INFOS.html b/issues/_index/30_INFOS.html
index b275b99..8a31684 100644
--- a/issues/_index/30_INFOS.html
+++ b/issues/_index/30_INFOS.html
@@ -1,5 +1,7 @@
+<article id="infos">
 <h2>Infos</h2>
 <div>
     <p>This webzine is done by volunteers who are passionate about the OpenBSD project development.</p>
     <p>Our goal is to allow people to stay informed about OpenBSD in a cool, fun and instructive way, like reading a regularly issued magazine of one's favorite hobby.</p>
 </div>
+</article>
diff --git a/issues/_index/60_COMMUNITY.html b/issues/_index/60_COMMUNITY.html
index e601b80..72fbc3e 100644
--- a/issues/_index/60_COMMUNITY.html
+++ b/issues/_index/60_COMMUNITY.html
@@ -1,14 +1,14 @@
+<article id="community">
 <h2>Community</h2>
-<div>
-    <p>Looking to get in touch with OpenBSD users? Here are a few ways to join them.</p>
-    <ul>
-        <li><a class="permalink" href="atom.xml">Webzine feed</a></li>
-        <li><a class="permalink" href="https://www.openbsd.org/mail.html">Official OpenBSD mailing-lists</a></li>
-        <li>IRC: channel <code>#openbsd</code> on irc.libera.chat</li>
-        <li>XMPP: room <a class="permalink" href="xmpp:openbsd@chat.si3t.ch?join">openbsd@chat.si3t.ch</a></li>
-        <li>Reddit: <a class="permalink" href="https://www.reddit.com/r/openbsd/">Subreddit /r/openbsd/</a></li>
-        <li>Matrix: channel <code>#openbsd:matrix.org</code></li>
-        <li>Mastodon: Search for tag #OpenBSD</li>
-        <li>Twitter: <a class="permalink" href="https://twitter.com/hashtag/openbsd">#OpenBSD</a></li>
-    </ul>
-</div>
+<p>Looking to get in touch with OpenBSD users? Here are a few ways to join them.</p>
+<ul>
+	<li><a class="permalink" href="atom.xml">Webzine feed</a></li>
+    <li><a class="permalink" href="https://www.openbsd.org/mail.html">Official OpenBSD mailing-lists</a></li>
+    <li>IRC: channel <code>#openbsd</code> on irc.libera.chat</li>
+    <li>XMPP: room <a class="permalink" href="xmpp:openbsd@chat.si3t.ch?join">openbsd@chat.si3t.ch</a></li>
+    <li>Reddit: <a class="permalink" href="https://www.reddit.com/r/openbsd/">Subreddit /r/openbsd/</a></li>
+    <li>Matrix: channel <code>#openbsd:matrix.org</code></li>
+    <li>Mastodon: Search for tag #OpenBSD</li>
+    <li>Twitter: <a class="permalink" href="https://twitter.com/hashtag/openbsd">#OpenBSD</a></li>
+</ul>
+</article>
diff --git a/issues/_index/70_CONTRIBUTE.html b/issues/_index/70_CONTRIBUTE.html
index 5ea7506..ddbc3c5 100644
--- a/issues/_index/70_CONTRIBUTE.html
+++ b/issues/_index/70_CONTRIBUTE.html
@@ -1,4 +1,7 @@
+<article id="contribute">
 <h2>How to contribute</h2>
-<div>
-    <p>If you want to contribute to the Webzine, from a simple contribution suggesting a link or a news to a large or regular contribution, we do all the work publicly with Git. <a class="permalink" href="https://tildegit.org/solene/openbsd-webzine/">Link to the Git repository.</a></p>
-</div>
+<p>
+	If you want to contribute to the Webzine, from a simple contribution suggesting a link or a news to a large or regular contribution, we do all the work publicly with Git. 
+	<a class="permalink" href="https://tildegit.org/solene/openbsd-webzine/">Link to the Git repository.</a>
+</p>
+</article>
diff --git a/issues/_template/00_METADATA.html b/issues/_template/00_METADATA.html
index af8610e..9dc663f 100644
--- a/issues/_template/00_METADATA.html
+++ b/issues/_template/00_METADATA.html
@@ -1,9 +1,8 @@
 <header>
-<h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
+<h2 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h2>
 <div id="banner">
     <p>ISSUE #__ISSUE__</p>
-    <p><time datetime="__DATE__">__DATE__</time></p>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
 </header>
 <main>
-<section>
\ No newline at end of file
diff --git a/issues/_template/10_HEADLINES.html b/issues/_template/10_HEADLINES.html
index a174991..661f559 100644
--- a/issues/_template/10_HEADLINES.html
+++ b/issues/_template/10_HEADLINES.html
@@ -1,5 +1,5 @@
 <article id="headlines">
-<h1>TL;DR</h1>
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 release very soon</li>
 </ul>
diff --git a/issues/_template/15_JOBS.html b/issues/_template/15_JOBS.html
index 8d2ccd7..175342e 100644
--- a/issues/_template/15_JOBS.html
+++ b/issues/_template/15_JOBS.html
@@ -1,10 +1,9 @@
-<!-- SECTION -->
 <!--
 <article id="jobs">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h1>Job offers</h1>
 <ul>
-    <li><a href=""></a></li>
+    <li><a class="permalink" href=""></a></li>
 </ul>
 </article>
 -->
diff --git a/issues/_template/20_CURRENT.html b/issues/_template/20_CURRENT.html
index f1c540a..a45ce4e 100644
--- a/issues/_template/20_CURRENT.html
+++ b/issues/_template/20_CURRENT.html
@@ -1,6 +1,6 @@
 <article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Recent -current changes</h1>
+<h2>Recent -current changes</h2>
 <ul>
     <li></li>
 </ul>
diff --git a/issues/_template/30_STABLE.html b/issues/_template/30_STABLE.html
index dd845be..8a2adad 100644
--- a/issues/_template/30_STABLE.html
+++ b/issues/_template/30_STABLE.html
@@ -1,6 +1,6 @@
 <article id="stable">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>6.9-stable changes</h1>
+<h2>6.9-stable changes</h2>
 <ul>
     <li></li>
 </ul>
diff --git a/issues/_template/40_INTERVIEW.html b/issues/_template/40_INTERVIEW.html
index 7fb3448..6d3b947 100644
--- a/issues/_template/40_INTERVIEW.html
+++ b/issues/_template/40_INTERVIEW.html
@@ -1,5 +1,5 @@
 <article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Interview</h1>
+<h2>Interview</h2>
 <p>…</p>
 </article>
diff --git a/issues/_template/50_TIPS.html b/issues/_template/50_TIPS.html
index 4d0d1a8..f7ee47d 100644
--- a/issues/_template/50_TIPS.html
+++ b/issues/_template/50_TIPS.html
@@ -1,6 +1,6 @@
 <article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>
 </p>
 </article>
diff --git a/issues/_template/60_COMMENTS.html b/issues/_template/60_COMMENTS.html
index 564693c..b100f71 100644
--- a/issues/_template/60_COMMENTS.html
+++ b/issues/_template/60_COMMENTS.html
@@ -1,6 +1,6 @@
 <article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
+<h2>Reader comments</h2>
 <p>
     <em>Message received from XXX: </em>
     <quote>blabla.</quote>
diff --git a/issues/_template/70_LINKS.html b/issues/_template/70_LINKS.html
index c56e33c..83c8f6c 100644
--- a/issues/_template/70_LINKS.html
+++ b/issues/_template/70_LINKS.html
@@ -1,6 +1,6 @@
 <article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
     <li><a class="permalink" href=""></a></li>
 </ul>
diff --git a/issues/_template/80_ARTWORK.html b/issues/_template/80_ARTWORK.html
index 8f98484..9be1e50 100644
--- a/issues/_template/80_ARTWORK.html
+++ b/issues/_template/80_ARTWORK.html
@@ -1,16 +1,15 @@
-<!-- section commented --
+<!-- section commented
 <article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
+<h2>Artworks of the moment</h2>
 <figure>
-    <a href="static/images/puffer_city_original.jpg"
+    <a href="static/images/puffer_city_original.jpg">
     <picture>
-    <img src="static/images/puffer_city_small.jpg"
-         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot."
-         width="100%" />
+        <img src="static/images/puffer_city_small.jpg"
+         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot." />
     </picture>
     </a>
     <figcaption>MASCOT</figcaption>
 </figure>
 </article>
--- END HTML Comment -->
+END HTML Comment -->
diff --git a/issues/_template/90_SOCIALMEDIA.html b/issues/_template/90_SOCIALMEDIA.html
index 3694478..9dd86f3 100644
--- a/issues/_template/90_SOCIALMEDIA.html
+++ b/issues/_template/90_SOCIALMEDIA.html
@@ -1,6 +1,6 @@
 <article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>On social media</h1>
+<h2>On social media</h2>
 <ul>
     <li><a class="permalink" href=""></a></li>
 </ul>
diff --git a/issues/_template/91_QUOTES.html b/issues/_template/91_QUOTES.html
index a1b3cf9..d95011a 100644
--- a/issues/_template/91_QUOTES.html
+++ b/issues/_template/91_QUOTES.html
@@ -1,7 +1,7 @@
-<!-- section commented --
+<!-- section commented
 <article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 
 <blockquote>
     glub
@@ -9,4 +9,4 @@
 </blockquote>
 
 </article>
--- END HTML Comment -->
+END HTML Comment -->
diff --git a/issues/issue-1/00_METADATA.html b/issues/issue-1/00_METADATA.html
index 8091b18..8400d5e 100644
--- a/issues/issue-1/00_METADATA.html
+++ b/issues/issue-1/00_METADATA.html
@@ -1,8 +1,8 @@
-<div id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></div>
+<header>
+<h1 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h1>
 <div id="banner">
-	<div>ISSUE #__ISSUE__</div>
-	<div>__DATE__</div>
+    <p>ISSUE #__ISSUE__</p>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
+</header>
 <main>
-<section>
-	
diff --git a/issues/issue-1/10_HEADLINES.html b/issues/issue-1/10_HEADLINES.html
index d00c062..b54eb2f 100644
--- a/issues/issue-1/10_HEADLINES.html
+++ b/issues/issue-1/10_HEADLINES.html
@@ -1,7 +1,8 @@
-<!-- SECTION -->
-<h1>TL;DR</h1>
+<article id="headlines">
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 release very soon</li>
     <li>LibreSSL problem with Let's Encrypt certificates</li>
     <li>First issue of this webzine!! We do have an <a href="atom.xml" class="permalink">Atom feed</a>.</li>
 </ul>
+</article>
diff --git a/issues/issue-1/20_CURRENT.html b/issues/issue-1/20_CURRENT.html
index 20eca70..7cb5ad2 100644
--- a/issues/issue-1/20_CURRENT.html
+++ b/issues/issue-1/20_CURRENT.html
@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Recent -current changes</h1>
+<h2>Recent -current changes</h2>
 <ul>
     <li>Base system repository has been locked and tagged 7.0 and development is now continuing.</li>
     <li>Ports tree is locked, meaning no ports changes are allowed to developers.</li>
 </ul>
+</article>
diff --git a/issues/issue-1/30_STABLE.html b/issues/issue-1/30_STABLE.html
index bc25110..9e5a7d9 100644
--- a/issues/issue-1/30_STABLE.html
+++ b/issues/issue-1/30_STABLE.html
@@ -1,6 +1,6 @@
-<!-- SECTION -->
+<article id="stable">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>6.9-stable changes</h1>
+<h2>6.9-stable changes</h2>
 <ul>
     <li>27 September 2021: Errata #16: sshd</li>
     <li>27 September 2021: Errata #17: libressl</li>
@@ -9,3 +9,4 @@
     One of the two root certificates used to sign Let's Encrypt certificates has expired.
     This is due to a bug in LibreSSL triggered by Let's Encrypt certificates being signed by two certificates of which one expired.</li>
 </ul>
+</article>
diff --git a/issues/issue-1/40_INTERVIEW.html b/issues/issue-1/40_INTERVIEW.html
index 6f77383..ed0ca4d 100644
--- a/issues/issue-1/40_INTERVIEW.html
+++ b/issues/issue-1/40_INTERVIEW.html
@@ -1,5 +1,8 @@
-<!-- SECTION>
+<!-- Commented Section
+<article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h2>Interview</h2>
 <p>
-</p-->
+</p>
+</article>
+END HTML Comment -->
diff --git a/issues/issue-1/50_TIPS.html b/issues/issue-1/50_TIPS.html
index ab8b7b3..a2ec5a3 100644
--- a/issues/issue-1/50_TIPS.html
+++ b/issues/issue-1/50_TIPS.html
@@ -1,6 +1,6 @@
-<!-- SECTION -->
+<article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>
  With the default shell ksh, you may have noticed typing
  <code>history</code> would only display the last 10 lines of the
@@ -10,3 +10,4 @@
  history from that number. Use <code>history 1</code> to display
  the complete history.
 </p>
+</article>
diff --git a/issues/issue-1/60_COMMENTS.html b/issues/issue-1/60_COMMENTS.html
index fc7f5a6..de6c6bd 100644
--- a/issues/issue-1/60_COMMENTS.html
+++ b/issues/issue-1/60_COMMENTS.html
@@ -1,7 +1,6 @@
-<!-- SECTION-->
+<article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
-<div>
-    <p>I love the idea of a webzine! <em>- many people after showing the Webzine mockup</em></p>
-    <p>Please, make an RSS feed! <em>- anonymous</em></p>
-</div>
+<h2>Reader comments</h2>
+<p>I love the idea of a webzine! <cite>- many people after showing the Webzine mockup</cite></p>
+<p>Please, make an RSS feed! <cite>- anonymous</cite></p>
+</article>
diff --git a/issues/issue-1/70_LINKS.html b/issues/issue-1/70_LINKS.html
index d4f0457..9d97737 100644
--- a/issues/issue-1/70_LINKS.html
+++ b/issues/issue-1/70_LINKS.html
@@ -1,8 +1,12 @@
-<!-- SECTION -->
+<article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
     <li><a class="permalink" href="https://twitter.com/openbsdnow">OpenBSD Now! Unofficial OpenBSD news, updates and thoughts</a></li>
     <li><a class="permalink" href="https://github.com/ligurio/awesome-openbsd">A curated list of awesome OpenBSD resources</a></li>
-    <li><a class="permalink" href="https://www.openbsd.org/papers/eurobsdcon2021-espie-debug.pdf">Debug Packages in OpenBSD : Marc Espie - EuroBSDCon conference</a> - <a class="permalink" href="https://www.youtube.com/watch?v=pcHn4dl-K5c&list=PLskKNopggjc4dadqaCDmctW-swHPD49td&index=6">video</a></li>
+    <li>
+        <a class="permalink" href="https://www.openbsd.org/papers/eurobsdcon2021-espie-debug.pdf">Debug Packages in OpenBSD : Marc Espie - EuroBSDCon conference</a> -
+        <a class="permalink" href="https://www.youtube.com/watch?v=pcHn4dl-K5c&list=PLskKNopggjc4dadqaCDmctW-swHPD49td&index=6">video</a>
+    </li>
 </ul>
+</article>
diff --git a/issues/issue-1/80_ARTWORK.html b/issues/issue-1/80_ARTWORK.html
index 572d9b0..60a82e5 100644
--- a/issues/issue-1/80_ARTWORK.html
+++ b/issues/issue-1/80_ARTWORK.html
@@ -1,11 +1,15 @@
-<!-- SECTION -->
+<article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
-<p>
+<h2>Artworks of the moment</h2>
+<figure>
     <a href="images/puffy_city_original.jpg">
+        <picture>
         <img src="images/puffy_city_small.jpg"
              alt="A drawing featuring a city viewed from some altitude with many characters looking like the OpenBSD mascot." />
+        </picture>
     </a>
-    <br />
-    Artwork originally found <a class="permalink" href="https://www.openbsd.org/artwork.html">here</a>.
-</p>
+    <figcaption>
+        <p>Artwork originally found <a class="permalink" href="https://www.openbsd.org/artwork.html">here</a>.</p>
+    </figcaption>
+</figure>
+</article>
diff --git a/issues/issue-1/90_SOCIALMEDIA.html b/issues/issue-1/90_SOCIALMEDIA.html
index 5011b23..8064c8d 100644
--- a/issues/issue-1/90_SOCIALMEDIA.html
+++ b/issues/issue-1/90_SOCIALMEDIA.html
@@ -1,6 +1,9 @@
-<!-- SECTION >
+<!-- Commented Section
+<article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
 <h2>On social media</h2>
 <ul>
     <li><a href=""></a></li>
-</ul-->
+</ul>
+</article>
+END HTML Comment -->
diff --git a/issues/issue-1/91_QUOTES.html b/issues/issue-1/91_QUOTES.html
index 3861fdf..a3b0643 100644
--- a/issues/issue-1/91_QUOTES.html
+++ b/issues/issue-1/91_QUOTES.html
@@ -1,13 +1,14 @@
-<!-- SECTION -->
+<article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 <blockquote>
-<ul>
+    <ul>
         <li>if you want something conceptualy less broken, give plan9 a try</li>
         <li>if you want something more polished, give vim+coreutils a try</li>
         <li>if you want something convivialist, openbsd is the best trade off i seen (you can also give try to sbase or 9base)</li>
         <li>if you want something more consistent, let's start our project :)</li>
         <li>if you want something perfect, let it go :)</li>
-</ul>
-    <cite>&mdash; Marc Chantreux on misc@ <a class="permalink" href="https://marc.info/?l=openbsd-misc&m=163077585122070&w=2">Source</a></cite>
+    </ul>
+    <cite>— Marc Chantreux on misc@ <a class="permalink" href="https://marc.info/?l=openbsd-misc&m=163077585122070&w=2">Source</a></cite>
 </blockquote>
+</article>
diff --git a/issues/issue-2/00_METADATA.html b/issues/issue-2/00_METADATA.html
index 5e46279..9dc663f 100644
--- a/issues/issue-2/00_METADATA.html
+++ b/issues/issue-2/00_METADATA.html
@@ -1,7 +1,8 @@
-<div id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></div>
+<header>
+<h2 id="title"><a href="https://webzine.puffy.cafe">OpenBSD Webzine</a></h2>
 <div id="banner">
-	<div>ISSUE #__ISSUE__</div>
-	<div>__DATE__</div>
+    <p>ISSUE #__ISSUE__</p>
+    <p><time datetime="__DATETIME__">__HUMAN_DATE__</time></p>
 </div>
+</header>
 <main>
-<section>
diff --git a/issues/issue-2/10_HEADLINES.html b/issues/issue-2/10_HEADLINES.html
index ff8808c..ae1ed03 100644
--- a/issues/issue-2/10_HEADLINES.html
+++ b/issues/issue-2/10_HEADLINES.html
@@ -1,7 +1,8 @@
-<!-- SECTION -->
-<h1>TL;DR</h1>
+<article id="headlines">
+<h2>TL;DR</h2>
 <ul>
     <li>OpenBSD 7.0 released!</li>
     <li>No more packages updates for 6.9, syspatch will still be published</li>
     <li>No more syspatches for 6.8, it is now end of life and shouldn't be used anymore</li>
 </ul>
+</article>
diff --git a/issues/issue-2/20_CURRENT.html b/issues/issue-2/20_CURRENT.html
index 2b2c060..37857cc 100644
--- a/issues/issue-2/20_CURRENT.html
+++ b/issues/issue-2/20_CURRENT.html
@@ -1,6 +1,16 @@
-<!-- SECTION -->
+<article id="current">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Recent -current changes</h1>
+<h2>New 7.0 release highlights</h2>
 <ul>
-    <li>Packages commits will flow after three weeks of locked ports tree.  Some breakages could happen.</li>
+    <li>doas is now asking password again on failure</li>
+    <li>better hardware support (AMD, docks)</li>
+    <li>faster (un)hibernate (ZZZ)</li>
+    <li>faster wifi speed</li>
+    <li>xterm has unveil</li>
+    <li>base gcc removed on amd64</li>
+    <li>bsd-reconfig to have a KARL compatible modified kernel</li>
+    <li>new <em>dhcpleased</em> and <em>resolvd</em> superseeding dhclient (now default for new installs). After upgrade you can switch to it: replace <code>dhcp</code> by <code>autoconf</code> in your network <code>hostname.if</code> file then enable and start the two services</li>
+    <li>performance improvements for heavy loads on many cores</li>
+    <li><a href="https://www.openbsd.org/plus70.html" class="permalink">Many other changes!</a></li>
 </ul>
+</article>
diff --git a/issues/issue-2/30_STABLE.html b/issues/issue-2/30_STABLE.html
index 190aadd..8375bf2 100644
--- a/issues/issue-2/30_STABLE.html
+++ b/issues/issue-2/30_STABLE.html
@@ -1,6 +1,6 @@
 <!-- SECTION -->
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>7.0-stable changes</h1>
+<h2>7.0-stable changes</h2>
 <ul>
     <li>No syspatch yet.</li>
 </ul>
diff --git a/issues/issue-2/40_INTERVIEW.html b/issues/issue-2/40_INTERVIEW.html
index 3c3e656..d2d4336 100644
--- a/issues/issue-2/40_INTERVIEW.html
+++ b/issues/issue-2/40_INTERVIEW.html
@@ -1,3 +1,4 @@
-<!-- SECTION -->
+<article id="interview">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Interview</h1>
+<h2>Interview</h2>
+</article>
diff --git a/issues/issue-2/50_TIPS.html b/issues/issue-2/50_TIPS.html
index b8a750a..8997337 100644
--- a/issues/issue-2/50_TIPS.html
+++ b/issues/issue-2/50_TIPS.html
@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="tips">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Shell tips</h1>
+<h2>Shell tips</h2>
 <p>OpenBSD 7.0 comes with a new utility named <em>timeout</em> to run a command and stop it after an user defined time.  The <a class="permalink" href="https://man.openbsd.org/timeout">man page</a> is available for full information.
 While it was possible to achieve this in shell using a child process sleeping for some time and stopping the main process if it wasn't finished yet, <em>timeout</em> makes this job very easy.
 One simple real world use case would be a lazy site-to-site synchronization using a rsync job run every night when the Internet uplink can be fully used and stop it right before people will need the network.  Such a scenario can be done with <code>timeout 8h rsync -a /data/ remote:/data/</code> and started from a cron job at 00h00.  In this case rsync would run at midnight and <em>timeout</em> would stop it at 8h00 if the job is not finished.
 </p>
+</article>
diff --git a/issues/issue-2/60_COMMENTS.html b/issues/issue-2/60_COMMENTS.html
index ff1e586..5cdbe3d 100644
--- a/issues/issue-2/60_COMMENTS.html
+++ b/issues/issue-2/60_COMMENTS.html
@@ -1,6 +1,7 @@
-<!-- SECTION -->
+<article id="comments">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Reader comments</h1>
+<h2>Reader comments</h2>
 <p>Nice!
-    <em>- jcs@openbsd</em>
+    <cite>- jcs@openbsd</cite>
 </p>
+</article>
diff --git a/issues/issue-2/70_LINKS.html b/issues/issue-2/70_LINKS.html
index b59ad10..0deff23 100644
--- a/issues/issue-2/70_LINKS.html
+++ b/issues/issue-2/70_LINKS.html
@@ -1,6 +1,10 @@
-<!-- SECTION -->
+<article id="links">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Going further</h1>
+<h2>Going further</h2>
 <ul>
-    <li><a href=""></a></li>
+    <li><a class="permalink" href=""></a></li>
+    <li><a class="permalink" href="https://www.openbsd.org/faq/upgrade70.html">Official OpenBSD upgrade guide to 7.0</a></li>
+    <li><a class="permalink" href="https://www.playonbsd.com/shopping_guide/">PlayOnBSD shopping Guide (list of compatible commercial games)</a></li>
+    <li><a class="permalink" href="https://videos.pair2jeux.tube/c/openbsd_gaming/videos">OpenBSD Gaming peertube channel</a></li>
 </ul>
+</article>
diff --git a/issues/issue-2/80_ARTWORK.html b/issues/issue-2/80_ARTWORK.html
index 46f8040..73418a0 100644
--- a/issues/issue-2/80_ARTWORK.html
+++ b/issues/issue-2/80_ARTWORK.html
@@ -1,8 +1,15 @@
-<!-- SECTION>
+<article id="artwork">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Artworks of the moment</h1>
-<a href="static/images/puffer_city_original.jpg"
-    <img src="static/images/puffer_city_small.jpg"
-         alt="A drawing featuring a city viewed from some altitude with many characters looking like OpenBSD mascot."
-         width="100%" /></a-->
-
+<h2>Artworks of the moment</h2>
+<figure>
+    <a href="images/.jpg">
+        <picture>
+        <img src="images/.jpg"
+             alt="." />
+        </picture>
+    </a>
+    <figcaption>
+        <p>Artwork originally published <a class="permalink" href="https://bsd.network/@prahou/107026745346972847">here</a>.</p>
+    </figcaption>
+</figure>
+</article>
diff --git a/issues/issue-2/90_SOCIALMEDIA.html b/issues/issue-2/90_SOCIALMEDIA.html
index bb73002..a736bc9 100644
--- a/issues/issue-2/90_SOCIALMEDIA.html
+++ b/issues/issue-2/90_SOCIALMEDIA.html
@@ -1,7 +1,8 @@
-<!-- SECTION -->
+<article id="socials">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>On social media</h1>
+<h2>On social media</h2>
 <ul>
     <li><a class="permalink" href="https://news.ycombinator.com/item?id=28711519">We did hit first page of hackernews at launch</a></li>
     <li><a class="permalink" href="https://bsd.network/@bcallah/107037881574770525">thfr@ needing help for improving audio support in the video game Celeste</a></li>
 </ul>
+</article>
diff --git a/issues/issue-2/91_QUOTES.html b/issues/issue-2/91_QUOTES.html
index 1755266..b27ad6b 100644
--- a/issues/issue-2/91_QUOTES.html
+++ b/issues/issue-2/91_QUOTES.html
@@ -1,7 +1,8 @@
-<!-- SECTION-->
+<article id="quotes">
 <div class="puffies" aria-hidden="true">🐡🐡🐡</div>
-<h1>Quote</h1>
+<h2>Quote</h2>
 <blockquote>
     Boredom is a powerful driving force.
-    <cite>&mdash; solene@openbsd</cite>
+    <cite>— solene@openbsd</cite>
 </blockquote>
+</article>
diff --git a/issues/tools/make_issue.sh b/issues/tools/make_issue.sh
index 9b04310..d981789 100755
--- a/issues/tools/make_issue.sh
+++ b/issues/tools/make_issue.sh
@@ -43,23 +43,26 @@ cat _common/header $DIR/*html _common/footer > $DESTFILENAME
 
 if ! [ "$DIR" = "_index" ]
 then
+    set -e
     # replace with issue number
     issue="${1#issue-}"
     sed -i "s/__ISSUE__/${issue}/g" $DESTFILENAME
     sed -i "s/__TITLE__/issue #${issue}/g" $DESTFILENAME
     sed -i "s/__FILENAME__/issue-${issue}.html/" $DESTFILENAME
     # replace date
+    DATETIME="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%Y-%m-%d %H:%M")" 2>/dev/null
     HUMAN_DATE="$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "${PUBLISHED_DATE}" +"%B %e, %Y")" 2>/dev/null
 
-    if [ $? -ne 0 ]; then
+    if [ $? -ne 0 ];
+    then
         echo "err: Please fill ${DIR}/metadata.sh with ISO-8601 valid date"
         exit 1
-    else
-        sed -i "s/__DATE__/${HUMAN_DATE}/" $DESTFILENAME
     fi
+    sed -i "s,__DATETIME__,${DATETIME}," $DESTFILENAME
+    sed -i "s/__HUMAN_DATE__/${HUMAN_DATE}/" $DESTFILENAME
 else
     # index.html changes
-    sed -i "s/OpenBSD_WEBZINE_ISSUE #__ISSUE__/The OpenBSD Webzine/g" $DESTFILENAME
+    sed -i "s/ #__ISSUE__//g" $DESTFILENAME
     sed -i "s/__TITLE__/homepage/g" $DESTFILENAME
     sed -i "s/__FILENAME__/index.html/" $DESTFILENAME
 fi