4 files changed, 22 insertions, 10 deletions
diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt
index 4ca861dcd..f485b5705 100644
--- a/docutils/RELEASE-NOTES.txt
+++ b/docutils/RELEASE-NOTES.txt
@@ -22,6 +22,10 @@ For a more detailed list of changes, please see the `Docutils History`_.
 Future changes
 ==============
 
+* The "html5" will use the new semantic tags <main>, <section>, <header>,
+  <footer>, <aside>, <figure>, and <figcaption>.
+  See ``minimal.css`` and ``plain.css`` for styling rule examples.
+
 * The "latex" writer will wrap admonitions in a "DUclass" environment.
   Stylesheets modifying "\DUadmonition" will need to adapt.
 
@@ -70,7 +74,6 @@ Release 0.16
   __ http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#escaping-mechanism
   __ docs/ref/rst/restructuredtext.html#bibliographic-fields
 
-
 * LaTeX writer:
 
   - Informal titles of type "rubric" default to bold-italic and left aligned.
diff --git a/docutils/docutils/writers/_html_base.py b/docutils/docutils/writers/_html_base.py
index 8b4d83264..c541b38a5 100644
--- a/docutils/docutils/writers/_html_base.py
+++ b/docutils/docutils/writers/_html_base.py
@@ -974,7 +974,6 @@ class HTMLTranslator(nodes.NodeVisitor):
             self.body.append(self.emptytag(node, 'img', suffix, **atts))
 
     def depart_image(self, node):
-        # self.body.append(self.context.pop())
         pass
 
     def visit_inline(self, node):
diff --git a/docutils/docutils/writers/html5_polyglot/minimal.css b/docutils/docutils/writers/html5_polyglot/minimal.css
index 359e8b89c..28f34c14e 100644
--- a/docutils/docutils/writers/html5_polyglot/minimal.css
+++ b/docutils/docutils/writers/html5_polyglot/minimal.css
@@ -182,12 +182,14 @@ div.line-block div.line-block {
 
 /* Figures, Images, and Tables */
 .figure.align-left,
+figure.align-left,
 img.align-left,
 object.align-left,
 table.align-left {
   margin-right: auto;
 }
 .figure.align-center,
+figure.align-center,
 img.align-center,
 object.align-center,
 table.align-center {
@@ -195,20 +197,24 @@ table.align-center {
   margin-right: auto;
 }
 .figure.align-right,
+figure.align-right,
 img.align-right,
 object.align-right,
 table.align-right {
   margin-left: auto;
 }
 .figure.align-center, .figure.align-right,
+figure.align-center, figure.align-right,
 img.align-center, img.align-right,
 object.align-center, object.align-right {
   display: block;
 }
 /* reset inner alignment in figures and tables */
-/* div.align-left, div.align-center, div.align-right, */
-table.align-left, table.align-center, table.align-right
-{ text-align: inherit }
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+  text-align: inherit;
+}
 
 /* Admonitions and System Messages */
 div.admonition,
diff --git a/docutils/docutils/writers/html5_polyglot/plain.css b/docutils/docutils/writers/html5_polyglot/plain.css
index 825ea516f..cb19f7ada 100644
--- a/docutils/docutils/writers/html5_polyglot/plain.css
+++ b/docutils/docutils/writers/html5_polyglot/plain.css
@@ -25,7 +25,8 @@ body {
   margin: 0;
   background-color: #dbdbdb;
 }
-div.document {
+div.document,
+main {
   line-height:1.3;
   counter-reset: table;
   /* counter-reset: figure; */
@@ -199,20 +200,22 @@ dl.footnote {
 
 /* let content flow to the side of aligned images and figures */
 .figure.align-left,
+figure.align-left,
 img.align-left,
 object.align-left {
   display: block;
   clear: left;
   float: left;
-  margin-right: 1em
+  margin-right: 1em;
 }
 .figure.align-right,
+figure.align-right,
 img.align-right,
 object.align-right {
   display: block;
   clear: right;
   float: right;
-  margin-left: 1em
+  margin-left: 1em;
 }
 /* Stop floating sidebars, images and figures at section level 1,2,3 */
 h1, h2, h3 { clear: both; }
@@ -221,12 +224,13 @@ h1, h2, h3 { clear: both; }
 
 /* Move right. In a layout with fixed margins, */
 /* it can be moved into the margin.   	       */
-div.sidebar {
+div.sidebar,
+aside.sidebar {
   width: 30%;
   max-width: 26em;
   margin-left: 1em;
   margin-right: -2%;
-  background-color: #ffffee ;
+  background-color: #ffffee;
 }
 
 /* Code */