diff --git a/src/Resources/contao/templates/calendar/cal_default.html5 b/src/Resources/contao/templates/calendar/cal_default.html5
index 2827364a5e..58dd54c0d7 100644
--- a/src/Resources/contao/templates/calendar/cal_default.html5
+++ b/src/Resources/contao/templates/calendar/cal_default.html5
@@ -2,25 +2,25 @@
 <table class="calendar">
 <thead>
   <tr>
-    <th colspan="2" class="head previous"><?php if ($this->prevHref): ?><a href="<?php echo $this->prevHref; ?>" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLink; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
-    <th colspan="3" class="head current"><?php echo $this->current; ?></th>
-    <th colspan="2" class="head next"><?php if ($this->nextHref): ?><a href="<?php echo $this->nextHref; ?>" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLink; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="2" class="head previous"><?php if ($this->prevHref): ?><a href="<?= $this->prevHref ?>" title="<?= $this->prevTitle ?>"><?= $this->prevLink ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="3" class="head current"><?= $this->current ?></th>
+    <th colspan="2" class="head next"><?php if ($this->nextHref): ?><a href="<?= $this->nextHref ?>" title="<?= $this->nextTitle ?>"><?= $this->nextLink ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
   </tr>
   <tr>
     <?php foreach ($this->days as $i=>$day): ?>
-      <th class="label<?php echo $day['class']; ?>"><?php echo utf8_substr($day['name'], 0, $this->substr); ?><span><?php echo utf8_substr($day['name'], $this->substr); ?></span></th>
+      <th class="label<?= $day['class'] ?>"><?= utf8_substr($day['name'], 0, $this->substr) ?><span><?= utf8_substr($day['name'], $this->substr) ?></span></th>
     <?php endforeach; ?>
   </tr>
 </thead>
 <tbody>
   <?php foreach ($this->weeks as $class=>$week): ?>
-    <tr class="<?php echo $class; ?>">
+    <tr class="<?= $class ?>">
       <?php foreach ($week as $day): ?>
-        <td class="<?php echo $day['class']; ?>">
-          <div class="header"><?php echo $day['label']; ?></div>
+        <td class="<?= $day['class'] ?>">
+          <div class="header"><?= $day['label'] ?></div>
           <?php foreach ($day['events'] as $event): ?>
-            <div class="event cal_<?php echo $event['parent']; ?><?php echo $event['class']; ?>">
-              <a href="<?php echo $event['href']; ?>" title="<?php echo $event['title']; ?> (<?php if ($event['day']): echo $event['day']; ?>, <?php endif; echo $event['date']; if ($event['time']): ?>, <?php echo $event['time']; endif; ?>)"<?php echo $event['target']; ?>><?php echo $event['link']; ?></a>
+            <div class="event cal_<?= $event['parent'] ?><?= $event['class'] ?>">
+              <a href="<?= $event['href'] ?>" title="<?= $event['title'] ?> (<?php if ($event['day']) echo $event['day'] . ', '; ?><?= $event['date'] ?><?php if ($event['time']) echo ', ' .  $event['time']; ?>)"<?= $event['target'] ?>><?= $event['link'] ?></a>
             </div>
           <?php endforeach; ?>
         </td>
diff --git a/src/Resources/contao/templates/calendar/cal_default.xhtml b/src/Resources/contao/templates/calendar/cal_default.xhtml
index 2827364a5e..58dd54c0d7 100644
--- a/src/Resources/contao/templates/calendar/cal_default.xhtml
+++ b/src/Resources/contao/templates/calendar/cal_default.xhtml
@@ -2,25 +2,25 @@
 <table class="calendar">
 <thead>
   <tr>
-    <th colspan="2" class="head previous"><?php if ($this->prevHref): ?><a href="<?php echo $this->prevHref; ?>" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLink; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
-    <th colspan="3" class="head current"><?php echo $this->current; ?></th>
-    <th colspan="2" class="head next"><?php if ($this->nextHref): ?><a href="<?php echo $this->nextHref; ?>" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLink; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="2" class="head previous"><?php if ($this->prevHref): ?><a href="<?= $this->prevHref ?>" title="<?= $this->prevTitle ?>"><?= $this->prevLink ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="3" class="head current"><?= $this->current ?></th>
+    <th colspan="2" class="head next"><?php if ($this->nextHref): ?><a href="<?= $this->nextHref ?>" title="<?= $this->nextTitle ?>"><?= $this->nextLink ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
   </tr>
   <tr>
     <?php foreach ($this->days as $i=>$day): ?>
-      <th class="label<?php echo $day['class']; ?>"><?php echo utf8_substr($day['name'], 0, $this->substr); ?><span><?php echo utf8_substr($day['name'], $this->substr); ?></span></th>
+      <th class="label<?= $day['class'] ?>"><?= utf8_substr($day['name'], 0, $this->substr) ?><span><?= utf8_substr($day['name'], $this->substr) ?></span></th>
     <?php endforeach; ?>
   </tr>
 </thead>
 <tbody>
   <?php foreach ($this->weeks as $class=>$week): ?>
-    <tr class="<?php echo $class; ?>">
+    <tr class="<?= $class ?>">
       <?php foreach ($week as $day): ?>
-        <td class="<?php echo $day['class']; ?>">
-          <div class="header"><?php echo $day['label']; ?></div>
+        <td class="<?= $day['class'] ?>">
+          <div class="header"><?= $day['label'] ?></div>
           <?php foreach ($day['events'] as $event): ?>
-            <div class="event cal_<?php echo $event['parent']; ?><?php echo $event['class']; ?>">
-              <a href="<?php echo $event['href']; ?>" title="<?php echo $event['title']; ?> (<?php if ($event['day']): echo $event['day']; ?>, <?php endif; echo $event['date']; if ($event['time']): ?>, <?php echo $event['time']; endif; ?>)"<?php echo $event['target']; ?>><?php echo $event['link']; ?></a>
+            <div class="event cal_<?= $event['parent'] ?><?= $event['class'] ?>">
+              <a href="<?= $event['href'] ?>" title="<?= $event['title'] ?> (<?php if ($event['day']) echo $event['day'] . ', '; ?><?= $event['date'] ?><?php if ($event['time']) echo ', ' .  $event['time']; ?>)"<?= $event['target'] ?>><?= $event['link'] ?></a>
             </div>
           <?php endforeach; ?>
         </td>
diff --git a/src/Resources/contao/templates/calendar/cal_mini.html5 b/src/Resources/contao/templates/calendar/cal_mini.html5
index 8aafc7621c..6aa31adfef 100644
--- a/src/Resources/contao/templates/calendar/cal_mini.html5
+++ b/src/Resources/contao/templates/calendar/cal_mini.html5
@@ -2,24 +2,24 @@
 <table class="minicalendar">
 <thead>
   <tr>
-    <th class="head previous"><?php if ($this->prevHref): ?><a href="<?php echo $this->prevHref; ?>" rel="nofollow" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLabel; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
-    <th colspan="5" class="head current"><?php echo $this->current; ?></th>
-    <th class="head next"><?php if ($this->nextHref): ?><a href="<?php echo $this->nextHref; ?>" rel="nofollow" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLabel; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th class="head previous"><?php if ($this->prevHref): ?><a href="<?= $this->prevHref ?>" rel="nofollow" title="<?= $this->prevTitle ?>"><?= $this->prevLabel ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="5" class="head current"><?= $this->current ?></th>
+    <th class="head next"><?php if ($this->nextHref): ?><a href="<?= $this->nextHref ?>" rel="nofollow" title="<?= $this->nextTitle ?>"><?= $this->nextLabel ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
   </tr>
   <tr>
     <?php foreach ($this->days as $i=>$day): ?>
-      <th class="label<?php echo $day['class']; ?>"><?php echo utf8_substr($day['name'], 0, $this->substr); ?><span class="invisible"><?php echo utf8_substr($day['name'], $this->substr); ?></span></th>
+      <th class="label<?= $day['class'] ?>"><?= utf8_substr($day['name'], 0, $this->substr) ?><span class="invisible"><?= utf8_substr($day['name'], $this->substr) ?></span></th>
     <?php endforeach; ?>
   </tr>
 </thead>
 <tbody>
   <?php foreach ($this->weeks as $class=>$week): ?>
-    <tr class="<?php echo $class; ?>">
+    <tr class="<?= $class ?>">
       <?php foreach ($week as $day): ?>
         <?php if ($day['href']): ?>
-          <td class="<?php echo $day['class']; ?>"><a href="<?php echo $day['href']; ?>" title="<?php echo $day['title']; ?>"><?php echo $day['label']; ?></a></td>
+          <td class="<?= $day['class'] ?>"><a href="<?= $day['href'] ?>" title="<?= $day['title'] ?>"><?= $day['label'] ?></a></td>
         <?php else: ?>
-          <td class="<?php echo $day['class']; ?>"><?php echo $day['label']; ?></td>
+          <td class="<?= $day['class'] ?>"><?= $day['label'] ?></td>
         <?php endif; ?>
       <?php endforeach; ?>
     </tr>
diff --git a/src/Resources/contao/templates/calendar/cal_mini.xhtml b/src/Resources/contao/templates/calendar/cal_mini.xhtml
index 8aafc7621c..6aa31adfef 100644
--- a/src/Resources/contao/templates/calendar/cal_mini.xhtml
+++ b/src/Resources/contao/templates/calendar/cal_mini.xhtml
@@ -2,24 +2,24 @@
 <table class="minicalendar">
 <thead>
   <tr>
-    <th class="head previous"><?php if ($this->prevHref): ?><a href="<?php echo $this->prevHref; ?>" rel="nofollow" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLabel; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
-    <th colspan="5" class="head current"><?php echo $this->current; ?></th>
-    <th class="head next"><?php if ($this->nextHref): ?><a href="<?php echo $this->nextHref; ?>" rel="nofollow" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLabel; ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th class="head previous"><?php if ($this->prevHref): ?><a href="<?= $this->prevHref ?>" rel="nofollow" title="<?= $this->prevTitle ?>"><?= $this->prevLabel ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
+    <th colspan="5" class="head current"><?= $this->current ?></th>
+    <th class="head next"><?php if ($this->nextHref): ?><a href="<?= $this->nextHref ?>" rel="nofollow" title="<?= $this->nextTitle ?>"><?= $this->nextLabel ?></a><?php else: ?>&nbsp;<?php endif; ?></th>
   </tr>
   <tr>
     <?php foreach ($this->days as $i=>$day): ?>
-      <th class="label<?php echo $day['class']; ?>"><?php echo utf8_substr($day['name'], 0, $this->substr); ?><span class="invisible"><?php echo utf8_substr($day['name'], $this->substr); ?></span></th>
+      <th class="label<?= $day['class'] ?>"><?= utf8_substr($day['name'], 0, $this->substr) ?><span class="invisible"><?= utf8_substr($day['name'], $this->substr) ?></span></th>
     <?php endforeach; ?>
   </tr>
 </thead>
 <tbody>
   <?php foreach ($this->weeks as $class=>$week): ?>
-    <tr class="<?php echo $class; ?>">
+    <tr class="<?= $class ?>">
       <?php foreach ($week as $day): ?>
         <?php if ($day['href']): ?>
-          <td class="<?php echo $day['class']; ?>"><a href="<?php echo $day['href']; ?>" title="<?php echo $day['title']; ?>"><?php echo $day['label']; ?></a></td>
+          <td class="<?= $day['class'] ?>"><a href="<?= $day['href'] ?>" title="<?= $day['title'] ?>"><?= $day['label'] ?></a></td>
         <?php else: ?>
-          <td class="<?php echo $day['class']; ?>"><?php echo $day['label']; ?></td>
+          <td class="<?= $day['class'] ?>"><?= $day['label'] ?></td>
         <?php endif; ?>
       <?php endforeach; ?>
     </tr>
diff --git a/src/Resources/contao/templates/events/event_full.html5 b/src/Resources/contao/templates/events/event_full.html5
index cd474fb694..92a6a51944 100644
--- a/src/Resources/contao/templates/events/event_full.html5
+++ b/src/Resources/contao/templates/events/event_full.html5
@@ -1,29 +1,29 @@
 
-<div class="event layout_full block<?php echo $this->class; ?>">
+<div class="event layout_full block<?= $this->class ?>">
 
-  <h1><?php echo $this->title; ?></h1>
-  <p class="info"><?php echo $this->date; ?></p>
+  <h1><?= $this->title ?></h1>
+  <p class="info"><?= $this->date ?></p>
 
   <?php if ($this->recurring): ?>
-    <p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+    <p class="recurring"><?= $this->recurring ?><?php if ($this->until) echo ' ' . $this->until; ?>.</p>
   <?php endif; ?>
 
   <?php if ($this->details): ?>
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   <?php else: ?>
     <div class="ce_text block">
-      <?php echo $this->teaser; ?>
+      <?= $this->teaser ?>
     </div>
   <?php endif; ?>
 
   <?php if ($this->location): ?>
-    <p class="location"><?php echo $this->locationLabel; ?>: <?php echo $this->location; ?></p>
+    <p class="location"><?= $this->locationLabel ?>: <?= $this->location ?></p>
   <?php endif; ?>
 
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon"> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon"> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>
diff --git a/src/Resources/contao/templates/events/event_full.xhtml b/src/Resources/contao/templates/events/event_full.xhtml
index cda3d22f4c..a2cb556a4e 100644
--- a/src/Resources/contao/templates/events/event_full.xhtml
+++ b/src/Resources/contao/templates/events/event_full.xhtml
@@ -1,29 +1,29 @@
 
-<div class="event layout_full block<?php echo $this->class; ?>">
+<div class="event layout_full block<?= $this->class ?>">
 
-  <h1><?php echo $this->title; ?></h1>
-  <p class="info"><?php echo $this->date; ?></p>
+  <h1><?= $this->title ?></h1>
+  <p class="info"><?= $this->date ?></p>
 
   <?php if ($this->recurring): ?>
-    <p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+    <p class="recurring"><?= $this->recurring ?><?php if ($this->until) echo ' ' . $this->until; ?>.</p>
   <?php endif; ?>
 
   <?php if ($this->details): ?>
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   <?php else: ?>
     <div class="ce_text block">
-      <?php echo $this->teaser; ?>
+      <?= $this->teaser ?>
     </div>
   <?php endif; ?>
 
   <?php if ($this->location): ?>
-    <p class="location"><?php echo $this->locationLabel; ?>: <?php echo $this->location; ?></p>
+    <p class="location"><?= $this->locationLabel ?>: <?= $this->location ?></p>
   <?php endif; ?>
 
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon" /> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon" /> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>
diff --git a/src/Resources/contao/templates/events/event_list.html5 b/src/Resources/contao/templates/events/event_list.html5
index 7c4e83b2d4..f0aae28544 100644
--- a/src/Resources/contao/templates/events/event_list.html5
+++ b/src/Resources/contao/templates/events/event_list.html5
@@ -1,20 +1,20 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <time datetime="<?php echo $this->datetime; ?>" class="date"><?php echo $this->firstDate; ?></time><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <time datetime="<?= $this->datetime ?>" class="date"><?= $this->firstDate ?></time><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_list<?php echo $this->classList; ?>">
+<div class="event layout_list<?= $this->classList ?>">
 
-  <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+  <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
   <div class="ce_text block">
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   </div>
 
 </div>
diff --git a/src/Resources/contao/templates/events/event_list.xhtml b/src/Resources/contao/templates/events/event_list.xhtml
index c544d1026b..65a85dbe68 100644
--- a/src/Resources/contao/templates/events/event_list.xhtml
+++ b/src/Resources/contao/templates/events/event_list.xhtml
@@ -1,20 +1,20 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <span class="date"><?php echo $this->firstDate; ?></span><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <span class="date"><?= $this->firstDate ?></span><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_list<?php echo $this->classList; ?>">
+<div class="event layout_list<?= $this->classList ?>">
 
-  <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+  <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
   <div class="ce_text block">
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   </div>
 
 </div>
diff --git a/src/Resources/contao/templates/events/event_teaser.html5 b/src/Resources/contao/templates/events/event_teaser.html5
index 4981ebe796..3cfea97d3b 100644
--- a/src/Resources/contao/templates/events/event_teaser.html5
+++ b/src/Resources/contao/templates/events/event_teaser.html5
@@ -1,28 +1,28 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <span class="date"><?php echo $this->firstDate; ?></span><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <span class="date"><?= $this->firstDate ?></span><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_teaser<?php echo $this->classList; ?>">
+<div class="event layout_teaser<?= $this->classList ?>">
 
   <?php if ($this->details): ?>
-    <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+    <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
   <?php else: ?>
-    <h2><?php echo $this->title; ?></h2>
+    <h2><?= $this->title ?></h2>
   <?php endif; ?>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
   <div class="teaser">
-    <?php echo $this->teaser; ?>
+    <?= $this->teaser ?>
   </div>
 
   <?php if ($this->details): ?>
-    <p class="more"><a href="<?php echo $this->href; ?>" title="<?php echo $this->readMore; ?>"<?php echo $this->target; ?>><?php echo $this->more; ?> <span class="invisible"><?php echo $this->link; ?></span></a></p>
+    <p class="more"><a href="<?= $this->href ?>" title="<?= $this->readMore ?>"<?= $this->target ?>><?= $this->more ?> <span class="invisible"><?= $this->link ?></span></a></p>
   <?php endif; ?>
 
 </div>
diff --git a/src/Resources/contao/templates/events/event_teaser.xhtml b/src/Resources/contao/templates/events/event_teaser.xhtml
index 4981ebe796..3cfea97d3b 100644
--- a/src/Resources/contao/templates/events/event_teaser.xhtml
+++ b/src/Resources/contao/templates/events/event_teaser.xhtml
@@ -1,28 +1,28 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <span class="date"><?php echo $this->firstDate; ?></span><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <span class="date"><?= $this->firstDate ?></span><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_teaser<?php echo $this->classList; ?>">
+<div class="event layout_teaser<?= $this->classList ?>">
 
   <?php if ($this->details): ?>
-    <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+    <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
   <?php else: ?>
-    <h2><?php echo $this->title; ?></h2>
+    <h2><?= $this->title ?></h2>
   <?php endif; ?>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
   <div class="teaser">
-    <?php echo $this->teaser; ?>
+    <?= $this->teaser ?>
   </div>
 
   <?php if ($this->details): ?>
-    <p class="more"><a href="<?php echo $this->href; ?>" title="<?php echo $this->readMore; ?>"<?php echo $this->target; ?>><?php echo $this->more; ?> <span class="invisible"><?php echo $this->link; ?></span></a></p>
+    <p class="more"><a href="<?= $this->href ?>" title="<?= $this->readMore ?>"<?= $this->target ?>><?= $this->more ?> <span class="invisible"><?= $this->link ?></span></a></p>
   <?php endif; ?>
 
 </div>
diff --git a/src/Resources/contao/templates/events/event_upcoming.html5 b/src/Resources/contao/templates/events/event_upcoming.html5
index 6a06f6e868..7fd05afe8b 100644
--- a/src/Resources/contao/templates/events/event_upcoming.html5
+++ b/src/Resources/contao/templates/events/event_upcoming.html5
@@ -1,11 +1,11 @@
 
-<div class="event layout_upcoming<?php echo $this->classUpcoming; ?>">
+<div class="event layout_upcoming<?= $this->classUpcoming ?>">
 
-  <span class="date"><?php echo $this->date; ?></span>
-  <a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif;?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a>
+  <span class="date"><?= $this->date ?></span>
+  <a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time;?>)"<?= $this->target ?>><?= $this->link ?></a>
 
   <?php if ($this->time): ?>
-    <span class="time">(<?php echo $this->time; ?>)</span>
+    <span class="time">(<?= $this->time ?>)</span>
   <?php endif; ?>
 
 </div>
diff --git a/src/Resources/contao/templates/events/event_upcoming.xhtml b/src/Resources/contao/templates/events/event_upcoming.xhtml
index 6a06f6e868..7fd05afe8b 100644
--- a/src/Resources/contao/templates/events/event_upcoming.xhtml
+++ b/src/Resources/contao/templates/events/event_upcoming.xhtml
@@ -1,11 +1,11 @@
 
-<div class="event layout_upcoming<?php echo $this->classUpcoming; ?>">
+<div class="event layout_upcoming<?= $this->classUpcoming ?>">
 
-  <span class="date"><?php echo $this->date; ?></span>
-  <a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif;?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a>
+  <span class="date"><?= $this->date ?></span>
+  <a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time;?>)"<?= $this->target ?>><?= $this->link ?></a>
 
   <?php if ($this->time): ?>
-    <span class="time">(<?php echo $this->time; ?>)</span>
+    <span class="time">(<?= $this->time ?>)</span>
   <?php endif; ?>
 
 </div>
diff --git a/src/Resources/contao/templates/modules/mod_calendar.html5 b/src/Resources/contao/templates/modules/mod_calendar.html5
index 7a588de6b2..9601ef59a3 100644
--- a/src/Resources/contao/templates/modules/mod_calendar.html5
+++ b/src/Resources/contao/templates/modules/mod_calendar.html5
@@ -2,6 +2,6 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->calendar; ?>
+  <?= $this->calendar ?>
 
 <?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/modules/mod_calendar.xhtml b/src/Resources/contao/templates/modules/mod_calendar.xhtml
index 7a588de6b2..9601ef59a3 100644
--- a/src/Resources/contao/templates/modules/mod_calendar.xhtml
+++ b/src/Resources/contao/templates/modules/mod_calendar.xhtml
@@ -2,6 +2,6 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->calendar; ?>
+  <?= $this->calendar ?>
 
 <?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/modules/mod_event.html5 b/src/Resources/contao/templates/modules/mod_event.html5
index ad1ff6eddb..9b2feda3a6 100644
--- a/src/Resources/contao/templates/modules/mod_event.html5
+++ b/src/Resources/contao/templates/modules/mod_event.html5
@@ -2,17 +2,17 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->event; ?>
+  <?= $this->event ?>
 
   <!-- indexer::stop -->
-  <p class="back"><a href="<?php echo $this->referer; ?>" title="<?php echo $this->back; ?>"><?php echo $this->back; ?></a></p>
+  <p class="back"><a href="<?= $this->referer ?>" title="<?= $this->back ?>"><?= $this->back ?></a></p>
   <!-- indexer::continue -->
 
   <?php if ($this->allowComments): ?>
     <div class="ce_comments block">
-      <<?php echo $this->hlc; ?>><?php echo $this->addComment; ?></<?php echo $this->hlc; ?>>
-      <?php echo implode('', $this->comments); ?>
-      <?php echo $this->pagination; ?>
+      <<?= $this->hlc ?>><?= $this->addComment ?></<?= $this->hlc ?>>
+      <?= implode('', $this->comments) ?>
+      <?= $this->pagination ?>
       <?php include $this->getTemplate('mod_comment_form', 'html5'); ?>
     </div>
   <?php endif; ?>
diff --git a/src/Resources/contao/templates/modules/mod_event.xhtml b/src/Resources/contao/templates/modules/mod_event.xhtml
index db6afbeed1..7f0582af00 100644
--- a/src/Resources/contao/templates/modules/mod_event.xhtml
+++ b/src/Resources/contao/templates/modules/mod_event.xhtml
@@ -2,17 +2,17 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->event; ?>
+  <?= $this->event ?>
 
   <!-- indexer::stop -->
-  <p class="back"><a href="<?php echo $this->referer; ?>" title="<?php echo $this->back; ?>"><?php echo $this->back; ?></a></p>
+  <p class="back"><a href="<?= $this->referer ?>" title="<?= $this->back ?>"><?= $this->back ?></a></p>
   <!-- indexer::continue -->
 
   <?php if ($this->allowComments): ?>
     <div class="ce_comments block">
-      <<?php echo $this->hlc; ?>><?php echo $this->addComment; ?></<?php echo $this->hlc; ?>>
-      <?php echo implode('', $this->comments); ?>
-      <?php echo $this->pagination; ?>
+      <<?= $this->hlc ?>><?= $this->addComment ?></<?= $this->hlc ?>>
+      <?= implode('', $this->comments) ?>
+      <?= $this->pagination ?>
       <?php include $this->getTemplate('mod_comment_form', 'xhtml'); ?>
     </div>
   <?php endif; ?>
diff --git a/src/Resources/contao/templates/modules/mod_eventlist.html5 b/src/Resources/contao/templates/modules/mod_eventlist.html5
index 13621d56f5..f23378be01 100644
--- a/src/Resources/contao/templates/modules/mod_eventlist.html5
+++ b/src/Resources/contao/templates/modules/mod_eventlist.html5
@@ -2,8 +2,8 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->events; ?>
+  <?= $this->events ?>
 
-  <?php echo $this->pagination; ?>
+  <?= $this->pagination ?>
 
 <?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/modules/mod_eventlist.xhtml b/src/Resources/contao/templates/modules/mod_eventlist.xhtml
index 13621d56f5..f23378be01 100644
--- a/src/Resources/contao/templates/modules/mod_eventlist.xhtml
+++ b/src/Resources/contao/templates/modules/mod_eventlist.xhtml
@@ -2,8 +2,8 @@
 
 <?php $this->block('content'); ?>
 
-  <?php echo $this->events; ?>
+  <?= $this->events ?>
 
-  <?php echo $this->pagination; ?>
+  <?= $this->pagination ?>
 
 <?php $this->endblock(); ?>
diff --git a/src/Resources/contao/templates/modules/mod_eventmenu.html5 b/src/Resources/contao/templates/modules/mod_eventmenu.html5
index 397f57d675..b605ae5ed4 100644
--- a/src/Resources/contao/templates/modules/mod_eventmenu.html5
+++ b/src/Resources/contao/templates/modules/mod_eventmenu.html5
@@ -6,16 +6,16 @@
     <?php foreach ($this->items as $year=>$months): ?>
       <li class="year submenu">
         <?php if ($year == $this->activeYear): ?>
-          <span class="active"><?php echo $year; ?></span>
+          <span class="active"><?= $year ?></span>
         <?php else: ?>
-          <a href="<?php echo $this->url; ?>year=<?php echo $year; ?>"><?php echo $year; ?></a>
+          <a href="<?= $this->url ?>year=<?= $year ?>"><?= $year ?></a>
         <?php endif; ?>
         <ul class="level_2">
           <?php foreach ($months as $month): ?>
             <?php if($month['isActive']): ?>
-              <li class="active<?php if ($month['class']): ?> <?php echo $month['class']; endif; ?>"><span class="active"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></span></li>
+              <li class="active<?php if ($month['class']) echo ' ' . $month['class']; ?>"><span class="active"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></span></li>
             <?php else: ?>
-              <li<?php if ($month['class']): ?> class="<?php echo $month['class']; ?>"<?php endif; ?>><a href="<?php echo $this->url; ?>month=<?php echo $month['date']; ?>" title="<?php echo $month['title']; ?>"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></a></li>
+              <li<?php if ($month['class']): ?> class="<?= $month['class'] ?>"<?php endif; ?>><a href="<?= $this->url ?>month=<?= $month['date'] ?>" title="<?= $month['title'] ?>"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></a></li>
             <?php endif; ?>
           <?php endforeach; ?>
         </ul>
diff --git a/src/Resources/contao/templates/modules/mod_eventmenu.xhtml b/src/Resources/contao/templates/modules/mod_eventmenu.xhtml
index 397f57d675..b605ae5ed4 100644
--- a/src/Resources/contao/templates/modules/mod_eventmenu.xhtml
+++ b/src/Resources/contao/templates/modules/mod_eventmenu.xhtml
@@ -6,16 +6,16 @@
     <?php foreach ($this->items as $year=>$months): ?>
       <li class="year submenu">
         <?php if ($year == $this->activeYear): ?>
-          <span class="active"><?php echo $year; ?></span>
+          <span class="active"><?= $year ?></span>
         <?php else: ?>
-          <a href="<?php echo $this->url; ?>year=<?php echo $year; ?>"><?php echo $year; ?></a>
+          <a href="<?= $this->url ?>year=<?= $year ?>"><?= $year ?></a>
         <?php endif; ?>
         <ul class="level_2">
           <?php foreach ($months as $month): ?>
             <?php if($month['isActive']): ?>
-              <li class="active<?php if ($month['class']): ?> <?php echo $month['class']; endif; ?>"><span class="active"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></span></li>
+              <li class="active<?php if ($month['class']) echo ' ' . $month['class']; ?>"><span class="active"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></span></li>
             <?php else: ?>
-              <li<?php if ($month['class']): ?> class="<?php echo $month['class']; ?>"<?php endif; ?>><a href="<?php echo $this->url; ?>month=<?php echo $month['date']; ?>" title="<?php echo $month['title']; ?>"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></a></li>
+              <li<?php if ($month['class']): ?> class="<?= $month['class'] ?>"<?php endif; ?>><a href="<?= $this->url ?>month=<?= $month['date'] ?>" title="<?= $month['title'] ?>"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></a></li>
             <?php endif; ?>
           <?php endforeach; ?>
         </ul>
diff --git a/src/Resources/contao/templates/modules/mod_eventmenu_year.html5 b/src/Resources/contao/templates/modules/mod_eventmenu_year.html5
index fbbaad0628..416876ffac 100644
--- a/src/Resources/contao/templates/modules/mod_eventmenu_year.html5
+++ b/src/Resources/contao/templates/modules/mod_eventmenu_year.html5
@@ -5,9 +5,9 @@
   <ul class="level_1">
     <?php foreach ($this->items as $year=>$month): ?>
       <?php if($month['isActive']): ?>
-        <li class="active<?php if ($month['class']): ?> <?php echo $month['class']; endif; ?>"><span class="active"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></span></li>
+        <li class="active<?php if ($month['class']) echo ' ' . $month['class']; ?>"><span class="active"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></span></li>
       <?php else: ?>
-        <li<?php if ($month['class']): ?> class="<?php echo $month['class']; ?>"<?php endif; ?>><a href="<?php echo $month['href']; ?>" title="<?php echo $month['title']; ?>"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></a></li>
+        <li<?php if ($month['class']): ?> class="<?= $month['class'] ?>"<?php endif; ?>><a href="<?= $month['href'] ?>" title="<?= $month['title'] ?>"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></a></li>
       <?php endif; ?>
     <?php endforeach; ?>
   </ul>
diff --git a/src/Resources/contao/templates/modules/mod_eventmenu_year.xhtml b/src/Resources/contao/templates/modules/mod_eventmenu_year.xhtml
index fbbaad0628..416876ffac 100644
--- a/src/Resources/contao/templates/modules/mod_eventmenu_year.xhtml
+++ b/src/Resources/contao/templates/modules/mod_eventmenu_year.xhtml
@@ -5,9 +5,9 @@
   <ul class="level_1">
     <?php foreach ($this->items as $year=>$month): ?>
       <?php if($month['isActive']): ?>
-        <li class="active<?php if ($month['class']): ?> <?php echo $month['class']; endif; ?>"><span class="active"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></span></li>
+        <li class="active<?php if ($month['class']) echo ' ' . $month['class']; ?>"><span class="active"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></span></li>
       <?php else: ?>
-        <li<?php if ($month['class']): ?> class="<?php echo $month['class']; ?>"<?php endif; ?>><a href="<?php echo $month['href']; ?>" title="<?php echo $month['title']; ?>"><?php echo $month['link']; ?><?php if ($this->showQuantity): ?> (<?php echo $month['quantity']; ?>)<?php endif; ?></a></li>
+        <li<?php if ($month['class']): ?> class="<?= $month['class'] ?>"<?php endif; ?>><a href="<?= $month['href'] ?>" title="<?= $month['title'] ?>"><?= $month['link'] ?><?php if ($this->showQuantity): ?> (<?= $month['quantity'] ?>)<?php endif; ?></a></li>
       <?php endif; ?>
     <?php endforeach; ?>
   </ul>