diff --git a/content/contents/leistungen.blade.php b/content/contents/leistungen.blade.php
index bfe0d50..48b29da 100644
--- a/content/contents/leistungen.blade.php
+++ b/content/contents/leistungen.blade.php
@@ -32,7 +32,7 @@
                     Veröffentlicht: {{date('d.m.Y', strtotime($content->created_at))}}
                 </div>
                 <div class="col-12 col-lg-9">
-                    <img src="{{ $content->image() }}" class="img-fluid rounded">
+                    <x-img src="{{ $content->image() }}" class="img-fluid rounded" />
                     <br>
                 </div>
                 <div class="col-12 mb-5 mt-5 fs-5">
diff --git a/content/contents/news.blade.php b/content/contents/news.blade.php
index 389e38c..07e6c58 100644
--- a/content/contents/news.blade.php
+++ b/content/contents/news.blade.php
@@ -42,7 +42,7 @@
             <div class="col-12 col-lg-9">
 
 
-                    <img src="{{ $content->image() }}" class="img-fluid rounded">
+                    <x-img src="{{ $content->image() }}" class="img-fluid rounded" />
 
                 <br>
 
@@ -66,43 +66,51 @@
             </div>
 
             <div class="col-12 col-md-4 mb-3">
-                <div class="card shadow-sm h-100">
-                    <a href="" class="text-decoration-none">
-                        <img src="https://picsum.photos/600/400" class="img-fluid card-img-top">
-                    </a>
 
-                    <div class="card-body">
-                        <h3 class="h5 mb-2">
-                            <a href="" class="text-decoration-none">
-                                Neuigkeit
+                @foreach(filterByContentType("News") as $content)
 
-                            </a>
-                        </h3>
+                    <div class="card shadow-sm h-100">
+                        <a href="" class="text-decoration-none">
+                            <img src="https://picsum.photos/600/400" class="img-fluid card-img-top">
+                        </a>
 
-                        <div class="text-muted small my-3">
+                        <div class="card-body">
+                            <h3 class="h5 mb-2">
+                                <a href="" class="text-decoration-none">
+                                    Neuigkeit
+
+                                </a>
+                            </h3>
+
+                            <div class="text-muted small my-3">
                                 <span title="383.393.2029">
                                      <svg style="fill: currentColor;width:15px;margin-bottom: 5px;margin-right: 3px;}" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M112 0c8.8 0 16 7.2 16 16V64H320V16c0-8.8 7.2-16 16-16s16 7.2 16 16V64h32c35.3 0 64 28.7 64 64v32 32V448c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V192 160 128C0 92.7 28.7 64 64 64H96V16c0-8.8 7.2-16 16-16zM416 192H32V448c0 17.7 14.3 32 32 32H384c17.7 0 32-14.3 32-32V192zM384 96H64c-17.7 0-32 14.3-32 32v32H416V128c0-17.7-14.3-32-32-32z"/></svg>
                                 19 hours ago
                                 </span>
 
+                            </div>
+
+                            {!! Str::limit('                        Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusamus consequuntur cum cumque dicta eligendi et ex, fugiat id, incidunt iste iusto natus non provident quae veritatis vero vitae voluptas voluptate?
+    ', 280) !!}
+
+
                         </div>
 
-                        {!! Str::limit('                        Lorem ipsum dolor sit amet, consectetur adipisicing elit. Accusamus consequuntur cum cumque dicta eligendi et ex, fugiat id, incidunt iste iusto natus non provident quae veritatis vero vitae voluptas voluptate?
-', 280) !!}
-
+                        <div class="card-footer text-end">
+                            <a class="btn btn-sm btn-ci" href="">
+                                Mehr lesen
+                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+                                    <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
+                                </svg>
+                            </a>
+                        </div>
 
                     </div>
 
-                    <div class="card-footer text-end">
-                        <a class="btn btn-sm btn-ci" href="">
-                            Mehr lesen
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
-                                <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
-                            </svg>
-                        </a>
-                    </div>
+                @endforeach
+
+
 
-                </div>
             </div>
 
             <div class="col-12 col-md-4 mb-3">
diff --git a/content/contents/produkt.blade.php b/content/contents/produkt.blade.php
index a48229b..a9374fc 100644
--- a/content/contents/produkt.blade.php
+++ b/content/contents/produkt.blade.php
@@ -27,7 +27,7 @@
             <div class="row">
                 <div class="col-12 col-lg-5">
 
-                        <img src="{{ $content->image() }}" class="rounded img-fluid shadow-sm"  alt="Bild {{$content->title}} ">
+                        <x-img src="{{ $content->image() }}" class="rounded img-fluid shadow-sm"  alt="Bild {{$content->title}} "/>
                     <br>
                     <br>
                     <br>
diff --git a/content/index.blade.php b/content/index.blade.php
index 523a7ff..25307aa 100644
--- a/content/index.blade.php
+++ b/content/index.blade.php
@@ -2,7 +2,7 @@
 @section('content')
 
     <div class="card text-bg-dark">
-        <img src="{{$cover}}" class="img-fluid shadow-lg" alt="" >
+        <x-img src="{{$cover}}" class="img-fluid shadow-lg" alt="" />
         <div class="card-img-overlay d-none d-lg-block" >
             <div class="container p-3 mt-5 rounded" style="width: 55vw;
                 background: rgba(252, 252, 252, 0.38);
@@ -25,23 +25,7 @@
             </div>
         </div>
 
-<<<<<<< HEAD
-    <section id="article-section" >
-        <div class="container">
-            <div class="row">
-                <div class="col-12">
-                    <h2 id="aktuelles" class="mb-4">Aktuelles</h2>
-                </div>
-                @foreach(filterByContentType("News")->take(3) as $content)
-                <div class="col-12 col-md-6 col-lg-4 mb-4">
-                    <div class="card shadow-sm h-100">
-                        <a href="{{ $content->path }}" class="text-decoration-none">
-                            <img src="{{ $content->image() }}" class="img-fluid card-img-top">
-                        </a>
-                        <div class="card-body">
-                            <h3 class="h5 mb-2">
-=======
-    </div>
+
 
     @php($news = filterByContentType("News"))
     @if($news->isNotEmpty())
@@ -53,11 +37,10 @@
                     </div>
                 
                     @foreach($news->take(3) as $content)
-                        <div class="col-12 col-md-4 mb-4">
+                        <div class="col-12 col-md-6 col-lg-4 mb-4">
                             <div class="card shadow-sm h-100">
->>>>>>> e8b1460416d191f5a4f9c2b709ee36caed852c79
                                 <a href="{{ $content->path }}" class="text-decoration-none">
-                                    <img src="{{ $content->image() }}" class="img-fluid card-img-top">
+                                    <x-img src="{{ $content->image() }}" class="img-fluid card-img-top"/>
                                 </a>
                                 <div class="card-body">
                                     <h3 class="h5 mb-2">
diff --git a/content/lists/aktuelles.blade.php b/content/lists/aktuelles.blade.php
index 7330ae4..3cd2e7f 100644
--- a/content/lists/aktuelles.blade.php
+++ b/content/lists/aktuelles.blade.php
@@ -1,6 +1,6 @@
 @extends('template.'.config('settings.template').'.content.master')
 @section('content')
-    <img src="{{ $list->image }}" class="img-fluid" alt="">
+    <x-img src="{{ $list->image }}" class="img-fluid" alt=""/>
 
 
 
@@ -20,7 +20,7 @@
                 <div class="col-12 col-md-6 col-lg-4 mb-4">
                     <div class="card shadow-sm h-100">
                         <a href="{{ $content->path }}" class="text-decoration-none">
-                            <img src="{{ $content->image() }}" class="img-fluid card-img-top">
+                            <x-img src="{{ $content->image() }}" class="img-fluid card-img-top"/>
                         </a>
 
                         <div class="card-body">
diff --git a/content/lists/leistungen.blade.php b/content/lists/leistungen.blade.php
index a458b9f..5f01486 100644
--- a/content/lists/leistungen.blade.php
+++ b/content/lists/leistungen.blade.php
@@ -2,7 +2,7 @@
 @section('content')
 
 
-            <img src="{{ $list->image }}" class="img-fluid" alt="">
+            <x-img src="{{ $list->image }}" class="img-fluid" alt=""/>
 
 
 
diff --git a/content/lists/produkte.blade.php b/content/lists/produkte.blade.php
index 9a9a569..efdd4c6 100644
--- a/content/lists/produkte.blade.php
+++ b/content/lists/produkte.blade.php
@@ -1,7 +1,7 @@
 @extends('template.'.config('settings.template').'.content.master')
 @section('content')
 
-    <img src="{{ $list->image }}" class="img-fluid" alt="">
+    <x-img src="{{ $list->image }}" class="img-fluid" alt=""/>
 
 
 
@@ -21,7 +21,7 @@
                 <div class="col-12 col-md-6 col-lg-4 mb-3">
                     <a href="{{ $content->path }}" class="text-decoration-none">
                         <div class="card shadow-sm h-100">
-                            <img src="{{ $content->image() }}" class="img-fluid card-img-top">
+                            <x-img src="{{ $content->image() }}" class="img-fluid card-img-top"/>
                             <div class="card-body">
                                 <h3 class="h5 mb-2">{{$content->title}} </h3>
                                 <div class="fw-bold my-3 text-right fs-5" style="color: {{$_secondary_link_color}};">{{$content->preis}} €</div>
diff --git a/content/lists/referenzen.blade.php b/content/lists/referenzen.blade.php
index f88e1d4..c8ca811 100644
--- a/content/lists/referenzen.blade.php
+++ b/content/lists/referenzen.blade.php
@@ -2,7 +2,7 @@
 @section('content')
 
 
-            <img src="{{ $list->image }}" class="img-fluid" alt="">
+            <x-img src="{{ $list->image }}" class="img-fluid" alt=""/>
 
 
 
@@ -25,7 +25,7 @@
 
                     <div class="card h-100 shadow-lg mb-4" id="news-{{$content->id}}">
 
-                            <img src="{{ $content->image() }}" class="card-img-top">
+                            <x-img src="{{ $content->image() }}" class="card-img-top"/>
 
                         <div class="card-body">