diff --git a/app/Jobs/Banking/CreateTransfer.php b/app/Jobs/Banking/CreateTransfer.php
index c8d094c6a..8a444c322 100644
--- a/app/Jobs/Banking/CreateTransfer.php
+++ b/app/Jobs/Banking/CreateTransfer.php
@@ -41,6 +41,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
                 'category_id' => $this->getTransferCategoryId(),
                 'payment_method' => $this->request->get('payment_method'),
                 'reference' => $this->request->get('reference'),
+                'created_from' => $this->request->get('created_from'),
                 'created_by' => $this->request->get('created_by'),
             ]));
 
@@ -65,6 +66,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
                 'category_id' => $this->getTransferCategoryId(),
                 'payment_method' => $this->request->get('payment_method'),
                 'reference' => $this->request->get('reference'),
+                'created_from' => $this->request->get('created_from'),
                 'created_by' => $this->request->get('created_by'),
             ]));
 
@@ -72,6 +74,7 @@ class CreateTransfer extends Job implements HasOwner, HasSource, ShouldCreate
                 'company_id' => $this->request['company_id'],
                 'expense_transaction_id' => $expense_transaction->id,
                 'income_transaction_id' => $income_transaction->id,
+                'created_from' => $this->request->get('created_from'),
                 'created_by' => $this->request->get('created_by'),
             ]);
 
diff --git a/presets.js b/presets.js
index 58c4de140..cc5252cd9 100644
--- a/presets.js
+++ b/presets.js
@@ -20,8 +20,24 @@ module.exports = {
 
     safelist: [
       {
-        pattern: /.*/,
+        pattern: /./,
       },
+      {
+        pattern: /^p-/,
+        variants: ['ltr', 'rtl'],
+      },
+      {
+        pattern: /^m-/,
+        variants: ['ltr', 'rtl'],
+      },
+      {
+        pattern: /^left-/,
+        variants: ['ltr', 'rtl'],
+      },
+      {
+        pattern: /^right-/,
+        variants: ['ltr', 'rtl'],
+      }
     ],
    
     darkMode: 'class', // or 'media' or 'class',
diff --git a/public/css/app.css b/public/css/app.css
index 6cd6cca15..a63f1a101 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -49291,40 +49291,260 @@ body{
   opacity: 1;
 }
 
-[dir="ltr"] .ltr\:-right-1\.5{
-  right: -0.375rem;
-}
-
-[dir="ltr"] .ltr\:-right-1{
-  right: -0.25rem;
-}
-
-[dir="ltr"] .ltr\:-right-8{
-  right: -2rem;
-}
-
 [dir="ltr"] .ltr\:right-0{
   right: 0px;
 }
 
-[dir="ltr"] .ltr\:-left-80{
-  left: -20rem;
-}
-
-[dir="ltr"] .ltr\:right-12{
-  right: 3rem;
+[dir="ltr"] .ltr\:right-1{
+  right: 0.25rem;
 }
 
 [dir="ltr"] .ltr\:right-2{
   right: 0.5rem;
 }
 
+[dir="ltr"] .ltr\:right-3{
+  right: 0.75rem;
+}
+
+[dir="ltr"] .ltr\:right-4{
+  right: 1rem;
+}
+
+[dir="ltr"] .ltr\:right-5{
+  right: 1.25rem;
+}
+
+[dir="ltr"] .ltr\:right-6{
+  right: 1.5rem;
+}
+
+[dir="ltr"] .ltr\:right-7{
+  right: 1.75rem;
+}
+
+[dir="ltr"] .ltr\:right-8{
+  right: 2rem;
+}
+
+[dir="ltr"] .ltr\:right-9{
+  right: 2.25rem;
+}
+
+[dir="ltr"] .ltr\:right-10{
+  right: 2.5rem;
+}
+
+[dir="ltr"] .ltr\:right-11{
+  right: 2.75rem;
+}
+
+[dir="ltr"] .ltr\:right-12{
+  right: 3rem;
+}
+
+[dir="ltr"] .ltr\:right-14{
+  right: 3.5rem;
+}
+
+[dir="ltr"] .ltr\:right-16{
+  right: 4rem;
+}
+
+[dir="ltr"] .ltr\:right-20{
+  right: 5rem;
+}
+
+[dir="ltr"] .ltr\:right-24{
+  right: 6rem;
+}
+
+[dir="ltr"] .ltr\:right-28{
+  right: 7rem;
+}
+
+[dir="ltr"] .ltr\:right-31{
+  right: 30.938rem;
+}
+
+[dir="ltr"] .ltr\:right-32{
+  right: 8rem;
+}
+
+[dir="ltr"] .ltr\:right-33{
+  right: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:right-36{
+  right: 9rem;
+}
+
+[dir="ltr"] .ltr\:right-37{
+  right: 9.25rem;
+}
+
+[dir="ltr"] .ltr\:right-40{
+  right: 10rem;
+}
+
+[dir="ltr"] .ltr\:right-44{
+  right: 11rem;
+}
+
+[dir="ltr"] .ltr\:right-46{
+  right: 46.875rem;
+}
+
+[dir="ltr"] .ltr\:right-48{
+  right: 12rem;
+}
+
+[dir="ltr"] .ltr\:right-52{
+  right: 13rem;
+}
+
+[dir="ltr"] .ltr\:right-56{
+  right: 14rem;
+}
+
+[dir="ltr"] .ltr\:right-60{
+  right: 15rem;
+}
+
+[dir="ltr"] .ltr\:right-64{
+  right: 16rem;
+}
+
+[dir="ltr"] .ltr\:right-72{
+  right: 18rem;
+}
+
+[dir="ltr"] .ltr\:right-80{
+  right: 20rem;
+}
+
+[dir="ltr"] .ltr\:right-96{
+  right: 24rem;
+}
+
+[dir="ltr"] .ltr\:right-auto{
+  right: auto;
+}
+
+[dir="ltr"] .ltr\:right-px{
+  right: 1px;
+}
+
+[dir="ltr"] .ltr\:right-0\.5{
+  right: 0.125rem;
+}
+
+[dir="ltr"] .ltr\:right-1\.5{
+  right: 0.375rem;
+}
+
+[dir="ltr"] .ltr\:right-2\.5{
+  right: 0.625rem;
+}
+
+[dir="ltr"] .ltr\:right-3\.5{
+  right: 0.875rem;
+}
+
+[dir="ltr"] .ltr\:right-modal{
+  right: 610px;
+}
+
+[dir="ltr"] .ltr\:right-5\.5{
+  right: 1.30rem;
+}
+
+[dir="ltr"] .ltr\:right-9\.5{
+  right: 2.45rem;
+}
+
+[dir="ltr"] .ltr\:right-12\.5{
+  right: 3.2rem;
+}
+
+[dir="ltr"] .ltr\:right-32\.5{
+  right: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:right-1\/2{
+  right: 50%;
+}
+
+[dir="ltr"] .ltr\:right-1\/3{
+  right: 33.333333%;
+}
+
+[dir="ltr"] .ltr\:right-2\/3{
+  right: 66.666667%;
+}
+
+[dir="ltr"] .ltr\:right-1\/4{
+  right: 25%;
+}
+
+[dir="ltr"] .ltr\:right-2\/4{
+  right: 50%;
+}
+
+[dir="ltr"] .ltr\:right-3\/4{
+  right: 75%;
+}
+
+[dir="ltr"] .ltr\:right-full{
+  right: 100%;
+}
+
+[dir="ltr"] .ltr\:left-0{
+  left: 0px;
+}
+
+[dir="ltr"] .ltr\:left-1{
+  left: 0.25rem;
+}
+
+[dir="ltr"] .ltr\:left-2{
+  left: 0.5rem;
+}
+
 [dir="ltr"] .ltr\:left-3{
   left: 0.75rem;
 }
 
-[dir="ltr"] .ltr\:-right-2{
-  right: -0.5rem;
+[dir="ltr"] .ltr\:left-4{
+  left: 1rem;
+}
+
+[dir="ltr"] .ltr\:left-5{
+  left: 1.25rem;
+}
+
+[dir="ltr"] .ltr\:left-6{
+  left: 1.5rem;
+}
+
+[dir="ltr"] .ltr\:left-7{
+  left: 1.75rem;
+}
+
+[dir="ltr"] .ltr\:left-8{
+  left: 2rem;
+}
+
+[dir="ltr"] .ltr\:left-9{
+  left: 2.25rem;
+}
+
+[dir="ltr"] .ltr\:left-10{
+  left: 2.5rem;
+}
+
+[dir="ltr"] .ltr\:left-11{
+  left: 2.75rem;
 }
 
 [dir="ltr"] .ltr\:left-12{
@@ -49335,20 +49555,360 @@ body{
   left: 3.5rem;
 }
 
-[dir="ltr"] .ltr\:left-0{
-  left: 0px;
+[dir="ltr"] .ltr\:left-16{
+  left: 4rem;
 }
 
-[dir="ltr"] .ltr\:left-8{
-  left: 2rem;
+[dir="ltr"] .ltr\:left-20{
+  left: 5rem;
+}
+
+[dir="ltr"] .ltr\:left-24{
+  left: 6rem;
+}
+
+[dir="ltr"] .ltr\:left-28{
+  left: 7rem;
+}
+
+[dir="ltr"] .ltr\:left-31{
+  left: 30.938rem;
+}
+
+[dir="ltr"] .ltr\:left-32{
+  left: 8rem;
+}
+
+[dir="ltr"] .ltr\:left-33{
+  left: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:left-36{
+  left: 9rem;
+}
+
+[dir="ltr"] .ltr\:left-37{
+  left: 9.25rem;
+}
+
+[dir="ltr"] .ltr\:left-40{
+  left: 10rem;
+}
+
+[dir="ltr"] .ltr\:left-44{
+  left: 11rem;
+}
+
+[dir="ltr"] .ltr\:left-46{
+  left: 46.875rem;
+}
+
+[dir="ltr"] .ltr\:left-48{
+  left: 12rem;
+}
+
+[dir="ltr"] .ltr\:left-52{
+  left: 13rem;
+}
+
+[dir="ltr"] .ltr\:left-56{
+  left: 14rem;
+}
+
+[dir="ltr"] .ltr\:left-60{
+  left: 15rem;
+}
+
+[dir="ltr"] .ltr\:left-64{
+  left: 16rem;
+}
+
+[dir="ltr"] .ltr\:left-72{
+  left: 18rem;
+}
+
+[dir="ltr"] .ltr\:left-80{
+  left: 20rem;
+}
+
+[dir="ltr"] .ltr\:left-96{
+  left: 24rem;
+}
+
+[dir="ltr"] .ltr\:left-auto{
+  left: auto;
+}
+
+[dir="ltr"] .ltr\:left-px{
+  left: 1px;
+}
+
+[dir="ltr"] .ltr\:left-0\.5{
+  left: 0.125rem;
+}
+
+[dir="ltr"] .ltr\:left-1\.5{
+  left: 0.375rem;
+}
+
+[dir="ltr"] .ltr\:left-2\.5{
+  left: 0.625rem;
+}
+
+[dir="ltr"] .ltr\:left-3\.5{
+  left: 0.875rem;
+}
+
+[dir="ltr"] .ltr\:left-modal{
+  left: 610px;
+}
+
+[dir="ltr"] .ltr\:left-5\.5{
+  left: 1.30rem;
+}
+
+[dir="ltr"] .ltr\:left-9\.5{
+  left: 2.45rem;
+}
+
+[dir="ltr"] .ltr\:left-12\.5{
+  left: 3.2rem;
+}
+
+[dir="ltr"] .ltr\:left-32\.5{
+  left: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:left-1\/2{
+  left: 50%;
+}
+
+[dir="ltr"] .ltr\:left-1\/3{
+  left: 33.333333%;
+}
+
+[dir="ltr"] .ltr\:left-2\/3{
+  left: 66.666667%;
+}
+
+[dir="ltr"] .ltr\:left-1\/4{
+  left: 25%;
+}
+
+[dir="ltr"] .ltr\:left-2\/4{
+  left: 50%;
+}
+
+[dir="ltr"] .ltr\:left-3\/4{
+  left: 75%;
+}
+
+[dir="ltr"] .ltr\:left-full{
+  left: 100%;
+}
+
+[dir="ltr"] .ltr\:-left-80{
+  left: -20rem;
+}
+
+[dir="ltr"] .ltr\:-right-1{
+  right: -0.25rem;
+}
+
+[dir="ltr"] .ltr\:-right-2{
+  right: -0.5rem;
+}
+
+[dir="ltr"] .ltr\:-right-8{
+  right: -2rem;
 }
 
 [dir="ltr"] .ltr\:-left-8{
   left: -2rem;
 }
 
-[dir="ltr"] .ltr\:right-4{
-  right: 1rem;
+[dir="ltr"] .ltr\:m-0{
+  margin: 0px;
+}
+
+[dir="ltr"] .ltr\:m-1{
+  margin: 0.25rem;
+}
+
+[dir="ltr"] .ltr\:m-2{
+  margin: 0.5rem;
+}
+
+[dir="ltr"] .ltr\:m-3{
+  margin: 0.75rem;
+}
+
+[dir="ltr"] .ltr\:m-4{
+  margin: 1rem;
+}
+
+[dir="ltr"] .ltr\:m-5{
+  margin: 1.25rem;
+}
+
+[dir="ltr"] .ltr\:m-6{
+  margin: 1.5rem;
+}
+
+[dir="ltr"] .ltr\:m-7{
+  margin: 1.75rem;
+}
+
+[dir="ltr"] .ltr\:m-8{
+  margin: 2rem;
+}
+
+[dir="ltr"] .ltr\:m-9{
+  margin: 2.25rem;
+}
+
+[dir="ltr"] .ltr\:m-10{
+  margin: 2.5rem;
+}
+
+[dir="ltr"] .ltr\:m-11{
+  margin: 2.75rem;
+}
+
+[dir="ltr"] .ltr\:m-12{
+  margin: 3rem;
+}
+
+[dir="ltr"] .ltr\:m-14{
+  margin: 3.5rem;
+}
+
+[dir="ltr"] .ltr\:m-16{
+  margin: 4rem;
+}
+
+[dir="ltr"] .ltr\:m-20{
+  margin: 5rem;
+}
+
+[dir="ltr"] .ltr\:m-24{
+  margin: 6rem;
+}
+
+[dir="ltr"] .ltr\:m-28{
+  margin: 7rem;
+}
+
+[dir="ltr"] .ltr\:m-31{
+  margin: 30.938rem;
+}
+
+[dir="ltr"] .ltr\:m-32{
+  margin: 8rem;
+}
+
+[dir="ltr"] .ltr\:m-33{
+  margin: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:m-36{
+  margin: 9rem;
+}
+
+[dir="ltr"] .ltr\:m-37{
+  margin: 9.25rem;
+}
+
+[dir="ltr"] .ltr\:m-40{
+  margin: 10rem;
+}
+
+[dir="ltr"] .ltr\:m-44{
+  margin: 11rem;
+}
+
+[dir="ltr"] .ltr\:m-46{
+  margin: 46.875rem;
+}
+
+[dir="ltr"] .ltr\:m-48{
+  margin: 12rem;
+}
+
+[dir="ltr"] .ltr\:m-52{
+  margin: 13rem;
+}
+
+[dir="ltr"] .ltr\:m-56{
+  margin: 14rem;
+}
+
+[dir="ltr"] .ltr\:m-60{
+  margin: 15rem;
+}
+
+[dir="ltr"] .ltr\:m-64{
+  margin: 16rem;
+}
+
+[dir="ltr"] .ltr\:m-72{
+  margin: 18rem;
+}
+
+[dir="ltr"] .ltr\:m-80{
+  margin: 20rem;
+}
+
+[dir="ltr"] .ltr\:m-96{
+  margin: 24rem;
+}
+
+[dir="ltr"] .ltr\:m-auto{
+  margin: auto;
+}
+
+[dir="ltr"] .ltr\:m-px{
+  margin: 1px;
+}
+
+[dir="ltr"] .ltr\:m-0\.5{
+  margin: 0.125rem;
+}
+
+[dir="ltr"] .ltr\:m-1\.5{
+  margin: 0.375rem;
+}
+
+[dir="ltr"] .ltr\:m-2\.5{
+  margin: 0.625rem;
+}
+
+[dir="ltr"] .ltr\:m-3\.5{
+  margin: 0.875rem;
+}
+
+[dir="ltr"] .ltr\:m-modal{
+  margin: 610px;
+}
+
+[dir="ltr"] .ltr\:m-5\.5{
+  margin: 1.30rem;
+}
+
+[dir="ltr"] .ltr\:m-9\.5{
+  margin: 2.45rem;
+}
+
+[dir="ltr"] .ltr\:m-12\.5{
+  margin: 3.2rem;
+}
+
+[dir="ltr"] .ltr\:m-32\.5{
+  margin: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:m-10\.5{
+  margin: 2.6rem;
 }
 
 [dir="ltr"] .ltr\:mr-4{
@@ -49421,16 +49981,180 @@ body{
   border-bottom-right-radius: 0.5rem;
 }
 
-[dir="ltr"] .ltr\:border-l-8{
-  border-left-width: 8px;
+[dir="ltr"] .ltr\:p-0{
+  padding: 0px;
 }
 
-[dir="ltr"] .ltr\:pr-20{
-  padding-right: 5rem;
+[dir="ltr"] .ltr\:p-1{
+  padding: 0.25rem;
 }
 
-[dir="ltr"] .ltr\:pl-0{
-  padding-left: 0px;
+[dir="ltr"] .ltr\:p-2{
+  padding: 0.5rem;
+}
+
+[dir="ltr"] .ltr\:p-3{
+  padding: 0.75rem;
+}
+
+[dir="ltr"] .ltr\:p-4{
+  padding: 1rem;
+}
+
+[dir="ltr"] .ltr\:p-5{
+  padding: 1.25rem;
+}
+
+[dir="ltr"] .ltr\:p-6{
+  padding: 1.5rem;
+}
+
+[dir="ltr"] .ltr\:p-7{
+  padding: 1.75rem;
+}
+
+[dir="ltr"] .ltr\:p-8{
+  padding: 2rem;
+}
+
+[dir="ltr"] .ltr\:p-9{
+  padding: 2.25rem;
+}
+
+[dir="ltr"] .ltr\:p-10{
+  padding: 2.5rem;
+}
+
+[dir="ltr"] .ltr\:p-11{
+  padding: 2.75rem;
+}
+
+[dir="ltr"] .ltr\:p-12{
+  padding: 3rem;
+}
+
+[dir="ltr"] .ltr\:p-14{
+  padding: 3.5rem;
+}
+
+[dir="ltr"] .ltr\:p-16{
+  padding: 4rem;
+}
+
+[dir="ltr"] .ltr\:p-20{
+  padding: 5rem;
+}
+
+[dir="ltr"] .ltr\:p-24{
+  padding: 6rem;
+}
+
+[dir="ltr"] .ltr\:p-28{
+  padding: 7rem;
+}
+
+[dir="ltr"] .ltr\:p-31{
+  padding: 30.938rem;
+}
+
+[dir="ltr"] .ltr\:p-32{
+  padding: 8rem;
+}
+
+[dir="ltr"] .ltr\:p-33{
+  padding: 8.5rem;
+}
+
+[dir="ltr"] .ltr\:p-36{
+  padding: 9rem;
+}
+
+[dir="ltr"] .ltr\:p-37{
+  padding: 9.25rem;
+}
+
+[dir="ltr"] .ltr\:p-40{
+  padding: 10rem;
+}
+
+[dir="ltr"] .ltr\:p-44{
+  padding: 11rem;
+}
+
+[dir="ltr"] .ltr\:p-46{
+  padding: 46.875rem;
+}
+
+[dir="ltr"] .ltr\:p-48{
+  padding: 12rem;
+}
+
+[dir="ltr"] .ltr\:p-52{
+  padding: 13rem;
+}
+
+[dir="ltr"] .ltr\:p-56{
+  padding: 14rem;
+}
+
+[dir="ltr"] .ltr\:p-60{
+  padding: 15rem;
+}
+
+[dir="ltr"] .ltr\:p-64{
+  padding: 16rem;
+}
+
+[dir="ltr"] .ltr\:p-72{
+  padding: 18rem;
+}
+
+[dir="ltr"] .ltr\:p-80{
+  padding: 20rem;
+}
+
+[dir="ltr"] .ltr\:p-96{
+  padding: 24rem;
+}
+
+[dir="ltr"] .ltr\:p-px{
+  padding: 1px;
+}
+
+[dir="ltr"] .ltr\:p-0\.5{
+  padding: 0.125rem;
+}
+
+[dir="ltr"] .ltr\:p-1\.5{
+  padding: 0.375rem;
+}
+
+[dir="ltr"] .ltr\:p-2\.5{
+  padding: 0.625rem;
+}
+
+[dir="ltr"] .ltr\:p-3\.5{
+  padding: 0.875rem;
+}
+
+[dir="ltr"] .ltr\:p-modal{
+  padding: 610px;
+}
+
+[dir="ltr"] .ltr\:p-5\.5{
+  padding: 1.30rem;
+}
+
+[dir="ltr"] .ltr\:p-9\.5{
+  padding: 2.45rem;
+}
+
+[dir="ltr"] .ltr\:p-12\.5{
+  padding: 3.2rem;
+}
+
+[dir="ltr"] .ltr\:p-32\.5{
+  padding: 8.5rem;
 }
 
 [dir="ltr"] .ltr\:pr-6{
@@ -49486,40 +50210,52 @@ body{
   line-height: 1.75rem;
 }
 
-[dir="rtl"] .rtl\:-left-1\.5{
-  left: -0.375rem;
+[dir="rtl"] .rtl\:right-0{
+  right: 0px;
 }
 
-[dir="rtl"] .rtl\:-left-1{
-  left: -0.25rem;
+[dir="rtl"] .rtl\:right-1{
+  right: 0.25rem;
 }
 
-[dir="rtl"] .rtl\:-left-8{
-  left: -2rem;
-}
-
-[dir="rtl"] .rtl\:left-0{
-  left: 0px;
-}
-
-[dir="rtl"] .rtl\:-right-80{
-  right: -20rem;
-}
-
-[dir="rtl"] .rtl\:left-12{
-  left: 3rem;
-}
-
-[dir="rtl"] .rtl\:left-2{
-  left: 0.5rem;
+[dir="rtl"] .rtl\:right-2{
+  right: 0.5rem;
 }
 
 [dir="rtl"] .rtl\:right-3{
   right: 0.75rem;
 }
 
-[dir="rtl"] .rtl\:-left-2{
-  left: -0.5rem;
+[dir="rtl"] .rtl\:right-4{
+  right: 1rem;
+}
+
+[dir="rtl"] .rtl\:right-5{
+  right: 1.25rem;
+}
+
+[dir="rtl"] .rtl\:right-6{
+  right: 1.5rem;
+}
+
+[dir="rtl"] .rtl\:right-7{
+  right: 1.75rem;
+}
+
+[dir="rtl"] .rtl\:right-8{
+  right: 2rem;
+}
+
+[dir="rtl"] .rtl\:right-9{
+  right: 2.25rem;
+}
+
+[dir="rtl"] .rtl\:right-10{
+  right: 2.5rem;
+}
+
+[dir="rtl"] .rtl\:right-11{
+  right: 2.75rem;
 }
 
 [dir="rtl"] .rtl\:right-12{
@@ -49530,26 +50266,574 @@ body{
   right: 3.5rem;
 }
 
-[dir="rtl"] .rtl\:right-0{
-  right: 0px;
+[dir="rtl"] .rtl\:right-16{
+  right: 4rem;
 }
 
-[dir="rtl"] .rtl\:right-8{
-  right: 2rem;
+[dir="rtl"] .rtl\:right-20{
+  right: 5rem;
 }
 
-[dir="rtl"] .rtl\:-right-8{
-  right: -2rem;
+[dir="rtl"] .rtl\:right-24{
+  right: 6rem;
+}
+
+[dir="rtl"] .rtl\:right-28{
+  right: 7rem;
+}
+
+[dir="rtl"] .rtl\:right-31{
+  right: 30.938rem;
+}
+
+[dir="rtl"] .rtl\:right-32{
+  right: 8rem;
+}
+
+[dir="rtl"] .rtl\:right-33{
+  right: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:right-36{
+  right: 9rem;
+}
+
+[dir="rtl"] .rtl\:right-37{
+  right: 9.25rem;
+}
+
+[dir="rtl"] .rtl\:right-40{
+  right: 10rem;
+}
+
+[dir="rtl"] .rtl\:right-44{
+  right: 11rem;
+}
+
+[dir="rtl"] .rtl\:right-46{
+  right: 46.875rem;
+}
+
+[dir="rtl"] .rtl\:right-48{
+  right: 12rem;
+}
+
+[dir="rtl"] .rtl\:right-52{
+  right: 13rem;
+}
+
+[dir="rtl"] .rtl\:right-56{
+  right: 14rem;
+}
+
+[dir="rtl"] .rtl\:right-60{
+  right: 15rem;
+}
+
+[dir="rtl"] .rtl\:right-64{
+  right: 16rem;
+}
+
+[dir="rtl"] .rtl\:right-72{
+  right: 18rem;
+}
+
+[dir="rtl"] .rtl\:right-80{
+  right: 20rem;
+}
+
+[dir="rtl"] .rtl\:right-96{
+  right: 24rem;
+}
+
+[dir="rtl"] .rtl\:right-auto{
+  right: auto;
+}
+
+[dir="rtl"] .rtl\:right-px{
+  right: 1px;
+}
+
+[dir="rtl"] .rtl\:right-0\.5{
+  right: 0.125rem;
+}
+
+[dir="rtl"] .rtl\:right-1\.5{
+  right: 0.375rem;
+}
+
+[dir="rtl"] .rtl\:right-2\.5{
+  right: 0.625rem;
+}
+
+[dir="rtl"] .rtl\:right-3\.5{
+  right: 0.875rem;
+}
+
+[dir="rtl"] .rtl\:right-modal{
+  right: 610px;
+}
+
+[dir="rtl"] .rtl\:right-5\.5{
+  right: 1.30rem;
+}
+
+[dir="rtl"] .rtl\:right-9\.5{
+  right: 2.45rem;
+}
+
+[dir="rtl"] .rtl\:right-12\.5{
+  right: 3.2rem;
+}
+
+[dir="rtl"] .rtl\:right-32\.5{
+  right: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:right-1\/2{
+  right: 50%;
+}
+
+[dir="rtl"] .rtl\:right-1\/3{
+  right: 33.333333%;
+}
+
+[dir="rtl"] .rtl\:right-2\/3{
+  right: 66.666667%;
+}
+
+[dir="rtl"] .rtl\:right-1\/4{
+  right: 25%;
+}
+
+[dir="rtl"] .rtl\:right-2\/4{
+  right: 50%;
+}
+
+[dir="rtl"] .rtl\:right-3\/4{
+  right: 75%;
+}
+
+[dir="rtl"] .rtl\:right-full{
+  right: 100%;
+}
+
+[dir="rtl"] .rtl\:left-0{
+  left: 0px;
+}
+
+[dir="rtl"] .rtl\:left-1{
+  left: 0.25rem;
+}
+
+[dir="rtl"] .rtl\:left-2{
+  left: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:left-3{
+  left: 0.75rem;
 }
 
 [dir="rtl"] .rtl\:left-4{
   left: 1rem;
 }
 
+[dir="rtl"] .rtl\:left-5{
+  left: 1.25rem;
+}
+
+[dir="rtl"] .rtl\:left-6{
+  left: 1.5rem;
+}
+
+[dir="rtl"] .rtl\:left-7{
+  left: 1.75rem;
+}
+
+[dir="rtl"] .rtl\:left-8{
+  left: 2rem;
+}
+
+[dir="rtl"] .rtl\:left-9{
+  left: 2.25rem;
+}
+
+[dir="rtl"] .rtl\:left-10{
+  left: 2.5rem;
+}
+
+[dir="rtl"] .rtl\:left-11{
+  left: 2.75rem;
+}
+
+[dir="rtl"] .rtl\:left-12{
+  left: 3rem;
+}
+
+[dir="rtl"] .rtl\:left-14{
+  left: 3.5rem;
+}
+
+[dir="rtl"] .rtl\:left-16{
+  left: 4rem;
+}
+
+[dir="rtl"] .rtl\:left-20{
+  left: 5rem;
+}
+
+[dir="rtl"] .rtl\:left-24{
+  left: 6rem;
+}
+
+[dir="rtl"] .rtl\:left-28{
+  left: 7rem;
+}
+
+[dir="rtl"] .rtl\:left-31{
+  left: 30.938rem;
+}
+
+[dir="rtl"] .rtl\:left-32{
+  left: 8rem;
+}
+
+[dir="rtl"] .rtl\:left-33{
+  left: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:left-36{
+  left: 9rem;
+}
+
+[dir="rtl"] .rtl\:left-37{
+  left: 9.25rem;
+}
+
+[dir="rtl"] .rtl\:left-40{
+  left: 10rem;
+}
+
+[dir="rtl"] .rtl\:left-44{
+  left: 11rem;
+}
+
+[dir="rtl"] .rtl\:left-46{
+  left: 46.875rem;
+}
+
+[dir="rtl"] .rtl\:left-48{
+  left: 12rem;
+}
+
+[dir="rtl"] .rtl\:left-52{
+  left: 13rem;
+}
+
+[dir="rtl"] .rtl\:left-56{
+  left: 14rem;
+}
+
+[dir="rtl"] .rtl\:left-60{
+  left: 15rem;
+}
+
+[dir="rtl"] .rtl\:left-64{
+  left: 16rem;
+}
+
+[dir="rtl"] .rtl\:left-72{
+  left: 18rem;
+}
+
+[dir="rtl"] .rtl\:left-80{
+  left: 20rem;
+}
+
+[dir="rtl"] .rtl\:left-96{
+  left: 24rem;
+}
+
+[dir="rtl"] .rtl\:left-auto{
+  left: auto;
+}
+
+[dir="rtl"] .rtl\:left-px{
+  left: 1px;
+}
+
+[dir="rtl"] .rtl\:left-0\.5{
+  left: 0.125rem;
+}
+
+[dir="rtl"] .rtl\:left-1\.5{
+  left: 0.375rem;
+}
+
+[dir="rtl"] .rtl\:left-2\.5{
+  left: 0.625rem;
+}
+
+[dir="rtl"] .rtl\:left-3\.5{
+  left: 0.875rem;
+}
+
+[dir="rtl"] .rtl\:left-modal{
+  left: 610px;
+}
+
+[dir="rtl"] .rtl\:left-5\.5{
+  left: 1.30rem;
+}
+
+[dir="rtl"] .rtl\:left-9\.5{
+  left: 2.45rem;
+}
+
+[dir="rtl"] .rtl\:left-12\.5{
+  left: 3.2rem;
+}
+
+[dir="rtl"] .rtl\:left-32\.5{
+  left: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:left-1\/2{
+  left: 50%;
+}
+
+[dir="rtl"] .rtl\:left-1\/3{
+  left: 33.333333%;
+}
+
+[dir="rtl"] .rtl\:left-2\/3{
+  left: 66.666667%;
+}
+
+[dir="rtl"] .rtl\:left-1\/4{
+  left: 25%;
+}
+
+[dir="rtl"] .rtl\:left-2\/4{
+  left: 50%;
+}
+
+[dir="rtl"] .rtl\:left-3\/4{
+  left: 75%;
+}
+
+[dir="rtl"] .rtl\:left-full{
+  left: 100%;
+}
+
+[dir="rtl"] .rtl\:-right-80{
+  right: -20rem;
+}
+
+[dir="rtl"] .rtl\:-left-1{
+  left: -0.25rem;
+}
+
+[dir="rtl"] .rtl\:-left-2{
+  left: -0.5rem;
+}
+
+[dir="rtl"] .rtl\:-left-8{
+  left: -2rem;
+}
+
+[dir="rtl"] .rtl\:-right-8{
+  right: -2rem;
+}
+
 [dir="rtl"] .rtl\:float-left{
   float: left;
 }
 
+[dir="rtl"] .rtl\:m-0{
+  margin: 0px;
+}
+
+[dir="rtl"] .rtl\:m-1{
+  margin: 0.25rem;
+}
+
+[dir="rtl"] .rtl\:m-2{
+  margin: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:m-3{
+  margin: 0.75rem;
+}
+
+[dir="rtl"] .rtl\:m-4{
+  margin: 1rem;
+}
+
+[dir="rtl"] .rtl\:m-5{
+  margin: 1.25rem;
+}
+
+[dir="rtl"] .rtl\:m-6{
+  margin: 1.5rem;
+}
+
+[dir="rtl"] .rtl\:m-7{
+  margin: 1.75rem;
+}
+
+[dir="rtl"] .rtl\:m-8{
+  margin: 2rem;
+}
+
+[dir="rtl"] .rtl\:m-9{
+  margin: 2.25rem;
+}
+
+[dir="rtl"] .rtl\:m-10{
+  margin: 2.5rem;
+}
+
+[dir="rtl"] .rtl\:m-11{
+  margin: 2.75rem;
+}
+
+[dir="rtl"] .rtl\:m-12{
+  margin: 3rem;
+}
+
+[dir="rtl"] .rtl\:m-14{
+  margin: 3.5rem;
+}
+
+[dir="rtl"] .rtl\:m-16{
+  margin: 4rem;
+}
+
+[dir="rtl"] .rtl\:m-20{
+  margin: 5rem;
+}
+
+[dir="rtl"] .rtl\:m-24{
+  margin: 6rem;
+}
+
+[dir="rtl"] .rtl\:m-28{
+  margin: 7rem;
+}
+
+[dir="rtl"] .rtl\:m-31{
+  margin: 30.938rem;
+}
+
+[dir="rtl"] .rtl\:m-32{
+  margin: 8rem;
+}
+
+[dir="rtl"] .rtl\:m-33{
+  margin: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:m-36{
+  margin: 9rem;
+}
+
+[dir="rtl"] .rtl\:m-37{
+  margin: 9.25rem;
+}
+
+[dir="rtl"] .rtl\:m-40{
+  margin: 10rem;
+}
+
+[dir="rtl"] .rtl\:m-44{
+  margin: 11rem;
+}
+
+[dir="rtl"] .rtl\:m-46{
+  margin: 46.875rem;
+}
+
+[dir="rtl"] .rtl\:m-48{
+  margin: 12rem;
+}
+
+[dir="rtl"] .rtl\:m-52{
+  margin: 13rem;
+}
+
+[dir="rtl"] .rtl\:m-56{
+  margin: 14rem;
+}
+
+[dir="rtl"] .rtl\:m-60{
+  margin: 15rem;
+}
+
+[dir="rtl"] .rtl\:m-64{
+  margin: 16rem;
+}
+
+[dir="rtl"] .rtl\:m-72{
+  margin: 18rem;
+}
+
+[dir="rtl"] .rtl\:m-80{
+  margin: 20rem;
+}
+
+[dir="rtl"] .rtl\:m-96{
+  margin: 24rem;
+}
+
+[dir="rtl"] .rtl\:m-auto{
+  margin: auto;
+}
+
+[dir="rtl"] .rtl\:m-px{
+  margin: 1px;
+}
+
+[dir="rtl"] .rtl\:m-0\.5{
+  margin: 0.125rem;
+}
+
+[dir="rtl"] .rtl\:m-1\.5{
+  margin: 0.375rem;
+}
+
+[dir="rtl"] .rtl\:m-2\.5{
+  margin: 0.625rem;
+}
+
+[dir="rtl"] .rtl\:m-3\.5{
+  margin: 0.875rem;
+}
+
+[dir="rtl"] .rtl\:m-modal{
+  margin: 610px;
+}
+
+[dir="rtl"] .rtl\:m-5\.5{
+  margin: 1.30rem;
+}
+
+[dir="rtl"] .rtl\:m-9\.5{
+  margin: 2.45rem;
+}
+
+[dir="rtl"] .rtl\:m-12\.5{
+  margin: 3.2rem;
+}
+
+[dir="rtl"] .rtl\:m-32\.5{
+  margin: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:m-10\.5{
+  margin: 2.6rem;
+}
+
 [dir="rtl"] .rtl\:ml-4{
   margin-left: 1rem;
 }
@@ -49616,14 +50900,208 @@ body{
   border-bottom-right-radius: 0.5rem;
 }
 
+<<<<<<< HEAD
+[dir="ltr"] .ltr\:border-l-8{
+  border-left-width: 8px;
+}
+
+[dir="ltr"] .ltr\:pr-20{
+  padding-right: 5rem;
+}
+
+[dir="ltr"] .ltr\:pl-0{
+  padding-left: 0px;
+}
+
+[dir="ltr"] .ltr\:pr-6{
+  padding-right: 1.5rem;
+}
+
+[dir="ltr"] .ltr\:pr-0{
+  padding-right: 0px;
+=======
 [dir="rtl"] .rtl\:rounded-tl-lg{
   border-top-left-radius: 0.5rem;
+>>>>>>> 746b131c68d1c21b95570c2213f605c60fa0d5e9
 }
 
 [dir="rtl"] .rtl\:rounded-bl-lg{
   border-bottom-left-radius: 0.5rem;
 }
 
+[dir="rtl"] .rtl\:p-0{
+  padding: 0px;
+}
+
+[dir="rtl"] .rtl\:p-1{
+  padding: 0.25rem;
+}
+
+[dir="rtl"] .rtl\:p-2{
+  padding: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:p-3{
+  padding: 0.75rem;
+}
+
+[dir="rtl"] .rtl\:p-4{
+  padding: 1rem;
+}
+
+[dir="rtl"] .rtl\:p-5{
+  padding: 1.25rem;
+}
+
+[dir="rtl"] .rtl\:p-6{
+  padding: 1.5rem;
+}
+
+[dir="rtl"] .rtl\:p-7{
+  padding: 1.75rem;
+}
+
+[dir="rtl"] .rtl\:p-8{
+  padding: 2rem;
+}
+
+[dir="rtl"] .rtl\:p-9{
+  padding: 2.25rem;
+}
+
+[dir="rtl"] .rtl\:p-10{
+  padding: 2.5rem;
+}
+
+[dir="rtl"] .rtl\:p-11{
+  padding: 2.75rem;
+}
+
+[dir="rtl"] .rtl\:p-12{
+  padding: 3rem;
+}
+
+[dir="rtl"] .rtl\:p-14{
+  padding: 3.5rem;
+}
+
+[dir="rtl"] .rtl\:p-16{
+  padding: 4rem;
+}
+
+[dir="rtl"] .rtl\:p-20{
+  padding: 5rem;
+}
+
+[dir="rtl"] .rtl\:p-24{
+  padding: 6rem;
+}
+
+[dir="rtl"] .rtl\:p-28{
+  padding: 7rem;
+}
+
+[dir="rtl"] .rtl\:p-31{
+  padding: 30.938rem;
+}
+
+[dir="rtl"] .rtl\:p-32{
+  padding: 8rem;
+}
+
+[dir="rtl"] .rtl\:p-33{
+  padding: 8.5rem;
+}
+
+[dir="rtl"] .rtl\:p-36{
+  padding: 9rem;
+}
+
+[dir="rtl"] .rtl\:p-37{
+  padding: 9.25rem;
+}
+
+[dir="rtl"] .rtl\:p-40{
+  padding: 10rem;
+}
+
+[dir="rtl"] .rtl\:p-44{
+  padding: 11rem;
+}
+
+[dir="rtl"] .rtl\:p-46{
+  padding: 46.875rem;
+}
+
+[dir="rtl"] .rtl\:p-48{
+  padding: 12rem;
+}
+
+[dir="rtl"] .rtl\:p-52{
+  padding: 13rem;
+}
+
+[dir="rtl"] .rtl\:p-56{
+  padding: 14rem;
+}
+
+[dir="rtl"] .rtl\:p-60{
+  padding: 15rem;
+}
+
+[dir="rtl"] .rtl\:p-64{
+  padding: 16rem;
+}
+
+[dir="rtl"] .rtl\:p-72{
+  padding: 18rem;
+}
+
+[dir="rtl"] .rtl\:p-80{
+  padding: 20rem;
+}
+
+[dir="rtl"] .rtl\:p-96{
+  padding: 24rem;
+}
+
+[dir="rtl"] .rtl\:p-px{
+  padding: 1px;
+}
+
+[dir="rtl"] .rtl\:p-0\.5{
+  padding: 0.125rem;
+}
+
+[dir="rtl"] .rtl\:p-1\.5{
+  padding: 0.375rem;
+}
+
+[dir="rtl"] .rtl\:p-2\.5{
+  padding: 0.625rem;
+}
+
+[dir="rtl"] .rtl\:p-3\.5{
+  padding: 0.875rem;
+}
+
+[dir="rtl"] .rtl\:p-modal{
+  padding: 610px;
+}
+
+[dir="rtl"] .rtl\:p-5\.5{
+  padding: 1.30rem;
+}
+
+[dir="rtl"] .rtl\:p-9\.5{
+  padding: 2.45rem;
+}
+
+[dir="rtl"] .rtl\:p-12\.5{
+  padding: 3.2rem;
+}
+
+<<<<<<< HEAD
 [dir="rtl"] .rtl\:border-r-8{
   border-right-width: 8px;
 }
@@ -49634,6 +51112,10 @@ body{
 
 [dir="rtl"] .rtl\:pr-0{
   padding-right: 0px;
+=======
+[dir="rtl"] .rtl\:p-32\.5{
+  padding: 8.5rem;
+>>>>>>> 746b131c68d1c21b95570c2213f605c60fa0d5e9
 }
 
 [dir="rtl"] .rtl\:pl-6{
@@ -49644,6 +51126,10 @@ body{
   padding-left: 0px;
 }
 
+[dir="rtl"] .rtl\:pr-0{
+  padding-right: 0px;
+}
+
 [dir="rtl"] .rtl\:pr-3{
   padding-right: 0.75rem;
 }
@@ -50285,6 +51771,7 @@ body{
     right: 0px;
   }
 
+<<<<<<< HEAD
   [dir="ltr"] .lg\:ltr\:ml-72{
     margin-left: 18rem;
   }
@@ -50293,6 +51780,8 @@ body{
     padding-left: 1.5rem;
   }
 
+=======
+>>>>>>> 746b131c68d1c21b95570c2213f605c60fa0d5e9
   [dir="ltr"] .lg\:ltr\:pr-12{
     padding-right: 3rem;
   }
@@ -50313,6 +51802,7 @@ body{
     left: 0px;
   }
 
+<<<<<<< HEAD
   [dir="rtl"] .lg\:rtl\:mr-72{
     margin-right: 18rem;
   }
@@ -50321,6 +51811,8 @@ body{
     padding-right: 1.5rem;
   }
 
+=======
+>>>>>>> 746b131c68d1c21b95570c2213f605c60fa0d5e9
   [dir="rtl"] .lg\:rtl\:pl-12{
     padding-left: 3rem;
   }
diff --git a/public/css/print.css b/public/css/print.css
index 4497ec86b..951b93bd5 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -25,6 +25,10 @@ th, td
     margin-bottom: 9px;
 }
 
+.print-report-padding {
+    padding-left: 25px;
+}
+
 html[dir='ltr'] .right-column {
     text-align: right;
 }
@@ -63,6 +67,10 @@ html[dir='rtl'] .right-column {
     margin-bottom: 8px;
 }
 
+.margin-bottom-12 {
+    margin: 12px 0;
+}
+
 .print-template .mt-1
 {
     margin-top: 8px;
diff --git a/resources/views/components/documents/show/template.blade.php b/resources/views/components/documents/show/template.blade.php
index d93973bc2..dddf6c1e5 100644
--- a/resources/views/components/documents/show/template.blade.php
+++ b/resources/views/components/documents/show/template.blade.php
@@ -1,143 +1,142 @@
 <div class="p-7 shadow-2xl rounded-2xl">
-    @if ($documentTemplate)
-        @switch($documentTemplate)
-            @case('classic')
-                <x-documents.template.classic
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-                @break
-            @case('modern')
-                <x-documents.template.modern
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-                @break
-            @default
-                <x-documents.template.ddefault
-                    type="{{ $type }}"
-                    :document="$document"
-                    document-template="{{ $documentTemplate }}"
-                    logo="{{ $logo }}"
-                    background-color="{{ $backgroundColor }}"
-                    hide-footer="{{ $hideFooter }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-order-number="{{ $hideOrderNumber }}"
-                    hide-document-number="{{ $hideDocumentNumber }}"
-                    hide-issued-at="{{ $hideIssuedAt }}"
-                    hide-due-at="{{ $hideDueAt }}"
-                    text-contact-info="{{ $textContactInfo }}"
-                    text-issued-at="{{ $textIssuedAt }}"
-                    text-document-number="{{ $textDocumentNumber }}"
-                    text-due-at="{{ $textDueAt }}"
-                    text-order-number="{{ $textOrderNumber }}"
-                    text-document-title="{{ $textDocumentTitle }}"
-                    text-document-subheading="{{ $textDocumentSubheading }}"
-                    hide-items="{{ $hideItems }}"
-                    hide-name="{{ $hideName }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-quantity="{{ $hideQuantity }}"
-                    hide-discount="{{ $hideDiscount }}"
-                    hide-price="{{ $hidePrice }}"
-                    hide-amount="{{ $hideAmount }}"
-                    hide-note="{{ $hideNote }}"
-                    text-items="{{ $textItems }}"
-                    text-quantity="{{ $textQuantity }}"
-                    text-price="{{ $textPrice }}"
-                    text-amount="{{ $textAmount }}"
-                />
-        @endswitch
-    @else
-        @include($documentTemplate)
-    @endif
+    @switch($documentTemplate)
+        @case('classic')
+            <x-documents.template.classic
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @case('modern')
+            <x-documents.template.modern
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @case('default')
+            <x-documents.template.ddefault
+                type="{{ $type }}"
+                :document="$document"
+                document-template="{{ $documentTemplate }}"
+                logo="{{ $logo }}"
+                background-color="{{ $backgroundColor }}"
+                hide-footer="{{ $hideFooter }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-order-number="{{ $hideOrderNumber }}"
+                hide-document-number="{{ $hideDocumentNumber }}"
+                hide-issued-at="{{ $hideIssuedAt }}"
+                hide-due-at="{{ $hideDueAt }}"
+                text-contact-info="{{ $textContactInfo }}"
+                text-issued-at="{{ $textIssuedAt }}"
+                text-document-number="{{ $textDocumentNumber }}"
+                text-due-at="{{ $textDueAt }}"
+                text-order-number="{{ $textOrderNumber }}"
+                text-document-title="{{ $textDocumentTitle }}"
+                text-document-subheading="{{ $textDocumentSubheading }}"
+                hide-items="{{ $hideItems }}"
+                hide-name="{{ $hideName }}"
+                hide-description="{{ $hideDescription }}"
+                hide-quantity="{{ $hideQuantity }}"
+                hide-discount="{{ $hideDiscount }}"
+                hide-price="{{ $hidePrice }}"
+                hide-amount="{{ $hideAmount }}"
+                hide-note="{{ $hideNote }}"
+                text-items="{{ $textItems }}"
+                text-quantity="{{ $textQuantity }}"
+                text-price="{{ $textPrice }}"
+                text-amount="{{ $textAmount }}"
+            />
+            @break
+        @default
+            @include($documentTemplate)
+    @endswitch
 </div>
\ No newline at end of file
diff --git a/resources/views/components/form/group/textarea.blade.php b/resources/views/components/form/group/textarea.blade.php
index 4127288bf..d9f3e5e07 100644
--- a/resources/views/components/form/group/textarea.blade.php
+++ b/resources/views/components/form/group/textarea.blade.php
@@ -48,6 +48,7 @@
             value="{!! $value !!}"
             placeholder="{{ $placeholder }}"
             rows="{{ $rows }}"
+            :disabled="$disabled"
             {{ $attributes->merge($custom_attributes) }}
         />
 
diff --git a/resources/views/components/index/summary.blade.php b/resources/views/components/index/summary.blade.php
index 111db7b51..075238924 100644
--- a/resources/views/components/index/summary.blade.php
+++ b/resources/views/components/index/summary.blade.php
@@ -4,12 +4,24 @@
     @elseif (! empty($items))
         @foreach ($items as $item)
             <div @class(['w-1/2 sm:w-1/3 text-center'])>
+                @php
+                    $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if (! empty($item['tooltip']))
                     <x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
                         @if (! empty($item['href']))
-                        <x-link href="{{ $item['href'] }}" class="group" override="class">
-                        @endif
-                            @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
+                            <x-link href="{{ $item['href'] }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                                    {!! $item['amount'] !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $item['title'] !!}
+                                </span>
+                            </x-link>
+                        @else
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                                 {!! $item['amount'] !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -18,15 +30,21 @@
                             <span class="font-light mt-3">
                                 {!! $item['title'] !!}
                             </span>
-                        @if (! empty($item['href']))
-                        </x-link>
                         @endif
                     </x-tooltip>
                 @else
                     @if (! empty($item['href']))
-                    <x-link href="{{ $item['href'] }}" class="group" override="class">
-                    @endif
-                        @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
+                        <x-link href="{{ $item['href'] }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                                {!! $item['amount'] !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $item['title'] !!}
+                            </span>
+                        </x-link>
+                    @else
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                             {!! $item['amount'] !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -35,8 +53,6 @@
                         <span class="font-light mt-3">
                             {!! $item['title'] !!}
                         </span>
-                    @if (! empty($item['href']))
-                    </x-link>
                     @endif
                 @endif
             </div>
@@ -46,13 +62,24 @@
             {!! $first !!}
         @elseif (! empty($first))
             <div class="w-1/2 sm:w-1/3 text-center">
+                @php
+                    $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if ($first->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
-                    
                         @if ($first->attributes->has('href'))
-                        <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                            <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
+                                    {!! $first->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $first->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
                                 {!! $first->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -61,16 +88,21 @@
                             <span class="font-light mt-3">
                                 {!! $first->attributes->get('title') !!}
                             </span>
-                        @if ($first->attributes->has('href'))
-                        </x-link>
                         @endif
-
                     </x-tooltip>
                 @else
                     @if ($first->attributes->has('href'))
-                    <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                        <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
+                                {!! $first->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $first->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
                             {!! $first->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -79,8 +111,6 @@
                         <span class="font-light mt-3">
                             {!! $first->attributes->get('title') !!}
                         </span>
-                    @if ($first->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
@@ -96,13 +126,24 @@
             {!! $second !!}
         @elseif (! empty($second))
             <div class="w-1/2 sm:w-1/3 text-center">
+                @php
+                    $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if ($second->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-second" placement="top" message="{!! $second->attributes->get('tooltip') !!}">
-
                         @if ($second->attributes->has('href'))
-                        <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                            <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
+                                    {!! $second->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $second->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
                                 {!! $second->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -111,17 +152,21 @@
                             <span class="font-light mt-3">
                                 {!! $second->attributes->get('title') !!}
                             </span>
-
-                        @if ($second->attributes->has('href'))
-                        </x-link>
                         @endif
-
                     </x-tooltip>
                 @else
                     @if ($second->attributes->has('href'))
-                    <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                        <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
+                                {!! $second->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $second->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
                             {!! $second->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -130,9 +175,6 @@
                         <span class="font-light mt-3">
                             {!! $second->attributes->get('title') !!}
                         </span>
-
-                    @if ($second->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
@@ -148,13 +190,24 @@
             {!! $third !!}
         @elseif (! empty($third))
             <div class="w-1/2 sm:w-1/3 text-center">
+                @php
+                    $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if ($third->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-third" placement="top" message="{!! $third->attributes->get('tooltip') !!}">
-
                         @if ($third->attributes->has('href'))
-                        <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                            <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
+                                    {!! $third->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $third->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
                                 {!! $third->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -163,16 +216,21 @@
                             <span class="font-light mt-3">
                                 {!! $third->attributes->get('title') !!}
                             </span>
-                        @if ($third->attributes->has('href'))
-                        </x-link>
                         @endif
-
                     </x-tooltip>
                 @else
                     @if ($third->attributes->has('href'))
-                    <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
+                        <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
+                                {!! $third->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $third->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
                             {!! $third->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -181,11 +239,9 @@
                         <span class="font-light mt-3">
                             {!! $third->attributes->get('title') !!}
                         </span>
-                    @if ($third->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
         @endif
     @endif
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/components/layouts/modules/show/reviews.blade.php b/resources/views/components/layouts/modules/show/reviews.blade.php
index 352e3310b..18f97c049 100644
--- a/resources/views/components/layouts/modules/show/reviews.blade.php
+++ b/resources/views/components/layouts/modules/show/reviews.blade.php
@@ -28,7 +28,7 @@
     </div>
 
     @stack('pagination_end')
-@else
+@elseif (! count($reviews->data))
     <div class="flex">
         <small>{{ trans('general.no_records') }}</small>
     </div>
diff --git a/resources/views/components/reports/detail/table.blade.php b/resources/views/components/reports/detail/table.blade.php
index 2b97074c4..8f410ea3a 100644
--- a/resources/views/components/reports/detail/table.blade.php
+++ b/resources/views/components/reports/detail/table.blade.php
@@ -1,4 +1,4 @@
-<div class="overflow-x-visible mb-8">
+<div class="overflow-x-visible mb-8 margin-bottom-12">
     <table class="w-full rp-border-collapse">
         @include($class->views['detail.table.header'])
         @include($class->views['detail.table.body'])
diff --git a/resources/views/components/show/summary/right.blade.php b/resources/views/components/show/summary/right.blade.php
index 45d4ee4e0..1276e4fe2 100644
--- a/resources/views/components/show/summary/right.blade.php
+++ b/resources/views/components/show/summary/right.blade.php
@@ -4,10 +4,37 @@
     @elseif (! empty($items))
         @foreach ($items as $item)
             <div @class(['w-1/2 sm:w-1/3 text-center'])>
+                @php
+                    $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if (! empty($item['tooltip']))
                     <x-tooltip id="tooltip-summary-{{ $loop->index }}" placement="top" message="{!! $item['tooltip'] !!}">
+                        @if (! empty($item['href']))
+                            <x-link href="{{ $item['href'] }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                                    {!! $item['amount'] !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $item['title'] !!}
+                                </span>
+                            </x-link>
+                        @else
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                                {!! $item['amount'] !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $item['title'] !!}
+                            </span>
+                        @endif
+                    </x-tooltip>
+                @else
+                    @if (! empty($item['href']))
                         <x-link href="{{ $item['href'] }}" class="group" override="class">
-                            @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                                 {!! $item['amount'] !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -17,10 +44,7 @@
                                 {!! $item['title'] !!}
                             </span>
                         </x-link>
-                    </x-tooltip>
-                @else
-                    <x-link href="{{ $item['href'] }}" class="group" override="class">
-                        @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
+                    @else
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                             {!! $item['amount'] !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
@@ -29,7 +53,7 @@
                         <span class="font-light mt-3">
                             {!! $item['title'] !!}
                         </span>
-                    </x-link>
+                    @endif
                 @endif
             </div>
         @endforeach
@@ -38,14 +62,25 @@
             {!! $first !!}
         @elseif (! empty($first))
             <div class="w-1/2 sm:w-1/3 text-center">
+                @php
+                    $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if ($first->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
-
                         @if ($first->attributes->has('href'))
-                        <x-link href="{{ $first->attributes->get('hef') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                            <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
+                                    {!! $first->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $first->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
                                 {!! $first->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                             </div>
@@ -53,17 +88,22 @@
                             <span class="font-light mt-3">
                                 {!! $first->attributes->get('title') !!}
                             </span>
-                        @if ($first->attributes->has('href'))
-                        </x-link>
                         @endif
-
                     </x-tooltip>
                 @else
                     @if ($first->attributes->has('href'))
-                    <x-link href="{{ $first->attributes->get('hef') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                        <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
+                                {!! $first->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $first->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
+                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
                             {!! $first->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                         </div>
@@ -71,8 +111,6 @@
                         <span class="font-light mt-3">
                             {!! $first->attributes->get('title') !!}
                         </span>
-                    @if ($first->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
@@ -88,14 +126,25 @@
             {!! $second !!}
         @elseif (! empty($second))
             <div class="w-1/2 sm:w-1/3 text-center">
+                @php
+                    $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700';
+                @endphp
+
                 @if ($second->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-second" placement="top" message="{!! $second->attributes->get('tooltip') !!}">
-
                         @if ($second->attributes->has('href'))
-                        <x-link href="{{ $second->attributes->get('hef') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                            <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
+                                    {!! $second->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $second->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
                                 {!! $second->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                             </div>
@@ -103,17 +152,22 @@
                             <span class="font-light mt-3">
                                 {!! $second->attributes->get('title') !!}
                             </span>
-                        @if ($second->attributes->has('href'))
-                        </x-link>
                         @endif
-
                     </x-tooltip>
                 @else
                     @if ($second->attributes->has('href'))
-                    <x-link href="{{ $second->attributes->get('hef') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                        <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
+                                {!! $second->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $second->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
+                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
                             {!! $second->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                         </div>
@@ -121,8 +175,6 @@
                         <span class="font-light mt-3">
                             {!! $second->attributes->get('title') !!}
                         </span>
-                    @if ($second->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
@@ -141,10 +193,18 @@
                 @if ($third->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-third" placement="top" message="{!! $third->attributes->get('tooltip') !!}">
                         @if ($third->attributes->has('href'))
-                        <x-link href="{{ $third->attributes->get('hef') }}" class="group" override="class">
-                        @endif
-                            @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                            <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
+                                <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
+                                    {!! $third->attributes->get('amount') !!}
+                                    <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                                </div>
+
+                                <span class="font-light mt-3">
+                                    {!! $third->attributes->get('title') !!}
+                                </span>
+                            </x-link>
+                        @else
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
                                 {!! $third->attributes->get('amount') !!}
                                 <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                             </div>
@@ -152,16 +212,22 @@
                             <span class="font-light mt-3">
                                 {!! $third->attributes->get('title') !!}
                             </span>
-                        @if ($third->attributes->has('href'))
-                        </x-link>
                         @endif
                     </x-tooltip>
                 @else
                     @if ($third->attributes->has('href'))
-                    <x-link href="{{ $third->attributes->get('hef') }}" class="group" override="class">
-                    @endif
-                        @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
-                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
+                        <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
+                            <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
+                                {!! $third->attributes->get('amount') !!}
+                                <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
+                            </div>
+
+                            <span class="font-light mt-3">
+                                {!! $third->attributes->get('title') !!}
+                            </span>
+                        </x-link>
+                    @else
+                        <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
                             {!! $third->attributes->get('amount') !!}
                             <span class="w-8 absolute left-0 right-0 m-auto -bottom-1 bg-gray-200 transition-all group-hover:bg-gray-900" style="height: 1px;"></span>
                         </div>
@@ -169,8 +235,6 @@
                         <span class="font-light mt-3">
                             {!! $third->attributes->get('title') !!}
                         </span>
-                    @if ($third->attributes->has('href'))
-                    </x-link>
                     @endif
                 @endif
             </div>
diff --git a/resources/views/components/transactions/show/template.blade.php b/resources/views/components/transactions/show/template.blade.php
index d37f1813d..61c623878 100644
--- a/resources/views/components/transactions/show/template.blade.php
+++ b/resources/views/components/transactions/show/template.blade.php
@@ -1,69 +1,68 @@
 <div class="p-7 shadow-2xl rounded-2xl">
-    @if ($transactionTemplate)
-        @switch($transactionTemplate)
-            @case('classic')
-                @break
-            @case('modern')
-                @break
-            @default
-                <x-transactions.template.ddefault
-                    type="{{ $type }}"
-                    :transaction="$transaction"
-                    :payment_methods="$payment_methods"
-                    transaction-template="{{ $transactionTemplate }}"
-                    logo="{{ $logo }}"
-                    hide-company="{{ $hideCompany }}"
-                    hide-company-logo="{{ $hideCompanyLogo }}"
-                    hide-company-details="{{ $hideCompanyDetails }}"
-                    hide-company-name="{{ $hideCompanyName }}"
-                    hide-company-address="{{ $hideCompanyAddress }}"
-                    hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
-                    hide-company-phone="{{ $hideCompanyPhone }}"
-                    hide-company-email="{{ $hideCompanyEmail }}"
-                    hide-content-title="{{ $hideContentTitle }}"
-                    hide-number="{{ $hideNumber }}"
-                    hide-paid-at="{{ $hidePaidAt }}"
-                    hide-account="{{ $hideAccount }}"
-                    hide-category="{{ $hideCategory }}"
-                    hide-payment-methods="{{ $hidePaymentMethods }}"
-                    hide-reference="{{ $hideReference }}"
-                    hide-description="{{ $hideDescription }}"
-                    hide-amount="{{ $hideAmount }}"
-                    text-content-title="{{ $textContentTitle }}"
-                    text-number="{{ $textNumber }}"
-                    text-paid-at="{{ $textPaidAt }}"
-                    text-account="{{ $textAccount }}"
-                    text-category="{{ $textCategory }}"
-                    text-payment-methods="{{ $textPaymentMethods }}"
-                    text-reference="{{ $textReference }}"
-                    text-description="{{ $textDescription }}"
-                    text-paid-by="{{ $textPaidBy }}"
-                    hide-contact="{{ $hideContact }}"
-                    hide-contact-info="{{ $hideContactInfo }}"
-                    hide-contact-name="{{ $hideContactName }}"
-                    hide-contact-address="{{ $hideContactAddress }}"
-                    hide-contact-tax-number="{{ $hideContactTaxNumber }}"
-                    hide-contact-phone="{{ $hideContactPhone }}"
-                    hide-contact-email="{{ $hideContactEmail }}"
-                    hide-related="{{ $hideRelated }}"
-                    hide-related-document-number="{{ $hideRelatedDocumentNumber }}"
-                    hide-related-contact="{{ $hideRelatedContact }}"
-                    hide-related-document-date="{{ $hideRelatedDocumentDate }}"
-                    hide-related-document-amount="{{ $hideRelatedDocumentAmount }}"
-                    hide-related-amount="{{ $hideRelatedAmount }}"
-                    text-related-transaction="{{ $textRelatedTransansaction }}"
-                    text-related-document-number="{{ $textRelatedDocumentNumber }}"
-                    text-related-contact="{{ $textRelatedContact }}"
-                    text-related-document-date="{{ $textRelatedDocumentDate }}"
-                    text-related-document-amount="{{ $textRelatedDocumentAmount }}"
-                    text-related-amount="{{ $textRelatedAmount }}"
-                    route-document-show="{{ $routeDocumentShow }}"
-                />
-        @endswitch
-    @else
-        @include($transactionTemplate)
-    @endif
-
+    @switch($transactionTemplate)
+        @case('classic')
+            @break
+        @case('modern')
+            @break
+        @case('default')
+            <x-transactions.template.ddefault
+                type="{{ $type }}"
+                :transaction="$transaction"
+                :payment_methods="$payment_methods"
+                transaction-template="{{ $transactionTemplate }}"
+                logo="{{ $logo }}"
+                hide-company="{{ $hideCompany }}"
+                hide-company-logo="{{ $hideCompanyLogo }}"
+                hide-company-details="{{ $hideCompanyDetails }}"
+                hide-company-name="{{ $hideCompanyName }}"
+                hide-company-address="{{ $hideCompanyAddress }}"
+                hide-company-tax-number="{{ $hideCompanyTaxNumber }}"
+                hide-company-phone="{{ $hideCompanyPhone }}"
+                hide-company-email="{{ $hideCompanyEmail }}"
+                hide-content-title="{{ $hideContentTitle }}"
+                hide-number="{{ $hideNumber }}"
+                hide-paid-at="{{ $hidePaidAt }}"
+                hide-account="{{ $hideAccount }}"
+                hide-category="{{ $hideCategory }}"
+                hide-payment-methods="{{ $hidePaymentMethods }}"
+                hide-reference="{{ $hideReference }}"
+                hide-description="{{ $hideDescription }}"
+                hide-amount="{{ $hideAmount }}"
+                text-content-title="{{ $textContentTitle }}"
+                text-number="{{ $textNumber }}"
+                text-paid-at="{{ $textPaidAt }}"
+                text-account="{{ $textAccount }}"
+                text-category="{{ $textCategory }}"
+                text-payment-methods="{{ $textPaymentMethods }}"
+                text-reference="{{ $textReference }}"
+                text-description="{{ $textDescription }}"
+                text-paid-by="{{ $textPaidBy }}"
+                hide-contact="{{ $hideContact }}"
+                hide-contact-info="{{ $hideContactInfo }}"
+                hide-contact-name="{{ $hideContactName }}"
+                hide-contact-address="{{ $hideContactAddress }}"
+                hide-contact-tax-number="{{ $hideContactTaxNumber }}"
+                hide-contact-phone="{{ $hideContactPhone }}"
+                hide-contact-email="{{ $hideContactEmail }}"
+                hide-related="{{ $hideRelated }}"
+                hide-related-document-number="{{ $hideRelatedDocumentNumber }}"
+                hide-related-contact="{{ $hideRelatedContact }}"
+                hide-related-document-date="{{ $hideRelatedDocumentDate }}"
+                hide-related-document-amount="{{ $hideRelatedDocumentAmount }}"
+                hide-related-amount="{{ $hideRelatedAmount }}"
+                text-related-transaction="{{ $textRelatedTransansaction }}"
+                text-related-document-number="{{ $textRelatedDocumentNumber }}"
+                text-related-contact="{{ $textRelatedContact }}"
+                text-related-document-date="{{ $textRelatedDocumentDate }}"
+                text-related-document-amount="{{ $textRelatedDocumentAmount }}"
+                text-related-amount="{{ $textRelatedAmount }}"
+                route-document-show="{{ $routeDocumentShow }}"
+            />
+            @break
+        @default
+            @include($transactionTemplate)
+    @endswitch
+    
     <akaunting-connect-transactions
         :show="connect.show"
         :transaction="connect.transaction"
diff --git a/safelist.txt b/safelist.txt
index c95fecc04..54cbb449b 100644
--- a/safelist.txt
+++ b/safelist.txt
@@ -1,11 +1,20 @@
 xl:pt-6
 lg:mt-2
-ltr:-right-1.5
-rtl:-left-1.5
 lg:pl-24
 lg:my-12
 lg:mt-4
 lg:pl-6
+sm:max-w-4xl
+hover:bg-silver-700
+hover:bg-peach_orange-700
+hover:bg-pastel_green-700
+hover:bg-white
+hover:border-silver-700
+hover:border-peach_orange-700
+hover:border-pastel_green-700
+hover:text-silver-700
+hover:text-peach_orange-700
+hover:text-pastel_green-700
 lg:text-6xl
 lg:h-6
 lg:text-xl
@@ -19,25 +28,4 @@ lg:rtl:mr-72
 lg:space-x-8
 lg:text-4xl
 lg:top-7
-ltr:border-l-8
-rtl:border-r-8
-ltr:pr-20
-rtl:pl-20
-lg:max-w-lg
-sm:max-w-4xl
-hover:bg-silver-700
-hover:bg-peach_orange-700
-hover:bg-pastel_green-700
-hover:bg-white
-hover:border-silver-700
-hover:border-peach_orange-700
-hover:border-pastel_green-700
-hover:text-silver-700
-hover:text-peach_orange-700
-hover:text-pastel_green-700
-ltr:pl-0
-rtl:pr-0
-ltr:lg:pl-6
-rtl:lg:pr-6
-ltr:-right-8
-rtl:-left-8
+lg:max-w-lg
\ No newline at end of file