diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 137d987..6cf3756 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -80,13 +80,15 @@ function template_preprocess_aggregator_item(&$variables) {
   else {
     $variables['source_date'] = format_date($item->getPostedTime(), 'medium');
   }
+  $variables['sourcetime'] = $item->getPostedTime();

   $variables['categories'] = array();
   foreach ($item->categories as $category) {
     $variables['categories'][$category->cid] = l($category->title, 'aggregator/categories/' . $category->cid);
+    $variables['categorie_title'] = $category->title;
+    $variables['categorie_url'] = 'aggregator/categories/'.$category->cid;
   }

-  $variables['attributes']['class'][] = 'feed-item';
 }

 /**
diff --git a/core/modules/aggregator/templates/aggregator-item.html.twig b/core/modules/aggregator/templates/aggregator-item.html.twig
index 3736f97..1a0eede 100644
--- a/core/modules/aggregator/templates/aggregator-item.html.twig
+++ b/core/modules/aggregator/templates/aggregator-item.html.twig
@@ -16,28 +16,44 @@
  *
  * @ingroup themeable
  */
+
 #}
-<div{{ attributes }}>
-  <h3 class="feed-item-title">
-    <a href="{{ feed_url }}">{{ feed_title }}</a>
-  </h3>

-  <div class="feed-item-meta">
-    {% if source_url %}
-      <a href="{{ source_url }}" class="feed-item-source">{{ source_title }}</a> -
-    {% endif %}
-    <span class="feed-item-date">{{ source_date }}</span>
-  </div>
+<article class="feed-item {{ attributes }}">
+
+  <h2{{ title_attributes }}>
+    <a href="{{ feed_url }}" rel="bookmark">{{ feed_title }}</a>
+  </h2>

   {% if content %}
-    <div class="feed-item-body">
+    <div>
       {{ content }}
     </div>
   {% endif %}

-  {% if categories %}
-    <div class="feed-item-categories">
-      {{ 'Categories'|t }}: {{ categories|join(', ') }}
-    </div>
-  {% endif %}
-</div>
+  <footer>
+    {% if source_url %}
+      <a href="{{ source_url }}">{{ source_title }}</a> -
+    {% endif %}
+
+    <time datetime="{{ sourcetime|date("Y-m-d H:i") }}">
+      {{ sourcetime|date("Y-m-d H:i") }}
+    </time>
+
+    {% if categories %}
+      <section>
+        <strong>{{ 'Categories'|t }}: </strong>
+          {# list through all categories #}
+          {% for delta, categori in categories %}
+            {% if loop.last %}
+              <a href="{{ categorie_url }}">{{ categorie_title }}</a>.
+            {% else %}
+              <a href="{{ categorie_url }}">{{ categorie_title }}</a>,
+            {% endif %}
+          {% endfor %}
+      </section>
+    {% endif %}
+
+  </footer>
+
+</article>