diff --git a/src/Resources/contao/templates/news_latest_rateit.html5 b/src/Resources/contao/templates/news_latest_rateit.html5
index e92dbc6..bfdf584 100644
--- a/src/Resources/contao/templates/news_latest_rateit.html5
+++ b/src/Resources/contao/templates/news_latest_rateit.html5
@@ -1,69 +1,40 @@
 
 <?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-	<?php if ($this->showBefore) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-	<div class="wrapper">
-       <div class="rateItRating-selected" style="display: block;"></div>
-       <div class="rateItRating-hover"></div>
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
 	</div>
-	<?php if ($this->showAfter) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-</div>
-<!-- indexer::continue -->
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
 
-<div class="layout_latest block<?php echo $this->class; ?>">
-<?php if ($this->hasMetaFields): ?>
-<p class="info"><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php echo $this->author; ?> <?php echo $this->commentCount; ?></p>
-<?php endif; ?>
-<?php if ($this->addImage): ?>
-<figure class="image_container<?php echo $this->floatClass; ?>"<?php if ($this->margin || $this->float): ?> style="<?php echo trim($this->margin . $this->float); ?>"<?php endif; ?>>
-<?php if ($this->href): ?>
-<a href="<?php echo $this->href; ?>"<?php echo $this->attributes; ?> title="<?php echo $this->alt; ?>">
-<?php endif; ?>
-<img src="<?php echo $this->src; ?>"<?php echo $this->imgSize; ?> alt="<?php echo $this->alt; ?>">
-<?php if ($this->href): ?>
-</a>
-<?php endif; ?>
-<?php if ($this->caption): ?>
-<figcaption class="caption" style="width:<?php echo $this->arrSize[0]; ?>px"><?php echo $this->caption; ?></figcaption>
-<?php endif; ?>
-</figure>
-<?php endif; ?>
-<h2><?php echo $this->text ? $this->linkHeadline : $this->newsHeadline; ?></h2>
-<div class="teaser">
-<?php echo $this->teaser; ?> 
-</div>
-<?php if ($this->text): ?>
-<p class="more"><?php echo $this->more; ?></p>
-<?php endif; ?>
-</div>
+<?php $this->insert('news_latest', $this->arrData); ?>
 
 <?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div itemtype="http://data-vocabulary.org/Review-aggregate" itemscope="" class="rating-microdata">
-    <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-        <?php if ($this->showBefore) : ?>
-        <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-        <?php endif; ?>
-        <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-        </div>
-        <?php if ($this->showAfter) : ?>
-        <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-        <?php endif; ?>
-    </div>
-    <span class="rating-microdata" itemprop="itemreviewed"><?php echo $this->itemreviewed; ?></span>
-    <span class="rating-microdata" itemtype="http://data-vocabulary.org/Rating" itemscope="" itemprop="rating">
-        <span itemprop="average"><?php echo $this->actRating; ?></span>
-        <span itemprop="best"><?php echo $this->maxRating; ?></span>
-    </span>
-    <span class="rating-microdata" itemprop="votes"><?php echo $this->votes; ?></span>
-</div>
-<!-- indexer::continue -->
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+	</div>
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
diff --git a/src/Resources/contao/templates/news_latest_rateit_microdata.html5 b/src/Resources/contao/templates/news_latest_rateit_microdata.html5
index c315685..e404888 100644
--- a/src/Resources/contao/templates/news_latest_rateit_microdata.html5
+++ b/src/Resources/contao/templates/news_latest_rateit_microdata.html5
@@ -1,79 +1,17 @@
+<?php $this->extend('news_latest_rateit'); ?>
 
-<?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-	<div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-		<?php if ($this->showBefore) : ?>
-	    <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-		<?php endif; ?>
-		<div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-		</div>
-		<?php if ($this->showAfter) : ?>
-	    <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-		<?php endif; ?>
-	</div>
-	<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-	<span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-		<span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->block('rating'); ?>
+  <!-- indexer::stop -->
+  <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+    <?php $this->parent(); ?>
+    <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
+    <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
+       <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
+       <span itemprop="worstRating">0</span>
+       <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
+       <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
+    </span>
+  </div>
+  <!-- indexer::continue -->
 
-<div class="layout_latest block<?php echo $this->class; ?>">
-<?php if ($this->hasMetaFields): ?>
-<p class="info"><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php echo $this->author; ?> <?php echo $this->commentCount; ?></p>
-<?php endif; ?>
-<?php if ($this->addImage): ?>
-<figure class="image_container<?php echo $this->floatClass; ?>"<?php if ($this->margin || $this->float): ?> style="<?php echo trim($this->margin . $this->float); ?>"<?php endif; ?>>
-<?php if ($this->href): ?>
-<a href="<?php echo $this->href; ?>"<?php echo $this->attributes; ?> title="<?php echo $this->alt; ?>">
-<?php endif; ?>
-<img src="<?php echo $this->src; ?>"<?php echo $this->imgSize; ?> alt="<?php echo $this->alt; ?>">
-<?php if ($this->href): ?>
-</a>
-<?php endif; ?>
-<?php if ($this->caption): ?>
-<figcaption class="caption" style="width:<?php echo $this->arrSize[0]; ?>px"><?php echo $this->caption; ?></figcaption>
-<?php endif; ?>
-</figure>
-<?php endif; ?>
-<h2><?php echo $this->text ? $this->linkHeadline : $this->newsHeadline; ?></h2>
-<div class="teaser">
-<?php echo $this->teaser; ?> 
-</div>
-<?php if ($this->text): ?>
-<p class="more"><?php echo $this->more; ?></p>
-<?php endif; ?>
-</div>
-
-<?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-   <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-      <?php if ($this->showBefore) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-      <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-      </div>
-      <?php if ($this->showAfter) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-   </div>
-   <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/news_short_rateit.html5 b/src/Resources/contao/templates/news_short_rateit.html5
index b8bd4e4..a98e5c4 100644
--- a/src/Resources/contao/templates/news_short_rateit.html5
+++ b/src/Resources/contao/templates/news_short_rateit.html5
@@ -1,55 +1,40 @@
 
 <?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-	<?php if ($this->showBefore) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-	<div class="wrapper">
-       <div class="rateItRating-selected" style="display: block;"></div>
-       <div class="rateItRating-hover"></div>
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
 	</div>
-	<?php if ($this->showAfter) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-</div>
-<!-- indexer::continue -->
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
 
-<div class="layout_short block<?php echo $this->class; ?>">
-<?php if ($this->hasMetaFields): ?>
-<p class="info"><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php echo $this->author; ?> <?php echo $this->commentCount; ?></p>
-<?php endif; ?>
-<h2><?php echo $this->text ? $this->linkHeadline : $this->newsHeadline; ?></h2>
-<div class="teaser">
-<?php echo $this->teaser; ?> 
-</div>
-<?php if ($this->text): ?>
-<p class="more"><?php echo $this->more; ?></p>
-<?php endif; ?>
-</div>
+<?php $this->insert('news_short', $this->arrData); ?>
 
 <?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div itemtype="http://data-vocabulary.org/Review-aggregate" itemscope="" class="rating-microdata">
-    <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-        <?php if ($this->showBefore) : ?>
-        <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-        <?php endif; ?>
-        <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-        </div>
-        <?php if ($this->showAfter) : ?>
-        <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-        <?php endif; ?>
-    </div>
-    <span class="rating-microdata" itemprop="itemreviewed"><?php echo $this->itemreviewed; ?></span>
-    <span class="rating-microdata" itemtype="http://data-vocabulary.org/Rating" itemscope="" itemprop="rating">
-        <span itemprop="average"><?php echo $this->actRating; ?></span>
-        <span itemprop="best"><?php echo $this->maxRating; ?></span>
-    </span>
-    <span class="rating-microdata" itemprop="votes"><?php echo $this->votes; ?></span>
-</div>
-<!-- indexer::continue -->
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+	</div>
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
diff --git a/src/Resources/contao/templates/news_short_rateit_microdata.html5 b/src/Resources/contao/templates/news_short_rateit_microdata.html5
index d1371ab..d9c7193 100644
--- a/src/Resources/contao/templates/news_short_rateit_microdata.html5
+++ b/src/Resources/contao/templates/news_short_rateit_microdata.html5
@@ -1,65 +1,17 @@
+<?php $this->extend('news_short_rateit'); ?>
 
-<?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-   <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-      <?php if ($this->showBefore) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-      <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-      </div>
-      <?php if ($this->showAfter) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-   </div>
-   <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->block('rating'); ?>
+  <!-- indexer::stop -->
+  <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+    <?php $this->parent(); ?>
+    <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
+    <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
+       <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
+       <span itemprop="worstRating">0</span>
+       <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
+       <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
+    </span>
+  </div>
+  <!-- indexer::continue -->
 
-<div class="layout_short block<?php echo $this->class; ?>">
-<?php if ($this->hasMetaFields): ?>
-<p class="info"><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php echo $this->author; ?> <?php echo $this->commentCount; ?></p>
-<?php endif; ?>
-<h2><?php echo $this->text ? $this->linkHeadline : $this->newsHeadline; ?></h2>
-<div class="teaser">
-<?php echo $this->teaser; ?> 
-</div>
-<?php if ($this->text): ?>
-<p class="more"><?php echo $this->more; ?></p>
-<?php endif; ?>
-</div>
-
-<?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-   <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-      <?php if ($this->showBefore) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-      <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-      </div>
-      <?php if ($this->showAfter) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-   </div>
-   <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/news_simple_rateit.html5 b/src/Resources/contao/templates/news_simple_rateit.html5
index 52169cd..b037485 100644
--- a/src/Resources/contao/templates/news_simple_rateit.html5
+++ b/src/Resources/contao/templates/news_simple_rateit.html5
@@ -1,38 +1,40 @@
 
 <?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-	<?php if ($this->showBefore) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-	<div class="wrapper">
-       <div class="rateItRating-selected" style="display: block;"></div>
-       <div class="rateItRating-hover"></div>
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
 	</div>
-	<?php if ($this->showAfter) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-</div>
-<!-- indexer::continue -->
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
 
-<div class="layout_simple block<?php echo $this->class; ?>">
-<?php if ($this->date): ?><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php endif; ?><?php echo $this->linkHeadline; ?> 
-</div>
+<?php $this->insert('news_simple', $this->arrData); ?>
 
 <?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-	<?php if ($this->showBefore) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-	<div class="wrapper">
-       <div class="rateItRating-selected" style="display: block;"></div>
-       <div class="rateItRating-hover"></div>
+	<!-- indexer::stop -->
+	<?php $this->block('rating'); ?>
+	<div id="<?= $this->ratingId ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
+			<?php if ($this->showBefore) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
+			<div class="wrapper">
+					<div class="rateItRating-selected" style="display: block;"></div>
+					<div class="rateItRating-hover"></div>
+			</div>
+			<?php if ($this->showAfter) : ?>
+			<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+			<?php endif; ?>
 	</div>
-	<?php if ($this->showAfter) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-	<?php endif; ?>
-</div>
-<!-- indexer::continue -->
+	<?php $this->endblock(); ?>
+	<!-- indexer::continue -->
 <?php endif; ?>
diff --git a/src/Resources/contao/templates/news_simple_rateit_microdata.html5 b/src/Resources/contao/templates/news_simple_rateit_microdata.html5
index 520cf1c..79c68b3 100644
--- a/src/Resources/contao/templates/news_simple_rateit_microdata.html5
+++ b/src/Resources/contao/templates/news_simple_rateit_microdata.html5
@@ -1,56 +1,17 @@
+<?php $this->extend('news_simple_rateit'); ?>
 
-<?php if ($this->rateit_rating_before): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-   <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-      <?php if ($this->showBefore) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-      <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-      </div>
-      <?php if ($this->showAfter) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-   </div>
-   <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->block('rating'); ?>
+  <!-- indexer::stop -->
+  <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+    <?php $this->parent(); ?>
+    <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
+    <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
+       <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
+       <span itemprop="worstRating">0</span>
+       <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
+       <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
+    </span>
+  </div>
+  <!-- indexer::continue -->
 
-<div class="layout_simple block<?php echo $this->class; ?>">
-<?php if ($this->date): ?><time datetime="<?php echo $this->datetime; ?>"><?php echo $this->date; ?></time> <?php endif; ?><?php echo $this->linkHeadline; ?> 
-</div>
-
-<?php if ($this->rateit_rating_after): ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-   <div id="<?php echo $this->ratingId; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?>">
-      <?php if ($this->showBefore) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-      <div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-      </div>
-      <?php if ($this->showAfter) : ?>
-       <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-      <?php endif; ?>
-   </div>
-   <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
-</div>
-<!-- indexer::continue -->
-<?php endif; ?>
+<?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/rateit_default.html5 b/src/Resources/contao/templates/rateit_default.html5
index 155a0bc..989e6c4 100644
--- a/src/Resources/contao/templates/rateit_default.html5
+++ b/src/Resources/contao/templates/rateit_default.html5
@@ -1,14 +1,14 @@
 <!-- indexer::stop -->
-<div id="<?php echo $this->id; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<div id="<?= $this->id ?>" class="<?= $this->class ?> <?= $this->rateit_class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
 	<?php if ($this->showBefore) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
+	<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
 	<?php endif; ?>
 	<div class="wrapper">
        <div class="rateItRating-selected" style="display: block;"></div>
        <div class="rateItRating-hover"></div>
 	</div>
 	<?php if ($this->showAfter) : ?>
-	<div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
+	<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
 	<?php endif; ?>
 </div>
-<!-- indexer::continue -->
\ No newline at end of file
+<!-- indexer::continue -->
diff --git a/src/Resources/contao/templates/rateit_microdata.html5 b/src/Resources/contao/templates/rateit_microdata.html5
index c5d41eb..bffe95d 100644
--- a/src/Resources/contao/templates/rateit_microdata.html5
+++ b/src/Resources/contao/templates/rateit_microdata.html5
@@ -1,23 +1,23 @@
 <!-- indexer::stop -->
 <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
-    <div id="<?php echo $this->id; ?>" class="<?php echo $this->class; ?> <?php echo $this->rateit_class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
-		<?php if ($this->showBefore) : ?>
-	    <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-		<?php endif; ?>
-		<div class="wrapper">
-            <div class="rateItRating-selected" style="display: block;"></div>
-            <div class="rateItRating-hover"></div>
-		</div>
-		<?php if ($this->showAfter) : ?>
-	    <div id="<?php echo $this->descriptionId; ?>" class="ratingText"><?php echo $this->description; ?></div>
-		<?php endif; ?>
-	</div>
-	<span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
-   <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
-      <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
-      <span itemprop="worstRating">0</span>
-      <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
-      <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
-   </span>
+  <div id="<?= $this->id ?>" class="<?= $this->class ?> <?= $this->rateit_class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+  	<?php if ($this->showBefore) : ?>
+  	<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+  	<?php endif; ?>
+  	<div class="wrapper">
+         <div class="rateItRating-selected" style="display: block;"></div>
+         <div class="rateItRating-hover"></div>
+  	</div>
+  	<?php if ($this->showAfter) : ?>
+  	<div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
+  	<?php endif; ?>
+  </div>
+  <span class="rating-microdata" itemprop="name"><?php echo $this->itemreviewed; ?></span>
+  <span class="rating-microdata" itemtype="http://schema.org/AggregateRating" itemscope itemprop="aggregateRating">
+    <span itemprop="ratingValue"><?php echo $this->actRating; ?></span>
+    <span itemprop="worstRating">0</span>
+    <span itemprop="bestRating"><?php echo $this->maxRating; ?></span>
+    <span itemprop="ratingCount"><?php echo $this->votes; ?></span>
+  </span>
 </div>
-<!-- indexer::continue -->
\ No newline at end of file
+<!-- indexer::continue -->