diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc
index 996f633..575fb21 100644
--- a/core/modules/aggregator/aggregator.pages.inc
+++ b/core/modules/aggregator/aggregator.pages.inc
@@ -74,19 +74,16 @@ function template_preprocess_aggregator_item(&$variables) {
     $variables['source_url'] = url('aggregator/sources/' . $fid);
     $variables['source_title'] = check_plain($item->ftitle);
   }
-  if (date('Ymd', $item->getPostedTime()) == date('Ymd')) {
-    $variables['source_date'] = t('%ago ago', array('%ago' => format_interval(REQUEST_TIME - $item->getPostedTime())));
-  }
-  else {
-    $variables['source_date'] = format_date($item->getPostedTime(), 'medium');
-  }
 
-  $variables['categories'] = array();
+  $variables['source_date'] = format_interval(REQUEST_TIME - $item->getPostedTime());
+  $variables['createdtime'] = $item->getPostedTime();
+
   foreach ($item->categories as $category) {
-    $variables['categories'][$category->cid] = l($category->title, 'aggregator/categories/' . $category->cid);
+    $variables['categories'][] = array(
+      'title' => $category->title ,
+      'href' => '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..0c77f44 100644
--- a/core/modules/aggregator/templates/aggregator-item.html.twig
+++ b/core/modules/aggregator/templates/aggregator-item.html.twig
@@ -8,36 +8,50 @@
  * - feed_title: Title of the feed item.
  * - source_url: Link to the local source section.
  * - source_title: Title of the remote source.
- * - source_date: Date the feed was posted on the remote source.
+ * - source_date: Date the feed was posted. formated as n days ago
+ * - createdtime: Date
  * - content: Feed item content.
- * - categories: Linked categories assigned to the feed.
+ * - categories: categories assigned to the feed.
  *
  * @see template_preprocess_aggregator_item()
  *
  * @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.class }}">
+
+  <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>
+    <time datetime="{{ createdtime|date("Y-m-d H:i") }}">
+      {{ source_date }}
+    </time>
+    {% if source_url %}
+      by <a href="{{ source_url }}">{{ source_title }}</a>
+    {% endif %}
+
+    {% if categories %}
+      <section>
+        <h3>{{ 'Categories'|t }}: </h3>
+        {% for item in categories %}
+          {% if loop.last %}
+          <a href="{{ item.href }}">{{item.title}}</a>.
+          {% else %}
+          <a href="{{ item.href }}">{{item.title}}</a>,
+          {% endif %}
+        {% endfor %}
+      </section>
+    {% endif %}
+
+  </footer>
+</article>