diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index 7d88e29876..b852449f21 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -5,7 +5,6 @@
 <div class="row home" itemscope itemtype="http://www.schema.org/ItemList">
 	<!-- BEGIN categories -->
 	<div class="{categories.class}">
-
 		<meta itemprop="name" content="{categories.name}">
 		<h4>
 			<!-- IF !categories.link -->
diff --git a/public/templates/noscript/category.tpl b/public/templates/noscript/category.tpl
index d88fd17c95..d0c7fa612b 100644
--- a/public/templates/noscript/category.tpl
+++ b/public/templates/noscript/category.tpl
@@ -1,12 +1,17 @@
 		<ol class="breadcrumb">
-			<li><a href="/">Home</a></li>
-			<li class="active">{category_name}</li>
+			<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+				<a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
+			</li>
+			<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+				<span itemprop="title">{category_name} <a target="_blank" href="../{category_id}.rss"><i class="fa fa-rss-square"></i></a></span>
+			</li>
 		</ol>
-		<ul class="topics">
+		<ul class="topics" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
 			<!-- BEGIN topics -->
-			<li>
+			<li itemprop="itemListElement">
+				<meta itemprop="name" content="{topics.title}">
 				<span class="timestamp">{topics.teaser_timestamp}</span>
-				<a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a>
+				<a href="../../topic/{topics.slug}" itemprop="url">{topics.title} ({topics.postcount})</a>
 				<div class="teaser">
 					<img class="img-thumbnail" src="{topics.teaser_userpicture}" />
 					<div class="clear"></div>
diff --git a/public/templates/noscript/home.tpl b/public/templates/noscript/home.tpl
index 3a4144b2b2..927d1b00e8 100644
--- a/public/templates/noscript/home.tpl
+++ b/public/templates/noscript/home.tpl
@@ -1,9 +1,10 @@
 		<ul class="categories">
 			<!-- BEGIN categories -->
 			<li>
+				<meta itemprop="name" content="{categories.name}">
 				<div class="icon"><i class="fa {categories.icon} fa-4x"></i></div>
-				<a href="category/{categories.slug}">{categories.name}</a>
-				<p>{categories.description}</p>
+				<a href="category/{categories.slug}" itemprop="name">{categories.name}</a>
+				<p itemprop="description">{categories.description}</p>
 				<div class="clear"></div>
 			</li>
 			<!-- END categories -->
diff --git a/public/templates/noscript/topic.tpl b/public/templates/noscript/topic.tpl
index 113b3d542d..787712400f 100644
--- a/public/templates/noscript/topic.tpl
+++ b/public/templates/noscript/topic.tpl
@@ -1,13 +1,26 @@
+		<ol class="breadcrumb">
+			<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+				<a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
+			</li>
+			<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+				<a href="{relative_path}/category/{category_slug}" itemprop="url"><span itemprop="title">{category_name}</span></a>
+			</li>
+			<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+				<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="fa fa-rss-square"></i></a></span>
+			</li>
+		</ol>
 		<ul class="posts">
 			<!-- BEGIN posts -->
-			<li>
+			<li itemscope itemtype="http://schema.org/Comment">
+				<meta itemprop="datePublished" content="{posts.relativeTime}">
+				<meta itemprop="dateModified" content="{posts.relativeEditTime}">
 				<a name="{posts.pid}"></a>
 				<div class="row">
 					<div class="col-lg-2 profile">
-						<img class="img-thumbnail" src="{posts.picture}" /><br />
-						<span class="username">{posts.username}</span>
+						<img class="img-thumbnail" src="{posts.picture}" itemprop="image" /><br />
+						<span class="username" itemprop="author">{posts.username}</span>
 					</div>
-					<div class="col-lg-10">
+					<div class="col-lg-10" itemprop="text">
 						{posts.content}
 					</div>
 					<div class="clear"></div>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 119c6989bf..571d137cc3 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -20,7 +20,6 @@
 		<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
 			<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="fa fa-rss-square"></i></a></span>
 		</li>
-
 	</ol>
 
 	<ul id="post-container" class="posts" data-tid="{topic_id}">