diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
index 857209f5..90a362dd 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
@@ -1,40 +1,30 @@
 <html data-namespace-typo3-fluid="true" lang="en"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
-      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:if condition="{data.header_link}">
-            <v:condition.string.isNumeric value="{data.header_link}">
-                <f:then>
-                    <f:link.typolink parameter="{data.header_link}" title="{data.header}" class="teaserbox teaserbox--default">
-                        <f:render section="Content" arguments="{_all}"/>
-                    </f:link.typolink>
-                </f:then>
-                <f:else>
-                    <a href="{data.header_link}" target="_blank" title="{data.header}" class="teaserbox teaserbox--default">
-                        <f:render section="Content" arguments="{_all}"/>
-                    </a>
-                </f:else>
-            </v:condition.string.isNumeric>
-        </f:if>
-    </f:section>
-
-    <f:section name="Content">
-        <div class="teaserbox__image">
-            <f:if condition="{context.country}">
-                <f:image class="teaserbox__flag"
-                         src="{ep:flagiconSource(country: context.country)}" alt="{context.country.name}"/>
-            </f:if>
-            <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
-        </div>
-        <div class="teaserbox__main" data-rte-content>
-            <span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span>
-            <hr>
-            {data.bodytext -> f:format.html()}
-        </div>
-        <button class="button button--full">{data.button -> v:or(alternative: 'Details')}</button>
+        <f:link.typolink parameter="{data.header_link}"
+                         class="teaserbox teaserbox--default">
+            <div class="teaserbox__image">
+                <f:if condition="{context.country}">
+                    <f:image class="teaserbox__flag"
+                             src="{ep:flagiconSource(country: context.country)}"
+                             alt="{context.country.name}"/>
+                </f:if>
+                <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
+            </div>
+            <div class="teaserbox__main" data-rte-content>
+                <span class="headline headline--3 headline--teaser">
+                    {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
+                </span>
+                <hr>
+                {data.bodytext -> f:format.html()}
+            </div>
+            <button class="button w-full">
+                {data.button -> v:or(alternative: 'Details')}
+            </button>
+        </f:link.typolink>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
index 551ac8f4..2f9c85f5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
@@ -3,35 +3,23 @@
       xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-    <f:layout name="Default"/>
-
     <f:section name="Teaser">
-        <f:if condition="{data.header_link}">
-            <v:condition.string.isNumeric value="{data.header_link}">
-                <f:then>
-                    <f:link.typolink parameter="{data.header_link}" title="{data.header}" class="teaserbox teaserbox--default">
-                        <f:render section="Content" arguments="{_all}"/>
-                    </f:link.typolink>
-                </f:then>
-                <f:else>
-                    <a href="{data.header_link}" target="_blank" title="{data.header}" class="teaserbox teaserbox--default">
-                        <f:render section="Content" arguments="{_all}"/>
-                    </a>
-                </f:else>
-            </v:condition.string.isNumeric>
-        </f:if>
-    </f:section>
-
-    <f:section name="Content">
-        <div class="teasebox__image">
-            <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
-        </div>
-        <div class="teaserbox__main" data-rte-content>
-            <span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span>
-            <hr>
-            {data.bodytext -> f:format.html()}
-        </div>
-        <button class="button button--full">{data.button -> v:or(alternative: 'Details')}</button>
+        <f:link.typolink parameter="{data.header_link}"
+                         class="teaserbox teaserbox--default">
+            <div class="teasebox__image">
+                <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
+            </div>
+            <div class="teaserbox__main" data-rte-content>
+                <span class="headline headline--3 headline--teaser">
+                    {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
+                </span>
+                <hr>
+                {data.bodytext -> f:format.html()}
+            </div>
+            <button class="button button--full">
+                {data.button -> v:or(alternative: 'Details')}
+            </button>
+        </f:link.typolink>
     </f:section>
 
 </html>
