diff --git a/addons/dine360_theme_chennora/__manifest__.py b/addons/dine360_theme_chennora/__manifest__.py
index 060a129..9df15b4 100644
--- a/addons/dine360_theme_chennora/__manifest__.py
+++ b/addons/dine360_theme_chennora/__manifest__.py
@@ -14,6 +14,7 @@
         'views/blog_page.xml',  # Blog Page
         'views/blog_detail_page.xml', # Blog Detail Page
         'views/shop_page.xml',  # Shop Page
+        'views/checkout_address.xml', # Checkout Address page (remove Company/VAT)
         'views/product_details_page.xml', # Customized Product Details Page
         'views/product_views.xml', # Product Form custom fields
         'views/snippets.xml',   # Custom Building Blocks
diff --git a/addons/dine360_theme_chennora/static/src/scss/shop.scss b/addons/dine360_theme_chennora/static/src/scss/shop.scss
index aa8f609..7b19ab8 100644
--- a/addons/dine360_theme_chennora/static/src/scss/shop.scss
+++ b/addons/dine360_theme_chennora/static/src/scss/shop.scss
@@ -590,11 +590,6 @@
     }
 
     /* Target the Terms and Conditions block */
-    >hr+div,
-    >div:has(a[href*="terms"]),
-    .o_not_editable {
-        /* Only hide if it's not the ones we want */
-    }
 
     /* Dedicated hide for Odoo's extra info */
     hr+div,
@@ -630,4 +625,33 @@
     background-color: #e5b945 !important;
     border-color: #e5b945 !important;
     transform: translateY(-1px) !important;
+}
+
+/* Update Checkout button on cart page */
+#o_cart_summary .btn-primary,
+.oe_website_sale .btn-primary[href='/shop/checkout'],
+.oe_website_sale .btn-primary.a-submit,
+.oe_website_sale a.btn-primary,
+.oe_cart .btn-primary {
+    background-color: #FECD4F !important;
+    color: #04121D !important;
+    border-color: #FECD4F !important;
+    font-weight: 800 !important;
+    text-transform: uppercase !important;
+    padding: 12px 30px !important;
+    border-radius: 8px !important;
+    transition: all 0.3s ease !important;
+    box-shadow: 0 4px 15px rgba(254, 205, 79, 0.2) !important;
+}
+
+#o_cart_summary .btn-primary:hover,
+.oe_website_sale .btn-primary[href='/shop/checkout']:hover,
+.oe_website_sale .btn-primary.a-submit:hover,
+.oe_website_sale a.btn-primary:hover,
+.oe_cart .btn-primary:hover {
+    background-color: #e5b945 !important;
+    border-color: #e5b945 !important;
+    transform: translateY(-2px) !important;
+    color: #000000 !important;
+    box-shadow: 0 6px 20px rgba(254, 205, 79, 0.4) !important;
 }
\ No newline at end of file
diff --git a/addons/dine360_theme_chennora/static/src/scss/theme.scss b/addons/dine360_theme_chennora/static/src/scss/theme.scss
index b90fb8f..90e6ea1 100644
--- a/addons/dine360_theme_chennora/static/src/scss/theme.scss
+++ b/addons/dine360_theme_chennora/static/src/scss/theme.scss
@@ -1382,6 +1382,22 @@ a:hover *,
     color: #2BB1A5 !important;
 }
 
+// Global Primary Button Color Fix (including Checkout)
+.btn-primary,
+.btn-primary:not(:disabled):not(.disabled):active,
+.btn-primary:not(:disabled):not(.disabled).active,
+.show>.btn-primary.dropdown-toggle {
+    background-color: #FECD4F !important;
+    color: #04121D !important;
+    border-color: #FECD4F !important;
+}
+
+.btn-primary:hover {
+    background-color: #e5b945 !important;
+    border-color: #e5b945 !important;
+    color: #000000 !important;
+}
+
 // Special case for buttons or text that should be white on teal background
 // Special case for buttons or text that should be white on teal background
 .nav-pills .nav-link.active,
diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
new file mode 100644
index 0000000..14bc2f0
--- /dev/null
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Custom Address Form - Remove Company/VAT and Rename Zip to Postal Code -->
+    <!-- Increased priority to 99 to ensure it overrides other theme or base overrides -->
+    <!-- Custom Address Form - Remove Company/VAT and Rename Zip to Postal Code -->
+    <!-- Increased priority to 99 to ensure it overrides other theme or base overrides -->
+    <template id="chennora_address_custom" inherit_id="website_sale.address" name="Chennora Address Custom" priority="99">
+        
+        <!-- 1. Remove Company Name Field -->
+        <xpath expr="//label[@for='company_name']/.." position="replace"/>
+
+        <!-- 2. Remove VAT Field -->
+        <xpath expr="//label[@for='vat']/.." position="replace"/>
+        
+        <!-- 3. Remove VAT Warning Message if it exists -->
+        <xpath expr="//small[contains(text(), 'VAT number is not allowed')]/.." position="replace"/>
+
+        <!-- 4. Rename Zip Code Label to Postal Code -->
+        <!-- Targeting by 'for' attribute and by text content to be absolutely sure -->
+        <xpath expr="//label[@for='zip'] | //label[contains(text(), 'Zip')]" position="replace">
+            <label class="col-form-label fw-normal" for="zip">Postal Code</label>
+        </xpath>
+        
+        <!-- 5. Update Placeholder for Zip Input -->
+        <xpath expr="//input[@name='zip']" position="attributes">
+            <attribute name="placeholder">Postal Code</attribute>
+        </xpath>
+    </template>
+</odoo>