diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
index 07fa0ceff..48d5928db 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100.phtml
@@ -1,7 +1,70 @@
-<div class="md:flex mt-10 md:w-2/4 m-auto">
-    <div class="w-1/2">
+<?php
+$this->headScript()->prependFile('/'. $this->designPath . '/js/saxoprint.js');
+?>
+<script type="text/javascript">
+    productUUId = '<?php echo $this->article->uuid ?>';
+    productLoaded = <?php echo ($this->load) ? 1 : 0 ?>;
+    productUrl = '<?php echo $this->article->url ?>';
+
+    window.onload = function() {
+        $('#in_basket').removeClass('disabled');
+        var saxoprint = new Saxoprint("<?php echo $this->article->uuid; ?>", "<?php echo $this->article->getPluginSettings('saxoprint', 'saxoprint'); ?>", "<?php echo $this->article->getPluginSettings('saxoprint', 'saxoprintauflage'); ?>", <?php echo $this->article->mwert ?>)
+        saxoprint.init();
+    }
+
+</script>
+<div class="md:flex mt-10 md:w-2/4 m-auto gap-10">
+    <div class="md:w-1/2">
+        <?php if ($this->article->file != "" && $this->layouterPreviewId == "") : ?>
+            <?php echo $this->image()->thumbnailImage($this->article->title, 'productdetail', $this->article->file); ?>
+        <?php endif; ?>
     </div>
-    <div class="w-1/2">
-        <h2><?php echo $this->article->title ?></h2>
+    <div class="md:w-1/2">
+        <h2 class="text-highlight text-2xl font-lenzFont"><?php echo $this->article->title ?></h2>
+        <p><?php echo $this->article->einleitung ?></p>
+    </div>
+</div>
+<div class="border border-slate-200 mt-10 md:w-2/4 m-auto">
+    <div class="bg-gray-200 divide-x flex w-full" id="default-tab" data-tabs-active-classes="border-b-2 border-gray-400 bg-gray-300" data-tabs-toggle="#product-content" role="tablist">
+        <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-calc" type="button" role="tab" aria-controls="div-calc" aria-selected="false">Kalkulation</div>
+        <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-details" type="button" role="tab" aria-controls="div-details" aria-selected="false">Beschreibung</div>
+    </div>
+    <div id="product-content">
+        <div id="div-calc" role="tabpanel" aria-labelledby="div-calc-tab">
+            <div class="md:flex">
+               
+                <form id="calc_saxoprint" class="m-2 basis-2/3">
+                <div id="selextender"></div>
+                </form>
+                
+                <div class="basis-1/3 m-2">
+                    <h2 class="text-lg font-lenzFont font-medium">Summe</h2>
+                    <table class="table-auto w-full">
+                        <tbody>
+                            <tr>
+                                <td><?php echo $this->translate('Preis (netto)') ?>:</td>
+                                <td class="text-right"><span id="netto"></span></td>
+                            </tr>
+                            <tr>
+                                <td><?= $this->translate('zzgl. ') ?> <?php echo $this->article->mwert; ?>% <?= $this->translate('MwSt.') ?></td>
+                                <td class="text-right"><span id="mwert"></span></td>
+                            </tr>
+                            <tr>
+                                <td><strong><?php echo $this->translate('Preis (brutto)') ?>:</strong></td>
+                                <td class="text-right"><strong><span id="brutto"></span></strong></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <?php if (!$this->article->not_buy) : ?>
+                        <input type="hidden" id="upload_mode" name="upload_mode" value="<?php echo $this->upload_mode ?>" />
+                        <button type="button" id="in_basket" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?= $this->translate('Buy') ?></button>
+                    <?php endif; ?>
+                    <?php if ($this->article->as_offer) : ?><button type="button" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-black p-2 pl-5 pr-5 rounded-full disabled bg-slate-50 mt-5 "><?php echo $this->translate('Angebot drucken') ?></button><?php endif; ?>
+                </div>
+            </div>
+        </div>
+        <div id="div-details" role="tabpanel" aria-labelledby="div-details-tab">
+            <div class="m-2"><?php echo $this->article->info ?></div>
+        </div>
     </div>
 </div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
index 7dbdc7e2a..a6c52f7f7 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6.phtml
@@ -48,13 +48,39 @@
     </div>
 </div>
 <div class="border border-slate-200 mt-10 md:w-2/4 m-auto">
-    <div class="bg-slate-50 divide-x flex w-full" id="default-tab" data-tabs-active-classes="border-b-2 border-slate-200 bg-slate-100" data-tabs-toggle="#product-content" role="tablist">
+    <div class="bg-gray-200 divide-x flex w-full" id="default-tab" data-tabs-active-classes="border-b-2 border-gray-400 bg-gray-300" data-tabs-toggle="#product-content" role="tablist">
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-calc" type="button" role="tab" aria-controls="div-calc" aria-selected="false">Kalkulation</div>
         <div class="w-1/2 p-1 cursor-pointer" data-tabs-target="#div-details" type="button" role="tab" aria-controls="div-details" aria-selected="false">Beschreibung</div>
     </div>
     <div id="product-content">
         <div id="div-calc" role="tabpanel" aria-labelledby="div-calc-tab">
-            <form id="CALCFORM" class="m-2"></form>
+            <div class="md:flex">
+                <form id="CALCFORM" class="m-2 basis-2/3"></form>
+                <div class="basis-1/3 m-2">
+                    <h2 class="text-lg font-lenzFont font-medium">Summe</h2>
+                    <table class="table-auto w-full">
+                        <tbody>
+                            <tr>
+                                <td><?php echo $this->translate('Preis (netto)') ?>:</td>
+                                <td class="text-right"><span id="netto"></span></td>
+                            </tr>
+                            <tr>
+                                <td><?= $this->translate('zzgl. ') ?> <?php echo $this->article->mwert; ?>% <?= $this->translate('MwSt.') ?></td>
+                                <td class="text-right"><span id="mwert"></span></td>
+                            </tr>
+                            <tr>
+                                <td><strong><?php echo $this->translate('Preis (brutto)') ?>:</strong></td>
+                                <td class="text-right"><strong><span id="brutto"></span></strong></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <?php if (!$this->article->not_buy) : ?>
+                        <input type="hidden" id="upload_mode" name="upload_mode" value="<?php echo $this->upload_mode ?>" />
+                        <button type="button" id="in_basket" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?= $this->translate('Buy') ?></button>
+                    <?php endif; ?>
+                    <?php if ($this->article->as_offer) : ?><button type="button" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-slate-200 border bg-highlight text-black p-2 pl-5 pr-5 rounded-full disabled bg-slate-50 mt-5 "><?php echo $this->translate('Angebot drucken') ?></button><?php endif; ?>
+                </div>
+            </div>
         </div>
         <div id="div-details" role="tabpanel" aria-labelledby="div-details-tab">
             <div class="m-2"><?php echo $this->article->info ?></div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6_basket_index.phtml b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6_basket_index.phtml
index 7eb78f810..85528dd0b 100755
--- a/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6_basket_index.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/6_basket_index.phtml
@@ -3,7 +3,7 @@ $basketArticle = $this->article['article'];
 $articleObj = new market_article();
 $filesOptions =$this->article['basketarticle']->getFiles();
 ?>
-    <div class="col-sm-4">
+    <div class="basis-4/12">
     	<?php if(($basketArticle['a6_org_article'] == 0 || $basketArticle['a6_org_article'] == "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
     		<?php echo $this->image()->thumbnailImage($basketArticle['title'], 'articlelist', $basketArticle['file']); ?>
     	<?php elseif(($basketArticle['a6_org_article'] != 0 && $basketArticle['file'] != "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
@@ -13,7 +13,7 @@ $filesOptions =$this->article['basketarticle']->getFiles();
             <?= $articleObj->generatePreview($basketArticle['id'],$this->article['basketarticle']->getLayouterId()); ?>
         <?php endif; ?>
     </div>
-    <div class="col-sm-4"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
+    <div class="basis-4/12"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
         <?php if(isset($count)): ?>
             <strong><?php echo $count ?></strong>
     	<?php else: ?>
@@ -59,11 +59,9 @@ $filesOptions =$this->article['basketarticle']->getFiles();
         <?php endif; ?>
         Gewicht: <?php echo $this->article['basketarticle']->getWeight() ?>
     </div>
-    <div class="col-sm-4" style="text-align: right;">
+    <div class="basis-4/12" style="text-align: right;">
     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->article['basketarticle']->getNetto()*$this->article['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;width: 45px;">(Netto)</label><br /><strong><?php echo $this->currency->toCurrency($this->article['basketarticle']->getBrutto()*$this->article['basketarticle']->getCount()) ?></strong> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$basketArticle["mwert"].'% MwSt.)')?></label></label><?php } ?>
-        <br/><a href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
+        <br/><a class="underline" href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
         <?php if($this->article['basketarticle']->getLayouterId() != "" && !$this->article()->checkIfCollectionOrdersForTemplatePrint($this->article['basketarticle']->getLayouterId())): ?><br/><a href="<?php echo $this->url(array('key' => $this->article['uuid']), 'articleload') ?>"><?php echo $this->translate('Bearbeiten') ?></a><?php endif; ?>
 
     </div>
-
-    <div class="clearfix"></div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.html b/src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.phtml
similarity index 94%
rename from src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.html
rename to src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.phtml
index f020fa4dd..43af67e72 100755
--- a/src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.html
+++ b/src/old/application/design/vorlagen/tailwindcss/layout/_hauptmenu.phtml
@@ -41,7 +41,7 @@
     </ul>
 </div>
 <div class="md:hidden text-center mb-4">
-    <button data-dropdown-toggle="sitenav" class="w-2/3 bg-slate-50 border border-slate-200 rounded-lg text-sm px-5 py-2.5 text-highlight block text-center inline-flex items-center" type="button">Seite wählen <svg class="w-2.5 h-2.5 ms-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+    <button data-dropdown-toggle="sitenav" class="w-2/3 bg-gray-200 border border-gray-300 rounded-lg text-sm px-5 py-2.5 text-highlight block text-center inline-flex items-center" type="button">Seite wählen <svg class="w-2.5 h-2.5 ms-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
         </svg>
     </button>
diff --git a/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml b/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
index 797f3b42d..533f46ca0 100755
--- a/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/layout/default.phtml
@@ -17,7 +17,8 @@
           colors: {
             all: '#666666',
             highlight: '#092041',
-            dark: '#262626'
+            dark: '#262626',
+            lenzBlue: '#428bca'
           }
         },
         fontFamily: {
@@ -36,8 +37,21 @@
     }
     </style>
 </head>
-<body class="bg-highlight text-all" x-data="{scrolledFromTop: false}" @scroll.window="window.pageYOffset > 60 ? scrolledFromTop = true: scrolledFromTop = false">
-    <div class="transition-all duration-200 sticky top-0 bg-white">
+<body class="h-screen text-all font-lenzFont" x-data="{scrolledFromTop: false}" @scroll.window="window.pageYOffset > 60 ? scrolledFromTop = true: scrolledFromTop = false">
+    
+    <div class="loading hidden absolute bg-white bg-opacity-60 z-40 h-full w-full flex items-center justify-center">
+      <div class="flex items-center">
+        <span class="text-3xl mr-4">Loading</span>
+        <svg class="animate-spin h-8 w-8 text-gray-800" xmlns="http://www.w3.org/2000/svg" fill="none"
+          viewBox="0 0 24 24">
+          <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+          <path class="opacity-75" fill="currentColor"
+            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
+          </path>
+        </svg>
+      </div>
+    </div>
+    <div class="transition-all duration-200 sticky top-0 z-10 bg-white">
       <div class="p-1 bg-highlight md:columns-2">
         <div class="text-sm text-white">
 				  <div class="mr-2 float-left">
@@ -106,13 +120,13 @@
         </div>
       </div>
 		  <a href="/" class="w-60 transition-all duration-200 m-auto mt-2 mb-6 block" :class="{'w-60': !scrolledFromTop, 'w-40': scrolledFromTop}" title="<?= $this->shop->name; ?>: zur Startseite"><?= $this->image()->thumbnailImage($this->shop->name, 'logo1', $this->shop->logo1); ?></a>
-      <?php include_once '_hauptmenu.html'; ?>
+      <?php include_once '_hauptmenu.phtml'; ?>
       <hr class="" :class="{'shadow': scrolledFromTop}"/>
     </div>
     <div class="bg-white"> <?php
         $PriorityMessenger = $this->PriorityMessenger();
         if(count($PriorityMessenger)): ?>
-		    <div class="w-3/4 md:w-2/4 m-auto border border-slate-200 bg-slate-50 p-2 mt-2">
+		    <div class="w-3/4 md:w-2/4 m-auto border border-gray-300 p-2 mt-2 mb-2">
 		    <?php
 		            foreach ($PriorityMessenger as $label => $messages) {
 		                if (count($messages)) {
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/basket/done.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/basket/done.phtml
index 4822cf600..70e52c81d 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/basket/done.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/basket/done.phtml
@@ -1,21 +1,9 @@
-<div class="row done_index" style="margin-bottom:5em">
-    
-   
-    
-    <div class="page-header col-xs-11 col-xs-offset-1">
-            
-        <h1><?php echo $this->translate('Vielen Dank für Ihre Bestellung') ?></h1>
-        
- 
-        <p style="margin:4em 0"><?php echo $this->translate('Sie erhalten in Kürze eine Bestätigungsmail Ihrer Bestellung.')?></p>
-
-            
-
-        <a class="btn btn-info btn-large" href="/user/myorders"><?php echo $this->translate('Zu meinen Aufträgen')?></a>
-        <a class="btn btn-info btn-large" href="/"><?php echo $this->translate('Zur Startseite')?></a> 
-        <a class="btn btn-info btn-large" href="/user?logout=1"><?php echo $this->translate('Abmelden')?></a>
-        
-
+<div class=" md:w-2/4 m-auto">
+    <h1 class="mt-4 text-xl"><?php echo $this->translate('Vielen Dank für Ihre Bestellung') ?></h1>
+    <p class="mt-4 mb-4"><?php echo $this->translate('Sie erhalten in Kürze eine Bestätigungsmail Ihrer Bestellung.')?></p>
+    <div class="md:flex gap-4">
+        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user/myorders"><?php echo $this->translate('Zu meinen Aufträgen')?></a>
+        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/"><?php echo $this->translate('Zur Startseite')?></a> 
+        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user?logout=1"><?php echo $this->translate('Abmelden')?></a>
     </div>
-
-</div>
\ No newline at end of file
+</div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/basket/finish.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/basket/finish.phtml
index 60f63c251..56d49b73a 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/basket/finish.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/basket/finish.phtml
@@ -1,75 +1,53 @@
-<style>
-    ul.breadcrumb {
-    display: none;
-}
-.btn-group.basket.col-xs-12 {
-    margin-top: 20px;
-}
-</style>
-<div class="finish_index">
-
-
-    <!--<div class="page-header col-xs-12"><?php echo $this->translate('Warenkorb / Bestellung') ?></div>-->
-
+<div class=" md:w-2/4 m-auto">
 
     <?php if ($this->basketIsEmpty) : ?>
 
-        <div class="basket col-xs-12">
-            <div class="alert alert-danger" style="min-height:20em;"><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung mC6glich.') ?></div>
+        <div class="text-center bg-indigo-500 p-2">
+            <div class="text-white" style=""><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung möglich.') ?></div>
         </div>
 
-        <div class="col-xs-10 col-xs-offset-1" style="margin-bottom:7em;">
-            <h3>Vielleicht möchten Sie einfach auf der Startseite beginnen?</h3>
+        <div class="mt-5" style="">
+            <h3><?php echo $this->translate('Vielleicht möchten Sie einfach auf der Startseite beginnen?')?></h3>
             <br>
-            <a class="btn btn-lg btn-success" href="/" title="<?= $this->shop->name; ?>: zur Startseite">Zur Startseite</a>
+            <a class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight " href="/" title="<?= $this->shop->name; ?>: zur Startseite"><?php echo $this->translate('Zur Startseite') ?></a>
         </div>
 
 
     <?php else : ?>
 
-        <div class="btn-group basket col-xs-12">
-            <a class="btn btn-success" href="/basket">
+        <div class="md:flex bg-white mt-4 border mb-4">
+            <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
-            </a>
-            <a class="btn btn-success" href="/basket/review">
+            </label>
+            <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>
-            </a>
-            <label class="btn btn-success active">
+            </label>
+            <label class="bg-highlight md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 3: <?php echo $this->translate('AGB') ?></h4><?php echo $this->translate('Bestätigen und bestellen') ?>
             </label>
         </div>
 
     <?php endif; ?>
 
-
-
-    <!--<?php if ($this->cms()->getCmsByIdMarket('template_display_orders')->text1 != '') : ?>
-        <div class="col-xs-12">
-            <?php echo $this->cms()->getCmsByIdMarket('template_display_orders')->text1; ?>
+    <div class="md:flex gap-3"> 
+        <div class="flex-1">
+            <div class="bg-gray-200 p-2 h-full">
+                <h4 class="text-lg font-medium"><?php echo $this->translate('Rechnungsadresse') ?>:</h4>
+                <p>
+                    <?php if ($this->invoice_address->getCompany() != "") : ?><?php echo $this->invoice_address->getCompany() ?></br><?php endif; ?>
+                <?php if ($this->invoice_address->getCompany2() != "") : ?><?php echo $this->invoice_address->getCompany2() ?><br /><?php endif; ?>
+            <?php echo $this->invoice_address->getAnrede() ?> <?php echo $this->invoice_address->getFirstname() ?> <?php echo $this->invoice_address->getLastname() ?>
+            <?php if ($this->invoice_address->getAbteilung() != "") : ?><br /><?php echo $this->invoice_address->getAbteilung() ?><?php endif; ?>
+                <br /><?php echo $this->invoice_address->getStreet() ?> <?php echo $this->invoice_address->getHouseNumber() ?>
+                <br /><?php echo $this->invoice_address->getCountry() ?> <?php echo $this->invoice_address->getZip() ?> <?php echo $this->invoice_address->getCity() ?> </p>
+                <a class="text-center block w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/basket/review"><?php echo $this->translate('Ändern') ?></a>
+            </div>
         </div>
-    <?php endif; ?>-->
-
-
-<div class="row">
-    <div class="col-sm-4 invoice">
-        <div class="well">
-            <h4><?php echo $this->translate('Rechnungsadresse') ?>:</h4>
-            <p>
-                <?php if ($this->invoice_address->getCompany() != "") : ?><?php echo $this->invoice_address->getCompany() ?></br><?php endif; ?>
-            <?php if ($this->invoice_address->getCompany2() != "") : ?><?php echo $this->invoice_address->getCompany2() ?><br /><?php endif; ?>
-        <?php echo $this->invoice_address->getAnrede() ?> <?php echo $this->invoice_address->getFirstname() ?> <?php echo $this->invoice_address->getLastname() ?>
-        <?php if ($this->invoice_address->getAbteilung() != "") : ?><br /><?php echo $this->invoice_address->getAbteilung() ?><?php endif; ?>
-            <br /><?php echo $this->invoice_address->getStreet() ?> <?php echo $this->invoice_address->getHouseNumber() ?>
-            <br /><?php echo $this->invoice_address->getCountry() ?> <?php echo $this->invoice_address->getZip() ?> <?php echo $this->invoice_address->getCity() ?> </p>
-            <p><a class="btn btn-primary" href="/basket/review"><?php echo $this->translate('Ändern') ?></a></p>
-        </div>
-    </div>
-
 
     <?php if ($this->shop->display_delivery) : ?>
-        <div class="col-sm-4 invoice">
-            <div class="well">
-                <h4><?php echo $this->translate('Lieferadresse') ?>:</h4>
+        <div class="flex-1">
+            <div class="bg-gray-200 p-2 h-full">
+                <h4 class="text-lg font-medium"><?php echo $this->translate('Lieferadresse') ?>:</h4>
                 <p>
                     <?php if ($this->delivery_address->getCompany() != "") : ?><?php echo $this->delivery_address->getCompany() ?><br /><?php endif; ?>
                 <?php if ($this->delivery_address->getCompany2() != "") : ?><?php echo $this->delivery_address->getCompany2() ?><br /><?php endif; ?>
@@ -77,16 +55,16 @@
             <?php if ($this->delivery_address->getAbteilung() != "") : ?><br /><?php echo $this->delivery_address->getAbteilung() ?><?php endif; ?>
                 <br /><?php echo $this->delivery_address->getStreet() ?> <?php echo $this->delivery_address->getHouseNumber() ?>
                 <br /><?php echo $this->delivery_address->getCountry() ?> <?php echo $this->delivery_address->getZip() ?> <?php echo $this->delivery_address->getCity() ?> </p>
-                <p><a class="btn btn-primary" href="/basket/review"><?php echo $this->translate('Ändern') ?></a></p>
+                <a class="text-center block w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/basket/review"><?php echo $this->translate('Ändern') ?></a>
             </div>
         </div>
     <?php endif; ?>
 
 
     <?php if ($this->shop->display_sender) : ?>
-        <div class="col-sm-4 invoice">
-            <div class="well">
-                <h4><?php echo $this->translate('Absenderadresse') ?>:</h4>
+        <div class="flex-1">
+            <div class="bg-gray-200 p-2 h-full">
+                <h4 class="text-lg font-medium"><?php echo $this->translate('Absenderadresse') ?>:</h4>
                 <p>
 
                     <?php if ($this->sender_address->getCompany() != "") : ?><?php echo $this->sender_address->getCompany() ?><br /><?php endif; ?>
@@ -95,321 +73,269 @@
             <?php if ($this->sender_address->getAbteilung() != "") : ?><br /><?php echo $this->sender_address->getAbteilung() ?><?php endif; ?>
                 <br /><?php echo $this->sender_address->getStreet() ?> <?php echo $this->sender_address->getHouseNumber() ?>
                 <br /><?php echo $this->sender_address->getCountry() ?> <?php echo $this->sender_address->getZip() ?> <?php echo $this->sender_address->getCity() ?> </p>
-                <p><a class="btn btn-primary" href="/basket/review"><?php echo $this->translate('Ändern') ?></a></p>
+                <a class="text-center block w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/basket/review"><?php echo $this->translate('Ändern') ?></a>
             </div>
         </div>
     <?php endif; ?>
     </div>
-    <div class="clearfix"></div>
-    <div class="col-xs-12">
-        <?php echo $this->translate('Gewählte Versandart') ?>: <b><?php echo $this->shippingtype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a><br>
-        <?php echo $this->translate('Gewählte Zahlungsart') ?>: <b><?php echo $this->paymenttype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a>
+
+
+    <div class="flex mt-4 mb-4">
+        <div class="flex-1"><?php echo $this->translate('Gewählte Versandart') ?>: <b><?php echo $this->shippingtype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a></div>
+        <div class="flex-1"><?php echo $this->translate('Gewählte Zahlungsart') ?>: <b><?php echo $this->paymenttype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a></div>
     </div>
 
-    <div class="clearfix"></div>
+    <h3 class="mb-4"><?php echo $this->translate('Warenkorb') ?> <a class="underline" href="/basket/index"><?php echo $this->translate('Produkte ändern') ?></a></h3>
 
-    <div class="btn-group basket col-xs-12" style="margin-top:2em;">
+    <form action="/basket/finish" method="post" enctype="multipart/form-data">
 
+        <?php foreach ($this->basket_articles_complete as $barticle) : ?>
+            <div class="flex border">
+            <div class="basis-4/12 p-1 font-medium text-right">
 
-
-        <h3><?php echo $this->translate('Warenkorb') ?> <a href="/basket/index"><?php echo $this->translate('Produkte ändern') ?></a></h3>
-
-
-
-
-        <form action="/basket/finish" method="post" enctype="multipart/form-data">
-
-
-
-                <div class="clearfix"></div>
-                    <?php foreach ($this->basket_articles_complete as $barticle) : ?>
-                        <div class="col-lg-12 <?php echo $this->cycle(array("even", "odd"))->next() ?>">
-                        <div class="col-sm-4">
-
-                                <?php if (($barticle['article']['a6_org_article'] == 0 || $barticle['article']['a6_org_article'] == "") && ($barticle['basketarticle']->getLayouterId() == "" || $barticle['basketarticle']->getLayouterId() == false)) : ?>
-                                    <?php echo $this->image()->thumbnailImage($barticle['article']['title'], 'articlelist', $barticle['article']['file']); ?>
-                                <?php else : ?>
-                                    <?php $articleObj = new market_article(); ?>
-                                    <?= $articleObj->generatePreview($barticle['article']['id'], $barticle['basketarticle']->getLayouterId(), 'articlelist'); ?>
-                                <?php endif; ?>
-
-                        </div>
-                        <div class="col-sm-4"><strong>Anzahl: <?php if (isset($count) && intval($count) > 0) : ?><?php echo $count ?><?php else : ?><?php echo $barticle['basketarticle']->getCount() ?><?php endif; ?></strong><br /><br />
-                                <?php if (($barticle['basketarticle']->getLayouterId() == "" || $barticle['basketarticle']->getLayouterId() == false)) : ?>
-                                    <?php echo $barticle['article']['title'] ?>
-                                <?php else : ?>
-                                    <?php echo $this->layouter()->getTitle($barticle['basketarticle']->getLayouterId()); ?>
-                                <?php endif; ?>
-
-
-                                <?php if (($barticle['options'])) : ?>
-                                    <ul>
-                                        <?php foreach ($barticle['options'] as $key => $option) : ?>
-                                            <?php
-
-                                            if (stripos($option, 'Auflage') === 0) {
-                                                $count = str_replace('Auflage: ', '', $option);
-                                            } else {
-                                            ?>
-                                                <li><?php echo $option ?>, </li>
-                                            <?php } ?>
-                                        <?php endforeach; ?>
-
-                                    </ul>
-                                <?php endif; ?>
-
-                        </div>
-                        <!--<div class="col-sm-1">
-                        <label class="mobilelabel">Einzelpreis: <small><?php if (isset($count) && intval($count) > 0) : ?><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() / intval($count)) ?><?php else : ?><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() / $barticle['basketarticle']->getCount()) ?><?php endif; ?></small></label>
-                        <label class="nomobilehead" style="display: block;width: 100%;text-align: right;"><?php if (isset($count) && intval($count) > 0) : ?><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() / intval($count)) ?><?php else : ?><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() / $barticle['basketarticle']->getCount()) ?><?php endif; ?></label>
-                        </div>-->
-                        <!--<div class="col-sm-1">
-                        <label class="mobilelabel">Anzahl: <small><?php if (isset($count) && intval($count) > 0) : ?><?php echo $count ?><?php else : ?><?php echo $barticle['basketarticle']->getCount() ?><?php endif; ?></small></label>
-                        <label class="nomobilehead"><?php if (isset($count) && intval($count) > 0) : ?><?php echo $count ?><?php else : ?><?php echo $barticle['basketarticle']->getCount() ?><?php endif; ?></label>
-                        </div>-->
-                        <div  class="col-sm-4">
-                        <?php if(!$this->designsettings()->get('display_no_price')) { ?><label class="mobilelabel">Preis: <small><?php if ($this->withTax) : ?>
-                            <label style="font-weight:100;"><?php echo $this->currency->toCurrency($barticle['basketarticle']->getNetto() * $barticle['basketarticle']->getCount()) ?></label><label style="font-size:14px; font-weight:100;width: 45px;"><?php echo $this->translate('(Netto)')?></label><br /><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() * $barticle['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$barticle['article']['mwert'].'% MwSt.)') ?></label>
-                                <?php else : ?>
-                        <label class="nomobilehead" style="display: block;width: 100%;text-align: right;font-weight:100;"><?php echo $this->currency->toCurrency($barticle['basketarticle']->getNetto() * $barticle['basketarticle']->getCount()) ?><label style="font-size:14px; font-weight:100;width: 45px;"><?php echo $this->translate('(Netto)')?></label><br /><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() * $barticle['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$barticle['article']['mwert'].'% MwSt.)') ?></label>
-                                <?php endif; ?></small></label>
-                        <label class="nomobilehead" style="display: block;width: 100%;text-align: right;"><?php if ($this->withTax) : ?>
-                            <label style="font-weight:100;"><?php echo $this->currency->toCurrency($barticle['basketarticle']->getNetto() * $barticle['basketarticle']->getCount()) ?></label><label style="font-size:14px; font-weight:100;width: 45px;"><?php echo $this->translate('(Netto)')?></label><br /><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() * $barticle['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$barticle['article']['mwert'].'% MwSt.)') ?></label>
-                                <?php else : ?>
-                        <label class="nomobilehead" style="display: block;width: 100%;text-align: right;font-weight:100;"><?php echo $this->currency->toCurrency($barticle['basketarticle']->getNetto() * $barticle['basketarticle']->getCount()) ?><label style="font-size:14px; font-weight:100;width: 45px;"><?php echo $this->translate('(Netto)')?></label><br /><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() * $barticle['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$barticle['article']['mwert'].'% MwSt.)') ?></label>
-                                <?php endif; ?></label><?php } ?>
-                        </div>
-                        <div class="clearfix"></div>
-                    </div>
-                    <?php endforeach; ?>
-            </div>
-
-
-
-            <?php
-            /************************************************************************************************************************************************************************
-             * Zusammenfassung der Bestellung
-             */
-            ?>
-
-
-                <div class="col-xs-12  col-lg-9 pull-right">
-
-                    <table width="100%" class="table table-bordered">
-                    <?php if(!$this->designsettings()->get('display_no_price')) { ?><thead>
-                            <?php if ($this->withTax) : ?>
-                                <tr>
-                                    <th class="well text-right" style="font-weight:100;"><?php echo $this->translate('Produktpreis (Netto)'); ?>:</th>
-                                    <th class="well">&nbsp;</th>
-                                    <th class="well text-right" style="font-weight:100;"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisBrutto()) ?></th>
-                                </tr>
-                                <tr>
-                                    <th class="well text-right"><?php echo $this->translate('Produktpreis (inkl. MwSt.)'); ?>:</th>
-                                    <th class="well">&nbsp;</th>
-                                    <th class="well text-right"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisBrutto()) ?></th>
-                                </tr>
-                            <?php else : ?>
-                                <tr>
-                                    <th class="well text-right"><?php echo $this->translate('Produktpreis'); ?>:</th>
-                                    <th class="well">&nbsp;</th>
-                                    <th class="well text-right"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisNetto()) ?></th>
-                                </tr>
-                            <?php endif; ?>
-                        </thead><?php } ?>
-
-                        <tr>
-
-                            <td align="right">
-                            <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->translate('zzgl. Versand'); ?><?php } else { ?><?php echo $this->translate('Versand'); ?><?php } ?>:
-                            </td>
-                            <td>
-                                <span style="color: #000"><?php echo $this->shippingtype->title ?></span>
-                            </td>
-                            <td align="right">
-                            <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getVersandBrutto()) ?><?php } ?>
-                            </td>
-                        </tr>
-                        <?php if (!$this->no_payment) : ?>
-                            <?php if(!$this->designsettings()->get('display_no_price')) { ?><tr>
-
-
-                                <td align="right">
-                                    <?php echo $this->translate('zzgl. Zahlart'); ?>:
-                                </td>
-                                <td>
-                                    <span style="color: #000"><?php echo $this->paymenttype->title ?></span>
-                                </td>
-                                <td align="right">
-                                    <?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getZahlartBrutto()) ?>
-                                </td>
-                            </tr><?php } ?>
-                        <?php endif; ?>
-                        <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php if ($this->withTax) : ?>
-                            <?php foreach (TP_Basket::getBasket()->getMWert() as $key => $mw) : ?>
-                                <tr>
-
-                                    <td align="right">
-                                        <?php echo $this->translate('enth. MwSt.'); ?> <?= $key ?>%:
-                                    </td>
-                                    <td align="right">
-
-                                    </td>
-                                    <td align="right">
-                                        <?php echo $this->currency->toCurrency($mw) ?>
-                                    </td>
-                                </tr>
-                            <?php endforeach; ?>
-                        <?php endif; ?>
-                        <tr class="brutto">
-
-                            <td align="right" class="well">
-                                <h4><?php echo $this->translate('Gesamtbetrag'); ?>:</h4>
-                            </td>
-                            <td align="right" class="well">
-
-                            </td>
-                            <td align="right" class="well">
-                                <h4><?php echo $this->currency->toCurrency($this->preisbrutto) ?></h4>
-                            </td>
-                        </tr><?php } ?>
-                        <?php if ($this->basket_gutschein_enable != "") : ?>
-                            <tr>
-                                <td align="right">
-                                    <strong><?php echo $this->translate('abzgl. Gutschein'); ?>:</strong>
-                                </td>
-                                <td align="right">
-
-                                </td>
-                                <td align="right">
-                                    <?php echo $this->currency->toCurrency($this->basket_gutschein) ?>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td align="right" class="text-white bg-success"><strong><?php echo $this->translate('Preis abzgl. Gutschein'); ?>:</strong></td>
-                                <td align="right" class="text-white bg-success">
-
-                                </td>
-                                <td align="right" class="text-white bg-success">
-                                    <?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getPreisBrutto() - $this->basket_gutschein) ?>
-                                </td>
-                            </tr>
-                        <?php endif; ?>
-                    </table>
-
-
-
-<div class="clearfix"></div>
-
-<script>
-    $(function()
-{
-    $('input[type=checkbox][name=agb]').change(function() {
-        $('input[type=hidden][name=agb]').val("1");
-    });
-    $('input[type=checkbox][name=revocation]').change(function() {
-        $('input[type=hidden][name=revocation]').val("1");
-    });
-    $('input[type=checkbox][name=privacy]').change(function() {
-        $('input[type=hidden][name=privacy]').val("1");
-    });
-});
-</script>
-                <div class="col-xs-12">
-
-                    <div class="pull-right">
-                        <?php if (!$this->designsettings()->get('b2bshop')) : ?>
-                            <input type="hidden" name="agb" value="0" />
-                            <?php if ($this->erroragb == true) : ?>
-                                <div class="control-group error">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="agb" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/agb" target="_blank">AGBs</a> habe ich zur Kenntnis genommen und akzeptiere diese.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php else : ?>
-                                <div class="control-group">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="agb" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/agb" target="_blank">AGBs</a> habe ich zur Kenntnis genommen und akzeptiere diese.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php endif; ?>
-
-                            <input type="hidden" name="revocation" value="0" />
-
-                            <?php if ($this->errorrevocation == true) : ?>
-                                <div class="control-group error">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="revocation" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/revocation" target="_blank">Widerrufsbelehrung</a> habe ich zur Kenntnis genommen.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php else : ?>
-                                <div class="control-group">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="revocation" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/revocation" target="_blank">Widerrufsbelehrung</a> habe ich zur Kenntnis genommen.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php endif; ?>
-
-                            <input type="hidden" name="privacy" value="0" />
-
-                            <?php if ($this->errorprivacy == true) : ?>
-                                <div class="control-group error">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="privacy" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/privacy" target="_blank">Datenschutzerklärung</a> habe ich zur Kenntnis genommen.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php else : ?>
-                                <div class="control-group">
-                                    <div class="controls">
-                                        <label class="checkbox" style="padding-top: 0">
-                                            <input type="checkbox" name="privacy" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
-                                            <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/privacy" target="_blank">Datenschutzerklärung</a> habe ich zur Kenntnis genommen.') ?></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            <?php endif; ?>
-
-
-                        <?php else : ?>
-                            <input type="hidden" name="agb" value="1" />
-                            <input type="hidden" name="revocation" value="1" />
-                            <input type="hidden" name="privacy" value="1" />
-                        <?php endif; ?>
-
-                    </div><!-- //class="pull-right" -->
-
-                </div>
-
-            <div class="clearfix"></div>
-
-
-                <div class="col-xs-12">
-                    <?php if (!$this->designsettings()->get('b2bshop')) : ?>
-                        <button type="submit" class="btn btn-success btn-lg pull-right"><?php echo $this->translate('kostenpflichtig bestellen') ?></button>
+                    <?php if (($barticle['article']['a6_org_article'] == 0 || $barticle['article']['a6_org_article'] == "") && ($barticle['basketarticle']->getLayouterId() == "" || $barticle['basketarticle']->getLayouterId() == false)) : ?>
+                        <?php echo $this->image()->thumbnailImage($barticle['article']['title'], 'articlelist', $barticle['article']['file']); ?>
                     <?php else : ?>
-                        <button type="submit" class="btn btn-success btn-lg pull-right"><?php echo $this->translate('Bestellung abschließen') ?></button>
+                        <?php $articleObj = new market_article(); ?>
+                        <?= $articleObj->generatePreview($barticle['article']['id'], $barticle['basketarticle']->getLayouterId(), 'articlelist'); ?>
                     <?php endif; ?>
-                </div>
-                <div class="clearfix" style="margin-top:2em;margin-bottom:2em;"></div>
+
+            </div>
+            <div class="basis-4/12 p-1 font-medium ">Anzahl: <?php if (isset($count) && intval($count) > 0) : ?><?php echo $count ?><?php else : ?><?php echo $barticle['basketarticle']->getCount() ?><?php endif; ?><br /><br />
+                    <?php if (($barticle['basketarticle']->getLayouterId() == "" || $barticle['basketarticle']->getLayouterId() == false)) : ?>
+                        <?php echo $barticle['article']['title'] ?>
+                    <?php else : ?>
+                        <?php echo $this->layouter()->getTitle($barticle['basketarticle']->getLayouterId()); ?>
+                    <?php endif; ?>
+
+
+                    <?php if (($barticle['options'])) : ?>
+                        <ul>
+                            <?php foreach ($barticle['options'] as $key => $option) : ?>
+                                <?php
+
+                                if (stripos($option, 'Auflage') === 0) {
+                                    $count = str_replace('Auflage: ', '', $option);
+                                } else {
+                                ?>
+                                    <li><?php echo $option ?>, </li>
+                                <?php } ?>
+                            <?php endforeach; ?>
+
+                        </ul>
+                    <?php endif; ?>
+
+            </div>
+            <div  class="basis-4/12 text-right p-1 font-medium text-right">
+            <?php echo $this->currency->toCurrency($barticle['basketarticle']->getNetto() * $barticle['basketarticle']->getCount()) ?></label><label style="font-size:14px; font-weight:100;width: 45px;"><?php echo $this->translate('(Netto)')?></label><br /><?php echo $this->currency->toCurrency($barticle['basketarticle']->getBrutto() * $barticle['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$barticle['article']['mwert'].'% MwSt.)') ?>
+            </div>
+        </div>
+        <?php endforeach; ?>
+
+        <?php
+        /************************************************************************************************************************************************************************
+         * Zusammenfassung der Bestellung
+         */
+        ?>
+
+
+        <table width="100%" class="table table-bordered">
+        <?php if(!$this->designsettings()->get('display_no_price')) { ?><thead>
+                <?php if ($this->withTax) : ?>
+                    <tr>
+                        <th class="well text-right" style="font-weight:100;"><?php echo $this->translate('Produktpreis (Netto)'); ?>:</th>
+                        <th class="well">&nbsp;</th>
+                        <th class="well text-right" style="font-weight:100;"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisBrutto()) ?></th>
+                    </tr>
+                    <tr>
+                        <th class="text-right bg-gray-200 text-bold"><?php echo $this->translate('Produktpreis (inkl. MwSt.)'); ?>:</th>
+                        <th class="bg-gray-200">&nbsp;</th>
+                        <th class="text-right bg-gray-200 text-bold"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisBrutto()) ?></th>
+                    </tr>
+                <?php else : ?>
+                    <tr>
+                        <th class="well text-right"><?php echo $this->translate('Produktpreis'); ?>:</th>
+                        <th class="well">&nbsp;</th>
+                        <th class="well text-right"><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getProduktPreisNetto()) ?></th>
+                    </tr>
+                <?php endif; ?>
+            </thead><?php } ?>
+
+            <tr>
+
+                <td align="right">
+                <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->translate('zzgl. Versand'); ?><?php } else { ?><?php echo $this->translate('Versand'); ?><?php } ?>:
+                </td>
+                <td class="text-right">
+                    <?php echo $this->shippingtype->title ?>
+                </td>
+                <td align="right">
+                <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getVersandBrutto()) ?><?php } ?>
+                </td>
+            </tr>
+            <?php if (!$this->no_payment) : ?>
+                <?php if(!$this->designsettings()->get('display_no_price')) { ?><tr>
+
+
+                    <td align="right">
+                        <?php echo $this->translate('zzgl. Zahlart'); ?>:
+                    </td>
+                    <td class="text-right">
+                        <span style="color: #000"><?php echo $this->paymenttype->title ?></span>
+                    </td>
+                    <td align="right">
+                        <?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getZahlartBrutto()) ?>
+                    </td>
+                </tr><?php } ?>
+            <?php endif; ?>
+            <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php if ($this->withTax) : ?>
+                <?php foreach (TP_Basket::getBasket()->getMWert() as $key => $mw) : ?>
+                    <tr>
+
+                        <td align="right">
+                            <?php echo $this->translate('enth. MwSt.'); ?> <?= $key ?>%:
+                        </td>
+                        <td align="right">
+
+                        </td>
+                        <td align="right">
+                            <?php echo $this->currency->toCurrency($mw) ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            <?php endif; ?>
+            <tr class="">
+
+                <td class="text-xl font-bold border-gray-300 border bg-gray-200 text-right">
+                    <h4><?php echo $this->translate('Gesamtbetrag'); ?>:</h4>
+                </td>
+                <td class="text-xl border-gray-300 border bg-gray-200">
+
+                </td>
+                <td class="text-xl font-bold border-gray-300 border bg-gray-200 text-right">
+                    <h4><?php echo $this->currency->toCurrency($this->preisbrutto) ?></h4>
+                </td>
+            </tr><?php } ?>
+            <?php if ($this->basket_gutschein_enable != "") : ?>
+                <tr>
+                    <td align="right">
+                        <strong><?php echo $this->translate('abzgl. Gutschein'); ?>:</strong>
+                    </td>
+                    <td align="right">
+
+                    </td>
+                    <td align="right">
+                        <?php echo $this->currency->toCurrency($this->basket_gutschein) ?>
+                    </td>
+                </tr>
+                <tr>
+
+                    <td align="right" class="text-white bg-success"><strong><?php echo $this->translate('Preis abzgl. Gutschein'); ?>:</strong></td>
+                    <td align="right" class="text-white bg-success">
+
+                    </td>
+                    <td align="right" class="text-white bg-success">
+                        <?php echo $this->currency->toCurrency(TP_Basket::getBasket()->getPreisBrutto() - $this->basket_gutschein) ?>
+                    </td>
+                </tr>
+            <?php endif; ?>
+        </table>
 
 
 
+
+        <script>
+        window.onload = function(e){
+        $(function() {
+            $('input[type=checkbox][name=agb]').change(function() {
+                $('input[type=hidden][name=agb]').val("1");
+            });
+            $('input[type=checkbox][name=revocation]').change(function() {
+                $('input[type=hidden][name=revocation]').val("1");
+            });
+            $('input[type=checkbox][name=privacy]').change(function() {
+                $('input[type=hidden][name=privacy]').val("1");
+            });
+        });
+        }
+        </script>
+            <div class="text-right mt-2 mb-2">
+                <?php if (!$this->designsettings()->get('b2bshop')) : ?>
+                    <input type="hidden" name="agb" value="0" />
+                    <?php if ($this->erroragb == true) : ?>
+                        <div class="control-group error">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="agb" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/agb" class="underline" target="_blank">AGBs</a> habe ich zur Kenntnis genommen und akzeptiere diese.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php else : ?>
+                        <div class="control-group">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="agb" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/agb" class="underline" target="_blank">AGBs</a> habe ich zur Kenntnis genommen und akzeptiere diese.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+
+                    <input type="hidden" name="revocation" value="0" />
+
+                    <?php if ($this->errorrevocation == true) : ?>
+                        <div class="control-group error">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="revocation" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/revocation" class="underline" target="_blank">Widerrufsbelehrung</a> habe ich zur Kenntnis genommen.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php else : ?>
+                        <div class="control-group">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="revocation" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/revocation" class="underline" target="_blank">Widerrufsbelehrung</a> habe ich zur Kenntnis genommen.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+
+                    <input type="hidden" name="privacy" value="0" />
+
+                    <?php if ($this->errorprivacy == true) : ?>
+                        <div class="control-group error">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="privacy" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/privacy" class="underline" target="_blank">Datenschutzerklärung</a> habe ich zur Kenntnis genommen.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php else : ?>
+                        <div class="control-group">
+                            <div class="controls">
+                                <label class="checkbox" style="padding-top: 0">
+                                    <input type="checkbox" name="privacy" value="1" data-toggle="toggle" data-size="small" data-offstyle="danger" data-onstyle="success" data-on="Ja" data-off="Nein" />
+                                    <span style="margin-bottom: 0"><?php echo $this->translate('Die <a href="/privacy" class="underline" target="_blank">Datenschutzerklärung</a> habe ich zur Kenntnis genommen.') ?></span>
+                                </label>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+
+
+                <?php else : ?>
+                    <input type="hidden" name="agb" value="1" />
+                    <input type="hidden" name="revocation" value="1" />
+                    <input type="hidden" name="privacy" value="1" />
+                <?php endif; ?>
+
+            </div><!-- //class="pull-right" -->
+
+            <div class="text-right">
+                <button type="submit" class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?php echo $this->translate('kostenpflichtig bestellen') ?></button>
+            </div>
         </form>
-    </div>
-
-</div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/basket/index.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/basket/index.phtml
index bb73b75a9..31ffe177e 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/basket/index.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/basket/index.phtml
@@ -1,50 +1,38 @@
-<style>
-    ul.breadcrumb {
-    display: none;
-}
-</style>
-<div class="row basket_index">
-
-
-
+<div class=" md:w-2/4 m-auto">
     <!--<div class="page-header col-xs-12"><?php echo $this->translate('Warenkorb / Bestellung') ?></div>-->
-
-
-
     <?php if ($this->basketIsEmpty) : ?>
 
-        <div class="basket col-xs-12">
-            <div class="alert alert-danger" style="min-height:2em;"><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung möglich.') ?></div>
+        <div class="text-center bg-indigo-500 p-2">
+            <div class="text-white" style=""><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung möglich.') ?></div>
         </div>
 
-        <div class="col-xs-10 col-xs-offset-1" style="margin-bottom:7em;">
+        <div class="mt-5" style="">
             <h3><?php echo $this->translate('Vielleicht möchten Sie einfach auf der Startseite beginnen?')?></h3>
             <br>
-            <a class="btn btn-lg btn-success" href="/" title="<?= $this->shop->name; ?>: zur Startseite"><?php echo $this->translate('Zur Startseite') ?></a>
+            <a class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight " href="/" title="<?= $this->shop->name; ?>: zur Startseite"><?php echo $this->translate('Zur Startseite') ?></a>
         </div>
 
 
     <?php else : ?>
 
-        <div class="btn-group basket col-xs-12">
-            <label class="btn btn-success active">
+        <div class="flex bg-white border mb-4">
+            <label class="bg-highlight p-4 text-white flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
             </label>
-            <label class="btn btn-default">
+            <label class="flex-1 p-4">
                 <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>
             </label>
-            <label class="btn btn-default">
+            <label class="flex-1 p-4">
                 <h4><?php echo $this->translate('Schritt') ?> 3: <?php echo $this->translate('AGB') ?></h4><?php echo $this->translate('Bestätigen und bestellen') ?>
             </label>
         </div>
 
 
-            <div class="btn-group basket col-lg-12">
-                <div class="clearfix"></div>
+            <div class="">
             
-                <div class="basketborder">
+                <div class="">
                     <?php foreach ($this->articles as $article) : ?>
-                        <div class="col-lg-12 <?php echo $this->cycle(array("odd", "even"))->next() ?>">
+                        <div class="p-2 flex border border-gray-300 mb-4">
                             <?php echo $this->partial($article['article']->typ . '_basket_index.phtml', array('article' => $article, 'currency' => $this->currency, 'shop' => $this->shop)) ?>
                         </div>
                     <?php endforeach; ?>
@@ -55,36 +43,34 @@
              * Zusammenfassung der Bestellung
              */
             ?>
-            <br>
-            <br>
-            <div class="row">
-                <div class="col-sm-offset-3 col-lg-9 nomobilebasketprice">
+            <div class="flex flex-row-reverse mt-5">
+                <div class="basis-10/12">
 
                     <form action="<?php echo $this->redirect_ssl_path ?>/basket" method="post" class="niceform" enctype="multipart/form-data">
-                        <table class="table table-bordered">
+                        <table class="table-auto w-full border-collapse border-spacing-2">
                         <?php if(!$this->designsettings()->get('display_no_price')) { ?><thead>
                                 <tr>
-                                    <th class="well text-right" style="font-weight:100;"><?php echo $this->translate('Produktpreis'); ?>:</th>
-                                    <th class="well">&nbsp;</th>
-                                    <th class="well text-right" style="font-weight:100;"><?php echo $this->currency->toCurrency($this->productnetto) ?> (<?php echo $this->currency->toCurrency($this->productbrutto) ?>)</th>
+                                    <th class="bg-gray-300 p-1 font-medium text-right" style=""><?php echo $this->translate('Produktpreis'); ?>:</th>
+                                    <th class="bg-gray-300 p-1 ">&nbsp;</th>
+                                    <th class="bg-gray-300 p-1 font-medium text-right" style=""><?php echo $this->currency->toCurrency($this->productnetto) ?> (<?php echo $this->currency->toCurrency($this->productbrutto) ?>)</th>
                                 </tr>
                             </thead><?php } ?>
                             <tbody>
 
                                 <tr>
 
-                                    <td align="right">
+                                    <td class="text-right p-1">
                                     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->translate('zzgl. Versand'); ?><?php } else { ?><?php echo $this->translate('Versand'); ?><?php } ?>:
                                     </td>
-                                    <td style="width:36%">
-                                        <select name="shippingtype" onchange="javascript:this.form.submit()" style="width:100%">
+                                    <td class="p-1">
+                                        <select name="shippingtype" onchange="javascript:this.form.submit()" class="border border-gray-300 bg-gray-200 text-black p-2 w-full">
                                             <?php foreach ($this->shippingtype as $shippingtype) : ?>
                                                 <option value="<?php echo $shippingtype['id'] ?>" <?php echo ($shippingtype['id'] == $this->shippingselected) ? 'selected="selected"' : '' ?>><?php echo $shippingtype['title'] ?></option>
                                             <?php endforeach; ?>
                                         </select>
                                         <?php echo $this->shippingtypeselected['description'] ?>
                                     </td>
-                                    <td align="right" style="width:21%">
+                                    <td class="p-1 text-right">
                                     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->versand) ?> (<?php echo $this->currency->toCurrency($this->versandbrutto) ?>)<?php } ?>
                                     </td>
                                 </tr>
@@ -92,11 +78,12 @@
                                     <tr>
 
 
-                                    <?php if(!$this->designsettings()->get('display_no_price')) { ?><td align="right">
+                                <?php if(!$this->designsettings()->get('display_no_price')) { ?>
+                                    <td class="p-1 text-right">
                                             <?php echo $this->translate('zzgl. Zahlart'); ?>:
                                         </td>
-                                        <td style="width:36%">
-                                            <select name="paymenttype" onchange="javascript:this.form.submit()" style="width:100%">
+                                        <td class="p-1">
+                                            <select name="paymenttype" onchange="javascript:this.form.submit()" class="border border-gray-300 bg-gray-200 text-black p-2 w-full">
                                                 <?php foreach ($this->paymenttype as $paymenttype) : ?>
                                                     <option value="<?php echo $paymenttype['id'] ?>" <?php echo ($paymenttype['id'] == $this->paymentselected) ? 'selected="selected"' : '' ?>><?php echo $paymenttype['title'] ?></option>
                                                 <?php endforeach; ?>
@@ -106,7 +93,7 @@
                                             </select>
                                             <?php echo $this->paymenttypeselected['description'] ?>
                                         </td>
-                                        <td align="right" style="width:21%">
+                                        <td class="p-1 text-right">
                                         <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->paymentwert) ?> (<?php echo $this->currency->toCurrency($this->paymentwertbrutto) ?>)<?php } ?>
                                         </td>
                                     </tr><?php } ?>
@@ -114,22 +101,22 @@
                                 <?php if (!$this->designsettings()->get('b2bshop')) : ?>
                                     <?php if(!$this->designsettings()->get('display_no_price')) { ?>
                                     <tr>
-                                        <td align="right"><?php echo $this->translate('Gutscheincode') ?>:</td>
-                                        <td align="right">
-                                            <input style="width: 100%;" type="text" name="gutscheincode" value="<?php echo $this->gutscheincode ?>" class="" />
+                                        <td class="p-1 text-right"><?php echo $this->translate('Gutscheincode') ?>:</td>
+                                        <td class="p-1 text-right">
+                                            <input class="border bg-gray-200 text-black p-2 w-full border-gray-300" type="text" name="gutscheincode" value="<?php echo $this->gutscheincode ?>" />
                                         </td>
-                                        <td align="right" style="width:21%">
-                                            <input class="btn vouchersubmit" type="submit" value="<?php echo $this->translate('Einlösen') ?>" />
+                                        <td class="p-1 text-right">
+                                            <input class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " type="submit" value="<?php echo $this->translate('Einlösen') ?>" />
                                         </td>
                                     </tr>
                                 <?php } endif; ?>
                                 <?php if ($this->errorGutscheincode == false && $this->gutscheincode != "" && (TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_ALL || TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_PRODUCT)) : ?>
                                 <tr>
-                                    <td align="right" class="grey"></td>
-                                    <td align="right" class="grey">
+                                    <td class="text-right" class="grey"></td>
+                                    <td class="text-right" class="grey">
                                         <strong><?php echo $this->translate('abzgl. Gutschein'); ?>:</strong>
                                     </td>
-                                    <td align="right" style="width:21%" class="grey">
+                                    <td class="text-right" class="grey">
                                         <?php echo $this->currency->toCurrency($this->gutscheincodeabzugnetto) ?> (<?php echo $this->currency->toCurrency($this->gutscheincodeabzug) ?>)
                                     </td>
                                 </tr>
@@ -137,45 +124,45 @@
                                 <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php foreach ($this->mwertalle as $key => $mw) : ?>
                                     <tr>
 
-                                        <td align="right">
+                                        <td class="text-right">
                                             <?php echo $this->translate('enth. MwSt.'); ?> <?= $key ?>%:
                                         </td>
-                                        <td align="right">
+                                        <td class="text-right">
 
                                         </td>
-                                        <td align="right" style="width:21%">
+                                        <td class="text-right" style="">
                                             <?php echo $this->currency->toCurrency($mw) ?>
                                         </td>
                                     </tr>
                                 <?php endforeach; ?><?php } ?>
                                 <?php if(!$this->designsettings()->get('display_no_price')) { ?><tr class="brutto">
 
-                                    <td align="right" class="well">
+                                    <td class="text-right bg-gray-300 p-1 text-lg">
                                         <h4><?php echo $this->translate('Gesamtbetrag'); ?>:<?php /*echo $this->currency->toCurrency($this->brutto / 1.19)*/ ?></h4>
                                     </td>
-                                    <td class="well">
+                                    <td class="text-right bg-gray-300 p-1 text-lg">
                                         &nbsp;
                                     </td>
-                                    <td align="right" style="width:21%" class="well">
+                                    <td class="text-right bg-gray-300 p-1 text-lg">
                                     <h4><?php echo $this->currency->toCurrency($this->brutto) ?></h4>
                                     </td>
                                 </tr><?php } ?>
                                 <?php if ($this->errorGutscheincode == false && $this->gutscheincode != "" && (TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_ALL || TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_PRODUCT)) : ?>
                                     <tr>
-                                        <td align="right" class="grey"></td>
-                                        <td align="right" class="grey">
+                                        <td class="text-right" class="grey"></td>
+                                        <td class="text-right" class="grey">
                                             <strong><?php echo $this->translate('abzgl. Gutschein'); ?>:</strong>
                                         </td>
-                                        <td align="right" style="width:21%" class="grey">
+                                        <td class="text-right" style="" class="grey">
                                             <?php echo $this->currency->toCurrency($this->gutscheincodeabzug) ?>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td align="right" class="grey abstand"></td>
-                                        <td align="right" class="grey abstand bg-success text-white">
+                                        <td class="text-right bg-gray-300 p-1 text-lg"></td>
+                                        <td class="text-right bg-gray-300 p-1 text-lg">
                                             <strong><?php echo $this->translate('Preis abzgl. Gutschein'); ?>:</strong>
                                         </td>
-                                        <td align="right" style="width:21%" class="grey bg-success text-white abstand lastcolumn">
+                                        <td class="text-right bg-gray-300 p-1 text-lg">
                                             <?php echo $this->currency->toCurrency($this->productbruttogutschein) ?>
                                         </td>
                                     </tr>
@@ -184,146 +171,40 @@
                     </form>
                     <form action="<?php echo $this->redirect_ssl_path ?>/basket/review" method="GET" class="niceform" enctype="multipart/form-data" id="form-demo">
                         <?php if ($this->shop->basketfield1) : ?>
-                            <tr class="brutto">
+                            <tr>
 
-                                <td align="right">
+                                <td class="text-right">
                                     
                                 </td>
-                                <td style="width:21%" colspan="2">
+                                <td colspan="2">
                                 <?php echo $this->translate($this->shop->basketfield1) ?><br />
-                                    <textarea style="width: 100%;" name="basketfield1"><?php echo $this->basketfield1 ?></textarea>
+                                    <textarea class="border bg-gray-200 text-black p-2 w-full border-gray-300" name="basketfield1"><?php echo $this->basketfield1 ?></textarea>
                                 </td>
                             </tr>
                         <?php endif; ?>
                         <?php if ($this->shop->basketfield2) : ?>
-                            <tr class="brutto">
+                            <tr>
 
-                                <td align="right">
+                                <td class="text-right">
                                     
                                 </td>
-                                <td style="width:21%" colspan="2">
+                                <td colspan="2">
                                 <?php echo $this->translate($this->shop->basketfield2) ?><br />
-                                    <textarea style="width: 100%;" name="basketfield2"><?php echo $this->basketfield2 ?></textarea>
+                                    <textarea class="border bg-gray-200 text-black p-2 w-full border-gray-300" name="basketfield2"><?php echo $this->basketfield2 ?></textarea>
                                 </td>
                             </tr>
                         <?php endif; ?>
                         </table>
 
-                        <div style="clear:both"></div>
-
-                        <div class="basketButtons pull-right">
-                            <input type="submit" class="btn btn-info btn-lg" title="weiter" onclick="location.href='/';return false;" value="<?php echo $this->translate('weiter einkaufen') ?>" />
-                            <input type="submit" class="btn btn-success btn-lg" title="bestellen" value="<?php echo $this->translate('Zur Kasse gehen') ?>" />
+                        <div class="mt-5 text-right">
+                            <input type="submit" class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black p-2 pl-5 pr-5 rounded-full disabled bg-slate-200 " title="weiter" onclick="location.href='/';return false;" value="<?php echo $this->translate('weiter einkaufen') ?>" />
+                            <input type="submit" class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight " title="bestellen" value="<?php echo $this->translate('Zur Kasse gehen') ?>" />
                         </div>
                     </form>
 
 
                 </div>
-                <!-- //Mobileview -->
-                <div class="col-lg-12 mobilebasketprice">
-                                    <h4 class="h4netprice"><?php echo $this->translate('Produktsumme Brutto'); ?>: <span class="basket_netprice pull-right"><?php echo $this->currency->toCurrency($this->productbrutto) ?></span></h4>
-                <form action="<?php echo $this->redirect_ssl_path ?>/basket" method="post" class="niceform" enctype="multipart/form-data">
-
-
-                        <?php echo $this->translate('zzgl. Versand'); ?>:
-                                            <span class="shippingprice pull-right"><?php echo $this->currency->toCurrency($this->versandbrutto) ?></span>
-                            <select name="shippingtype" onchange="javascript:this.form.submit()" class="formpaymenttype pull-right">>
-                        <?php foreach ($this->shippingtype as $shippingtype) : ?>
-                            <option value="<?php echo $shippingtype['id'] ?>" <?php echo ($shippingtype['id'] == $this->shippingselected) ? 'selected="selected"' : '' ?>><?php echo $shippingtype['title'] ?></option>
-                        <?php endforeach; ?>
-                            </select>
-                                            <hr class="transparenthr" />  
-                                            <?php echo $this->shippingtypeselected['description'] ?>
-
-                                            <hr class="transparenthr" />                                        
-   
-
-
-                        <?php if (!$this->no_payment) : ?>
-                                            <?php echo $this->translate('zzgl. Zahlart'); ?>:
-                                            <span class="paymentprice pull-right"><?php echo $this->currency->toCurrency($this->paymentwertbrutto) ?></span>
-                            <select name="paymenttype" onchange="javascript:this.form.submit()" class="formpaymenttype pull-right">
-                        <?php foreach ($this->paymenttype as $paymenttype) : ?>
-                            <option value="<?php echo $paymenttype['id'] ?>" <?php echo ($paymenttype['id'] == $this->paymentselected) ? 'selected="selected"' : '' ?>><?php echo $paymenttype['title'] ?></option>
-                        <?php endforeach; ?>
-                        <?php foreach ($this->paymenttypecontact as $paymenttype) : ?>
-                            <option value="<?php echo $paymenttype['id'] ?>" <?php echo ($paymenttype['id'] == $this->paymentselected) ? 'selected="selected"' : '' ?>><?php echo $paymenttype['title'] ?></option>
-                        <?php endforeach; ?>
-                            </select>
-                                            
-                                            <hr class="transparenthr" />
-                                            <span class="paymenttypdescription"><?php echo $this->paymenttypeselected['description'] ?></span>
-                                            <hr class="transparenthr" />
-                        <?php endif; ?>                
-
-                        <?php if (!$this->designsettings()->get('b2bshop')) : ?>
-                            <div class="control-group">
-                                <label for="basket_voucher" class="control-label"><?php echo $this->translate('Gutscheincode') ?></label>
-                                <div class="controls">    
-                                    <input type="text" name="gutscheincode" value="<?php echo $this->gutscheincode ?>" class="basketmobileform" />
-                                </div>
-                            </div>
-                            <div class="control-group clearfix">
-                        <?php if((isset($_POST["gutscheincode"]) AND $_POST["gutscheincode"] != "") AND $this->gutscheincode == "") { ?>
-                            <strong class="danger">Gutscheincode ungültig</strong>
-                        <?php } ?>
-                                <div class="controls pull-right">   
-                                    <input class="btn vouchersubmit" type="submit" value="<?php echo $this->translate('Einlösen') ?>" />
-                                </div>
-                            </div>
-                        <?php endif; ?>
-                        
-                        
-                        <?php if ($this->errorGutscheincode == false && $this->gutscheincode != "" && (TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_ALL || TP_Basket::getBasket()->getGutscheinAbzugTyp() == TP_Basket::GUTSCHEIN_PRODUCT)) : ?>
-                                            <hr class="transparenthr" />
-                                            <?php echo $this->translate('abzgl. Gutschein'); ?>: <span class="basketvoucherprice pull-right"><?php echo $this->currency->toCurrency($this->gutscheincodeabzug) ?></span><br />
-                                            <?php echo $this->translate('Preis abzgl. Gutschein'); ?>: <span class="basketvoucherprice pull-right"><?php echo $this->currency->toCurrency($this->productbruttogutschein) ?></span>
-                        <?php endif; ?>
-                        <hr class="transparenthr" />
-                            <div class="control-group">
-                        <?php foreach ($this->mwertalle as $key => $mw) : ?>
-                            <span class="basketVattxt"><?php echo $this->translate('enth. MwSt.'); ?><?= $key ?>%:</span> <span class="basketVatprice pull-right"><?php echo $this->currency->toCurrency($mw) ?></span><br />
-                        <?php endforeach; ?>
-                            </div>
-                            <h4 class="h4grossprice"><?php echo $this->translate('Gesamtsumme Brutto'); ?>:<?php /*echo $this->currency->toCurrency($this->brutto / 1.19)*/ ?> <span class="basket_grossprice pull-right"><?php echo $this->currency->toCurrency($this->brutto) ?></span></h4>
-                </form>
-                    <form action="<?php echo $this->redirect_ssl_path ?>/basket/review" method="GET" class="niceform" enctype="multipart/form-data" id="basketformmobile">
-                        <?php if ($this->shop->basketfield1) : ?>
-                            <div class="control-group">
-                                <label for="basket_fild1" class="control-label"><?php echo $this->shop->basketfield1 ?></label>
-                                <div class="controls">  
-                                    <textarea name="basketfield1"><?php echo $this->basketfield1 ?></textarea>
-                                </div>
-                            </div>
-                        <?php endif; ?>
-                        <?php if ($this->shop->basketfield2) : ?>
-                            <div class="control-group">
-                                <label for="basket_fild2" class="control-label"><?php echo $this->shop->basketfield2 ?></label>
-                                <div class="controls">  
-                                    <textarea name="basketfield2"><?php echo $this->basketfield2 ?></textarea>
-                                </div>
-                            </div>
-                        <?php endif; ?>
-                        <div class="basketButtons pull-right">
-                            <input type="submit" class="btn btn-info btn-lg" title="weiter" onclick="location.href='/';return false;" value="<?php echo $this->translate('weiter einkaufen') ?>" />
-                            <input type="submit" class="btn btn-success btn-lg" title="bestellen" value="<?php echo $this->translate('Zur Kasse gehen') ?>" />
-                        </div>
-                    </form>
-                </div><!-- //mobilebasketprice -->
-            </div>
-            <!-- //row -->
-            <!--
-        <script type="text/javascript">
-        $(document).ready( function() {
-            $('.myaddress select').dropkick({
-                                change: function (value, label) {
-                                                $(this).closest("form").submit();
-                                        }
-                });
-        });
-        </script>
-        -->
-        </div> <!-- // WK ausgabe class="btn-group basket col-xs-12 col-md-9 col-md-offset-3" -->
+      </div>
 
     <?php endif; ?>
 </div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/basket/review.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/basket/review.phtml
index 641e1a501..069e3ba22 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/basket/review.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/basket/review.phtml
@@ -1,102 +1,59 @@
+<div class=" md:w-2/4 m-auto">
 <?php
 $this->headScript()->prependFile('/scripts/underscore.js');
-$this->headScript()->prependFile('/' . $this->designPath . '/basket/review.js');
+$this->headScript()->prependFile('/' . $this->designPath . '/js/review.js');
 ?>
-<style>
-form#register {
-    width: 100%;
-}
-
-.radio, .checkbox {
-    display: block;
-    min-height: 20px;
-    padding-left: 0px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    vertical-align: left;
-}
-form#updateaddress {
-    width: 100%;
-}
-form#register input, form#register select, form#updateaddress input, form#updateaddress select {
-    height: 26px;
-}
-.btn-group-xs>.btn, .btn-xs {
-    padding: 0.35rem 0.4rem 0.25rem 0.4rem;
-    font-size: 1.5rem;
-    line-height: .5;
-    border-radius: 0.2rem;
-}
-a.editAddress.btn.btn-info.btn-xs {
-    margin-bottom: 10px;
-}
-    ul.breadcrumb {
-    display: none;
-}
-.btn-group.basket.col-xs-12 {
-    margin-top: 20px;
-}
-</style>
 <div class="review_index">
 
-
-
-    <!--<div class="page-header col-xs-12"><?php echo $this->translate('Warenkorb / Bestellung') ?></div>-->
-
-
-
     <?php if ($this->basketIsEmpty) : ?>
 
-        <div class="basket col-xs-12">
-            <div class="alert alert-danger" style="min-height:2em;"><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung möglich.') ?></div>
+        <div class="text-center bg-indigo-500 p-2">
+            <div class="text-white" style=""><?php echo $this->translate('Sie haben keine Artikel im Warenkorb. Keine Bestellung möglich.') ?></div>
         </div>
 
-        <div class="col-xs-10 col-xs-offset-1" style="margin-bottom:7em;">
-            <h3>Vielleicht möchten Sie einfach auf der Startseite beginnen?</h3>
+        <div class="mt-5" style="">
+            <h3><?php echo $this->translate('Vielleicht möchten Sie einfach auf der Startseite beginnen?')?></h3>
             <br>
-            <a class="btn btn-lg btn-success" href="/" title="<?= $this->shop->name; ?>: zur Startseite">Zur Startseite</a>
+            <a class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight " href="/" title="<?= $this->shop->name; ?>: zur Startseite"><?php echo $this->translate('Zur Startseite') ?></a>
         </div>
 
     <?php else : ?>
 
-        <div class="btn-group basket col-xs-12">
-            <a class="btn btn-success" href="/basket">
+        <div class="md:flex bg-white mb-4 mt-4 border">
+            <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
-            </a>
-            <label class="btn btn-success active">
+            </label>
+            <label class="bg-highlight md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>
             </label>
-            <label class="btn btn-default">
+            <label class="md:flex-1 md:p-4">
                 <h4><?php echo $this->translate('Schritt') ?> 3: <?php echo $this->translate('AGB') ?></h4><?php echo $this->translate('Bestätigen und bestellen') ?>
             </label>
         </div>
 
     <?php endif; ?>
 
-
-<div class="row" style="display:block;">
-    <form action="/basket/review" class="niceform basket" method="post" enctype="multipart/form-data" id="review-form">
-
-
-        <div class="col-sm-4 invoice">
-            <div class="well">
-                <h4><?php echo $this->translate('Rechnungsadresse') ?></h4>
-                <p id="invoiceaddresstext">
-                    <?php if ($this->invoice_address->getCompany() != "") : ?><?php echo $this->invoice_address->getCompany() ?></br><?php endif; ?>
-                    <?php if ($this->invoice_address->getCompany2() != "") : ?><?php echo $this->invoice_address->getCompany2() ?><br /><?php endif; ?>
-                    <?php if ($this->invoice_address->getFirstname() != "" || $this->invoice_address->getLastname() != ""): ?><?php echo $this->invoice_address->getAnrede() ?> <?php echo $this->invoice_address->getFirstname() ?> <?php echo $this->invoice_address->getLastname() ?><br /><?php endif; ?>
-                    <?php if ($this->invoice_address->getAbteilung() != "") : ?><?php echo $this->invoice_address->getAbteilung() ?><br /><?php endif; ?>
-                <?php echo $this->invoice_address->getStreet() ?> <?php echo $this->invoice_address->getHouseNumber() ?>
-                <br /><?php echo $this->invoice_address->getCountry() ?> <?php echo $this->invoice_address->getZip() ?> <?php echo $this->invoice_address->getCity() ?>
-                </p>
-                <p><button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#myInvoice" onclick="return false;"><?php echo $this->translate('Ändern') ?></button></p>
+    <form action="/basket/review" class="" method="post" enctype="multipart/form-data" id="review-form">
+        <div class="md:flex gap-3"> 
+            <div class="flex-1">
+                <div class="bg-gray-200 p-2 h-full">
+                    <h4 class="text-lg font-medium"><?php echo $this->translate('Rechnungsadresse') ?></h4>
+                    <p id="invoiceaddresstext">
+                        <?php if ($this->invoice_address->getCompany() != "") : ?><?php echo $this->invoice_address->getCompany() ?></br><?php endif; ?>
+                        <?php if ($this->invoice_address->getCompany2() != "") : ?><?php echo $this->invoice_address->getCompany2() ?><br /><?php endif; ?>
+                        <?php if ($this->invoice_address->getFirstname() != "" || $this->invoice_address->getLastname() != ""): ?><?php echo $this->invoice_address->getAnrede() ?> <?php echo $this->invoice_address->getFirstname() ?> <?php echo $this->invoice_address->getLastname() ?><br /><?php endif; ?>
+                        <?php if ($this->invoice_address->getAbteilung() != "") : ?><?php echo $this->invoice_address->getAbteilung() ?><br /><?php endif; ?>
+                    <?php echo $this->invoice_address->getStreet() ?> <?php echo $this->invoice_address->getHouseNumber() ?>
+                    <br /><?php echo $this->invoice_address->getCountry() ?> <?php echo $this->invoice_address->getZip() ?> <?php echo $this->invoice_address->getCity() ?>
+                    </p>
+                    <p><button type="button" id="invoiceEdit" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white "><?php echo $this->translate('Ändern') ?></button></p>
+                </div>
             </div>
-        </div>
 
         <?php if ($this->shop->display_delivery) : ?>
-            <div class="col-sm-4 delivery">
-                <div class="well">
-                    <h4><?php echo $this->translate('Lieferadresse') ?></h4>
+            <div class="flex-1 delivery">
+                <div class="bg-gray-200 p-2 h-full">
+                    <h4 class="text-lg font-medium"><?php echo $this->translate('Lieferadresse') ?></h4>
                     <div id="differentdeliverydiv" style="">
                         <p id="deliveryaddresstext">
                             <?php if ($this->delivery_address->getCompany() != "") : ?><?php echo $this->delivery_address->getCompany() ?><br /><?php endif; ?>
@@ -106,8 +63,8 @@ a.editAddress.btn.btn-info.btn-xs {
                         <?php echo $this->delivery_address->getStreet() ?> <?php echo $this->delivery_address->getHouseNumber() ?>
                         <br /><?php echo $this->delivery_address->getCountry() ?> <?php echo $this->delivery_address->getZip() ?> <?php echo $this->delivery_address->getCity() ?>
                         </p>
-                        <p><button type="submit" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#myDelivery" onclick="return false;"><?php echo $this->translate('Ändern') ?></button></p>
-                        <p><button type="button" id="sameDeliveryAsInvoice" class="btn btn-sm btn-info"><?php echo $this->translate('Gleich wie Rechnungsadresse') ?></button></p>
+                        <p><button type="button" id="deliveryEdit" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " data-toggle="modal" data-target="#myDelivery" onclick="return false;"><?php echo $this->translate('Ändern') ?></button></p>
+                        <p><button type="button" id="sameDeliveryAsInvoice" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 text-xs rounded-full disabled bg-highlight "><?php echo $this->translate('Gleich wie Rechnungsadresse') ?></button></p>
                     </div>
                 </div>
             </div>
@@ -115,9 +72,9 @@ a.editAddress.btn.btn-info.btn-xs {
 
 
         <?php if ($this->shop->display_sender) : ?>
-            <div class="col-sm-4  sender">
-                <div class="well">
-                    <h4><?php echo $this->translate('Absenderadressen auf Paketschein') ?></h4>
+            <div class="flex-1  sender">
+                <div class="bg-gray-200 p-2 h-full">
+                    <h4 class="text-lg font-medium"><?php echo $this->translate('Absenderadressen auf Paketschein') ?></h4>
                     <div id="differentsenderdiv">
                         <p id="senderaddresstext">
                             <?php if ($this->sender_address->getCompany() != "") : ?><?php echo $this->sender_address->getCompany() ?><br /><?php endif; ?>
@@ -127,22 +84,18 @@ a.editAddress.btn.btn-info.btn-xs {
                         <?php echo $this->sender_address->getStreet() ?> <?php echo $this->sender_address->getHouseNumber() ?>
                         <br /><?php echo $this->sender_address->getCountry() ?> <?php echo $this->sender_address->getZip() ?> <?php echo $this->sender_address->getCity() ?>
                         </p>
-                        <p><button type="submit" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#mySender" onclick="return false;"><?php echo $this->translate('Ändern') ?></button></p>
-                        <p><button type="button" id="sameSenderAsShop" class="btn btn-sm btn-info"><?php echo $this->translate('Shopadresse benutzen') ?></button></p>
+                        <p><button type="submit" id="senderEdit" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " data-toggle="modal" data-target="#mySender" onclick="return false;"><?php echo $this->translate('Ändern') ?></button></p>
+                        <p><button type="button" id="sameSenderAsShop" class="w-full transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 text-xs rounded-full disabled bg-highlight "><?php echo $this->translate('Shopadresse benutzen') ?></button></p>
                     </div>
                 </div>
             </div>
         <?php endif; ?>
-
-
+        </div>
         <input id="delivery" type="hidden" name="delivery" value="<?php echo $this->delivery ?>" />
         <input id="sender" type="hidden" name="sender" value="<?php echo $this->sender ?>" />
         <input id="invoice" type="hidden" name="invoice" value="<?php echo $this->invoice ?>" />
 
-
-
-        <div class="col-xs-12"><input id="review_next" type="submit" value="<?php echo $this->translate('Weiter') ?>" class="btn btn-success btn-lg pull-right" style="margin-right: 15px;" /></div>
-        <div class="clearfix" style="margin-top:2em;margin-bottom:2em;"></div>
+        <div class="mt-2 text-right"><input id="review_next" type="submit" value="<?php echo $this->translate('Weiter') ?>" class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight " style="" /></div>
     </form>
 </div>
 
@@ -157,34 +110,21 @@ a.editAddress.btn.btn-info.btn-xs {
                 <br /><?php echo $this->sender_address_shop->getCountry() ?> <?php echo $this->sender_address_shop->getZip() ?> <?php echo $this->sender_address_shop->getCity() ?>
     </p>
 
-
-
-
-
-
-
-    <!-- \\\\\\\\\\ Modals ////////////// -->
-
-    <!-- \\\\\\\\\\ myInvoice - Rechnungsadresse  ////////////// -->
-    <div class="modal fade" id="myInvoice" tabindex="-1" role="dialog" aria-labelledby="myInvoiceLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Schließen</span></button>
-                    <div style="float: right; margin-right: 40px;"><input class="search" placeholder="Search" style="" /><button class="btn btn-sm">Suche</button></div>
-                    <h4 class="modal-title" id="myInvoiceLabel"><?php echo $this->translate('Rechnungsadresse auswählen') ?></h4>
+    <div class="hidden fixed left-0 top-0 flex justify-center items-center bg-black bg-opacity-50 text-sm w-screen h-screen z-20" id="addresses">
+        <div class="bg-white rounded shadow-md p-1 md:p-8 md:w-[60%] w-[99%] m-auto">
+            <div class="">
+                <div class="float-right mb-1">
+                    <input class="searchTerm border border-r-0 border-gray-300 p-1" placeholder="Search" style="" /><button class="searchButton border border-gray-300 text-black p-1">Suche</button>
                 </div>
-                <div class="modal-body">
-                    <table class="table table-striped">
+                <h4 class="text-lg mb-1"><?php echo $this->translate('Adresse auswählen') ?></h4>
+                <div class="">
+                    <table class="w-full table-auto">
                         <thead>
                             <tr>
-                                <!--<th><?php echo $this->translate('KundenNr') ?></th>-->
-                                <th><?php echo $this->translate('Firma/Kd.Nr') ?></th>
-                                <!--<th><?php echo $this->translate('Firma Zusatz') ?></th>-->
-                                <th><?php echo $this->translate('Name') ?></th>
-                                <th><?php echo $this->translate('Adresse') ?></th>
-                                <!--<th><?php echo $this->translate('Land') ?></th>-->
-                                <th align="right"></th>
+                                <th class="bg-gray-200 text-left p-1"><?php echo $this->translate('Firma/Kd.Nr') ?></th>
+                                <th class="bg-gray-200 text-left p-1"><?php echo $this->translate('Name') ?></th>
+                                <th class="bg-gray-200 text-left p-1"><?php echo $this->translate('Adresse') ?></th>
+                                <th class="bg-gray-200 text-left p-1"></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -192,184 +132,50 @@ a.editAddress.btn.btn-info.btn-xs {
                         </tbody>
                     </table>
                 </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $this->translate('Schließen') ?></button>
-                    <button class="btn btn-primary" data-toggle="modal" data-target="#addAdress"><?php echo $this->translate('Adresse hinzufügen') ?></button>
-                </div>
+            </div>
+            <div class="flex justify-end gap-4 mt-5">
+                <button type="button" class="closeButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200" ><?php echo $this->translate('Schließen') ?></button>
+                <button type="submit" class="addButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200" ><?php echo $this->translate('Adresse hinzufügen') ?></button>
             </div>
         </div>
     </div>
 
-
-
-
-
-
-    <!-- \\\\\\\\\\ myDelivery - Lieferadresse ////////////// -->
-    <!-- Modal -->
-    <div class="modal fade" id="myDelivery" tabindex="-1" role="dialog" aria-labelledby="myDeliveryLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Schließen</span></button>
-                    <div style="float: right; margin-right: 40px;"><input class="search" placeholder="Search" style="" /><button class="btn btn-sm">Suche</button></div>
-                    <h4 class="modal-title" id="myDeliveryLabel"><?php echo $this->translate('Lieferadresse auswählen') ?></h4>
-                </div>
-                <div class="modal-body">
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <!--<th><?php echo $this->translate('KundenNr') ?></th>-->
-                                <th><?php echo $this->translate('Firma/Kd.Nr') ?></th>
-                                <!--<th><?php echo $this->translate('Firma Zusatz') ?></th>-->
-                                <th><?php echo $this->translate('Name') ?></th>
-                                <th><?php echo $this->translate('Adresse') ?></th>
-                                <!--<th><?php echo $this->translate('Land') ?></th>-->
-                                <th align="right"></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-
-                        </tbody>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $this->translate('Schließen') ?></button>
-                    <button type="submit" class="btn btn-primary" data-toggle="modal" data-target="#addAdress"><?php echo $this->translate('Adresse hinzufügen') ?></button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-
-    <!-- \\\\\\\\\\ mySender - Absender ////////////// -->
-    <!-- Modal -->
-    <div class="modal fade" id="mySender" tabindex="-1" role="dialog" aria-labelledby="meinmySender" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Schließen</span></button>
-                    <div style="float: right; margin-right: 40px;"><input class="search" placeholder="Search" style="" /><button class="btn btn-sm">Suche</button></div>
-                    <h4 class="modal-title" id="meinmySender"><?php echo $this->translate('Absenderadresse auswählen') ?></h4>
-                </div>
-                <div class="modal-body">
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                            <!--<th><?php echo $this->translate('KundenNr') ?></th>-->
-                                <th><?php echo $this->translate('Firma/Kd.Nr') ?></th>
-                                <!--<th><?php echo $this->translate('Firma Zusatz') ?></th>-->
-                                <th><?php echo $this->translate('Name') ?></th>
-                                <th><?php echo $this->translate('Adresse') ?></th>
-                                <!--<th><?php echo $this->translate('Land') ?></th>-->
-                                <th align="right"></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-
-                        </tbody>
-                    </table>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $this->translate('Schließen') ?></button>
-                    <button type="submit" class="btn btn-primary" data-toggle="modal" data-target="#addAdress"><?php echo $this->translate('Adresse hinzufügen') ?></button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-
     <!-- \\\\\\\\\\ addAdress - Adresse hinzufügen ////////////// -->
-    <div class="modal fade" id="addAdress" tabindex="-1" role="dialog" aria-labelledby="addAdressLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Schließen</span></button>
-                    <h4 class="modal-title" id="addAdressLabel"><?php echo $this->translate('Adresse einfügen') ?></h4>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <?php
-                        $this->form->removeElement('submit');
-                        EasyBib_Form_Decorator::setFormDecorator($this->form, \EasyBib_Form_Decorator::BOOTSTRAP, 'submit');
-                        ?>
-                        <form id="register" enctype="application/x-www-form-urlencoded" action="" method="post" role="form" style="padding:0 2em">
-                            <div class="col-sm-6">
-
-                                <?php
-                                $i = 0;
-                                foreach ($this->form->getElements() as $element) : ?>
-                                    <?php if ($i == 7) : ?></div>
-                            <div class="col-sm-6"><?php endif; ?>
-                            <?php echo str_replace(array('control-group', 'control-label', 'class="controls"'), array('form-group', 'form-label', 'class="form-controls"'), $element->render()); ?>
-                        <?php
-                                    $i++;
-                                endforeach; ?>
-                            </div>
-                        </form>
-                        <br class="clearfix">
+    <div class="hidden fixed left-0 top-0 flex justify-center items-center bg-black bg-opacity-50 text-sm w-screen h-screen z-20" id="addAddressModal">
+        <div class="bg-white rounded shadow-md p-1 md:p-8 md:w-[60%] w-[99%] m-auto">
+        <div class="">
+            <h4 class="text-lg mb-1"><?php echo $this->translate('Adresse hinzufügen') ?></h4>
+                <div class="">
+                    <div class="columns-2">
+                        <?= $this->partial('completeform.phtml', array('buttonName' => '', 'buttonClass' => '', 'form' => $this->form)) ?>
                     </div>
+
                 </div>
-                <div class="modal-footer">
-                    <a id="saveAdresse" class="btn btn-primary" href="#saveAdresse"><?php echo $this->translate('Adresse speichern') ?></a>
-                    <a href="#" class="btn  btn-default" data-dismiss="modal"><?php echo $this->translate('Abbrechen') ?></a>
+                <div class="flex justify-end gap-4 mt-5">
+                    <button type="button" class="closeAddButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200"><?php echo $this->translate('Abbrechen') ?></button>
+                    <button type="button" class="saveAddButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200"><?php echo $this->translate('Änderungen speichern') ?></button>
                 </div>
             </div>
         </div>
     </div>
 
-
-
-
     <!-- \\\\\\\\\\ editAdresse - Adresse bearbeiten ////////////// -->
     <!-- Modal -->
-    <div class="modal fade" id="editAdresse" tabindex="-1" role="dialog" aria-labelledby="editAdresseLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Schließen</span></button>
-                    <h4 class="modal-title" id="editAdresseLabel"><?php echo $this->translate('Adresse bearbeiten') ?></h4>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <?php
-                        $this->editform->removeElement('update');
-                        EasyBib_Form_Decorator::setFormDecorator($this->editform, \EasyBib_Form_Decorator::BOOTSTRAP, 'update');
-                        ?>
-                        <input type="hidden" value="" name="editaddressuuid" id="editaddressuuid" />
-
-                        <form id="updateaddress" name="updateaddress" enctype="application/x-www-form-urlencoded" class="form-horizontal" action="" method="post" role="form" style="padding:0 2em">
-
-                            <div class="col-sm-6">
-                                <?php
-                                $i = 0;
-                                foreach ($this->editform->getElements() as $element) : ?>
-                                    <?php if ($i == 7) : ?></div>
-                            <div class="col-sm-6"><?php endif; ?>
-                            <?php echo str_replace(array('control-group', 'control-label', 'class="controls"'), array('form-group', 'form-label', 'class="form-controls"'), $element->render()); ?>
-                        <?php
-                                    $i++;
-                                endforeach; ?>
-                            </div>
-
-
-                        </form>
-                        <br class="clearfix">
-
+    <div class="hidden fixed left-0 top-0 flex justify-center items-center bg-black bg-opacity-50 text-sm w-screen h-screen z-20" id="editAddressModal">
+        <div class="bg-white rounded shadow-md p-1 md:p-8 md:w-[60%] w-[99%] m-auto">
+        <div class="">
+            <h4 class="text-lg mb-1"><?php echo $this->translate('Adresse bearbeiten') ?></h4>
+                <div class="">
+                    <div class="columns-2">
+                        <?= $this->partial('completeform.phtml', array('buttonName' => '', 'buttonClass' => '', 'form' => $this->editform)) ?>
                     </div>
 
                 </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $this->translate('Abbrechen') ?></button>
-                    <button type="submit" class="btn btn-primary" id="saveEditAdresse"><?php echo $this->translate('Änderungen speichern') ?></button>
+                <div class="flex justify-end gap-4 mt-5">
+                    <button type="button" class="closeEditButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200"><?php echo $this->translate('Abbrechen') ?></button>
+                    <button type="button" class="saveEditButton bg-gray-100 border border-gray-300 px-6 py-2 rounded text-black hover:bg-gray-200"><?php echo $this->translate('Änderungen speichern') ?></button>
                 </div>
             </div>
         </div>
     </div>
-
-
 </div>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/completeform.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/completeform.phtml
index 2aea3baae..ebe7e9efc 100644
--- a/src/old/application/design/vorlagen/tailwindcss/templates/completeform.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/completeform.phtml
@@ -2,5 +2,5 @@
   <?php if(count($this->form->getSubForms()) > 0): ?><div class="md:columns-2"><?php endif; ?>
 	<?= $this->partial('form.phtml', array('appendixName' => '', 'prefixName' => '', 'form' => $this->form)) ?>
   <?php if(count($this->form->getSubForms()) > 0): ?></div><?php endif; ?>
-  <button class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black <?php echo $this->buttonClass ?> border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" type="submit"><?php echo $this->buttonName ?></button>
+  <?php if($this->buttonName != ""): ?>  <button class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black <?php echo $this->buttonClass ?> border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" type="submit"><?php echo $this->buttonName ?></button> <?php endif; ?>
 </form>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/form.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/form.phtml
index 3d40ef8a6..6eec83336 100644
--- a/src/old/application/design/vorlagen/tailwindcss/templates/form.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/form.phtml
@@ -9,7 +9,7 @@
 		<label class="block text-gray-700 text-sm font-bold mb-2" for="<?php echo $element->getId() ?>">
       <?php echo $element->getLabel() ?>
     </label>
-		<input class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-slate-200<?php endif; ?> bg-slate-50 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>" type="password" value="<?php echo $element->getValue() ?>"/>
+		<input class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-gray-300<?php endif; ?> bg-gray-200 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>" type="password" value="<?php echo $element->getValue() ?>"/>
 		<?php foreach($element->getMessages() as $message): ?>
 		<p class="text-sm text-red-500"><?php echo $message ?></span>
 		<?php endforeach; ?>
@@ -20,7 +20,7 @@
 		<label class="block text-gray-700 text-sm font-bold mb-2" for="<?php echo $element->getId() ?>">
       <?php echo $element->getLabel() ?>
     </label>
-		<input class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-slate-200<?php endif; ?> bg-slate-50 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>" type="text" value="<?php echo $element->getValue() ?>"/>
+			<input <?php if($element->isRequired()): ?>required<?php endif; ?> class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-gray-300<?php endif; ?> bg-gray-200 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>" type="text" value="<?php echo $element->getValue() ?>"/>
 		<?php foreach($element->getMessages() as $message): ?>
 		<p class="text-sm text-red-500"><?php echo $message ?></span>
 		<?php endforeach; ?>
@@ -37,7 +37,7 @@
     <?php $element->setValue($element->getCaptcha()->generate()); ?>
 		<div class="flex">
 		<input name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>[id]" id="<?php echo $element->getId() ?>" type="hidden" value="<?php echo $element->getValue() ?>"/>
-		<input class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-slate-200<?php endif; ?> bg-slate-50 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>[input]" id="<?php echo $element->getId() ?>" type="text" value=""/>
+		<input class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-gray-300<?php endif; ?> bg-gray-200 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>[input]" id="<?php echo $element->getId() ?>" type="text" value=""/>
 	  <?php echo $element->getCaptcha()->render(); ?>
 		</div>
 		<?php foreach($element->getMessages() as $message): ?>
@@ -45,12 +45,25 @@
 		<?php endforeach; ?>
   </div>
 	<?php endif; ?>
+	<?php if($element instanceof Zend_Form_Element_MultiCheckbox): ?>
+	<div class="mb-4">
+		<label class="block text-gray-700 text-sm font-bold mb-2" for="<?php echo $element->getId() ?>">
+      <?php echo $element->getLabel() ?>
+    </label>
+    <?php foreach($element->getMultiOptions() as $key => $value): ?>
+        <input type="checkbox" class="mr-1" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>[]" value="<?php echo $key ?>"/><?php echo $value ?>
+    <?php endforeach; ?>
+		<?php foreach($element->getMessages() as $message): ?>
+		<p class="text-sm text-red-500"><?php echo $message ?></span>
+		<?php endforeach; ?>
+	</div>
+  <?php endif; ?>
 	<?php if($element instanceof Zend_Form_Element_Select): ?>
 	<div class="mb-4">
 		<label class="block text-gray-700 text-sm font-bold mb-2" for="<?php echo $element->getId() ?>">
       <?php echo $element->getLabel() ?>
     </label>
-		<select class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-slate-200<?php endif; ?> bg-slate-50 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>">
+		<select class="border <?php if($element->hasErrors()): ?>border-red-500<?php else: ?>border-gray-300<?php endif; ?> bg-gray-200 text-black p-2 w-full" name="<?php echo $this->prefixName ?><?php echo $element->getName() ?><?php echo $this->appendixName ?>" id="<?php echo $element->getId() ?>">
         <?php foreach($element->getMultiOptions() as $key => $value): ?>
           <option value="<?php echo $key ?>"><?php echo $value ?></option>
         <?php endforeach; ?>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/myaddress.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/myaddress.phtml
index 8a06169d4..20bf56080 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/myaddress.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/myaddress.phtml
@@ -2,37 +2,37 @@
 
 <div class="w-3/4 md:w-2/4 m-auto">
 	<h2 class="mb-1 text-lg"><?php echo $this->translate('Rechnungsadressen')?></h2>
-    <div class="relative rounded-xl overflow-auto border bg-slate-50 border-slate-200">
+    <div class="relative rounded-xl overflow-auto border bg-gray-200 border-gray-300">
         <div class="shadow-sm overflow-hidden my-4 ">
             <table class="border-collapse table-auto w-full text-sm">
                 <thead>
                     <tr>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Firma')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Name')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Adresse')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Land')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Firma')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Name')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Adresse')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Land')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php foreach($this->invoice_addresses as $address): ?>
                     <tr class="<?php echo $this->cycle(array("odd","even"))->next() ?>">
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->country ?></td>
-                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-left bg-white flex justify-end">
-                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->country ?></td>
+                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-left bg-white flex justify-end">
+                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
+                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
+                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
                                 </svg>
@@ -44,7 +44,7 @@
             </table>
         </div>
     </div>
-	<div class="mt-5 text-right"><a href="/user/addaddress//1" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
+	<div class="mt-5 text-right"><a href="/user/addaddress//1" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 mr-2">
   <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v6m3-3H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
 </svg>
@@ -52,37 +52,37 @@
         <?php echo $this->translate('Neue Adresse anlegen')?></a></div>
     <?php if($this->shop->display_delivery): ?>
     <h2 class="mb-1 text-lg"><?php echo $this->translate('Lieferadressen')?></h2>
-    <div class="relative rounded-xl overflow-auto border bg-slate-50 border-slate-200">
+    <div class="relative rounded-xl overflow-auto border bg-gray-200 border-gray-300">
         <div class="shadow-sm overflow-hidden my-4 ">
             <table class="border-collapse table-auto w-full text-sm">
                 <thead>
                     <tr>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Firma')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Name')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Adresse')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Land')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Firma')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Name')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Adresse')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Land')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php foreach($this->delivery_addresses as $address): ?>
                     <tr class="<?php echo $this->cycle(array("odd","even"))->next() ?>">
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->country ?></td>
-                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-left bg-white flex justify-end">
-                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->country ?></td>
+                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-left bg-white flex justify-end">
+                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
+                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
+                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
                                 </svg>
@@ -94,7 +94,7 @@
             </table>
         </div>
     </div>
-	<div class="mt-5 text-right"><a href="/user/addaddress//2" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
+	<div class="mt-5 text-right"><a href="/user/addaddress//2" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 mr-2">
   <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v6m3-3H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
 </svg>
@@ -103,37 +103,37 @@
     <?php endif; ?>
     <?php if($this->shop->display_sender): ?>
     <h2 class="mb-1 text-lg"><?php echo $this->translate('Absendeadressen')?></h2>
-    <div class="relative rounded-xl overflow-auto border bg-slate-50 border-slate-200">
+    <div class="relative rounded-xl overflow-auto border bg-gray-200 border-gray-300">
         <div class="shadow-sm my-4 ">
             <table class="border-collapse table-auto w-full text-sm">
                 <thead>
                     <tr>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Firma')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Name')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Adresse')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"><?php echo $this->translate('Land')?></th>
-                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-slate-200 text-left bg-slate-50"></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Firma')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Name')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Adresse')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"><?php echo $this->translate('Land')?></th>
+                    <th class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-0 pb-3 text-slate-400 dark:text-gray-300 text-left bg-gray-200"></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php foreach($this->sender_addresses as $address): ?>
                     <tr class="<?php echo $this->cycle(array("odd","even"))->next() ?>">
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
-                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-base text-left bg-white"><?php echo $address->country ?></td>
-                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-slate-200 text-left bg-white flex justify-end">
-                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $this->text()->truncate_text($address->company,27) ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->firstname . ' ' . $address->lastname ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->street . ' ' . $address->zip ?></td>
+                    <td class="border-b dark:border-slate-600 p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-base text-left bg-white"><?php echo $address->country ?></td>
+                        <td class="border-b dark:border-slate-600 font-medium p-4 pl-8 pt-3 pb-3 text-slate-400 dark:text-gray-300 text-left bg-white flex justify-end">
+                            <a <?php echo ($this->user->standart_invoice == $address->id)? 'title="'.$this->translate('Adresse ist Standard').'" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"': 'title="'.$this->translate('Adresse als Standard setzen').'" class="bg-yellow-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full"'; ?> href="/user/setaddressasdefault/invoice/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
+                            <a title="<?php echo $this->translate('Adresse bearbeiten')?>" class="bg-blue-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/addaddress/<?php echo $address->uuid ?>/1">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                   <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125" />
                                 </svg>
                             </a>
-                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
+                            <a title="<?php echo $this->translate('Adresse l&ouml;schen')?>" class="bg-red-500 border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full" href="/user/deladdress/<?php echo $address->uuid ?>">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
                                 </svg>
@@ -145,7 +145,7 @@
             </table>
         </div>
     </div>
-<div class="mt-5 text-right"><a href="/user/addaddress//3" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-slate-200 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
+<div class="mt-5 text-right"><a href="/user/addaddress//3" class="inline-flex transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black bg-highlight border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 mr-2">
   <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v6m3-3H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
 </svg>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/myorders.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/myorders.phtml
index 902872499..10306b964 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/myorders.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/myorders.phtml
@@ -5,7 +5,7 @@
 
         <?php echo $this->paginationControl($this->paginator, 'Sliding', 'pagination.phtml'); ?>
         <?php $ia = 0; foreach($this->paginator as $order): ?>
-        <div class="border bg-slate-50 rounded border-slate-200 mb-2"> 
+        <div class="border bg-gray-200 rounded border-gray-300 mb-2"> 
             <div class="ml-2 mr-2 mt-2 flex">
                 <div class="basis-2/12"><strong><?php echo $this->translate('Auftragsnummer') ?></strong></div>        
                 <div class="basis-4/12"><strong><?php echo $this->translate('Datum') ?>/<?php echo $this->translate('Besteller') ?></strong></div>    
@@ -15,7 +15,7 @@
                 <div class="basis-1/12"><strong><?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->translate('Zahlart') ?><?php } ?></strong></div>        
                      
             </div>
-            <div class="flex bg-slate-50 ml-2 mr-2 <?php echo $this->cycle(array("even","odd"))->next()?> bg-slate-50">
+            <div class="flex bg-gray-200 ml-2 mr-2 <?php echo $this->cycle(array("even","odd"))->next()?> bg-gray-200">
                 <div class="basis-2/12"><?php echo $order['alias'] ?></div>        
                 <div class="basis-4/12"><?php echo $this->date($order['created'])->toString(Zend_Date::DATE_SHORT) ?><br /><?php echo $order['email'] ?><br /><?php echo $order['contact'] ?></div>
                 <div class="basis-1/12"><?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($order['preisbrutto']+0) ?><?php } ?></div>        
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/myoverview.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/myoverview.phtml
index 7d6b5a9c8..a78d73613 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/myoverview.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/myoverview.phtml
@@ -1,7 +1,7 @@
 <?= $this->partial ( 'user_tabs.phtml', array ('shop' => $this->shop, 'articlegroup' => $this->articlegroup, 'mode' => $this->mode, 'inworkCount' => $this->inworkCount, 'currency' => $this->currency, 'designPath' => $this->designPath ) );?>
 
 <div class="w-3/4 md:w-2/4 m-auto">
-    <div class="border border-slate-200 bg-slate-50 p-2 flex" style="">
+    <div class="border border-gray-300 bg-gray-200 p-2 flex" style="">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 mr-3">
           <path stroke-linecap="round" stroke-linejoin="round" d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
         </svg>
@@ -9,21 +9,21 @@
     </div>
 </div>
 <div class="w-3/4 md:w-2/4 mt-4 md:flex md:space-x-2 m-auto">
-    <div class="flex-1 border border-slate-200 bg-slate-50 p-2">
+    <div class="flex-1 border border-gray-300 bg-gray-200 p-2">
         <h3 class="text-highlight text-lg"><?php echo $this->translate('Zur Startseite')?></h3>
         <a class="underline font-bold" href="/"><?php echo $this->translate("Los geht's")?></a>
     </div>
-    <div class="flex-1 border border-slate-200 bg-slate-50 p-2">
+    <div class="flex-1 border border-gray-300 bg-gray-200 p-2">
         <h3 class="text-highlight text-lg"><?php echo $this->translate('Meine Bestellungen')?></h3>
         <p><?php echo $this->translate('Hier erhalten Sie eine Übersicht über alle Ihre Bestellungen und des jeweiligen Auftragsstatus.')?></p>
         <a class="underline font-bold" href="/user/myorders"><?php echo $this->translate("Los geht's")?></a>
     </div>
-    <div class="flex-1 border border-slate-200 bg-slate-50 p-2">
+    <div class="flex-1 border border-gray-300 bg-gray-200 p-2">
         <h3 class="text-highlight text-lg"><?php echo $this->translate('Meine Logindaten')?></h3>
         <p><?php echo $this->translate('Hier können Sie Ihre Zugangs- und Benutzerdaten sowie Ihre Kontoeinstellungen bearbeiten.')?></p>
         <a class="underline font-bold" href="/user/mysettings"><?php echo $this->translate("Los geht's")?></a>
     </div>
-    <div class="flex-1 border border-slate-200 bg-slate-50 p-2">
+    <div class="flex-1 border border-gray-300 bg-gray-200 p-2">
         <h3 class="text-highlight text-lg"><?php echo $this->translate('Persönliche Produkte')?></h3>
         <p><?php echo $this->translate('Hier gelangen Sie zu den "privatisierten" Produkten, für deren Bestellung Sie ein Sonderrecht haben.')?></p>
         <a class="underline font-bold" href="/article/mypersarticle"><?php echo $this->translate("Los geht's")?></a>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user/mysettings.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user/mysettings.phtml
index d62abd743..4e63ec3ab 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user/mysettings.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user/mysettings.phtml
@@ -1,7 +1,7 @@
 <?= $this->partial ( 'user_tabs.phtml', array ('shop' => $this->shop, 'articlegroup' => $this->articlegroup, 'mode' => $this->mode, 'inworkCount' => $this->inworkCount, 'currency' => $this->currency, 'designPath' => $this->designPath ) );?>
 
 <div class="w-3/4 md:w-2/4 m-auto">
-    <div class="border border-slate-200 bg-slate-50 p-2 flex" style="">
+    <div class="border border-gray-300 bg-gray-200 p-2 flex" style="">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 mr-3">
           <path stroke-linecap="round" stroke-linejoin="round" d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
         </svg>
diff --git a/src/old/application/design/vorlagen/tailwindcss/templates/user_tabs.phtml b/src/old/application/design/vorlagen/tailwindcss/templates/user_tabs.phtml
index f76bba8c3..fbc5488cf 100755
--- a/src/old/application/design/vorlagen/tailwindcss/templates/user_tabs.phtml
+++ b/src/old/application/design/vorlagen/tailwindcss/templates/user_tabs.phtml
@@ -1,12 +1,12 @@
-<div class="border border-slate-200 mt-10 md:w-2/4 mb-4 m-auto">
-   <div class="bg-slate-50 divide-x md:flex w-full text-lg text-center">
-        <div class="flex-auto <?= ($this->mode == 1)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/myoverview"><?= $this->translate('Übersicht', 'text') ?></a></div>
-        <div class="flex-auto <?= ($this->mode == 2)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/mysettings"><?= $this->translate('Meine Einstellungen', 'text') ?></a></div>
-        <div class="flex-auto <?= ($this->mode == 7)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/mydata"><?= $this->translate('Aktuelle Layouterdaten', 'text') ?></a></div>
-        <div class="flex-auto <?= ($this->mode == 6)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/myaddress"><?= $this->translate('Meine Adressen', 'text') ?></a></div>
-        <div class="flex-auto <?= ($this->mode == 3)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/myorders"><?= $this->translate('Meine Bestellungen', 'text') ?></a></div>
+<div class="border border-gray-300 mt-10 md:w-2/4 mb-4 m-auto">
+   <div class="bg-gray-200 divide-x md:flex w-full text-lg text-center">
+        <div class="flex-auto <?= ($this->mode == 1)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/myoverview"><?= $this->translate('Übersicht', 'text') ?></a></div>
+        <div class="flex-auto <?= ($this->mode == 2)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/mysettings"><?= $this->translate('Meine Einstellungen', 'text') ?></a></div>
+        <div class="flex-auto <?= ($this->mode == 7)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/mydata"><?= $this->translate('Aktuelle Layouterdaten', 'text') ?></a></div>
+        <div class="flex-auto <?= ($this->mode == 6)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/myaddress"><?= $this->translate('Meine Adressen', 'text') ?></a></div>
+        <div class="flex-auto <?= ($this->mode == 3)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/myorders"><?= $this->translate('Meine Bestellungen', 'text') ?></a></div>
         <?php if($this->shop->template_display_user_approval): ?>
-        <div class="flex-auto <?= ($this->mode == 10)? 'border-b-2 border-slate-200 bg-slate-100':''; ?>"><a href="/user/myapproval"><?= $this->translate('Freigabebedürftige Bestellungen', 'text') ?></a></div>
+        <div class="flex-auto <?= ($this->mode == 10)? 'text-white border-gray-300 bg-lenzBlue':''; ?>"><a href="/user/myapproval"><?= $this->translate('Freigabebedürftige Bestellungen', 'text') ?></a></div>
         <?php endif; ?>
    </div>
 </div>
diff --git a/src/old/public/styles/vorlagen/tailwindcss/js/calc.js b/src/old/public/styles/vorlagen/tailwindcss/js/calc.js
index 332290b8b..cdb53283f 100755
--- a/src/old/public/styles/vorlagen/tailwindcss/js/calc.js
+++ b/src/old/public/styles/vorlagen/tailwindcss/js/calc.js
@@ -360,7 +360,7 @@ function buildForm(elements, display_group = "", validElements = []) {
               title: element.help,
               disabled: true
             });
-            $obj.addClass("border border-slate-200 bg-slate-50 text-black p-2 w-full");
+            $obj.addClass("border border-gray-300 bg-gray-200 text-black p-2 w-full");
         }
         if(element.htmlType == "input") {
             var $obj = $('<input>', {
@@ -376,7 +376,7 @@ function buildForm(elements, display_group = "", validElements = []) {
             if(element.maxValue != null) {
                 $obj.data('maxValue', element.maxValue);
             }
-            $obj.addClass("border border-slate-200 bg-slate-50 text-black p-2 w-full");
+            $obj.addClass("border border-gray-300 bg-gray-200 text-black p-2 w-full");
          }
 
         if(element.htmlType == "checkbox") {
diff --git a/src/old/public/styles/vorlagen/tailwindcss/js/review.js b/src/old/public/styles/vorlagen/tailwindcss/js/review.js
new file mode 100755
index 000000000..3bbce3382
--- /dev/null
+++ b/src/old/public/styles/vorlagen/tailwindcss/js/review.js
@@ -0,0 +1,176 @@
+var changeMode = 0;
+var editAddressUuid = "";
+
+$(function () {
+  $('#invoiceEdit').click(function() {
+    changeMode = 1;
+    $('#addresses').toggleClass('hidden');
+    loadAddresses();
+  });
+  $('#deliveryEdit').click(function() {
+    changeMode = 2;
+    $('#addresses').toggleClass('hidden');
+    loadAddresses();
+  });
+  $('#senderEdit').click(function() {
+    changeMode = 3;
+    $('#addresses').toggleClass('hidden');
+    loadAddresses();
+  });
+  $('.searchButton').click( function() {
+    loadAddresses();
+  });
+  $('.addButton').click( function() {
+    $('#addAddressModal').toggleClass('hidden');
+  });
+  $('.closeButton').click( function() {
+    $('#addresses').toggleClass('hidden');
+  });
+  $('.closeEditButton').click( function() {
+    $('#editAddressModal').toggleClass('hidden');
+  });
+  $('.addEditButton').click( function() {
+    $('#addAddressModal').toggleClass('hidden');
+  });
+
+  $(".saveEditButton").click(function () {
+    if ($('#editAddressModal form').get(0).reportValidity()) {
+      $.post(
+        "/user/addressupdate/" + editAddressUuid + "/format/json",
+        $("#editAddressModal form").serialize(),
+        function (data) {
+          if (data.success) {
+            loadAddresses();
+          }
+        },
+      );
+      $("#editAddressModal").toggleClass("hidden");
+    }
+
+    return false;
+  });
+
+  $(".saveAddButton").click(function () {
+    if ($('#addAddressModal form').get(0).reportValidity()) {
+      $.post(
+        "/user/addressadd/format/json",
+        $("#addAddressModal form").serialize(),
+        function (data) {
+          if (data.success) {
+            $("#addAddressModal").toggleClass("hidden");
+            loadAddresses();
+          } else {
+            $.each(data.messages, function (index, item) {
+              $("#register #" + index).css("border", "1px solid red");
+            });
+          }
+        },
+      );
+    }
+    return false;
+  });
+
+  $("#sameDeliveryAsInvoice").click(function () {
+    $("#delivery").val($("#invoice").val());
+    $("#deliveryaddresstext").html($("#invoiceaddresstext").html());
+  });
+
+  $("#sameSenderAsShop").click(function () {
+    $("#sender").val(0);
+    $("#senderaddresstext").html($("#senderaddresstext_hidden").html());
+  });
+
+});
+
+function loadAddresses() {
+  $.ajax({
+    type: "POST",
+    url: "/user/addressget/format/json",
+    data: {
+      term: $(".searchTerm").val(),
+      mode: changeMode,
+    },
+    success: function (data) {
+      var markup =
+        '<tr id="address-<%= uuid %>">' +
+        '<td class="border border-t-0 border-l-0 border-r-0 border-b-1 border-gray-300 p-1"><% if(kundenNr != "" && kundenNr != null) { %><%= kundenNr %><br /><% } %><% if(company != "" && company != null) { %><%= company %><br /><% } %><%= company2 %></td>' +
+        '<td class="border border-t-0 border-l-0 border-r-0 border-b-1 border-gray-300 p-1"><%= anredeText %> <%= firstname %> <%= lastname %></td>' +
+        '<td class="border border-t-0 border-l-0 border-r-0 border-b-1 border-gray-300 p-1"><%= street %> <%= house_number %><br /><%= zip %> <%= city %><br /><%= country %></td>' +
+        '<td class="border border-t-0 border-l-0 border-r-0 border-b-1 border-gray-300 p-1">' +
+        '<div class="flex flex-auto">' +
+        '<input type="hidden" id="text" name="text" value="<% if(company != "" && company != null) {  %><%= company %>&lt;br/&gt;<% } %><% if(company2 != "" && company2 != null) { %><%= company2 %>&lt;br/&gt;<% } %><%= anredeText %> <%= firstname %> <%= lastname %>&lt;br/&gt;<%= street %> <%= house_number %>&lt;br/&gt;<%= zip %> <%= city %>"/>' +
+        '<input type="hidden" name="id" value="<%= uuid %>"/>' +
+        '<button type="button" class="editButton text-yellow-500"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"><path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" /></svg></button><br />' +
+        '<button type="button" class="useButton text-green-500" title="verwenden"><svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" /></svg></button>' +
+        "</div>" +
+        "</td>" +
+        "</tr>";
+
+      $("#addresses tbody").empty();
+
+      $.each(data.data, function (index, item) {
+        $("#addresses tbody").append(_.template(markup, item));
+      });
+
+      $(".useButton").unbind();
+      $(".useButton").click(function () {
+        if(changeMode == 1) {
+          $("#invoice").val($(this).prev().prev().prev().val());
+          $("#invoiceaddresstext").html(
+            $(this).prev().prev().prev().prev().val(),
+            );
+        }
+        if(changeMode == 2) {
+          $("#delivery").val($(this).prev().prev().prev().val());
+          $("#deliveryaddresstext").html(
+            $(this).prev().prev().prev().prev().val(),
+            );
+        }
+        if(changeMode == 3) {
+          $("#sender").val($(this).prev().prev().prev().val());
+          $("#senderaddresstext").html(
+            $(this).prev().prev().prev().prev().val(),
+            );
+        }
+        $("#addresses").toggleClass("hidden");
+      });
+      
+      bindEditButton();
+    },
+  });
+}
+
+function bindEditButton() {
+  $(".editButton").unbind();
+  $(".editButton").click(function () {
+    editAddressUuid = $(this).prev().val();
+    $.getJSON(
+      "/user/addressload/" + $(this).prev().val() + "/format/json",
+      function (data) {
+        var items = [];
+
+        $("#editAddressModal #firstname").val(data.address.firstname);
+        $("#editAddressModal #lastname").val(data.address.lastname);
+        $("#editAddressModal #zip").val(data.address.zip);
+        $("#editAddressModal #city").val(data.address.city);
+        $("#editAddressModal #fax").val(data.address.fax);
+        $("#editAddressModal #street").val(data.address.street);
+        $("#editAddressModal #company2").val(data.address.company2);
+        $("#editAddressModal #kostenstellung").val(data.address.kostenstellung);
+        $("#editAddressModal #house_number").val(data.address.house_number);
+        $("#editAddressModal #company").val(data.address.company);
+        $("#editAddressModal #phone").val(data.address.phone);
+        $("#editAddressModal #email").val(data.address.email);
+        $("#editAddressModal #mobil_phone").val(data.address.mobil_phone);
+        $("#editAddressModal #update_country").val(data.address.country);
+        $("#editAddressModal #update_anrede").val(data.address.anrede);
+        $("#editAddressModal #ustid").val(data.address.ustid);
+        $("#editAddressModal #homepage").val(data.address.homepage);
+      },
+    );
+    $("#editAddressModal").toggleClass("hidden");
+
+    return false;
+  });
+
+}
diff --git a/src/old/public/styles/vorlagen/tailwindcss/js/saxoprint.js b/src/old/public/styles/vorlagen/tailwindcss/js/saxoprint.js
new file mode 100755
index 000000000..fad8f1516
--- /dev/null
+++ b/src/old/public/styles/vorlagen/tailwindcss/js/saxoprint.js
@@ -0,0 +1,286 @@
+var productXml = "";
+
+loadCalc = function () {};
+
+class Saxoprint {
+  constructor(productId, saxoprintProductId, auflage, mwert) {
+    this.productId = productId;
+    this.saxoprintProductId = saxoprintProductId;
+    this.auflage = auflage;
+    this.mwert = mwert;
+  }
+
+  init() {
+    this.getProduct();
+  }
+
+  getProduct() {
+    $(".loading").toggleClass('hidden');
+    var self = this;
+    $.post(
+      "/apps/plugin/custom/psc/saxoprint/config",
+      {
+        saxoprintProductId: this.saxoprintProductId,
+        productId: self.productId,
+        config: $("#calc_saxoprint").serialize(),
+      },
+      function (data, status) {
+        self.buildUi(data.config);
+        self.buildPrice(data.price);
+      },
+    );
+  }
+
+  changeAuflage() {
+    $(".loading").toggleClass('hidden');
+    var self = this;
+    $.post(
+      "/apps/plugin/custom/psc/saxoprint/price",
+      {
+        saxoprintProductId: this.saxoprintProductId,
+        productId: self.productId,
+        config: $("#calc_saxoprint").serialize(),
+      },
+      function (data, status) {
+        //self.buildUi(data.config);
+        self.buildPrice(data.price);
+      },
+    );
+  }
+
+  buildUi(productOptions) {
+    var form = "";
+    var options = "";
+    var selected = "";
+
+    $.each(productOptions, function (index, item) {
+      if (item.type == "select") {
+        options = "";
+        $.each(item.values, function (i, value) {
+          selected = "";
+          if (parseInt(item.defaultValue) == value.id) {
+            selected = 'selected="selected"';
+          }
+          if (value.id == 0) {
+            options +=
+              '<option value="' +
+              value.id +
+              '" ' +
+              selected +
+              ">----------------</option>";
+          } else {
+            options +=
+              '<option value="' +
+              value.id +
+              '" ' +
+              selected +
+              ">" +
+              value.label +
+              "</option>";
+          }
+        });
+
+        if ($("#saxo_" + item.id).length > 0) {
+          $("#saxo_" + item.id).html(options);
+        } else {
+          if (item.disabled) {
+            form +=
+              '<div class="form-group form-group-sm ' +
+              (item.values.length > 0 ? "show" : "hide") +
+              '">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '      <select class="border border-gray-300 bg-gray-200 text-black p-2 w-full" disabled id="saxo_' +
+              item.id +
+              '"  name="property[' +
+              item.id +
+              ']">' +
+              options +
+              "</select>" +
+              '      <input type="hidden" name="property[' +
+              item.id +
+              ']" id="disabled_input_' +
+              item.id +
+              '" value="' +
+              item.defaultValue +
+              '"/>' +
+              "    </div>\n" +
+              "  </div>";
+          } else {
+            form +=
+              '<div class="form-group form-group-sm ' +
+              (item.values.length > 0 ? "show" : "hidden") +
+              '">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '      <select class="border border-gray-300 bg-gray-200 text-black p-2 w-full" id="saxo_' +
+              item.id +
+              '"  name="property[' +
+              item.id +
+              ']">' +
+              options +
+              "</select>" +
+              "    </div>\n" +
+              "  </div>";
+          }
+        }
+
+        if (item.values.length > 0) {
+          $("#saxo_" + item.id)
+            .parent()
+            .parent()
+            .removeClass("hide");
+        } else {
+          $("#saxo_" + item.id)
+            .parent()
+            .parent()
+            .addClass("hide");
+        }
+      }
+      if (item.type == "input") {
+        if ($("#saxo_" + item.id).length > 0) {
+        } else {
+          if (item.disabled) {
+            form +=
+              '<div class="form-group form-group-sm show">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '       <div class="input-group">\n' +
+              '       <input class="border border-gray-300 bg-gray-200 text-black p-2 w-full" disabled id="saxo_' +
+              item.id +
+              '"  name="custom[' +
+              item.id +
+              ']" value="' +
+              item.defaultValue +
+              '" />' +
+              '       <input type="hidden" name="custom[' +
+              item.id +
+              ']" id="disabled_input_' +
+              item.id +
+              '" value="' +
+              item.defaultValue +
+              '" >' +
+              '           <div class="input-group-append">' +
+              '         <span class="input-group-text">mm</span>' +
+              "           </div>" +
+              "      </div>" +
+              "    </div>\n" +
+              "  </div>";
+          } else {
+            form +=
+              '<div class="form-group form-group-sm show">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '    <div class="flex">\n' +
+              '      <input class="flex-1 border border-gray-300 bg-gray-200 text-black p-2 w-full" id="saxo_' +
+              item.id +
+              '"  name="custom[' +
+              item.id +
+              ']" value="' +
+              item.defaultValue +
+              '">' +
+              '      <div class="justify-center text-center p-1">' +
+              '         mm' +
+              "      </div>" +
+              "      </div>" +
+              "    </div>\n" +
+              "  </div>";
+          }
+        }
+      }
+    });
+
+    $("#selextender").append(form);
+  }
+
+  bindUi() {
+    var self = this;
+    $("#in_basket").removeClass("disabled");
+    $("#calc_saxoprint #saxo_auflage").unbind();
+    $("#calc_saxoprint #saxo_auflage").change(function () {
+      self.changeAuflage();
+    });
+    $("#calc_saxoprint select, #calc_saxoprint input").not("#saxo_auflage").unbind();
+    $("#calc_saxoprint select, #calc_saxoprint input")
+      .not("#saxo_auflage")
+      .change(function () {
+        self.getProduct();
+      });
+  }
+
+  storePrice(price) {
+    var options = { auflage: $("#auflage").val() };
+    var infos = [];
+
+    $("#calc_saxoprint select").each(function () {
+      if ($(this).find("option:selected").val() == "") {
+        return;
+      }
+      infos.push({
+        name: this.name,
+        value: $(this).find("option:selected").val(),
+        text: $(this).find("option:selected").text(),
+      });
+
+      options[this.name] = $(this).find("option:selected").text();
+    });
+
+    $.post(
+      "/apps/plugin/custom/psc/saxoprint/storePrice",
+      {
+        saxoprintProductId: this.saxoprintProductId,
+        productId: this.productId,
+        netto: price,
+        steuer: (price / 100) * this.mwert,
+        brutto: price + (price / 100) * this.mwert,
+        options: JSON.stringify(options),
+        infos: JSON.stringify(infos),
+      },
+      function (data, status) {
+        $(".loading").addClass('hidden');
+      },
+    );
+  }
+
+  buildPrice(price) {
+    var self = this;
+
+    $("#netto").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format(price),
+    );
+    $("#mwert").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format((price / 100) * self.mwert),
+    );
+    $("#brutto").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format(price + (price / 100) * self.mwert),
+    );
+
+    self.bindUi();
+    self.storePrice(price);
+  }
+}
diff --git a/src/old/public/styles/vorlagen/tailwindcss/js/wmd.js b/src/old/public/styles/vorlagen/tailwindcss/js/wmd.js
new file mode 100755
index 000000000..a0a66c297
--- /dev/null
+++ b/src/old/public/styles/vorlagen/tailwindcss/js/wmd.js
@@ -0,0 +1,250 @@
+var productXml = "";
+loadCalc = function () {};
+class WMD {
+  constructor(productId, mwert) {
+    this.productId = productId;
+    this.mwert = mwert;
+  }
+
+  init() {
+    this.getProduct();
+  }
+
+  getProduct() {
+    $(".loading").show();
+    var self = this;
+    $.post(
+      "/apps/plugin/custom/psc/wmd/config",
+      {
+        productId: self.productId,
+        config: $("#calc_wmd").serialize(),
+      },
+      function (data, status) {
+        self.buildUi(data.config);
+        self.buildPrice(data.price);
+      },
+    );
+  }
+
+  buildUi(productOptions) {
+    var form = "";
+    var options = "";
+    var selected = "";
+
+    $.each(productOptions, function (index, item) {
+      if (item.type == "select") {
+        options = "";
+        $.each(item.values, function (i, value) {
+          selected = "";
+          if (parseInt(item.defaultValue) == value.id) {
+            selected = 'selected="selected"';
+          }
+          if (value.id == 0) {
+            options +=
+              '<option value="' +
+              value.id +
+              '" ' +
+              selected +
+              ">----------------</option>";
+          } else {
+            options +=
+              '<option value="' +
+              value.id +
+              '" ' +
+              selected +
+              ">" +
+              value.label +
+              " (" +
+              new Intl.NumberFormat("de-DE", {
+                style: "currency",
+                currency: "EUR",
+              }).format(value.price / 100) +
+              ")" +
+              "</option>";
+          }
+        });
+
+        if ($("#wmd_" + item.id).length > 0) {
+          $("#wmd_" + item.id).html(options);
+        } else {
+          if (item.disabled) {
+            form +=
+              '<div class="form-group form-group-sm ' +
+              (item.values.length > 0 ? "show" : "hide") +
+              '">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '      <select class="form-control" disabled id="wmd_' +
+              item.id +
+              '"  name="' +
+              item.id +
+              '">' +
+              options +
+              "</select>" +
+              '      <input type="hidden" name="' +
+              item.id +
+              '" id="disabled_input_' +
+              item.id +
+              '" value="' +
+              item.defaultValue +
+              '"/>' +
+              "    </div>\n" +
+              "  </div>";
+          } else {
+            form +=
+              '<div class="form-group form-group-sm ' +
+              (item.values.length > 0 ? "show" : "hide") +
+              '">\n' +
+              '    <label for="' +
+              item.id +
+              '" class="col-sm-4 control-label">' +
+              item.label +
+              "</label>\n" +
+              '    <div class="col-sm-8">\n' +
+              '      <select class="form-control" id="wmd_' +
+              item.id +
+              '"  name="' +
+              item.id +
+              '">' +
+              options +
+              "</select>" +
+              "    </div>\n" +
+              "  </div>";
+          }
+        }
+
+        if (item.values.length > 0) {
+          $("#saxo_" + item.id)
+            .parent()
+            .parent()
+            .removeClass("hide");
+        } else {
+          $("#saxo_" + item.id)
+            .parent()
+            .parent()
+            .addClass("hide");
+        }
+      }
+      if (item.type == "input") {
+        if ($("#wmd_" + item.id).length == 0) {
+          form +=
+            '<div class="form-group form-group-sm">\n' +
+            '    <label for="' +
+            item.id +
+            '" class="col-sm-4 control-label">' +
+            item.label +
+            "</label>\n" +
+            '    <div class="col-sm-8">\n' +
+            '      <input class="form-control" id="wmd_' +
+            item.id +
+            '" value="' +
+            item.defaultValue +
+            '" name="' +
+            item.id +
+            '"/>' +
+            "    </div>\n" +
+            "  </div>";
+        }
+      }
+      if (item.type == "hidden") {
+        if ($("#wmd_" + item.id).length == 0) {
+          form +=
+            '<div class="form-group form-group-sm">\n' +
+            '    <div class="col-sm-8">\n' +
+            '      <input type="hidden" class="form-control" id="wmd_' +
+            item.id +
+            '" value="' +
+            item.defaultValue +
+            '" name="' +
+            item.id +
+            '"/>' +
+            "    </div>\n" +
+            "  </div>";
+        }
+      }
+    });
+
+    $("#selextender").append(form);
+  }
+
+  bindUi() {
+    var self = this;
+    $("#in_basket").removeClass("disabled");
+    $("#calc_wmd select, #calc_wmd input").unbind();
+    $("#calc_wmd select, #calc_wmd input").change(function () {
+      self.getProduct();
+    });
+  }
+
+  storePrice(price) {
+    var options = { auflage: $("#wmd_auflage").val() };
+    var infos = [];
+
+    $("#calc_wmd select").each(function () {
+      if ($(this).find("option:selected").val() == "") {
+        return;
+      }
+      infos.push({
+        name: this.name,
+        value: $(this).find("option:selected").val(),
+        text: $(this).find("option:selected").text(),
+      });
+
+      options[this.name] = $(this).find("option:selected").text();
+    });
+
+    $("#calc_wmd input").each(function () {
+      infos.push({
+        name: this.name,
+        value: $(this).val(),
+        text: $(this).val(),
+      });
+
+      options[this.name] = $(this).val();
+    });
+
+    $.post(
+      "/apps/plugin/custom/psc/wmd/storePrice",
+      {
+        productId: this.productId,
+        netto: price.net / 100,
+        steuer: price.vat / 100,
+        brutto: price.gross / 100,
+        options: JSON.stringify(options),
+        infos: JSON.stringify(infos),
+      },
+      function (data, status) {},
+    );
+  }
+
+  buildPrice(price) {
+    var self = this;
+
+    $("#netto").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format(price.net / 100),
+    );
+    $("#mwert").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format(price.vat / 100),
+    );
+    $("#brutto").html(
+      new Intl.NumberFormat("de-DE", {
+        style: "currency",
+        currency: "EUR",
+      }).format(price.gross / 100),
+    );
+
+    self.bindUi();
+    self.storePrice(price);
+    $(".loading").hide();
+  }
+}