diff --git a/Resources/Private/Extensions/news/Configuration/TSconfig/templateLayouts.tsconfig b/Resources/Private/Extensions/news/Configuration/TSconfig/templateLayouts.tsconfig
index 1d0f69f5..a91c16bd 100644
--- a/Resources/Private/Extensions/news/Configuration/TSconfig/templateLayouts.tsconfig
+++ b/Resources/Private/Extensions/news/Configuration/TSconfig/templateLayouts.tsconfig
@@ -3,11 +3,20 @@
 # **********************************************************
 
 tx_news.templateLayouts {
-	71 = BS4: List Group (list view)
-	72 = BS4: Grid Cards (list view)
-	73 = BS4: Card Groups (list view)
-	74 = BS4: Masonry (list view)
-	75 = BS4: 2 Columns (list view)
-	76 = BS4: OWL Slider - Fullscreen (list view) - experimental
-	81 = BS4: Detail view
+	71 = BS5: List Group (list view)
+	72 = BS5: Grid Cards (list view)
+	73 = BS5: Card Groups (list view)
+	74 = BS5: Masonry (list view)
+	75 = BS5: 2 Columns (list view)
+	76 = BS5: OWL Slider - Fullscreen (list view) - experimental
+	81 = BS5: Detail view
+
+	// Custom List Templates
+	90 = Custom Template1 (list view)
+	91 = Custom Template2 (list view)
+	92 = Custom Template3 (list view)
+
+	// Custom Detail Templates
+	95 = Custom Template1 (detail view)
+	96 = Custom Template2 (detail view)
 }
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom1.html b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom1.html
new file mode 100644
index 00000000..1dada911
--- /dev/null
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom1.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info" role="alert">
+	<h3>BUILD YOUR OWN NEWS LIST-TEMPLATE</h3>
+	<p>Folgendes Template auslagern und anpassen: <br>
+		<pre>Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom1.html</pre>
+	</p>
+</div>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom2.html b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom2.html
new file mode 100644
index 00000000..1dada911
--- /dev/null
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom2.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info" role="alert">
+	<h3>BUILD YOUR OWN NEWS LIST-TEMPLATE</h3>
+	<p>Folgendes Template auslagern und anpassen: <br>
+		<pre>Resources/Private/Extensions/news/Resources/Private/Partials/Detail/Custom1.html</pre>
+	</p>
+</div>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom1.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom1.html
new file mode 100644
index 00000000..3e9dd8fd
--- /dev/null
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom1.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info" role="alert">
+	<h3>BUILD YOUR OWN NEWS LIST-TEMPLATE</h3>
+	<p>Folgendes Template auslagern und anpassen: <br>
+		<pre>Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom1.html</pre>
+	</p>
+</div> 
\ No newline at end of file
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom2.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom2.html
new file mode 100644
index 00000000..0a64d46b
--- /dev/null
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom2.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info" role="alert">
+	<h3>BUILD YOUR OWN NEWS LIST-TEMPLATE</h3>
+	<p>Folgendes Template auslagern und anpassen: <br>
+		<pre>Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom2.html</pre>
+	</p>
+</div>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom3.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom3.html
new file mode 100644
index 00000000..f79b40b0
--- /dev/null
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom3.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info" role="alert">
+	<h3>BUILD YOUR OWN NEWS LIST-TEMPLATE</h3>
+	<p>Folgendes Template auslagern und anpassen: <br>
+		<pre>Resources/Private/Extensions/news/Resources/Private/Partials/List/Custom3.html</pre>
+	</p>
+</div>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_8.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_8.html
index acb3c79e..a0547db9 100644
--- a/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_8.html
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_8.html
@@ -4,35 +4,43 @@
 	<!--TYPO3SEARCH_end-->
 	<f:if condition="{news}">
 		<f:then>
-			<f:if condition="{settings.templateLayout} == 71">
-				<f:then>
+			<f:switch expression="{settings.templateLayout}">
+				<!-- t3sbootstrap Templates	-->
+				<f:case value="71">
 					<f:render section="ListGroup" arguments="{_all}" />
-				</f:then>
-				<f:else>
-					<f:if condition="{settings.templateLayout} > 71 && {settings.templateLayout} < 75">
-						<f:then>
-							<f:render section="Cards" arguments="{_all}" />
-						</f:then>
-						<f:else>
-							<f:if condition="{settings.templateLayout} == 75">
-								<f:then>
-									<f:render section="Columns" arguments="{_all}" />
-								</f:then>
-								<f:else>
-									<f:if condition="{settings.templateLayout} == 76">
-										<f:then>
-											<f:render section="OwlSliader" arguments="{_all}" />
-										</f:then>
-										<f:else>
-											<f:render section="Default" arguments="{_all}" />
-										</f:else>
-									</f:if>
-								</f:else>
-							</f:if>
-						</f:else>
-					</f:if>
-				</f:else>
-			</f:if>
+				</f:case>
+				<f:case value="72">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="73">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="74">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="75">
+					<f:render section="Columns" arguments="{_all}" />
+				</f:case>
+				<f:case value="76">
+					<f:render section="OwlSlider" arguments="{_all}" />
+				</f:case>
+
+				<!-- Custom Templates -->
+				<f:case value="90">
+					<f:render partial="List/Custom1" arguments="{_all}" />
+				</f:case>
+				<f:case value="91">
+					<f:render partial="List/Custom2" arguments="{_all}" />
+				</f:case>
+				<f:case value="92">
+					<f:render partial="List/Custom3" arguments="{_all}" />
+				</f:case>
+
+				<!-- Default Templates -->
+				<f:defaultCase>
+					<f:render section="Default" arguments="{_all}" />
+				</f:defaultCase>
+			</f:switch>
 		</f:then>
 		<f:else>
 			<div class="no-news-found">
@@ -44,116 +52,116 @@
 </html>
 
 
-<f:section name="OwlSliader">
-<div class="owl-carousel owl-theme">
-	<f:for each="{news}" as="newsItem" iteration="iterator">
-		<f:render partial="List/OwlSlider" arguments="{newsItem: newsItem,iterator:iterator}" />
-	</f:for>
-</div>
+<f:section name="OwlSlider">
+	<div class="owl-carousel owl-theme">
+		<f:for each="{news}" as="newsItem" iteration="iterator">
+			<f:render partial="List/OwlSlider" arguments="{newsItem: newsItem,iterator:iterator}" />
+		</f:for>
+	</div>
 </f:section>
 
 <f:section name="ListGroup">
-<div class="list-group news-list-view" id="news-container-{contentObjectData.uid}">
-	<f:if condition="{settings.hidePagination}">
-		<f:then>
-			<f:for each="{news}" as="newsItem" iteration="iterator">
-				<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
-			</f:for>
-		</f:then>
-		<f:else>
-			<f:render section="AjaxPagination" arguments="{_all}" />
-			<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-			<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
-				initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
-				<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
-					<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
-				</f:for>
-			</n:widget.paginate>
-			<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
-		</f:else>
-	</f:if>
-</div>
-</f:section>
-
-
-<f:section name="Cards">
-<f:if condition="{settings.templateLayout} == 72">
-	<f:then>
-		<f:comment> Card Decks -> Grid Cards </f:comment>
+	<div class="list-group news-list-view" id="news-container-{contentObjectData.uid}">
 		<f:if condition="{settings.hidePagination}">
 			<f:then>
-				<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4" id="news-container-{contentObjectData.uid}">
-					<f:for each="{news}" as="newsItem" iteration="iterator">
-						<div class="col">
-							<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
-						</div>
-					</f:for>
-				</div>
+				<f:for each="{news}" as="newsItem" iteration="iterator">
+					<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
+				</f:for>
 			</f:then>
 			<f:else>
-				<div id="news-container-{contentObjectData.uid}">
-					<f:render section="AjaxPagination" arguments="{_all}" />
-					<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-					<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
-						 initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
-						<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4">
-							<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
-								<div class="col">
-									<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
-								</div>
-							</f:for>
-						</div>
-					</n:widget.paginate>
-					<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
-				</div>
+				<f:render section="AjaxPagination" arguments="{_all}" />
+				<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+				<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
+								   initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
+					<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
+						<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
+					</f:for>
+				</n:widget.paginate>
+				<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
 			</f:else>
 		</f:if>
-	</f:then>
-	<f:else>
-		<f:if condition="{settings.templateLayout} == 73">
-			<f:then>
-				<f:comment> Card Groups </f:comment>
-				<f:if condition="{settings.hidePagination}">
-					<f:then>
-						<div class="mb-2 card-group" id="news-container-{contentObjectData.uid}">
-							<f:for each="{news}" as="newsItem" iteration="iterator">
-								<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
-							</f:for>
-						</div>
-					</f:then>
-					<f:else>
-						<div id="news-container-{contentObjectData.uid}">
-							<f:render section="AjaxPagination" arguments="{_all}" />
-							<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-							<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
-								 initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
-								<div class="mb-2 card-group">
-									<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
-										<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
-									</f:for>
-								</div>
-							</n:widget.paginate>
-							<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
-						</div>
-					</f:else>
-				</f:if>
-			</f:then>
-			<f:else>
-				<f:comment> Masonry </f:comment>
-				<f:if condition="{settings.hidePagination}">
-					<f:then>
-						<f:if condition="{settings.cdn}">
-							<f:then>
-								<f:asset.script identifier="masonry" src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{settings.masonryVersion}/masonry.pkgd.min.js"
-								 integrity="{settings.masonryIntegrity}" crossorigin="anonymous" async="async" />
-							</f:then>
-							<f:else>
-								<f:asset.script identifier="masonry" src="fileadmin/T3SB/Resources/Public/JS/masonry.pkgd.min.js"
-								 crossorigin="anonymous" async="async" />
-							</f:else>
-						</f:if>
-						<div id="masonry-{contentObjectData.uid}" class="row masonry"
-							{f:if(condition: '{style}',then: ' style="{style}"')}{dataAnimate} data-masonry='{"percentPosition": true }'>
+	</div>
+</f:section>
+
+
+<f:section name="Cards">
+	<f:if condition="{settings.templateLayout} == 72">
+		<f:then>
+			<f:comment> Card Decks -> Grid Cards </f:comment>
+			<f:if condition="{settings.hidePagination}">
+				<f:then>
+					<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4" id="news-container-{contentObjectData.uid}">
+						<f:for each="{news}" as="newsItem" iteration="iterator">
+							<div class="col">
+								<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
+							</div>
+						</f:for>
+					</div>
+				</f:then>
+				<f:else>
+					<div id="news-container-{contentObjectData.uid}">
+						<f:render section="AjaxPagination" arguments="{_all}" />
+						<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+						<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
+											 initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
+							<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4">
+								<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
+									<div class="col">
+										<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
+									</div>
+								</f:for>
+							</div>
+						</n:widget.paginate>
+						<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+					</div>
+				</f:else>
+			</f:if>
+		</f:then>
+		<f:else>
+			<f:if condition="{settings.templateLayout} == 73">
+				<f:then>
+					<f:comment> Card Groups </f:comment>
+					<f:if condition="{settings.hidePagination}">
+						<f:then>
+							<div class="mb-2 card-group" id="news-container-{contentObjectData.uid}">
+								<f:for each="{news}" as="newsItem" iteration="iterator">
+									<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
+								</f:for>
+							</div>
+						</f:then>
+						<f:else>
+							<div id="news-container-{contentObjectData.uid}">
+								<f:render section="AjaxPagination" arguments="{_all}" />
+								<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+								<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
+												   initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
+									<div class="mb-2 card-group">
+										<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
+											<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
+										</f:for>
+									</div>
+								</n:widget.paginate>
+								<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+							</div>
+						</f:else>
+					</f:if>
+				</f:then>
+				<f:else>
+					<f:comment> Masonry </f:comment>
+					<f:if condition="{settings.hidePagination}">
+						<f:then>
+							<f:if condition="{settings.cdn}">
+								<f:then>
+									<f:asset.script identifier="masonry" src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{settings.masonryVersion}/masonry.pkgd.min.js"
+													integrity="{settings.masonryIntegrity}" crossorigin="anonymous" async="async" />
+								</f:then>
+								<f:else>
+									<f:asset.script identifier="masonry" src="fileadmin/T3SB/Resources/Public/JS/masonry.pkgd.min.js"
+													crossorigin="anonymous" async="async" />
+								</f:else>
+							</f:if>
+							<div id="masonry-{contentObjectData.uid}" class="row masonry"
+								 {f:if(condition: '{style}',then: ' style="{style}"')}{dataAnimate} data-masonry='{"percentPosition": true }'>
 							<f:for each="{news}" as="newsItem" iteration="iterator">
 								<n:excludeDisplayedNews newsItem="{newsItem}"/>
 								<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}" class="col-sm-6 col-lg-3 mb-3" >
@@ -187,117 +195,117 @@
 									</div>
 								</n:link>
 							</f:for>
-						</div>
-					</f:then>
-					<f:else>
-						<div class="alert alert-danger" role="alert">
-							Pagination did not work with Masonry
-						</div>
-					</f:else>
-				</f:if>
-			</f:else>
-		</f:if>
-	</f:else>
-</f:if>
-</f:section>
-
-
-<f:section name="Columns">
-<f:if condition="{settings.hidePagination}">
-	<f:then>
-		<f:for each="{news}" as="newsItem" iteration="iterator">
-			<f:if condition="{iterator.isFirst}">
-				<div class="row">
-			</f:if>
-			<f:if condition="{iterator.cycle} % 2">
-				<f:then>
-					<div class="col-md-6">
-						<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
-					</div>
-				</f:then>
-				<f:else>
-					<div class="col-md-6">
-						<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
-					</div>
-					<f:if condition="{iterator.isLast}">
-						<f:then></f:then>
+							</div>
+						</f:then>
 						<f:else>
-							</div><div class="row">
+							<div class="alert alert-danger" role="alert">
+								Pagination did not work with Masonry
+							</div>
 						</f:else>
 					</f:if>
 				</f:else>
 			</f:if>
-			<f:if condition="{iterator.isLast}">
-				</div>
-			</f:if>
-		</f:for>
-	</f:then>
-	<f:else>
-		<div class="alert alert-danger" role="alert">
-			Pagination did not work with the Template Layout "BS4: 2 Columns"
-		</div>
-	</f:else>
-</f:if>
+		</f:else>
+	</f:if>
 </f:section>
 
 
-<f:section name="Default">
-<ul class="list-unstyled" id="news-container-{contentObjectData.uid}">
+<f:section name="Columns">
 	<f:if condition="{settings.hidePagination}">
 		<f:then>
 			<f:for each="{news}" as="newsItem" iteration="iterator">
-				<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+				<f:if condition="{iterator.isFirst}">
+					<div class="row">
+				</f:if>
+				<f:if condition="{iterator.cycle} % 2">
+					<f:then>
+						<div class="col-md-6">
+							<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
+						</div>
+					</f:then>
+					<f:else>
+						<div class="col-md-6">
+							<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
+						</div>
+						<f:if condition="{iterator.isLast}">
+							<f:then></f:then>
+							<f:else>
+								</div><div class="row">
+							</f:else>
+						</f:if>
+					</f:else>
+				</f:if>
+				<f:if condition="{iterator.isLast}">
+					</div>
+				</f:if>
 			</f:for>
 		</f:then>
 		<f:else>
-			<f:render section="AjaxPagination" arguments="{_all}" />
-			<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-			<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
-				 initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
-				<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
-					<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
-				</f:for>
-			</n:widget.paginate>
-			<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+			<div class="alert alert-danger" role="alert">
+				Pagination did not work with the Template Layout "BS5: 2 Columns"
+			</div>
 		</f:else>
 	</f:if>
-</ul>
+</f:section>
+
+
+<f:section name="Default">
+	<ul class="list-unstyled" id="news-container-{contentObjectData.uid}">
+		<f:if condition="{settings.hidePagination}">
+			<f:then>
+				<f:for each="{news}" as="newsItem" iteration="iterator">
+					<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+				</f:for>
+			</f:then>
+			<f:else>
+				<f:render section="AjaxPagination" arguments="{_all}" />
+				<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+				<n:widget.paginate objects="{news}" as="paginatedNews" configuration="{settings.list.paginate}"
+								   initial="{offset:settings.offset,limit:settings.limit,recordId:contentObjectData.uid}">
+					<f:for each="{paginatedNews}" as="newsItem" iteration="iterator">
+						<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+					</f:for>
+				</n:widget.paginate>
+				<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+			</f:else>
+		</f:if>
+	</ul>
 </f:section>
 
 
 <f:section name="LoadingSpinnerTop">
-<f:if condition="{settings.loadingSpinnerPosition} == top">
-	<div id="news-preloader">
-		<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
-			 style="width: 3rem; height: 3rem; display: none;" role="status">
-			<span class="visually-hidden">Loading...</span>
+	<f:if condition="{settings.loadingSpinnerPosition} == top">
+		<div id="news-preloader">
+			<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
+				 style="width: 3rem; height: 3rem; display: none;" role="status">
+				<span class="visually-hidden">Loading...</span>
+			</div>
 		</div>
-	</div>
-</f:if>
+	</f:if>
 </f:section>
 
 
 <f:section name="LoadingSpinnerBottom">
-<f:if condition="{settings.loadingSpinnerPosition} == bottom">
-	<div id="news-preloader-bottom">
-		<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
-			 style="width: 3rem; height: 3rem; display: none;" role="status">
-			<span class="visually-hidden">Loading...</span>
+	<f:if condition="{settings.loadingSpinnerPosition} == bottom">
+		<div id="news-preloader-bottom">
+			<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
+				 style="width: 3rem; height: 3rem; display: none;" role="status">
+				<span class="visually-hidden">Loading...</span>
+			</div>
 		</div>
-	</div>
-</f:if>
+	</f:if>
 </f:section>
 
 
 <f:section name="AjaxPagination">
-<f:if condition="{settings.jqueryDisable} == 0">
-	<f:if condition="{settings.lazyLoad}">
-		<f:then>
-			<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/ScriptsAjaxLazyPagination.js" />
-		</f:then>
-		<f:else>
-			<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/Scripts/AjaxPagination.js" />
-		</f:else>
+	<f:if condition="{settings.jqueryDisable} == 0">
+		<f:if condition="{settings.lazyLoad}">
+			<f:then>
+				<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/ScriptsAjaxLazyPagination.js" />
+			</f:then>
+			<f:else>
+				<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/Scripts/AjaxPagination.js" />
+			</f:else>
+		</f:if>
 	</f:if>
-</f:if>
 </f:section>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_9.html b/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_9.html
index 546d2264..a02d3157 100644
--- a/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_9.html
+++ b/Resources/Private/Extensions/news/Resources/Private/Partials/List/List_9.html
@@ -4,35 +4,43 @@
 	<!--TYPO3SEARCH_end-->
 	<f:if condition="{news}">
 		<f:then>
-			<f:if condition="{settings.templateLayout} == 71">
-				<f:then>
+			<f:switch expression="{settings.templateLayout}">
+				<!-- t3sbootstrap Templates	-->
+				<f:case value="71">
 					<f:render section="ListGroup" arguments="{_all}" />
-				</f:then>
-				<f:else>
-					<f:if condition="{settings.templateLayout} > 71 && {settings.templateLayout} < 75">
-						<f:then>
-							<f:render section="Cards" arguments="{_all}" />
-						</f:then>
-						<f:else>
-							<f:if condition="{settings.templateLayout} == 75">
-								<f:then>
-									<f:render section="Columns" arguments="{_all}" />
-								</f:then>
-								<f:else>
-									<f:if condition="{settings.templateLayout} == 76">
-										<f:then>
-											<f:render section="OwlSliader" arguments="{_all}" />
-										</f:then>
-										<f:else>
-											<f:render section="Default" arguments="{_all}" />
-										</f:else>
-									</f:if>
-								</f:else>
-							</f:if>
-						</f:else>
-					</f:if>
-				</f:else>
-			</f:if>
+				</f:case>
+				<f:case value="72">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="73">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="74">
+					<f:render section="Cards" arguments="{_all}" />
+				</f:case>
+				<f:case value="75">
+					<f:render section="Columns" arguments="{_all}" />
+				</f:case>
+				<f:case value="76">
+					<f:render section="OwlSlider" arguments="{_all}" />
+				</f:case>
+
+				<!-- Custom Templates -->
+				<f:case value="90">
+					<f:render partial="List/Custom1" arguments="{_all}" />
+				</f:case>
+				<f:case value="91">
+					<f:render partial="List/Custom2" arguments="{_all}" />
+				</f:case>
+				<f:case value="92">
+					<f:render partial="List/Custom3" arguments="{_all}" />
+				</f:case>
+
+				<!-- Default Templates -->
+				<f:defaultCase>
+					<f:render section="Default" arguments="{_all}" />
+				</f:defaultCase>
+			</f:switch>
 		</f:then>
 		<f:else>
 			<div class="no-news-found">
@@ -44,12 +52,12 @@
 </html>
 
 
-<f:section name="OwlSliader">
-<div class="owl-carousel owl-theme">
-	<f:for each="{news}" as="newsItem" iteration="iterator">
-		<f:render partial="List/OwlSlider" arguments="{newsItem: newsItem,iterator:iterator}" />
-	</f:for>
-</div>
+<f:section name="OwlSlider">
+	<div class="owl-carousel owl-theme">
+		<f:for each="{news}" as="newsItem" iteration="iterator">
+			<f:render partial="List/OwlSlider" arguments="{newsItem: newsItem,iterator:iterator}" />
+		</f:for>
+	</div>
 </f:section>
 
 <f:section name="ListGroup">
@@ -62,15 +70,15 @@
 		</f:then>
 		<f:else>
 			<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-				<f:if condition="{settings.list.paginate.insertAbove}">
-					<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-				</f:if>
-				<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
-					<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
-				</f:for>
-				<f:if condition="{settings.list.paginate.insertBelow}">
-					<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-				</f:if>
+			<f:if condition="{settings.list.paginate.insertAbove}">
+				<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+			</f:if>
+			<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
+				<f:render partial="List/ListGroup" arguments="{newsItem: newsItem,iterator:iterator}" />
+			</f:for>
+			<f:if condition="{settings.list.paginate.insertBelow}">
+				<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+			</f:if>
 			<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
 		</f:else>
 	</f:if>
@@ -79,81 +87,81 @@
 
 
 <f:section name="Cards">
-<f:if condition="{settings.templateLayout} == 72">
-	<f:then>
-		<f:comment> Card Decks -> Grid Cards </f:comment>
-		<f:if condition="{settings.hidePagination}">
-			<f:then>
-				<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4" id="news-container-{contentObjectData.uid}">
-					<f:for each="{news}" as="newsItem" iteration="iterator">
-						<div class="col">
+	<f:if condition="{settings.templateLayout} == 72">
+		<f:then>
+			<f:comment> Card Decks -> Grid Cards </f:comment>
+			<f:if condition="{settings.hidePagination}">
+				<f:then>
+					<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 g-4" id="news-container-{contentObjectData.uid}">
+						<f:for each="{news}" as="newsItem" iteration="iterator">
+							<div class="col">
+								<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
+							</div>
+						</f:for>
+					</div>
+				</f:then>
+				<f:else>
+					<div id="news-container-{contentObjectData.uid}">
+						<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+						<f:if condition="{settings.list.paginate.insertAbove}">
+							<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+						</f:if>
+						<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
 							<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
-						</div>
-					</f:for>
-				</div>
-			</f:then>
-			<f:else>
-				<div id="news-container-{contentObjectData.uid}">
-					<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-					<f:if condition="{settings.list.paginate.insertAbove}">
-						<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-					</f:if>
-					<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
-						<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator, templ: 'gridCard'}" />
-					</f:for>
-					<f:if condition="{settings.list.paginate.insertBelow}">
-						<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+						</f:for>
+						<f:if condition="{settings.list.paginate.insertBelow}">
+							<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+						</f:if>
+						<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+					</div>
+				</f:else>
+			</f:if>
+		</f:then>
+		<f:else>
+			<f:if condition="{settings.templateLayout} == 73">
+				<f:then>
+					<f:comment> Card Groups </f:comment>
+					<f:if condition="{settings.hidePagination}">
+						<f:then>
+							<div class="mb-2 card-group" id="news-container-{contentObjectData.uid}">
+								<f:for each="{news}" as="newsItem" iteration="iterator">
+									<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
+								</f:for>
+							</div>
+						</f:then>
+						<f:else>
+							<div id="news-container-{contentObjectData.uid}">
+								<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+								<f:if condition="{settings.list.paginate.insertAbove}">
+									<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+								</f:if>
+								<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
+									<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
+								</f:for>
+								<f:if condition="{settings.list.paginate.insertBelow}">
+									<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+								</f:if>
+								<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+							</div>
+						</f:else>
 					</f:if>
-					<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
-				</div>
-			</f:else>
-		</f:if>
-	</f:then>
-	<f:else>
-		<f:if condition="{settings.templateLayout} == 73">
-			<f:then>
-				<f:comment> Card Groups </f:comment>
-				<f:if condition="{settings.hidePagination}">
-					<f:then>
-						<div class="mb-2 card-group" id="news-container-{contentObjectData.uid}">
-							<f:for each="{news}" as="newsItem" iteration="iterator">
-								<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
-							</f:for>
-						</div>
-					</f:then>
-					<f:else>
-						<div id="news-container-{contentObjectData.uid}">
-							<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-							<f:if condition="{settings.list.paginate.insertAbove}">
-								<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-							</f:if>
-							<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
-								<f:render partial="List/Card" arguments="{newsItem: newsItem, iterator: iterator}" />
-							</f:for>
-							<f:if condition="{settings.list.paginate.insertBelow}">
-								<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+				</f:then>
+				<f:else>
+					<f:comment> Masonry </f:comment>
+					<f:if condition="{settings.hidePagination}">
+						<f:then>
+							<f:if condition="{settings.cdn}">
+								<f:then>
+									<f:asset.script identifier="masonry" src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{settings.masonryVersion}/masonry.pkgd.min.js"
+													integrity="{settings.masonryIntegrity}" crossorigin="anonymous" async="async" />
+								</f:then>
+								<f:else>
+									<f:asset.script identifier="masonry" src="fileadmin/T3SB/Resources/Public/JS/masonry.pkgd.min.js"
+													crossorigin="anonymous" async="async" />
+								</f:else>
 							</f:if>
-							<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
-						</div>
-					</f:else>
-				</f:if>
-			</f:then>
-			<f:else>
-				<f:comment> Masonry </f:comment>
-				<f:if condition="{settings.hidePagination}">
-					<f:then>
-						<f:if condition="{settings.cdn}">
-							<f:then>
-								<f:asset.script identifier="masonry" src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{settings.masonryVersion}/masonry.pkgd.min.js"
-								 integrity="{settings.masonryIntegrity}" crossorigin="anonymous" async="async" />
-							</f:then>
-							<f:else>
-								<f:asset.script identifier="masonry" src="fileadmin/T3SB/Resources/Public/JS/masonry.pkgd.min.js"
-								 crossorigin="anonymous" async="async" />
-							</f:else>
-						</f:if>
-						<div id="masonry-{contentObjectData.uid}" class="row masonry"
-							{f:if(condition: '{style}',then: ' style="{style}"')}{dataAnimate} data-masonry='{"percentPosition": true }'>
+							<div id="masonry-{contentObjectData.uid}" class="row masonry"
+								 {f:if(condition: '{style}',then: ' style="{style}"')}{dataAnimate} data-masonry='{"percentPosition": true }'>
 							<f:for each="{news}" as="newsItem" iteration="iterator">
 								<n:excludeDisplayedNews newsItem="{newsItem}"/>
 								<n:link newsItem="{newsItem}" settings="{settings}" title="{newsItem.title}" class="col-sm-6 col-lg-3 mb-3" >
@@ -187,119 +195,119 @@
 									</div>
 								</n:link>
 							</f:for>
-						</div>
-					</f:then>
-					<f:else>
-						<div class="alert alert-danger" role="alert">
-							Pagination did not work with Masonry
-						</div>
-					</f:else>
-				</f:if>
-			</f:else>
-		</f:if>
-	</f:else>
-</f:if>
-</f:section>
-
-
-<f:section name="Columns">
-<f:if condition="{settings.hidePagination}">
-	<f:then>
-		<f:for each="{news}" as="newsItem" iteration="iterator">
-			<f:if condition="{iterator.isFirst}">
-				<div class="row">
-			</f:if>
-			<f:if condition="{iterator.cycle} % 2">
-				<f:then>
-					<div class="col-md-6">
-						<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
-					</div>
-				</f:then>
-				<f:else>
-					<div class="col-md-6">
-						<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
-					</div>
-					<f:if condition="{iterator.isLast}">
-						<f:then></f:then>
+							</div>
+						</f:then>
 						<f:else>
-							</div><div class="row">
+							<div class="alert alert-danger" role="alert">
+								Pagination did not work with Masonry
+							</div>
 						</f:else>
 					</f:if>
 				</f:else>
 			</f:if>
-			<f:if condition="{iterator.isLast}">
-				</div>
-			</f:if>
-		</f:for>
-	</f:then>
-	<f:else>
-		<div class="alert alert-danger" role="alert">
-			Pagination did not work with the Template Layout "BS4: 2 Columns"
-		</div>
-	</f:else>
-</f:if>
+		</f:else>
+	</f:if>
 </f:section>
 
 
-<f:section name="Default">
-<ul class="list-unstyled" id="news-container-{contentObjectData.uid}">
+<f:section name="Columns">
 	<f:if condition="{settings.hidePagination}">
 		<f:then>
 			<f:for each="{news}" as="newsItem" iteration="iterator">
-				<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+				<f:if condition="{iterator.isFirst}">
+					<div class="row">
+				</f:if>
+				<f:if condition="{iterator.cycle} % 2">
+					<f:then>
+						<div class="col-md-6">
+							<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
+						</div>
+					</f:then>
+					<f:else>
+						<div class="col-md-6">
+							<f:render partial="List/Columns" arguments="{newsItem: newsItem,iterator:iterator, contentObjectData:contentObjectData}"/>
+						</div>
+						<f:if condition="{iterator.isLast}">
+							<f:then></f:then>
+							<f:else>
+								</div><div class="row">
+							</f:else>
+						</f:if>
+					</f:else>
+				</f:if>
+				<f:if condition="{iterator.isLast}">
+					</div>
+				</f:if>
 			</f:for>
 		</f:then>
 		<f:else>
-			<f:render section="LoadingSpinnerTop" arguments="{_all}" />
-			<f:if condition="{settings.list.paginate.insertAbove}">
-				<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-			</f:if>
-			<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
-				<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
-			</f:for>
-			<f:if condition="{settings.list.paginate.insertBelow}">
-				<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
-			</f:if>
-			<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+			<div class="alert alert-danger" role="alert">
+				Pagination did not work with the Template Layout "BS5: 2 Columns"
+			</div>
 		</f:else>
 	</f:if>
-</ul>
+</f:section>
+
+
+<f:section name="Default">
+	<ul class="list-unstyled" id="news-container-{contentObjectData.uid}">
+		<f:if condition="{settings.hidePagination}">
+			<f:then>
+				<f:for each="{news}" as="newsItem" iteration="iterator">
+					<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+				</f:for>
+			</f:then>
+			<f:else>
+				<f:render section="LoadingSpinnerTop" arguments="{_all}" />
+				<f:if condition="{settings.list.paginate.insertAbove}">
+					<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+				</f:if>
+				<f:for each="{pagination.paginator.paginatedItems}" as="newsItem" iteration="iterator">
+					<f:render partial="List/Default" arguments="{newsItem: newsItem, iterator: iterator}" />
+				</f:for>
+				<f:if condition="{settings.list.paginate.insertBelow}">
+					<f:render partial="List/Pagination" arguments="{pagination: pagination.pagination, paginator: pagination.paginator}" />
+				</f:if>
+				<f:render section="LoadingSpinnerBottom" arguments="{_all}" />
+			</f:else>
+		</f:if>
+	</ul>
 </f:section>
 
 
 <f:section name="LoadingSpinnerTop">
-<f:if condition="{settings.loadingSpinnerPosition} == top">
-	<div id="news-preloader">
-		<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
-			 style="width: 3rem; height: 3rem; display: none;" role="status">
-			<span class="visually-hidden">Loading...</span>
+	<f:if condition="{settings.loadingSpinnerPosition} == top">
+		<div id="news-preloader">
+			<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
+				 style="width: 3rem; height: 3rem; display: none;" role="status">
+				<span class="visually-hidden">Loading...</span>
+			</div>
 		</div>
-	</div>
-</f:if>
+	</f:if>
 </f:section>
 
 
 <f:section name="LoadingSpinnerBottom">
-<f:if condition="{settings.loadingSpinnerPosition} == bottom">
-	<div id="news-preloader-bottom">
-		<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
-			 style="width: 3rem; height: 3rem; display: none;" role="status">
-			<span class="visually-hidden">Loading...</span>
+	<f:if condition="{settings.loadingSpinnerPosition} == bottom">
+		<div id="news-preloader-bottom">
+			<div id="news-spinner" class="spinner-{settings.loadingSpinner} text-{settings.loadingSpinnerColor}"
+				 style="width: 3rem; height: 3rem; display: none;" role="status">
+				<span class="visually-hidden">Loading...</span>
+			</div>
 		</div>
-	</div>
-</f:if>
+	</f:if>
 </f:section>
 
 
 <f:section name="AjaxPagination">
-<f:if condition="{settings.jqueryDisable} == 0">
-	<f:if condition="{settings.lazyLoad}">
-		<f:then>
-			<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/ScriptsAjaxLazyPagination.js" />
-		</f:then>
-		<f:else>
-			<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/Scripts/AjaxPagination.js" />
-		</f:else>
+	<f:if condition="{settings.jqueryDisable} == 0">
+		<f:if condition="{settings.lazyLoad}">
+			<f:then>
+				<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/ScriptsAjaxLazyPagination.js" />
+			</f:then>
+			<f:else>
+				<f:asset.script identifier="AjaxPagination" src="EXT:t3sbootstrap/Resources/Public/Scripts/AjaxPagination.js" />
+			</f:else>
+		</f:if>
 	</f:if>
-</f:if>
 </f:section>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Templates/News/Detail.html b/Resources/Private/Extensions/news/Resources/Private/Templates/News/Detail.html
index 73ba119e..fe568f1e 100644
--- a/Resources/Private/Extensions/news/Resources/Private/Templates/News/Detail.html
+++ b/Resources/Private/Extensions/news/Resources/Private/Templates/News/Detail.html
@@ -30,7 +30,7 @@
 		<f:asset.script identifier="vanilla_lightbox">
 	// Baguette Box (lightbox) - Partials/Layouts/Assets.html
 	baguetteBox.run('.gallery, .image-gallery', {
-    	animation: 'fadeIn',
+		animation: 'fadeIn',
 		noScrollbars: true
 	});
 		</f:asset.script>
@@ -104,23 +104,24 @@
 		</f:asset.script>
 	</f:if>
 </f:if>
-
-
-
 <f:if condition="{newsItem}">
-	<f:then>
-		<f:if condition="{settings.templateLayout} == 81">
-			<f:then>
-				<f:render partial="Detail/Detail" arguments="{_all}" />
-			</f:then>
-			<f:else>
-				<f:render section="Default" arguments="{_all}" />
-			</f:else>
-		</f:if>
-	</f:then>
-	<f:else>
-
-	</f:else>
+	<f:switch expression="{settings.templateLayout}">
+		<!-- t3sbootstrap Templates	-->
+		<f:case value="81">
+			<f:render partial="Detail/Detail" arguments="{_all}" />
+		</f:case>
+		<!-- Custom Templates -->
+		<f:case value="95">
+			<f:render partial="Detail/Custom1" arguments="{_all}" />
+		</f:case>
+		<f:case value="96">
+			<f:render partial="Detail/Custom2" arguments="{_all}" />
+		</f:case>
+		<!-- Default Templates -->
+		<f:defaultCase>
+			<f:render section="Default" arguments="{_all}" />
+		</f:defaultCase>
+	</f:switch>
 </f:if>
 </f:section>
 </html>
diff --git a/Resources/Private/Extensions/news/Resources/Private/Templates/News/List.html b/Resources/Private/Extensions/news/Resources/Private/Templates/News/List.html
index 003a1ae9..a9dcd393 100644
--- a/Resources/Private/Extensions/news/Resources/Private/Templates/News/List.html
+++ b/Resources/Private/Extensions/news/Resources/Private/Templates/News/List.html
@@ -6,7 +6,7 @@
 		Templates/News/List.html
 -->
 <f:section name="content">
-	<!--TYPO3SEARCH_end-->
+	<!--TYPO3SEARCH_end-->	
     <f:if condition="{settings.version} > '8'">
         <f:then>
 			<f:render partial="List/List_9.html" arguments="{_all}" />
diff --git a/ext_emconf.php b/ext_emconf.php
index 5506c811..87c7d0c3 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -19,7 +19,7 @@
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author_company' => 't3solution',
-    'version' => '5.1.2',
+    'version' => '5.1.3',
     'constraints' => [
         'depends' => [
         'typo3' => '10.4.13-11.9.99',