diff --git a/custom_receipts_for_pos/__manifest__.py b/custom_receipts_for_pos/__manifest__.py
index 94947385a..643fa5c04 100644
--- a/custom_receipts_for_pos/__manifest__.py
+++ b/custom_receipts_for_pos/__manifest__.py
@@ -22,7 +22,7 @@
 ################################################################################
 {
     'name': 'POS Receipt Design',
-    'version': '17.0.1.0.3',
+    'version': '17.0.1.0.4',
     'category': 'Point of Sale',
     'summary': "POS Receipt, Receipt Design, POS Receipt Template, Design "
                "Report, Custom Receipt, POS Report, Customise Receipt, Odoo17, "
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/1.png b/custom_receipts_for_pos/static/description/assets/screenshots/1.png
index f18bfc7e3..388a0fe9a 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/1.png and b/custom_receipts_for_pos/static/description/assets/screenshots/1.png differ
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/2.png b/custom_receipts_for_pos/static/description/assets/screenshots/2.png
index d9c91add7..f60e6f415 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/2.png and b/custom_receipts_for_pos/static/description/assets/screenshots/2.png differ
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/3.png b/custom_receipts_for_pos/static/description/assets/screenshots/3.png
index 5a2ac916e..65601c61e 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/3.png and b/custom_receipts_for_pos/static/description/assets/screenshots/3.png differ
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/5.png b/custom_receipts_for_pos/static/description/assets/screenshots/5.png
index 286f8d20d..699413c9a 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/5.png and b/custom_receipts_for_pos/static/description/assets/screenshots/5.png differ
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/6.png b/custom_receipts_for_pos/static/description/assets/screenshots/6.png
index e4649c71c..ca4a70e2d 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/6.png and b/custom_receipts_for_pos/static/description/assets/screenshots/6.png differ
diff --git a/custom_receipts_for_pos/static/description/assets/screenshots/7.png b/custom_receipts_for_pos/static/description/assets/screenshots/7.png
index 348689554..2a7a7287a 100644
Binary files a/custom_receipts_for_pos/static/description/assets/screenshots/7.png and b/custom_receipts_for_pos/static/description/assets/screenshots/7.png differ
diff --git a/custom_receipts_for_pos/static/src/xml/order_receipt.xml b/custom_receipts_for_pos/static/src/xml/order_receipt.xml
index 5fd310f54..61606e743 100644
--- a/custom_receipts_for_pos/static/src/xml/order_receipt.xml
+++ b/custom_receipts_for_pos/static/src/xml/order_receipt.xml
@@ -2,13 +2,167 @@
 <!--Inherit point_of_sale.OrderReceipt for getting our custom receipt design-->
 <templates id="template" xml:space="preserve">
     <t t-inherit="point_of_sale.OrderReceipt" t-inherit-mode="extension">
-        <xpath expr="//div[hasclass('pos-receipt')]" position="attributes">
-            <attribute name="t-if">isTrue</attribute>
-        </xpath>
-        <xpath expr="//div[hasclass('pos-receipt')]" position="after">
-            <t t-else="">
-                <t t-component="templateComponent" t-props="templateProps"/>
-            </t>
+        <xpath expr="//div[hasclass('pos-receipt')]" position="replace">
+            <div class="pos-receipt">
+                <t t-if="isTrue">
+                    <ReceiptHeader data="props.data.headerData"/>
+                        <OrderWidget lines="props.data.orderlines" t-slot-scope="scope">
+                        <t t-set="line" t-value="scope.line"/>
+                            <Orderline line="omit(scope.line, 'customerNote')"
+                                       class="{ 'pe-none': true }">
+                                <li t-if="line.customerNote"
+                                    class="customer-note w-100 p-2 my-1 rounded text-break">
+                                    <i class="fa fa-sticky-note me-1" role="img"
+                                       aria-label="Customer Note" title="Customer Note"/>
+                                    <t t-esc="line.customerNote"/>
+                                </li>
+                                <ul t-if="line.pack_lot_lines">
+                                <li t-foreach="line.pack_lot_lines" t-as="lot"
+                                    t-key="lot.cid">
+                                    <t t-if="lot.order_line.product.tracking == 'lot'">
+                                        Lot Number <t t-esc="lot.lot_name"/>
+                                    </t>
+                                    <t t-else="">
+                                        SN <t t-esc="lot.lot_name"/>
+                                    </t>
+                                </li>
+                            </ul>
+                        </Orderline>
+                    </OrderWidget>
+
+                    <!-- Total -->
+                    <div class="pos-receipt-right-align">--------</div>
+                    <br/>
+                    <div class="pos-receipt-amount">
+                        TOTAL
+                        <span t-esc="props.formatCurrency(props.data.amount_total)"
+                              class="pos-receipt-right-align"/>
+                    </div>
+                    <t t-if="props.data.rounding_applied">
+                        <div class="pos-receipt-amount">
+                          Rounding
+                            <span t-esc='props.formatCurrency(props.data.rounding_applied)'
+                                  class="pos-receipt-right-align"/>
+                        </div>
+                        <div class="pos-receipt-amount">To Pay
+                            <span t-esc='props.formatCurrency(props.data.amount_total + props.data.rounding_applied)'
+                               class="pos-receipt-right-align"/>
+                        </div>
+                    </t>
+                    <br/>
+                    <br/>
+
+                    <!-- Payment Lines -->
+
+                    <div class="paymentlines" t-foreach="props.data.paymentlines"
+                         t-as="line" t-key="line_index">
+                        <t t-esc="line.name"/>
+                            <span t-esc="props.formatCurrency(line.amount, false)"
+                                  class="pos-receipt-right-align"/>
+                    </div>
+                    <div class="pos-receipt-amount receipt-change mt-2">
+                        CHANGE
+                        <span t-esc="props.formatCurrency(props.data.change)"
+                              class="pos-receipt-right-align"/>
+                    </div>
+
+                    <!-- Extra Payment Info -->
+
+                    <t t-if="props.data.total_discount">
+                        <div>
+                            Discounts
+                            <span t-esc="props.formatCurrency(props.data.total_discount)"
+                                  class="pos-receipt-right-align"/>
+                        </div>
+                    </t>
+                    <div t-if="props.data.tax_details.length > 0"
+                             class="pos-receipt-taxes">
+                        <span/>
+                            <span>TAX%</span>
+                            <span>Tax</span>
+                            <span>Base</span>
+                            <span>Total</span>
+                        <t t-foreach="props.data.tax_details" t-as="tax"
+                               t-key="tax.tax.id">
+                            <span t-esc="tax.tax.letter || ''"/>
+                                <span><t t-esc="tax.tax.amount"/>
+                                    %</span>
+                                <span t-esc="props.formatCurrency(tax.amount, false)"/>
+                                <span t-esc="props.formatCurrency(tax.base, false)"/>
+                                <span t-esc="props.formatCurrency(tax.amount + tax.base, false)"/>
+                        </t>
+                        <t t-if="props.data.tax_details.length > 1">
+                            <span/>
+                                <span/>
+                                <span t-esc="props.formatCurrency(props.data.amount_tax, false)"/>
+                                <span t-esc="props.formatCurrency(props.data.total_without_tax, false)"/>
+                                <span t-esc="props.formatCurrency(props.data.amount_total, false)"/>
+                        </t>
+                    </div>
+
+                    <div class="before-footer"/>
+
+                    <div t-if="props.data.pos_qr_code">
+                        <br/>
+                        <br/>
+                        <div class="pos-receipt-order-data mb-2">
+                            Scan me to request an invoice for your purchase.
+                        </div>
+                        <img id="posqrcode" t-att-src="props.data.pos_qr_code"
+                             class="pos-receipt-logo"/>
+                    </div>
+                    <div t-if="props.data.ticket_code">
+                        <br/>
+                        <br/>
+                        <div class="pos-receipt-order-data">
+                            You can go to <t t-out="props.data.base_url"/>/pos/ticket
+                            and use the code below to request an invoice online
+                        </div>
+                        <div class="pos-receipt-order-data">
+                            Unique Code: <t t-out="props.data.ticket_code"/>
+                        </div>
+                    </div>
+
+                    <!-- Footer -->
+                    <div t-if="props.data.footer" class="pos-receipt-center-align"
+                         style="white-space:pre-line">
+                         <br/>
+                         <t t-esc="props.data.footer"/>
+                         <br/>
+                         <br/>
+                    </div>
+
+                    <div class="after-footer">
+                       <t t-foreach="props.data.paymentlines" t-as="line"
+                          t-key="line_index">
+                           <t t-if="line.ticket">
+                               <br/>
+                               <div class="pos-payment-terminal-receipt">
+                                   <pre t-esc="line.ticket"/>
+                               </div>
+                           </t>
+                       </t>
+                    </div>
+
+                    <br/>
+                    <t t-if="props.shippingDate">
+                        <div class="pos-receipt-order-data">
+                            Expected delivery:
+                            <div><t t-esc="props.shippingDate" /></div>
+                        </div>
+                    </t>
+
+                    <br/>
+                    <div class="pos-receipt-order-data">
+                        <p>Odoo Point of Sale</p>
+                            <div t-esc="props.data.name"/>
+                            <div t-esc="props.data.date"/>
+                    </div>
+                </t>
+                <t t-else="">
+                    <t t-component="templateComponent" t-props="templateProps"/>
+                </t>
+            </div>
         </xpath>
     </t>
 </templates>