diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php
index 47a1671d..18ac319d 100644
--- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php
+++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php
@@ -274,17 +274,9 @@ return [
                                         'default' => [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
-                                                'teaserEven' => [
-                                                    'title' => 'Teaser gerade',
-                                                    'value' => 1.3333333333333334,
-                                                ],
-                                                'teaserOdd' => [
-                                                    'title' => 'Teaser ungerade',
-                                                    'value' => 2.0555555555555556,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                'teaser' => [
+                                                    'title' => 'Teaser',
+                                                    'value' => 2,
                                                 ],
                                             ],
                                         ],
@@ -323,16 +315,8 @@ return [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
                                                 'headerLarge' => [
-                                                    'title' => 'Header groß',
-                                                    'value' => 2.3333333333333334,
-                                                ],
-                                                'headerSmall' => [
-                                                    'title' => 'Header klein',
-                                                    'value' => 3.3333333333333334,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                    'title' => 'Header',
+                                                    'value' => 3.8,
                                                 ],
                                             ],
                                         ],
diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php
index eacc5c47..6f65611f 100644
--- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php
+++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php
@@ -271,17 +271,9 @@ return [
                                         'default' => [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
-                                                'teaserEven' => [
-                                                    'title' => 'Teaser gerade',
-                                                    'value' => 1.3333333333333334,
-                                                ],
-                                                'teaserOdd' => [
-                                                    'title' => 'Teaser ungerade',
-                                                    'value' => 2.0555555555555556,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                'teaser' => [
+                                                    'title' => 'Teaser',
+                                                    'value' => 2,
                                                 ],
                                             ],
                                         ],
@@ -320,16 +312,8 @@ return [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
                                                 'headerLarge' => [
-                                                    'title' => 'Header groß',
-                                                    'value' => 2.3333333333333334,
-                                                ],
-                                                'headerSmall' => [
-                                                    'title' => 'Header klein',
-                                                    'value' => 3.3333333333333334,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                    'title' => 'Header',
+                                                    'value' => 3.8,
                                                 ],
                                             ],
                                         ],
diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php
index 5ec3caea..994aea80 100644
--- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php
+++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php
@@ -290,17 +290,9 @@ return [
                                         'default' => [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
-                                                'teaserEven' => [
-                                                    'title' => 'Teaser gerade',
-                                                    'value' => 1.3333333333333334,
-                                                ],
-                                                'teaserOdd' => [
-                                                    'title' => 'Teaser ungerade',
-                                                    'value' => 2.0555555555555556,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                'teaser' => [
+                                                    'title' => 'Teaser',
+                                                    'value' => 2,
                                                 ],
                                             ],
                                         ],
@@ -339,16 +331,8 @@ return [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
                                                 'headerLarge' => [
-                                                    'title' => 'Header groß',
-                                                    'value' => 2.3333333333333334,
-                                                ],
-                                                'headerSmall' => [
-                                                    'title' => 'Header klein',
-                                                    'value' => 3.3333333333333334,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                    'title' => 'Header',
+                                                    'value' => 3.8,
                                                 ],
                                             ],
                                         ],
diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php
index 17f4188c..d880de05 100644
--- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php
+++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php
@@ -391,17 +391,9 @@ return [
                                         'default' => [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
-                                                'teaserEven' => [
-                                                    'title' => 'Teaser gerade',
-                                                    'value' => 1.3333333333333334,
-                                                ],
-                                                'teaserOdd' => [
-                                                    'title' => 'Teaser ungerade',
-                                                    'value' => 2.0555555555555556,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                'teaser' => [
+                                                    'title' => 'Teaser',
+                                                    'value' => 2,
                                                 ],
                                             ],
                                         ],
@@ -440,16 +432,8 @@ return [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
                                                 'headerLarge' => [
-                                                    'title' => 'Header groß',
-                                                    'value' => 2.3333333333333334,
-                                                ],
-                                                'headerSmall' => [
-                                                    'title' => 'Header klein',
-                                                    'value' => 3.3333333333333334,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                    'title' => 'Header',
+                                                    'value' => 3.8,
                                                 ],
                                             ],
                                         ],
diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php
index 15983522..7c721c6e 100644
--- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php
+++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php
@@ -343,17 +343,9 @@ return [
                                         'default' => [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
-                                                'teaserEven' => [
-                                                    'title' => 'Teaser gerade',
-                                                    'value' => 1.3333333333333334,
-                                                ],
-                                                'teaserOdd' => [
-                                                    'title' => 'Teaser ungerade',
-                                                    'value' => 2.0555555555555556,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                'teaser' => [
+                                                    'title' => 'Teaser',
+                                                    'value' => 2,
                                                 ],
                                             ],
                                         ],
@@ -392,16 +384,8 @@ return [
                                             'title' => 'Alle Geräte',
                                             'allowedAspectRatios' => [
                                                 'headerLarge' => [
-                                                    'title' => 'Header groß',
-                                                    'value' => 2.3333333333333334,
-                                                ],
-                                                'headerSmall' => [
-                                                    'title' => 'Header klein',
-                                                    'value' => 3.3333333333333334,
-                                                ],
-                                                'free' => [
-                                                    'title' => 'Frei',
-                                                    'value' => 'NaN',
+                                                    'title' => 'Header',
+                                                    'value' => 3.8,
                                                 ],
                                             ],
                                         ],
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContentSlider.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContentSlider.html
index daa20872..d6f80e7a 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContentSlider.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContentSlider.html
@@ -10,8 +10,8 @@
     <div class="slider__items">
         <f:alias map="{image: images.0}">
             <a href="#" data-trigger="gallery-{id}">
-                <f:image image="{image}" crop="{image.crop}" width="770" height="430c+100"
-                         class="slider__image" alt="{image.alternative}" title="{image.title}"/>
+                <f:image image="{image}" width="770" height="430c+100" class="slider__image"
+                         alt="{image.alternative}" title="{image.title}"/>
             </a>
         </f:alias>
     </div>
@@ -20,10 +20,10 @@
             <div class="slider__thumbs hidden-sm hidden-xs">
                 <f:for each="{images}" as="image" iteration="iteration">
                     <f:if condition="{iteration.cycle} <= 5">
-                        <a href="{f:uri.image(image: image, crop: image.crop, maxWidth: '2560')}"
+                        <a href="{f:uri.image(image: image, maxWidth: '2560')}"
                            data-fancybox="gallery-{id}" class="slider__thumb">
-                            <f:image image="{image}" crop="{image.crop}" width="150" height="85c+100"
-                                     class="img-responsive" alt="{image.alternative}" title="{image.title}"/>
+                            <f:image image="{image}" width="150" height="85c+100" class="img-responsive"
+                                     alt="{image.alternative}" title="{image.title}"/>
                         </a>
                     </f:if>
                 </f:for>
@@ -36,14 +36,14 @@
                 <f:if condition="{images -> f:count()} == 1">
                     <f:then>
                         <f:alias map="{image: images.0}">
-                            <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, crop: image.crop, maxWidth: '2560')}"
+                            <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, maxWidth: '2560')}"
                                title="{image.title}">1</a>
                         </f:alias>
                     </f:then>
                     <f:else>
                         <f:for each="{images}" as="image" iteration="iteration">
                             <f:if condition="{iteration.cycle} > 5">
-                                <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, crop: image.crop, maxWidth: '2560')}"
+                                <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, maxWidth: '2560')}"
                                    title="{image.title}">{iteration.index}</a>
                             </f:if>
                         </f:for>
@@ -52,7 +52,7 @@
             </f:then>
             <f:else>
                 <f:for each="{images}" as="image">
-                    <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, crop: image.crop, maxWidth: '2560')}"
+                    <a data-fancybox="gallery-{id}" href="{f:uri.image(image: image, maxWidth: '2560')}"
                        title="{image.title}">{iteration.index}</a>
                 </f:for>
             </f:else>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
index c9c41994..53736427 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
@@ -11,7 +11,8 @@
                         <div class="col-md-6">
                             <f:if condition="{teaserImage}">
                                 <f:then>
-                                    <img class="lazy" data-src="{f:uri.image(src: teaserImage.uid, treatIdAsReference: 1, crop: teaserImage.crop, width: '400', height: '400c')}" alt="{teaserImage.alternative}" title="{teaserImage.title}">
+                                    <img class="lazy" data-src="{f:uri.image(image: teaserImage, width: '400', height: '400c')}"
+                                         alt="{teaserImage.alternative}" title="{teaserImage.title}">
                                 </f:then>
                                 <f:else>
                                     <img src="https://placehold.it/800x600" alt="">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
index 2ec58674..3a122893 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
@@ -11,7 +11,8 @@
                 <a href="{f:uri.typolink(parameter: button.container.link)}" title="{button.container.label -> f:format.raw()}">
                     <f:if condition="{teaserImage}">
                         <f:then>
-                            <img class="scale lazy" data-src="{f:uri.image(src: teaserImage.uid, treatIdAsReference: 1, crop: teaserImage.crop, width: '400')}" alt="{teaserImage.alternative}" title="{teaserImage.title}">
+                            <img class="scale lazy" data-src="{f:uri.image(image: teaserImage, width: '400')}"
+                                 alt="{teaserImage.alternative}" title="{teaserImage.title}">
                         </f:then>
                         <f:else>
                             <img src="https://placehold.it/600x450" class="scale" alt="">
@@ -22,7 +23,8 @@
             <div class="col-md-6 ">
                 <div>{data.bodytext -> f:format.html()}</div>
             </div>
-            <a href="{f:uri.typolink(parameter: button.container.link)}" class="btn btn-info" title="{button.container.label -> f:format.raw()}">{button.container.label -> f:format.raw()}</a>
+            <a href="{f:uri.typolink(parameter: button.container.link)}" class="btn btn-info"
+               title="{button.container.label -> f:format.raw()}">{button.container.label -> f:format.raw()}</a>
         </div>
 	</f:section>
 
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
index 36f8ccbc..2c484aae 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
@@ -11,7 +11,8 @@
                         <div class="col-sm-2">
                             <f:if condition="{teaserImage}">
                                 <f:then>
-                                    <img class="scale lazy" data-src="{f:uri.image(src: teaserImage.uid, treatIdAsReference: 1, crop: teaserImage.crop, width: '400', height: '400c')}" alt="{teaserImage.alternative}" title="{teaserImage.title}">
+                                    <img class="scale lazy" data-src="{f:uri.image(image: teaserImage, width: '400', height: '400c')}"
+                                         alt="{teaserImage.alternative}" title="{teaserImage.title}">
                                 </f:then>
                                 <f:else>
                                     <img class="scale" src="https://placehold.it/800x600" alt="">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventHero.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventHero.html
index 49151502..bebe2f78 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventHero.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventHero.html
@@ -15,7 +15,8 @@
 	        {slides -> v:iterator.first() -> v:variable.set(name: 'slide')}
             <f:if condition="{slide.image.0}">
                 <f:then>
-                    <img src="{f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, width: '1370')}" alt="{slide.image.0.alternative}" title="{slide.image.0.title}">
+                    <img src="{f:uri.image(image: slide.image.0, width: '1370')}"
+                         alt="{slide.image.0.alternative}" title="{slide.image.0.title}">
                 </f:then>
                 <f:else>
                     <img src="https://placehold.it/1370x700" alt="">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
index 169ddfc6..5a5e89ea 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
@@ -4,9 +4,11 @@
         <f:for each="{slides}" as="slide" iteration="iteration">
             <div class="slider__item">
                 <div class="herounit">
-                    <div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, height: '240')})"
-                         data-mobile="{f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, height: '240')}"
-                         data-desktop="{f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, width: '1370')}"></div>
+                    <f:alias map="{image: slide.image.0}">
+                        <div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(image: image, height: '240')})"
+                             data-mobile="{f:uri.image(image: image, height: '240')}"
+                             data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
+                    </f:alias>
                     <div class="herounit__main">
                         <div class="herounit__inner">
                             <div class="header-caption">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
index 819d73e9..9277e06f 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
@@ -1,10 +1,12 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 {slides -> v:iterator.first() -> v:variable.set(name: 'slide')}
 <div class="pagehead">
-    <div class="pagehead__image responsive-bg"
-         style="background-image: url({f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, height: '240')})"
-         data-mobile="{f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, height: '240')}"
-         data-desktop="{f:uri.image(src: slide.image.0.uid, treatIdAsReference: 1, crop: slide.image.0.crop, width: '1370')}"></div>
+    <f:alias map="{image: slide.image.0}">
+        <div class="pagehead__image responsive-bg"
+             style="background-image: url({f:uri.image(image: image, height: '240')})"
+             data-mobile="{f:uri.image(image: image, height: '240')}"
+             data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
+    </f:alias>
     <div class="pagehead__main">
         <div class="pagehead__inner">
             <div class="header-caption">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
index 23594b91..f71eff3d 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserWide.html
@@ -136,20 +136,16 @@
                 <f:alias map="{image: item.hotel.images.original.0}">
                     <picture class="searchresult-item__image">
                         <source media="(max-width: 768px)" srcset="{f:uri.image(
-                            src: image.uid, treatIdAsReference: 1,
-                            crop: image.crop, width: '220', height: '130c-100'
+                            image: image, width: '220', height: '130c-100'
                         )}  220w"/>
                         <source media="(max-width: 1200px)" srcset="{f:uri.image(
-                            src: image.uid, treatIdAsReference: 1,
-                            crop: image.crop, width: '280', height: '220c-100'
+                            image: image, width: '280', height: '220c-100'
                         )}  280w"/>
                         <source media="(min-width: 1201px)" srcset="{f:uri.image(
-                            src: image.uid, treatIdAsReference: 1,
-                            crop: image.crop, width: '260', height: '200c-100'
+                            image: image, width: '260', height: '200c-100'
                         )}  260w"/>
                         <img class="scale" src="{f:uri.image(
-                            src: image.uid, treatIdAsReference: 1,
-                            crop: image.crop, width: '260', height: '200c-100'
+                            image: image, width: '260', height: '200c-100'
                         )}" title="{image.title}" alt="{image.alternative}">
                     </picture>
                 </f:alias>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html
index bd58c6ab..846e2a1b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html
@@ -4,7 +4,7 @@
 <h2>Eigenanreise</h2>
 {journey.byCar -> f:format.html()}
 <f:if condition="{journey.image}">
-    <img src="{f:uri.image(src: journey.image.uid, treatIdAsReference: 1, crop: journey.image.crop, width: '770', height: '430c+100')}"
+    <img src="{f:uri.image(image: journey.image, width: '770', height: '430c+100')}"
          alt="{journey.image.alternative}" title="{journey.image.title}">
 </f:if>
 <f:if condition="{journey.byBus}">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/News/Detail/MediaContainer.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/News/Detail/MediaContainer.html
index 5556d7a4..293fd454 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/News/Detail/MediaContainer.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/News/Detail/MediaContainer.html
@@ -8,7 +8,7 @@
             <div id="carousel-{id}" class="slider__items">
                 <f:for each="{images}" as="image" iteration="iteration">
                     <f:link.typolink parameter="{image.originalResource.link}" class="slider__item">
-                        <img src="{f:uri.image(src: image.uid, treatIdAsReference: 1, crop: image.crop, width: '770', height: '430c+100')}"
+                        <img src="{f:uri.image(image: image, width: '770', height: '430c+100')}"
                              class="slider__image" alt="{image.alternative}" title="{image.title}">
                     </f:link.typolink>
                 </f:for>
@@ -18,7 +18,7 @@
                     <f:for each="{images}" as="image" iteration="iteration">
                         <f:if condition="{iteration.cycle} <= 5">
                             <a href="#" class="slider__thumb" data-slide="{iteration.index}">
-                                <img src="{f:uri.image(src: image.uid, treatIdAsReference: 1, crop: image.crop, width: '150', height: '85c+100')}"
+                                <img src="{f:uri.image(image: image, width: '150', height: '85c+100')}"
                                      class="img-responsive" alt="{image.alternative}" title="{image.title}">
                             </a>
                         </f:if>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
index a69a3450..0c803166 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html
@@ -7,9 +7,9 @@
             <div class="slider__items">
                 <f:for each="{product.images}" as="image" iteration="iteration">
                     <div class="slider__item slider__item--product responsive-bg"
-                         style="background-image: url({f:uri.image(src: image.uid, treatIdAsReference: 1, crop: image.crop, width: '400', height: '200c')})"
-                         data-mobile="{f:uri.image(src: image.uid, treatIdAsReference: 1, crop: image.crop, width: '400', height: '180c')}"
-                         data-desktop="{f:uri.image(src: image.uid, treatIdAsReference: 1, crop: image.crop, width: '1370')}">
+                         style="background-image: url({f:uri.image(image: image, width: '400', height: '200c')})"
+                         data-mobile="{f:uri.image(image: image, width: '400', height: '180c')}"
+                         data-desktop="{f:uri.image(image: image, width: '1370')}">
                     </div>
                 </f:for>
             </div>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html
index 14dfa3e0..875dcb19 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html
@@ -112,20 +112,16 @@
     <f:section name="PictureTag">
         <picture class="searchresult-item__image">
             <source media="(max-width: 768px)" srcset="{f:uri.image(
-                        src: image.uid, treatIdAsReference: 1,
-                        crop: image.crop, width: '220', height: '130c-100'
+                        image: image, width: '220', height: '130c-100'
                     )}  220w"/>
             <source media="(max-width: 1200px)" srcset="{f:uri.image(
-                        src: image.uid, treatIdAsReference: 1,
-                        crop: image.crop, width: '280', height: '220c-100'
+                        image: image, width: '280', height: '220c-100'
                     )}  280w"/>
             <source media="(min-width: 1201px)" srcset="{f:uri.image(
-                        src: image.uid, treatIdAsReference: 1,
-                        crop: image.crop, width: '260', height: '200c-100'
+                        image: image, width: '260', height: '200c-100'
                     )}  260w"/>
             <img class="scale" src="{f:uri.image(
-                        src: image.uid, treatIdAsReference: 1,
-                        crop: image.crop, width: '260', height: '200c-100'
+                        image: image, width: '260', height: '200c-100'
                     )}" title="{image.title}" alt="{image.alternative}">
         </picture>
     </f:section>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionMaps.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionMaps.html
index 27f8b1d3..586adb8b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionMaps.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionMaps.html
@@ -7,12 +7,7 @@
                    data-fancybox="regionmap-{region.uid}" data-caption="Pistenplan {region.name}"
                    title="Pistenplan {region.name}">
                     <img class="img-responsive lazy"
-                         data-src="{f:uri.image(
-                            src: regionMap.uid,
-                            treatIdAsReference: 1,
-                            crop: regionMap.crop,
-                            width: '330'
-                        )}"
+                         data-src="{f:uri.image(image: regionMap, width: '330')}"
                         alt="{regionMap.alternative}"
                         title="{regionMap.title}">
                 </a>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html
index 91b6f91c..cf89a37f 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html
@@ -3,9 +3,9 @@
 <div class="pagehead">
     <f:if condition="{headerImage.uid}">
         <div class="pagehead__image responsive-bg"
-             style="background-image: url({f:uri.image(src: headerImage.uid, treatIdAsReference: 1, crop: headerImage.crop, height: '240')})"
-             data-mobile="{f:uri.image(src: headerImage.uid, treatIdAsReference: 1, crop: headerImage.crop, height: '240')}"
-             data-desktop="{f:uri.image(src: headerImage.uid, treatIdAsReference: 1, crop: headerImage.crop, width: '1370')}"></div>
+             style="background-image: url({f:uri.image(src: headerImage, height: '240')})"
+             data-mobile="{f:uri.image(src: headerImage, height: '240')}"
+             data-desktop="{f:uri.image(src: headerImage, width: '1370')}"></div>
     </f:if>
     <div class="pagehead__main">
         <div class="pagehead__inner">
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
index f3575f55..6c0f4fba 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserImage.html
@@ -2,28 +2,22 @@
     <f:then>
         <picture>
             <source media="(max-width: 512px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '350', height: '175c-100'
+                image: image, width: '350', height: '175c-100'
             )}  350w"/>
             <source media="(max-width: 768px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '500', height: '250c-100'
+                image: image, width: '500', height: '250c-100'
             )}  500w"/>
             <source media="(max-width: 991px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '360', height: '200c-100'
+                image: image, width: '360', height: '200c-100'
             )}  360w"/>
             <source media="(max-width: 1200px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '320', height: '160c-100'
+                image: image, width: '320', height: '160c-100'
             )}  320w"/>
             <source media="(min-width: 1201px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '370', height: '220c-100'
+                image: image, width: '370', height: '220c-100'
             )}  370w"/>
             <img class="scale" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '500', height: '250c-100'
+                image: image, width: '500', height: '250c-100'
             )}" title="{image.title}" alt="{image.alternative}">
         </picture>
     </f:then>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
index 2eab4a08..47f4d869 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/TeaserWideImage.html
@@ -2,24 +2,19 @@
     <f:then>
         <picture class="product-teaser__image">
             <source media="(max-width: 768px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '320', height: '140c-100'
+                image: image, width: '320', height: '140c-100'
             )}  320w"/>
             <source media="(max-width: 991px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '260', height: '220c-100'
+                image: image, width: '260', height: '220c-100'
             )}  260w"/>
             <source media="(max-width: 1200px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '220', height: '130c-100'
+                image: image, width: '220', height: '130c-100'
             )}  220w"/>
             <source media="(min-width: 1201px)" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '320', height: '200c-100'
+                image: image, width: '320', height: '200c-100'
             )}  320w"/>
             <img class="scale" srcset="{f:uri.image(
-                src: image.uid, treatIdAsReference: 1,
-                crop: image.crop, width: '260', height: '160c-100'
+                image: image, width: '260', height: '160c-100'
             )}" title="{image.title}" alt="{image.alternative}">
         </picture>
     </f:then>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Default.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Default.html
index 3c39e950..5323958d 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Default.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Default.html
@@ -9,7 +9,7 @@
         <f:if condition="{files}">
             <f:link.typolink parameter="{files.0.link}">
                 <img class="img-responsive lazy"
-                     data-src="{f:uri.image(src: files.0.uid, treatIdAsReference: 1, crop: files.0.crop, maxWidth: '770')}"
+                     data-src="{f:uri.image(image: files.0, maxWidth: '770')}"
                      alt="{files.0.originalResource.alternative}"
                      title="{files.0.originalResource.title}"
                 >
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html
index f33a0485..e3f391b4 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html
@@ -14,14 +14,14 @@
 								<div class="ep-tile-right">
 									<div class="ep-tile-right">
 										<f:if condition="{images.0}">
-											<div class="ep-tile ep-tile-bottom" style="background-image:url('{f:uri.image(src: images.0.uid, treatIdAsReference: 1, crop: images.0.crop)}');">
+											<div class="ep-tile ep-tile-bottom" style="background-image:url('{f:uri.image(image: images.0)}');">
                                                 <f:link.typolink parameter="{images.0.link}" title="{images.0.title -> f:format.raw()}">
                                                     {images.0.title -> f:format.raw()}
                                                 </f:link.typolink>
 											</div>
 										</f:if>
 										<f:if condition="{images.1}">
-											<div class="ep-tile" style="background-image:url('{f:uri.image(src: images.1.uid, treatIdAsReference: 1, crop: images.1.crop)}');">
+											<div class="ep-tile" style="background-image:url('{f:uri.image(image: images.1)}');">
                                                 <f:link.typolink parameter="{images.1.link}" title="{images.1.title -> f:format.raw()}">
                                                     {images.1.title -> f:format.raw()}
                                                 </f:link.typolink>
@@ -29,7 +29,7 @@
 										</f:if>
 									</div>
 									<f:if condition="{images.2}">
-										<div class="ep-tile" style="background-image:url('{f:uri.image(src: images.2.uid, treatIdAsReference: 1, crop: images.2.crop)}');">
+										<div class="ep-tile" style="background-image:url('{f:uri.image(image: images.2)}');">
                                             <f:link.typolink parameter="{images.2.link}" title="{images.2.title -> f:format.raw()}">
                                                 {images.2.title -> f:format.raw()}
                                             </f:link.typolink>
@@ -37,7 +37,7 @@
 									</f:if>
 								</div>
 								<f:if condition="{images.3}">
-									<div class="ep-tile" style="background-image:url('{f:uri.image(src: images.3.uid, treatIdAsReference: 1, crop: images.3.crop)}');">
+									<div class="ep-tile" style="background-image:url('{f:uri.image(image: images.3)}');">
                                         <f:link.typolink parameter="{images.3.link}" title="{images.3.title -> f:format.raw()}">
                                             {images.3.title -> f:format.raw()}
                                         </f:link.typolink>
@@ -46,14 +46,14 @@
 							</div>
 							<div>
 								<f:if condition="{images.4}">
-									<div class="ep-tile ep-tile-right" style="background-image:url('{f:uri.image(src: images.4.uid, treatIdAsReference: 1, crop: images.4.crop)}');">
+									<div class="ep-tile ep-tile-right" style="background-image:url('{f:uri.image(image: images.4)}');">
                                         <f:link.typolink parameter="{images.4.link}" title="{images.4.title -> f:format.raw()}">
                                             {images.4.title -> f:format.raw()}
                                         </f:link.typolink>
 									</div>
 								</f:if>
 								<f:if condition="{images.5}">
-									<div class="ep-tile" style="background-image:url('{f:uri.image(src: images.5.uid, treatIdAsReference: 1, crop: images.5.crop)}');">
+									<div class="ep-tile" style="background-image:url('{f:uri.image(image: images.5)}');">
                                         <f:link.typolink parameter="{images.5.link}" title="{images.5.title -> f:format.raw()}">
                                             {images.5.title -> f:format.raw()}
                                         </f:link.typolink>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Partnerlogos.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Partnerlogos.html
index 915e6ec0..9909dadd 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Partnerlogos.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/Partnerlogos.html
@@ -24,7 +24,9 @@
     <f:section name="Image">
         <div class="partnerlogo {cssClasses}">
             <f:link.typolink parameter="{image.link}">
-                <img class="lazy img-responsive partnerlogo__image" data-src="{f:uri.image(src: image.uid, treatIdAsReference: 1, crop: product.image.crop, width: '400c', height: '400')}" alt="{image.alternative}" title="{image.title}">
+                <img class="lazy img-responsive partnerlogo__image"
+                     data-src="{f:uri.image(image: image, width: '400c', height: '400')}"
+                     alt="{image.alternative}" title="{image.title}">
             </f:link.typolink>
         </div>
     </f:section>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
index 078cd13f..2c62e6a2 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
@@ -37,21 +37,26 @@
                             </div>
                         </div>
                         <f:if condition="{settings.showMoreLink}">
-                            <p class="text-right"><f:link.action pageUid="{settings.defaultSearchPageUid}"
-                                              class="button"
-                                              action="searchresult"
-                                              controller="Search"
-                                              arguments="{filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}"
-                                             additionalAttributes="{rel: 'nofollow'}">Alle anzeigen</f:link.action></p>
+                            <p class="text-right">
+                                <f:link.action pageUid="{settings.defaultSearchPageUid}" class="button"
+                                               action="searchresult" controller="Search"
+                                               arguments="{filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}"
+                                               additionalAttributes="{rel: 'nofollow'}">Alle anzeigen</f:link.action>
+                            </p>
                         </f:if>
                     </f:if>
                     <f:if condition="{concept.descriptionExtended}">{concept.descriptionExtended -> f:format.html()}</f:if>
                 </div>
                 <div class="col-md-4">
                     <f:if condition="{teasers}">
-                        <p class="hidden-xs hidden-md"><a v-on:click.prevent="scrollTo('#teasers')" href="#teasers" class="button button--full">Direkt zu den Angeboten</a></p>
+                        <p class="hidden-xs hidden-md">
+                            <a v-on:click.prevent="scrollTo('#teasers')" href="#teasers" class="button button--full">
+                                Direkt zu den Angeboten
+                            </a>
+                        </p>
                     </f:if>
-                    <img class="img-responsive lazy" data-src="{f:uri.image(src: concept.teaserImage.uid, treatIdAsReference: 1, crop: concept.teaserImage.crop, width: '330')}" alt="{concept.teaserImage.alternative}" title="{concept.teaserImage.title}">
+                    <img class="img-responsive lazy" data-src="{f:uri.image(image: concept.teaserImage, width: '330')}"
+                         alt="{concept.teaserImage.alternative}" title="{concept.teaserImage.title}">
                 </div>
             </div>
         </div>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
index 261b495e..cc566630 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html
@@ -11,7 +11,7 @@
 			<f:for each="{items}" as="item" iteration="iteration">
 				<div class="row ep-lineup{f:if(condition: iteration.isEven, then: ' right')}">
 					<div class="col-md-6">
-						<img class="scale lazy" data-src="{f:uri.image(src: item.image.0.uid, treatIdAsReference: 1, crop: item.image.0.crop)}" alt="{item.data.name}"/>
+						<img class="scale lazy" data-src="{f:uri.image(image: item.image.0)}" alt="{item.data.name}"/>
 					</div>
 					<div class="col-md-6 ">
 						<div>