diff --git a/intake/templates/edit.jinja2 b/intake/templates/edit.jinja2
index 88fa370..459f9f4 100644
--- a/intake/templates/edit.jinja2
+++ b/intake/templates/edit.jinja2
@@ -4,11 +4,11 @@
 <title>Intake - {{ subtitle }}</title>
 <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMS41ZEdYUgAAAGFJREFUOE+lkFEKwDAIxXrzXXB3ckMm9EnAV/YRCxFCcUXEL3Jc77NDjpDA/VGL3RFWYEICfeGC8oQc9IPuCAnQDcoRVmBCAn3hgvKEHPSD7ggJ0A3KEVZgQgJ94YLSJ9YDUzNGDXGZ/JEAAAAASUVORK5CYII=">
 <style>
-div#wrapper {
+main {
 	max-width: 700px;
 	margin: 0 auto;
 }
-.readable-item {
+article {
 	border: 1px solid black; border-radius: 6px;
 	padding: 5px;
 	margin-bottom: 20px;
@@ -33,10 +33,10 @@ div#wrapper {
 .item-info {
 	color: rgba(0, 0, 0, 0.7);
 }
-.readable-item img {
+article img {
 	max-width: 100%;
 }
-.readable-item textarea {
+article textarea {
 	width: 100%;
 	resize: vertical;
 }
@@ -67,9 +67,9 @@ span.error-message {
 </style>
 </head>
 <body>
-<div id="wrapper">
+<main>
 
-<div class="readable-item">
+<article>
 <form method="post">
 <label for="config" class="item-title">Config Editor</label>
 <textarea autofocus id="config" name="config" rows=20>{{config}}</textarea>
@@ -79,8 +79,8 @@ span.error-message {
 {% endif %}
 </p>
 </form>
-</div>
+</article>
 
-</div>
+</main>
 </body>
 </html>
diff --git a/intake/templates/feed.jinja2 b/intake/templates/feed.jinja2
index 0e01836..de79ee4 100644
--- a/intake/templates/feed.jinja2
+++ b/intake/templates/feed.jinja2
@@ -4,11 +4,11 @@
 <title>Intake{% if items %} ({{ items|length }}){% endif %}</title>
 <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMS41ZEdYUgAAAGFJREFUOE+lkFEKwDAIxXrzXXB3ckMm9EnAV/YRCxFCcUXEL3Jc77NDjpDA/VGL3RFWYEICfeGC8oQc9IPuCAnQDcoRVmBCAn3hgvKEHPSD7ggJ0A3KEVZgQgJ94YLSJ9YDUzNGDXGZ/JEAAAAASUVORK5CYII=">
 <style>
-div#wrapper {
+main {
 	max-width: 700px;
 	margin: 0 auto;
 }
-.readable-item {
+article {
 	border: 1px solid black; border-radius: 6px;
 	padding: 5px;
 	margin-bottom: 20px;
@@ -33,7 +33,7 @@ div#wrapper {
 .item-info {
 	color: rgba(0, 0, 0, 0.7);
 }
-.readable-item img {
+article img {
 	max-width: 100%;
 }
 button, summary {
@@ -120,13 +120,13 @@ var doAction = function (source, itemid, action) {
 </script>
 </head>
 <body>
-<div id="wrapper">
-<div class="readable-item center">
+<main>
+<article class="center">
 <span class="item-title"><a href="{{url_for('root')}}">Home</a></span>
-</div>
+</article>
 {% if items %}
 {% for item in items %}
-	<div class="readable-item
+	<article class="
 	{%- if not item.active %} strikethru{% endif %}
 	{%- if item.is_hidden %} fade{% endif -%}
 	" id="{{item.source}}-{{item.id}}">
@@ -173,30 +173,30 @@ var doAction = function (source, itemid, action) {
 	</span>
 	{% endif %}
 
-	</div>
+	</article>
 {% endfor %}
 
 {% if pager_prev or pager_next %}
-<div class="readable-item center">
+<article class="center">
 <span class="item-title">
 <a {% if pager_prev -%} href="{{pager_prev}}" {%- endif %}>Prev</a> |  <a {% if pager_next -%} href="{{pager_next}}" {%- endif %}>Next</a>
 </span>
-</div>
+</article>
 {% endif %}
 
-<div class="readable-item">
+<article>
 <div style="text-align:center;">
 <button onclick="javascript:mdeactivate({{ mdeac|safe }})">Deactivate All</button>
 </div>
-</div>
+</article>
 
 {# if items #}
 {% else %}
-<div class="readable-item center">
+<article class="center">
 <span class="item-title">Feed is empty</span>
-</div>
+</article>
 {% endif %}
 
-</div>
+</main>
 </body>
 </html>
diff --git a/intake/templates/home.jinja2 b/intake/templates/home.jinja2
index cc62de8..c6aa3b4 100644
--- a/intake/templates/home.jinja2
+++ b/intake/templates/home.jinja2
@@ -4,11 +4,11 @@
 <title>Intake</title>
 <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMS41ZEdYUgAAAGFJREFUOE+lkFEKwDAIxXrzXXB3ckMm9EnAV/YRCxFCcUXEL3Jc77NDjpDA/VGL3RFWYEICfeGC8oQc9IPuCAnQDcoRVmBCAn3hgvKEHPSD7ggJ0A3KEVZgQgJ94YLSJ9YDUzNGDXGZ/JEAAAAASUVORK5CYII=">
 <style>
-div#wrapper {
+main {
 	max-width: 700px;
 	margin: 0 auto;
 }
-.readable-item {
+article {
 	border: 1px solid black; border-radius: 6px;
 	padding: 5px;
 	margin-bottom: 20px;
@@ -17,7 +17,7 @@ div#wrapper {
 .item-title {
 	font-size: 1.4em;
 }
-.readable-item img {
+article img {
 	max-width: 100%;
 }
 button, summary {
@@ -32,9 +32,9 @@ summary:focus {
 </style>
 </head>
 <body>
-<div id="wrapper">
+<main>
 
-<div class="readable-item">
+<article>
 <details open>
 <summary><span class="item-title">Channels</span></summary>
 {% if not channels %}
@@ -46,9 +46,9 @@ summary:focus {
 {% endif %}
 <p><a href="{{ url_for('channels_edit') }}">Edit channels</a></p>
 </details>
-</div>
+</article>
 
-<div class="readable-item">
+<article>
 <details open>
 <summary><span class="item-title">Sources</span></summary>
 {% if not sources %}
@@ -59,9 +59,9 @@ summary:focus {
 {% endfor %}
 {% endif %}
 </details>
-</div>
+</article>
 
-<div class="readable-item">
+<article>
 <details open>
 <summary><span class="item-title">Add item</span></summary>
 <form action="add" method="post">
@@ -90,8 +90,8 @@ summary:focus {
 <input type="submit" value="Add">
 </form>
 </details>
-</div>
+</article>
 
-</div>
+</main>
 </body>
 </html>
