diff --git a/src/Resources/contao/templates/mod_article_rateit.html5 b/src/Resources/contao/templates/mod_article_rateit.html5
index c8698ad..e81bb4d 100644
--- a/src/Resources/contao/templates/mod_article_rateit.html5
+++ b/src/Resources/contao/templates/mod_article_rateit.html5
@@ -3,7 +3,6 @@
 <?php $this->block('content'); ?>
   <?php if ($this->rateit_rating_before): ?>
     <!-- indexer::stop -->
-    <?php $this->block('rating'); ?>
     <div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
         <?php if ($this->showBefore) : ?>
         <div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
@@ -16,13 +15,11 @@
         <div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
         <?php endif; ?>
     </div>
-    <?php $this->endblock(); ?>
     <!-- indexer::continue -->
   <?php endif; ?>
   <?php $this->parent(); ?>
   <?php if ($this->rateit_rating_after): ?>
     <!-- indexer::stop -->
-    <?php $this->block('rating'); ?>
     <div id="<?= $this->rateItID ?>" class="<?= $this->class ?> <?= $this->rateit_class ?>">
         <?php if ($this->showBefore) : ?>
         <div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
@@ -35,7 +32,6 @@
         <div id="<?= $this->descriptionId ?>" class="ratingText"><?= $this->description ?></div>
         <?php endif; ?>
     </div>
-    <?php $this->endblock(); ?>
     <!-- indexer::continue -->
   <?php endif; ?>
 <?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/mod_article_rateit_microdata.html5 b/src/Resources/contao/templates/mod_article_rateit_microdata.html5
index 4fa9484..cb07751 100644
--- a/src/Resources/contao/templates/mod_article_rateit_microdata.html5
+++ b/src/Resources/contao/templates/mod_article_rateit_microdata.html5
@@ -1,16 +1,55 @@
-<?php $this->extend('mod_article_rateit'); ?>
+<?php $this->extend('mod_article'); ?>
 
-<?php $this->block('rating'); ?>
-<!-- indexer::stop -->
-<div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+<?php $this->block('content'); ?>
+  <?php if ($this->rateit_rating_before): ?>
+    <!-- indexer::stop -->
+    <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+      <div id="<?= $this->rateItID ?>" 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>
+      <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->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 -->
+  <?php if ($this->rateit_rating_after): ?>
+    <!-- indexer::stop -->
+    <div itemtype="http://schema.org/CreativeWork" itemscope class="rating-microdata">
+      <div id="<?= $this->rateItID ?>" 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>
+      <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(); ?>