diff --git a/app/modules/analytics/templates/analytics/store/analytics.html b/app/modules/analytics/templates/analytics/store/analytics.html
index 296fd7d9..a317b21c 100644
--- a/app/modules/analytics/templates/analytics/store/analytics.html
+++ b/app/modules/analytics/templates/analytics/store/analytics.html
@@ -227,5 +227,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('analytics_static', path='store/js/analytics.js') }}"></script>
+<script defer src="{{ url_for('analytics_static', path='store/js/analytics.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/billing/templates/billing/admin/billing-history.html b/app/modules/billing/templates/billing/admin/billing-history.html
index f80daded..f9a9b6dc 100644
--- a/app/modules/billing/templates/billing/admin/billing-history.html
+++ b/app/modules/billing/templates/billing/admin/billing-history.html
@@ -203,5 +203,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('billing_static', path='admin/js/billing-history.js') }}"></script>
+<script defer src="{{ url_for('billing_static', path='admin/js/billing-history.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/billing/templates/billing/admin/subscription-tiers.html b/app/modules/billing/templates/billing/admin/subscription-tiers.html
index df4b5ab8..cf8f891d 100644
--- a/app/modules/billing/templates/billing/admin/subscription-tiers.html
+++ b/app/modules/billing/templates/billing/admin/subscription-tiers.html
@@ -474,5 +474,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('billing_static', path='admin/js/subscription-tiers.js') }}"></script>
+<script defer src="{{ url_for('billing_static', path='admin/js/subscription-tiers.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/billing/templates/billing/admin/subscriptions.html b/app/modules/billing/templates/billing/admin/subscriptions.html
index f8c332f4..57e49845 100644
--- a/app/modules/billing/templates/billing/admin/subscriptions.html
+++ b/app/modules/billing/templates/billing/admin/subscriptions.html
@@ -316,5 +316,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('billing_static', path='admin/js/subscriptions.js') }}"></script>
+<script defer src="{{ url_for('billing_static', path='admin/js/subscriptions.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/billing/templates/billing/platform/signup.html b/app/modules/billing/templates/billing/platform/signup.html
index 674e5351..b7233207 100644
--- a/app/modules/billing/templates/billing/platform/signup.html
+++ b/app/modules/billing/templates/billing/platform/signup.html
@@ -6,7 +6,7 @@
 
 {% block extra_head %}
 {# Stripe.js for payment #}
-<script src="https://js.stripe.com/v3/"></script>
+<script defer src="https://js.stripe.com/v3/"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/billing/templates/billing/store/billing.html b/app/modules/billing/templates/billing/store/billing.html
index 7d1df469..09fa7162 100644
--- a/app/modules/billing/templates/billing/store/billing.html
+++ b/app/modules/billing/templates/billing/store/billing.html
@@ -402,5 +402,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/modules/billing/store/js/billing.js"></script>
+<script defer src="/static/modules/billing/store/js/billing.js"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/admin/store-product-create.html b/app/modules/catalog/templates/catalog/admin/store-product-create.html
index bddef428..342ea821 100644
--- a/app/modules/catalog/templates/catalog/admin/store-product-create.html
+++ b/app/modules/catalog/templates/catalog/admin/store-product-create.html
@@ -340,7 +340,7 @@
                 <div class="w-32 h-32 rounded-lg overflow-hidden bg-gray-100 dark:bg-gray-700 border-2 border-dashed border-gray-300 dark:border-gray-600 flex-shrink-0">
                     <template x-if="form.primary_image_url">
                         <div class="relative w-full h-full group">
-                            <img :src="form.primary_image_url" class="w-full h-full object-cover" />
+                            <img loading="lazy" :src="form.primary_image_url" class="w-full h-full object-cover" />
                             <div class="absolute inset-0 bg-black/50 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center">
                                 <button
                                     type="button"
@@ -389,7 +389,7 @@
                 <!-- Existing Additional Images -->
                 <template x-for="(imgUrl, index) in form.additional_images" :key="index">
                     <div class="relative w-24 h-24 rounded-lg overflow-hidden bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600 group">
-                        <img :src="imgUrl" class="w-full h-full object-cover" />
+                        <img loading="lazy" :src="imgUrl" class="w-full h-full object-cover" />
                         <div class="absolute inset-0 bg-black/50 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center">
                             <button
                                 type="button"
@@ -507,6 +507,6 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('cms_static', path='shared/js/media-picker.js') }}"></script>
-<script src="{{ url_for('catalog_static', path='admin/js/product-create.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='shared/js/media-picker.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='admin/js/product-create.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/admin/store-product-detail.html b/app/modules/catalog/templates/catalog/admin/store-product-detail.html
index 45f9651b..d753c2c9 100644
--- a/app/modules/catalog/templates/catalog/admin/store-product-detail.html
+++ b/app/modules/catalog/templates/catalog/admin/store-product-detail.html
@@ -95,7 +95,7 @@
         <div class="px-4 py-3 bg-white rounded-lg shadow-md dark:bg-gray-800">
             <div class="aspect-square bg-gray-100 dark:bg-gray-700 rounded-lg overflow-hidden">
                 <template x-if="product?.image_url">
-                    <img :src="product?.image_url" :alt="product?.title" class="w-full h-full object-contain" />
+                    <img loading="lazy" :src="product?.image_url" :alt="product?.title" class="w-full h-full object-contain" />
                 </template>
                 <template x-if="!product?.image_url">
                     <div class="w-full h-full flex items-center justify-center">
@@ -109,7 +109,7 @@
                 <div class="grid grid-cols-4 gap-2">
                     <template x-for="(img, index) in (product?.additional_images || [])" :key="index">
                         <div class="aspect-square bg-gray-100 dark:bg-gray-700 rounded overflow-hidden">
-                            <img :src="img" :alt="'Image ' + (index + 1)" class="w-full h-full object-cover" />
+                            <img loading="lazy" :src="img" :alt="'Image ' + (index + 1)" class="w-full h-full object-cover" />
                         </div>
                     </template>
                 </div>
@@ -354,5 +354,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('catalog_static', path='admin/js/product-detail.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='admin/js/product-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/admin/store-product-edit.html b/app/modules/catalog/templates/catalog/admin/store-product-edit.html
index 8a320d0b..d965a57f 100644
--- a/app/modules/catalog/templates/catalog/admin/store-product-edit.html
+++ b/app/modules/catalog/templates/catalog/admin/store-product-edit.html
@@ -317,7 +317,7 @@
                     <!-- Preview -->
                     <div class="w-32 h-32 rounded-lg overflow-hidden bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600 flex-shrink-0">
                         <template x-if="form.primary_image_url">
-                            <img :src="form.primary_image_url" class="w-full h-full object-cover" />
+                            <img loading="lazy" :src="form.primary_image_url" class="w-full h-full object-cover" />
                         </template>
                         <template x-if="!form.primary_image_url">
                             <div class="w-full h-full flex items-center justify-center">
@@ -369,7 +369,7 @@
                     <template x-for="(url, index) in form.additional_images" :key="index">
                         <div class="relative group">
                             <div class="w-full aspect-square rounded-lg overflow-hidden bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600">
-                                <img :src="url" class="w-full h-full object-cover" />
+                                <img loading="lazy" :src="url" class="w-full h-full object-cover" />
                             </div>
                             <button
                                 type="button"
@@ -498,6 +498,6 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='shared/js/media-picker.js') }}"></script>
-<script src="{{ url_for('catalog_static', path='admin/js/product-edit.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='shared/js/media-picker.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='admin/js/product-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/admin/store-products.html b/app/modules/catalog/templates/catalog/admin/store-products.html
index 5018182a..69d2c9a4 100644
--- a/app/modules/catalog/templates/catalog/admin/store-products.html
+++ b/app/modules/catalog/templates/catalog/admin/store-products.html
@@ -396,5 +396,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('catalog_static', path='admin/js/products.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='admin/js/products.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/store/product-create.html b/app/modules/catalog/templates/catalog/store/product-create.html
index 14e7e59b..034fbef7 100644
--- a/app/modules/catalog/templates/catalog/store/product-create.html
+++ b/app/modules/catalog/templates/catalog/store/product-create.html
@@ -170,5 +170,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('catalog_static', path='store/js/product-create.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='store/js/product-create.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/store/products.html b/app/modules/catalog/templates/catalog/store/products.html
index ed9afe48..686afb57 100644
--- a/app/modules/catalog/templates/catalog/store/products.html
+++ b/app/modules/catalog/templates/catalog/store/products.html
@@ -364,5 +364,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('catalog_static', path='store/js/products.js') }}"></script>
+<script defer src="{{ url_for('catalog_static', path='store/js/products.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/catalog/templates/catalog/storefront/category.html b/app/modules/catalog/templates/catalog/storefront/category.html
index 2627c8c8..25fd85a6 100644
--- a/app/modules/catalog/templates/catalog/storefront/category.html
+++ b/app/modules/catalog/templates/catalog/storefront/category.html
@@ -62,7 +62,7 @@
             <template x-for="product in products" :key="product.id">
                 <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm hover:shadow-md transition-shadow overflow-hidden">
                     <a :href="`{{ base_url }}shop/products/${product.id}`">
-                        <img :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
+                        <img loading="lazy" :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
                              @error="$el.src = '/static/shop/img/placeholder.svg'"
                              :alt="product.marketplace_product?.title"
                              class="w-full h-48 object-cover">
diff --git a/app/modules/catalog/templates/catalog/storefront/products.html b/app/modules/catalog/templates/catalog/storefront/products.html
index 9800be13..87ec08cc 100644
--- a/app/modules/catalog/templates/catalog/storefront/products.html
+++ b/app/modules/catalog/templates/catalog/storefront/products.html
@@ -74,7 +74,7 @@
             <template x-for="product in products" :key="product.id">
                 <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm hover:shadow-md transition-shadow overflow-hidden">
                     <a :href="`{{ base_url }}shop/products/${product.id}`">
-                        <img :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
+                        <img loading="lazy" :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
                              @error="$el.src = '/static/shop/img/placeholder.svg'"
                              :alt="product.marketplace_product?.title"
                              class="w-full h-48 object-cover">
diff --git a/app/modules/catalog/templates/catalog/storefront/search.html b/app/modules/catalog/templates/catalog/storefront/search.html
index b3e7c5eb..0c137ad4 100644
--- a/app/modules/catalog/templates/catalog/storefront/search.html
+++ b/app/modules/catalog/templates/catalog/storefront/search.html
@@ -81,7 +81,7 @@
             <template x-for="product in products" :key="product.id">
                 <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm hover:shadow-md transition-shadow overflow-hidden">
                     <a :href="`{{ base_url }}shop/products/${product.id}`">
-                        <img :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
+                        <img loading="lazy" :src="product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
                              @error="$el.src = '/static/shop/img/placeholder.svg'"
                              :alt="product.marketplace_product?.title"
                              class="w-full h-48 object-cover">
diff --git a/app/modules/catalog/templates/catalog/storefront/wishlist.html b/app/modules/catalog/templates/catalog/storefront/wishlist.html
index 93d51f20..b8d07339 100644
--- a/app/modules/catalog/templates/catalog/storefront/wishlist.html
+++ b/app/modules/catalog/templates/catalog/storefront/wishlist.html
@@ -65,7 +65,7 @@
                     </button>
 
                     <a :href="`{{ base_url }}shop/products/${item.product.id}`">
-                        <img :src="item.product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
+                        <img loading="lazy" :src="item.product.marketplace_product?.image_link || '/static/shop/img/placeholder.svg'"
                              @error="$el.src = '/static/shop/img/placeholder.svg'"
                              :alt="item.product.marketplace_product?.title"
                              class="w-full h-48 object-cover">
diff --git a/app/modules/checkout/templates/checkout/storefront/checkout.html b/app/modules/checkout/templates/checkout/storefront/checkout.html
index 754b3d7a..231c4c67 100644
--- a/app/modules/checkout/templates/checkout/storefront/checkout.html
+++ b/app/modules/checkout/templates/checkout/storefront/checkout.html
@@ -384,7 +384,7 @@
                         <div class="divide-y divide-gray-200 dark:divide-gray-700">
                             <template x-for="item in cartItems" :key="item.product_id">
                                 <div class="py-4 flex items-center gap-4">
-                                    <img :src="item.image_url || '/static/shop/img/placeholder.svg'"
+                                    <img loading="lazy" :src="item.image_url || '/static/shop/img/placeholder.svg'"
                                          @error="$el.src = '/static/shop/img/placeholder.svg'"
                                          class="w-16 h-16 object-cover rounded-lg">
                                     <div class="flex-1 min-w-0">
@@ -428,7 +428,7 @@
                         <template x-for="item in cartItems" :key="item.product_id">
                             <div class="flex items-center gap-3">
                                 <div class="relative">
-                                    <img :src="item.image_url || '/static/shop/img/placeholder.svg'"
+                                    <img loading="lazy" :src="item.image_url || '/static/shop/img/placeholder.svg'"
                                          @error="$el.src = '/static/shop/img/placeholder.svg'"
                                          class="w-12 h-12 object-cover rounded">
                                     <span class="absolute -top-2 -right-2 w-5 h-5 bg-gray-500 text-white text-xs rounded-full flex items-center justify-center" x-text="item.quantity"></span>
diff --git a/app/modules/cms/templates/cms/admin/content-page-edit.html b/app/modules/cms/templates/cms/admin/content-page-edit.html
index a34c2997..35580152 100644
--- a/app/modules/cms/templates/cms/admin/content-page-edit.html
+++ b/app/modules/cms/templates/cms/admin/content-page-edit.html
@@ -636,5 +636,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='admin/js/content-page-edit.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='admin/js/content-page-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/cms/templates/cms/admin/content-pages.html b/app/modules/cms/templates/cms/admin/content-pages.html
index 86aee22f..c8c3bfad 100644
--- a/app/modules/cms/templates/cms/admin/content-pages.html
+++ b/app/modules/cms/templates/cms/admin/content-pages.html
@@ -178,5 +178,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='admin/js/content-pages.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='admin/js/content-pages.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/cms/templates/cms/store/content-page-edit.html b/app/modules/cms/templates/cms/store/content-page-edit.html
index c57a8ef1..fe508968 100644
--- a/app/modules/cms/templates/cms/store/content-page-edit.html
+++ b/app/modules/cms/templates/cms/store/content-page-edit.html
@@ -322,5 +322,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='store/js/content-page-edit.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='store/js/content-page-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/cms/templates/cms/store/content-pages.html b/app/modules/cms/templates/cms/store/content-pages.html
index 33fb565a..29a40097 100644
--- a/app/modules/cms/templates/cms/store/content-pages.html
+++ b/app/modules/cms/templates/cms/store/content-pages.html
@@ -323,5 +323,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='store/js/content-pages.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='store/js/content-pages.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/cms/templates/cms/store/media.html b/app/modules/cms/templates/cms/store/media.html
index 14de74a2..38b6b0ab 100644
--- a/app/modules/cms/templates/cms/store/media.html
+++ b/app/modules/cms/templates/cms/store/media.html
@@ -321,7 +321,7 @@
                 <!-- Preview -->
                 <div class="bg-gray-100 dark:bg-gray-700 rounded-lg overflow-hidden">
                     <template x-if="selectedMedia?.media_type === 'image'">
-                        <img :src="selectedMedia?.file_url" :alt="selectedMedia?.original_filename" class="w-full h-auto">
+                        <img loading="lazy" :src="selectedMedia?.file_url" :alt="selectedMedia?.original_filename" class="w-full h-auto">
                     </template>
                     <template x-if="selectedMedia?.media_type !== 'image'">
                         <div class="aspect-square flex items-center justify-center text-gray-400">
@@ -441,5 +441,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('cms_static', path='store/js/media.js') }}"></script>
+<script defer src="{{ url_for('cms_static', path='store/js/media.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/core/templates/core/admin/dashboard.html b/app/modules/core/templates/core/admin/dashboard.html
index c5361e14..2187915d 100644
--- a/app/modules/core/templates/core/admin/dashboard.html
+++ b/app/modules/core/templates/core/admin/dashboard.html
@@ -137,5 +137,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('core_static', path='admin/js/dashboard.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('core_static', path='admin/js/dashboard.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/core/templates/core/admin/my-menu-config.html b/app/modules/core/templates/core/admin/my-menu-config.html
index f4bbe3a8..d5c70e00 100644
--- a/app/modules/core/templates/core/admin/my-menu-config.html
+++ b/app/modules/core/templates/core/admin/my-menu-config.html
@@ -170,5 +170,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('core_static', path='admin/js/my-menu-config.js') }}"></script>
+<script defer src="{{ url_for('core_static', path='admin/js/my-menu-config.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/core/templates/core/admin/settings.html b/app/modules/core/templates/core/admin/settings.html
index 63238655..9d5ab6f7 100644
--- a/app/modules/core/templates/core/admin/settings.html
+++ b/app/modules/core/templates/core/admin/settings.html
@@ -778,5 +778,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('core_static', path='admin/js/settings.js') }}"></script>
+<script defer src="{{ url_for('core_static', path='admin/js/settings.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/core/templates/core/store/dashboard.html b/app/modules/core/templates/core/store/dashboard.html
index 7b4b8092..addbe00f 100644
--- a/app/modules/core/templates/core/store/dashboard.html
+++ b/app/modules/core/templates/core/store/dashboard.html
@@ -177,5 +177,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('core_static', path='store/js/dashboard.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('core_static', path='store/js/dashboard.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/core/templates/core/store/settings.html b/app/modules/core/templates/core/store/settings.html
index a3198a08..dbcb3595 100644
--- a/app/modules/core/templates/core/store/settings.html
+++ b/app/modules/core/templates/core/store/settings.html
@@ -1402,5 +1402,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('core_static', path='store/js/settings.js') }}"></script>
+<script defer src="{{ url_for('core_static', path='store/js/settings.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/customers/templates/customers/admin/customers.html b/app/modules/customers/templates/customers/admin/customers.html
index afd89655..c6faefe6 100644
--- a/app/modules/customers/templates/customers/admin/customers.html
+++ b/app/modules/customers/templates/customers/admin/customers.html
@@ -315,5 +315,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('customers_static', path='admin/js/customers.js') }}"></script>
+<script defer src="{{ url_for('customers_static', path='admin/js/customers.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/customers/templates/customers/store/customers.html b/app/modules/customers/templates/customers/store/customers.html
index fa8b531c..90914650 100644
--- a/app/modules/customers/templates/customers/store/customers.html
+++ b/app/modules/customers/templates/customers/store/customers.html
@@ -264,5 +264,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('customers_static', path='store/js/customers.js') }}"></script>
+<script defer src="{{ url_for('customers_static', path='store/js/customers.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/code-quality-dashboard.html b/app/modules/dev_tools/templates/dev_tools/admin/code-quality-dashboard.html
index 6a90d072..2039cff9 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/code-quality-dashboard.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/code-quality-dashboard.html
@@ -9,7 +9,7 @@
 {% block alpine_data %}codeQualityDashboard(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('dev_tools_static', path='admin/js/code-quality-dashboard.js') }}"></script>
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/code-quality-dashboard.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/code-quality-violations.html b/app/modules/dev_tools/templates/dev_tools/admin/code-quality-violations.html
index b2a9c703..f5c81ed9 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/code-quality-violations.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/code-quality-violations.html
@@ -10,7 +10,7 @@
 {% block alpine_data %}codeQualityViolations(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('dev_tools_static', path='admin/js/code-quality-violations.js') }}"></script>
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/code-quality-violations.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/components.html b/app/modules/dev_tools/templates/dev_tools/admin/components.html
index 0ed33788..1ccd421c 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/components.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/components.html
@@ -364,7 +364,7 @@ html {
                                                 ? 'border-purple-500 dark:border-purple-400 ring-2 ring-purple-500/30'
                                                 : 'border-gray-200 dark:border-gray-600 hover:border-gray-300 dark:hover:border-gray-500'"
                                         >
-                                            <img :src="image.url" :alt="image.alt" class="w-full h-full object-cover" />
+                                            <img loading="lazy" :src="image.url" :alt="image.alt" class="w-full h-full object-cover" />
                                         </button>
                                     </template>
                                 </div>
@@ -3173,5 +3173,5 @@ new Chart(document.getElementById('barChart'), barConfig);
 
 {% block extra_scripts %}
 {# ✅ CRITICAL: Load JavaScript file #}
-<script src="{{ url_for('dev_tools_static', path='admin/js/components.js') }}"></script>
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/components.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/icons.html b/app/modules/dev_tools/templates/dev_tools/admin/icons.html
index 44062c1d..b221fdab 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/icons.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/icons.html
@@ -318,5 +318,5 @@
 
 {% block extra_scripts %}
 {# ✅ CRITICAL: Load JavaScript file #}
-<script src="{{ url_for('dev_tools_static', path='admin/js/icons-page.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/icons-page.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/testing-dashboard.html b/app/modules/dev_tools/templates/dev_tools/admin/testing-dashboard.html
index 812c74f7..29e72019 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/testing-dashboard.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/testing-dashboard.html
@@ -8,7 +8,7 @@
 {% block alpine_data %}testingDashboard(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('dev_tools_static', path='admin/js/testing-dashboard.js') }}"></script>
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/testing-dashboard.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/dev_tools/templates/dev_tools/admin/testing-hub.html b/app/modules/dev_tools/templates/dev_tools/admin/testing-hub.html
index 11d0af71..47b9888a 100644
--- a/app/modules/dev_tools/templates/dev_tools/admin/testing-hub.html
+++ b/app/modules/dev_tools/templates/dev_tools/admin/testing-hub.html
@@ -218,5 +218,5 @@
 
 {% block extra_scripts %}
 {# ✅ CRITICAL: Load JavaScript file #}
-<script src="{{ url_for('dev_tools_static', path='admin/js/testing-hub.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('dev_tools_static', path='admin/js/testing-hub.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/inventory/templates/inventory/admin/inventory.html b/app/modules/inventory/templates/inventory/admin/inventory.html
index 7f486ac9..e5d8548f 100644
--- a/app/modules/inventory/templates/inventory/admin/inventory.html
+++ b/app/modules/inventory/templates/inventory/admin/inventory.html
@@ -599,5 +599,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('inventory_static', path='admin/js/inventory.js') }}"></script>
+<script defer src="{{ url_for('inventory_static', path='admin/js/inventory.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/inventory/templates/inventory/store/inventory.html b/app/modules/inventory/templates/inventory/store/inventory.html
index 28158326..61f2c3e0 100644
--- a/app/modules/inventory/templates/inventory/store/inventory.html
+++ b/app/modules/inventory/templates/inventory/store/inventory.html
@@ -370,5 +370,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('inventory_static', path='store/js/inventory.js') }}"></script>
+<script defer src="{{ url_for('inventory_static', path='store/js/inventory.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/admin/analytics.html b/app/modules/loyalty/templates/loyalty/admin/analytics.html
index 99ef4682..a33daf23 100644
--- a/app/modules/loyalty/templates/loyalty/admin/analytics.html
+++ b/app/modules/loyalty/templates/loyalty/admin/analytics.html
@@ -158,5 +158,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='admin/js/loyalty-analytics.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='admin/js/loyalty-analytics.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html b/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
index b30364e3..8773168a 100644
--- a/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
+++ b/app/modules/loyalty/templates/loyalty/admin/merchant-detail.html
@@ -234,5 +234,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='admin/js/loyalty-merchant-detail.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='admin/js/loyalty-merchant-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/admin/merchant-settings.html b/app/modules/loyalty/templates/loyalty/admin/merchant-settings.html
index 3e0cc777..a2ba3024 100644
--- a/app/modules/loyalty/templates/loyalty/admin/merchant-settings.html
+++ b/app/modules/loyalty/templates/loyalty/admin/merchant-settings.html
@@ -176,5 +176,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='admin/js/loyalty-merchant-settings.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='admin/js/loyalty-merchant-settings.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/admin/programs.html b/app/modules/loyalty/templates/loyalty/admin/programs.html
index a7ad931c..2fbdf7dc 100644
--- a/app/modules/loyalty/templates/loyalty/admin/programs.html
+++ b/app/modules/loyalty/templates/loyalty/admin/programs.html
@@ -237,5 +237,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='admin/js/loyalty-programs.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='admin/js/loyalty-programs.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/card-detail.html b/app/modules/loyalty/templates/loyalty/store/card-detail.html
index 536342c2..b38d52da 100644
--- a/app/modules/loyalty/templates/loyalty/store/card-detail.html
+++ b/app/modules/loyalty/templates/loyalty/store/card-detail.html
@@ -154,5 +154,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-card-detail.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-card-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/cards.html b/app/modules/loyalty/templates/loyalty/store/cards.html
index 67bc20d2..971cabf1 100644
--- a/app/modules/loyalty/templates/loyalty/store/cards.html
+++ b/app/modules/loyalty/templates/loyalty/store/cards.html
@@ -146,5 +146,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-cards.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-cards.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/enroll.html b/app/modules/loyalty/templates/loyalty/store/enroll.html
index c0afbee1..ac9141ca 100644
--- a/app/modules/loyalty/templates/loyalty/store/enroll.html
+++ b/app/modules/loyalty/templates/loyalty/store/enroll.html
@@ -142,5 +142,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-enroll.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-enroll.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/settings.html b/app/modules/loyalty/templates/loyalty/store/settings.html
index ea505e37..d723f9fd 100644
--- a/app/modules/loyalty/templates/loyalty/store/settings.html
+++ b/app/modules/loyalty/templates/loyalty/store/settings.html
@@ -154,5 +154,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-settings.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-settings.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/stats.html b/app/modules/loyalty/templates/loyalty/store/stats.html
index 75bc445c..476bd249 100644
--- a/app/modules/loyalty/templates/loyalty/store/stats.html
+++ b/app/modules/loyalty/templates/loyalty/store/stats.html
@@ -130,5 +130,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-stats.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-stats.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/store/terminal.html b/app/modules/loyalty/templates/loyalty/store/terminal.html
index cf9c3600..390499cc 100644
--- a/app/modules/loyalty/templates/loyalty/store/terminal.html
+++ b/app/modules/loyalty/templates/loyalty/store/terminal.html
@@ -305,5 +305,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='store/js/loyalty-terminal.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='store/js/loyalty-terminal.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/storefront/dashboard.html b/app/modules/loyalty/templates/loyalty/storefront/dashboard.html
index 1319144c..a1f5e2c4 100644
--- a/app/modules/loyalty/templates/loyalty/storefront/dashboard.html
+++ b/app/modules/loyalty/templates/loyalty/storefront/dashboard.html
@@ -222,5 +222,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='storefront/js/loyalty-dashboard.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='storefront/js/loyalty-dashboard.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/storefront/enroll.html b/app/modules/loyalty/templates/loyalty/storefront/enroll.html
index a9d86699..71be056e 100644
--- a/app/modules/loyalty/templates/loyalty/storefront/enroll.html
+++ b/app/modules/loyalty/templates/loyalty/storefront/enroll.html
@@ -131,5 +131,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='storefront/js/loyalty-enroll.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='storefront/js/loyalty-enroll.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/loyalty/templates/loyalty/storefront/history.html b/app/modules/loyalty/templates/loyalty/storefront/history.html
index a97bd579..b493d297 100644
--- a/app/modules/loyalty/templates/loyalty/storefront/history.html
+++ b/app/modules/loyalty/templates/loyalty/storefront/history.html
@@ -103,5 +103,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('loyalty_static', path='storefront/js/loyalty-history.js') }}"></script>
+<script defer src="{{ url_for('loyalty_static', path='storefront/js/loyalty-history.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/background-tasks.html b/app/modules/marketplace/templates/marketplace/admin/background-tasks.html
index e23d2429..a66ed880 100644
--- a/app/modules/marketplace/templates/marketplace/admin/background-tasks.html
+++ b/app/modules/marketplace/templates/marketplace/admin/background-tasks.html
@@ -8,7 +8,7 @@
 {% block alpine_data %}backgroundTasks(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/background-tasks.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/background-tasks.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/imports.html b/app/modules/marketplace/templates/marketplace/admin/imports.html
index a4b6d24b..720d28bc 100644
--- a/app/modules/marketplace/templates/marketplace/admin/imports.html
+++ b/app/modules/marketplace/templates/marketplace/admin/imports.html
@@ -11,7 +11,7 @@
 {% block alpine_data %}adminImports(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/imports.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/imports.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/letzshop-store-directory.html b/app/modules/marketplace/templates/marketplace/admin/letzshop-store-directory.html
index c80bbbc8..c32acadc 100644
--- a/app/modules/marketplace/templates/marketplace/admin/letzshop-store-directory.html
+++ b/app/modules/marketplace/templates/marketplace/admin/letzshop-store-directory.html
@@ -426,5 +426,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/letzshop-store-directory.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/letzshop-store-directory.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/letzshop.html b/app/modules/marketplace/templates/marketplace/admin/letzshop.html
index 86c599f2..e9571b42 100644
--- a/app/modules/marketplace/templates/marketplace/admin/letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/admin/letzshop.html
@@ -11,7 +11,7 @@
 {% block alpine_data %}adminLetzshop(){% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/letzshop.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/letzshop.js') }}"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html b/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
index 8ee53067..21e518e8 100644
--- a/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/admin/marketplace-letzshop.html
@@ -599,5 +599,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-letzshop.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/marketplace-letzshop.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/marketplace-product-detail.html b/app/modules/marketplace/templates/marketplace/admin/marketplace-product-detail.html
index e0950ae4..1d5f9820 100644
--- a/app/modules/marketplace/templates/marketplace/admin/marketplace-product-detail.html
+++ b/app/modules/marketplace/templates/marketplace/admin/marketplace-product-detail.html
@@ -50,7 +50,7 @@
         <div class="px-4 py-3 bg-white rounded-lg shadow-md dark:bg-gray-800">
             <div class="aspect-square bg-gray-100 dark:bg-gray-700 rounded-lg overflow-hidden">
                 <template x-if="product?.image_link">
-                    <img :src="product?.image_link" :alt="product?.title" class="w-full h-full object-contain" />
+                    <img loading="lazy" :src="product?.image_link" :alt="product?.title" class="w-full h-full object-contain" />
                 </template>
                 <template x-if="!product?.image_link">
                     <div class="w-full h-full flex items-center justify-center">
@@ -64,7 +64,7 @@
                 <div class="grid grid-cols-4 gap-2">
                     <template x-for="(img, index) in (product?.additional_images || [])" :key="index">
                         <div class="aspect-square bg-gray-100 dark:bg-gray-700 rounded overflow-hidden">
-                            <img :src="img" :alt="'Image ' + (index + 1)" class="w-full h-full object-cover" />
+                            <img loading="lazy" :src="img" :alt="'Image ' + (index + 1)" class="w-full h-full object-cover" />
                         </div>
                     </template>
                 </div>
@@ -388,5 +388,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-product-detail.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/marketplace-product-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/marketplace-products.html b/app/modules/marketplace/templates/marketplace/admin/marketplace-products.html
index 905fbf63..c6b38687 100644
--- a/app/modules/marketplace/templates/marketplace/admin/marketplace-products.html
+++ b/app/modules/marketplace/templates/marketplace/admin/marketplace-products.html
@@ -472,5 +472,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-products.js') }}"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/marketplace-products.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/admin/marketplace.html b/app/modules/marketplace/templates/marketplace/admin/marketplace.html
index 8b201487..99d0fd95 100644
--- a/app/modules/marketplace/templates/marketplace/admin/marketplace.html
+++ b/app/modules/marketplace/templates/marketplace/admin/marketplace.html
@@ -347,5 +347,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('marketplace_static', path='admin/js/marketplace.js') }}?v=2"></script>
+<script defer src="{{ url_for('marketplace_static', path='admin/js/marketplace.js') }}?v=2"></script>
 {% endblock %}
diff --git a/app/modules/marketplace/templates/marketplace/store/letzshop.html b/app/modules/marketplace/templates/marketplace/store/letzshop.html
index c0f6f5ba..d35fccae 100644
--- a/app/modules/marketplace/templates/marketplace/store/letzshop.html
+++ b/app/modules/marketplace/templates/marketplace/store/letzshop.html
@@ -9,7 +9,7 @@
 {% block alpine_data %}storeLetzshop(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/modules/marketplace/store/js/letzshop.js"></script>
+<script defer src="/static/modules/marketplace/store/js/letzshop.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/marketplace/templates/marketplace/store/marketplace.html b/app/modules/marketplace/templates/marketplace/store/marketplace.html
index eda10e4f..b1258e98 100644
--- a/app/modules/marketplace/templates/marketplace/store/marketplace.html
+++ b/app/modules/marketplace/templates/marketplace/store/marketplace.html
@@ -11,7 +11,7 @@
 {% block alpine_data %}storeMarketplace(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/modules/marketplace/store/js/marketplace.js"></script>
+<script defer src="/static/modules/marketplace/store/js/marketplace.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/marketplace/templates/marketplace/store/onboarding.html b/app/modules/marketplace/templates/marketplace/store/onboarding.html
index 1f9524f5..57f3712a 100644
--- a/app/modules/marketplace/templates/marketplace/store/onboarding.html
+++ b/app/modules/marketplace/templates/marketplace/store/onboarding.html
@@ -373,11 +373,11 @@
     </div>
 
     <!-- Scripts -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.14.0/dist/cdn.min.js"></script>
-    <script src="{{ url_for('marketplace_static', path='store/js/onboarding.js') }}"></script>
+    <script defer src="{{ url_for('marketplace_static', path='store/js/onboarding.js') }}"></script>
 </body>
 </html>
diff --git a/app/modules/messaging/templates/messaging/admin/email-templates.html b/app/modules/messaging/templates/messaging/admin/email-templates.html
index e6cd7be9..726e8612 100644
--- a/app/modules/messaging/templates/messaging/admin/email-templates.html
+++ b/app/modules/messaging/templates/messaging/admin/email-templates.html
@@ -364,5 +364,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='admin/js/email-templates.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='admin/js/email-templates.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/messaging/templates/messaging/admin/messages.html b/app/modules/messaging/templates/messaging/admin/messages.html
index 75c54066..8faf804e 100644
--- a/app/modules/messaging/templates/messaging/admin/messages.html
+++ b/app/modules/messaging/templates/messaging/admin/messages.html
@@ -332,5 +332,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='admin/js/messages.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='admin/js/messages.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/messaging/templates/messaging/admin/notifications.html b/app/modules/messaging/templates/messaging/admin/notifications.html
index 7d2a3694..4e0e6a39 100644
--- a/app/modules/messaging/templates/messaging/admin/notifications.html
+++ b/app/modules/messaging/templates/messaging/admin/notifications.html
@@ -357,5 +357,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='admin/js/notifications.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='admin/js/notifications.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/messaging/templates/messaging/store/email-templates.html b/app/modules/messaging/templates/messaging/store/email-templates.html
index 3032c817..6c8100de 100644
--- a/app/modules/messaging/templates/messaging/store/email-templates.html
+++ b/app/modules/messaging/templates/messaging/store/email-templates.html
@@ -326,5 +326,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='store/js/email-templates.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='store/js/email-templates.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/messaging/templates/messaging/store/messages.html b/app/modules/messaging/templates/messaging/store/messages.html
index 10339f60..f43bbb4c 100644
--- a/app/modules/messaging/templates/messaging/store/messages.html
+++ b/app/modules/messaging/templates/messaging/store/messages.html
@@ -275,5 +275,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='store/js/messages.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='store/js/messages.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/messaging/templates/messaging/store/notifications.html b/app/modules/messaging/templates/messaging/store/notifications.html
index 2288b350..55d9ff68 100644
--- a/app/modules/messaging/templates/messaging/store/notifications.html
+++ b/app/modules/messaging/templates/messaging/store/notifications.html
@@ -226,5 +226,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('messaging_static', path='store/js/notifications.js') }}"></script>
+<script defer src="{{ url_for('messaging_static', path='store/js/notifications.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/monitoring/templates/monitoring/admin/logs.html b/app/modules/monitoring/templates/monitoring/admin/logs.html
index a2494713..55b2b0d9 100644
--- a/app/modules/monitoring/templates/monitoring/admin/logs.html
+++ b/app/modules/monitoring/templates/monitoring/admin/logs.html
@@ -407,5 +407,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('monitoring_static', path='admin/js/logs.js') }}"></script>
+<script defer src="{{ url_for('monitoring_static', path='admin/js/logs.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/monitoring/templates/monitoring/admin/platform-health.html b/app/modules/monitoring/templates/monitoring/admin/platform-health.html
index 95d065f3..33038a11 100644
--- a/app/modules/monitoring/templates/monitoring/admin/platform-health.html
+++ b/app/modules/monitoring/templates/monitoring/admin/platform-health.html
@@ -263,5 +263,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('monitoring_static', path='admin/js/platform-health.js') }}"></script>
+<script defer src="{{ url_for('monitoring_static', path='admin/js/platform-health.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/orders/templates/orders/admin/orders.html b/app/modules/orders/templates/orders/admin/orders.html
index 9ddefe0d..854150a7 100644
--- a/app/modules/orders/templates/orders/admin/orders.html
+++ b/app/modules/orders/templates/orders/admin/orders.html
@@ -641,5 +641,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('orders_static', path='admin/js/orders.js') }}"></script>
+<script defer src="{{ url_for('orders_static', path='admin/js/orders.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/orders/templates/orders/store/invoices.html b/app/modules/orders/templates/orders/store/invoices.html
index 45351d81..fc310879 100644
--- a/app/modules/orders/templates/orders/store/invoices.html
+++ b/app/modules/orders/templates/orders/store/invoices.html
@@ -10,7 +10,7 @@
 {% block alpine_data %}storeInvoices(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/modules/billing/store/js/invoices.js"></script>
+<script defer src="/static/modules/billing/store/js/invoices.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/modules/orders/templates/orders/store/order-detail.html b/app/modules/orders/templates/orders/store/order-detail.html
index 575848de..ae80a33d 100644
--- a/app/modules/orders/templates/orders/store/order-detail.html
+++ b/app/modules/orders/templates/orders/store/order-detail.html
@@ -451,5 +451,5 @@
         orderId: {{ order_id }}
     };
 </script>
-<script src="{{ url_for('orders_static', path='store/js/order-detail.js') }}"></script>
+<script defer src="{{ url_for('orders_static', path='store/js/order-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/orders/templates/orders/store/orders.html b/app/modules/orders/templates/orders/store/orders.html
index 09c6c4c7..515c4a8a 100644
--- a/app/modules/orders/templates/orders/store/orders.html
+++ b/app/modules/orders/templates/orders/store/orders.html
@@ -330,5 +330,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('orders_static', path='store/js/orders.js') }}"></script>
+<script defer src="{{ url_for('orders_static', path='store/js/orders.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html b/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
index 6a7e1776..b5a630a6 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-user-detail.html
@@ -234,5 +234,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/admin-user-detail.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/admin-user-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html b/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
index 650c99c1..6cfe6d03 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-user-edit.html
@@ -268,5 +268,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/admin-user-edit.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/admin-user-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/admin-users.html b/app/modules/tenancy/templates/tenancy/admin/admin-users.html
index faf6ee65..a66e7003 100644
--- a/app/modules/tenancy/templates/tenancy/admin/admin-users.html
+++ b/app/modules/tenancy/templates/tenancy/admin/admin-users.html
@@ -258,5 +258,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/admin-users.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/admin-users.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/login.html b/app/modules/tenancy/templates/tenancy/admin/login.html
index 08c999f1..64ff69a6 100644
--- a/app/modules/tenancy/templates/tenancy/admin/login.html
+++ b/app/modules/tenancy/templates/tenancy/admin/login.html
@@ -106,16 +106,16 @@
     <!-- Scripts - ORDER MATTERS! -->
 
     <!-- 1. Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 2. Icons -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. Utils -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 4. API Client -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 5. Alpine.js v3 with CDN fallback -->
     <script>
@@ -135,6 +135,6 @@
     </script>
 
     <!-- 6. Login Logic -->
-    <script src="{{ url_for('core_static', path='admin/js/login.js') }}"></script>
+    <script defer src="{{ url_for('core_static', path='admin/js/login.js') }}"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
index cf976aad..216feeac 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-detail.html
@@ -452,5 +452,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/merchant-detail.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/merchant-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html b/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
index 0770b407..1ffa21b1 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-edit.html
@@ -445,5 +445,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/merchant-edit.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/merchant-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html b/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
index 1765b95d..0b798eed 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-user-detail.html
@@ -247,5 +247,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/merchant-user-detail.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/merchant-user-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchant-users.html b/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
index a185e391..8e00f1f8 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchant-users.html
@@ -226,5 +226,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/merchant-users.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/merchant-users.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/merchants.html b/app/modules/tenancy/templates/tenancy/admin/merchants.html
index 7afdb80e..dec1bbc6 100644
--- a/app/modules/tenancy/templates/tenancy/admin/merchants.html
+++ b/app/modules/tenancy/templates/tenancy/admin/merchants.html
@@ -245,5 +245,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/merchants.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/merchants.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/module-config.html b/app/modules/tenancy/templates/tenancy/admin/module-config.html
index 75b3f205..d13e4b2b 100644
--- a/app/modules/tenancy/templates/tenancy/admin/module-config.html
+++ b/app/modules/tenancy/templates/tenancy/admin/module-config.html
@@ -144,5 +144,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/module-config.js') }}"></script>
+<script defer src="{{ url_for('static', path='admin/js/module-config.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/module-info.html b/app/modules/tenancy/templates/tenancy/admin/module-info.html
index 9e03ab56..c05fbb33 100644
--- a/app/modules/tenancy/templates/tenancy/admin/module-info.html
+++ b/app/modules/tenancy/templates/tenancy/admin/module-info.html
@@ -270,5 +270,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/module-info.js') }}"></script>
+<script defer src="{{ url_for('static', path='admin/js/module-info.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-detail.html b/app/modules/tenancy/templates/tenancy/admin/platform-detail.html
index c952dbcd..83033c66 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-detail.html
@@ -297,5 +297,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/platform-detail.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/platform-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-edit.html b/app/modules/tenancy/templates/tenancy/admin/platform-edit.html
index 1d2887be..60d95532 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-edit.html
@@ -320,5 +320,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/platform-edit.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/platform-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html b/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
index a79300fb..3a7e00a4 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-menu-config.html
@@ -196,5 +196,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/platform-menu-config.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/platform-menu-config.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platform-modules.html b/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
index 466a104c..4c4100dc 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platform-modules.html
@@ -278,5 +278,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/platform-modules.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/platform-modules.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/platforms.html b/app/modules/tenancy/templates/tenancy/admin/platforms.html
index d9324236..cfb14779 100644
--- a/app/modules/tenancy/templates/tenancy/admin/platforms.html
+++ b/app/modules/tenancy/templates/tenancy/admin/platforms.html
@@ -158,5 +158,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/platforms.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/platforms.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/select-platform.html b/app/modules/tenancy/templates/tenancy/admin/select-platform.html
index 6d4479c2..9fe0822d 100644
--- a/app/modules/tenancy/templates/tenancy/admin/select-platform.html
+++ b/app/modules/tenancy/templates/tenancy/admin/select-platform.html
@@ -111,11 +111,11 @@
     </div>
 
     <!-- Scripts -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
-    <script src="{{ url_for('tenancy_static', path='admin/js/select-platform.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('tenancy_static', path='admin/js/select-platform.js') }}"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.13.3/dist/cdn.min.js"></script>
 </body>
 </html>
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-create.html b/app/modules/tenancy/templates/tenancy/admin/store-create.html
index 2e0a4c7e..b459196a 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-create.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-create.html
@@ -279,5 +279,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/store-create.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/store-create.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-detail.html b/app/modules/tenancy/templates/tenancy/admin/store-detail.html
index 5a1bb330..e755ba5e 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-detail.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-detail.html
@@ -45,7 +45,7 @@
     <div class="grid gap-6 mb-8 md:grid-cols-4">
         <!-- Verification Status -->
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
-            <div class="p-3 mr-4 rounded-full" 
+            <div class="p-3 mr-4 rounded-full"
                  :class="store?.is_verified ? 'text-green-500 bg-green-100 dark:text-green-100 dark:bg-green-500' : 'text-orange-500 bg-orange-100 dark:text-orange-100 dark:bg-orange-500'">
                 <span x-html="$icon(store?.is_verified ? 'badge-check' : 'clock', 'w-5 h-5')"></span>
             </div>
@@ -268,11 +268,11 @@
                 </div>
                 <div>
                     <p class="text-xs font-semibold text-gray-600 dark:text-gray-400 uppercase">Website</p>
-                    <a 
+                    <a
                         x-show="store?.website"
-                        :href="store?.website" 
+                        :href="store?.website"
                         target="_blank"
-                        class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400" 
+                        class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400"
                         x-text="store?.website">
                     </a>
                     <span x-show="!store?.website" class="text-sm text-gray-700 dark:text-gray-300">-</span>
@@ -327,28 +327,28 @@
         <div class="space-y-3">
             <div x-show="store?.letzshop_csv_url_fr">
                 <p class="text-xs font-semibold text-gray-600 dark:text-gray-400 uppercase mb-1">French (FR)</p>
-                <a 
-                    :href="store?.letzshop_csv_url_fr" 
+                <a
+                    :href="store?.letzshop_csv_url_fr"
                     target="_blank"
-                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all" 
+                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all"
                     x-text="store?.letzshop_csv_url_fr">
                 </a>
             </div>
             <div x-show="store?.letzshop_csv_url_en">
                 <p class="text-xs font-semibold text-gray-600 dark:text-gray-400 uppercase mb-1">English (EN)</p>
-                <a 
-                    :href="store?.letzshop_csv_url_en" 
+                <a
+                    :href="store?.letzshop_csv_url_en"
                     target="_blank"
-                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all" 
+                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all"
                     x-text="store?.letzshop_csv_url_en">
                 </a>
             </div>
             <div x-show="store?.letzshop_csv_url_de">
                 <p class="text-xs font-semibold text-gray-600 dark:text-gray-400 uppercase mb-1">German (DE)</p>
-                <a 
-                    :href="store?.letzshop_csv_url_de" 
+                <a
+                    :href="store?.letzshop_csv_url_de"
                     target="_blank"
-                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all" 
+                    class="text-sm text-purple-600 hover:text-purple-700 dark:text-purple-400 break-all"
                     x-text="store?.letzshop_csv_url_de">
                 </a>
             </div>
@@ -389,5 +389,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/store-detail.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('tenancy_static', path='admin/js/store-detail.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-edit.html b/app/modules/tenancy/templates/tenancy/admin/store-edit.html
index fcbeb568..eba61ade 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-edit.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-edit.html
@@ -428,5 +428,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/store-edit.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('tenancy_static', path='admin/js/store-edit.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-theme.html b/app/modules/tenancy/templates/tenancy/admin/store-theme.html
index bed9b655..39f98249 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-theme.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-theme.html
@@ -446,5 +446,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/store-theme.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('tenancy_static', path='admin/js/store-theme.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/store-themes.html b/app/modules/tenancy/templates/tenancy/admin/store-themes.html
index 14283676..875e13e5 100644
--- a/app/modules/tenancy/templates/tenancy/admin/store-themes.html
+++ b/app/modules/tenancy/templates/tenancy/admin/store-themes.html
@@ -124,6 +124,6 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.complete.min.js"></script>
-<script src="{{ url_for('tenancy_static', path='admin/js/store-themes.js') }}"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.complete.min.js"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/store-themes.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/stores.html b/app/modules/tenancy/templates/tenancy/admin/stores.html
index 8d6654fa..165889d1 100644
--- a/app/modules/tenancy/templates/tenancy/admin/stores.html
+++ b/app/modules/tenancy/templates/tenancy/admin/stores.html
@@ -228,5 +228,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/stores.js') }}"></script>
-{% endblock %}
\ No newline at end of file
+<script defer src="{{ url_for('tenancy_static', path='admin/js/stores.js') }}"></script>
+{% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/admin/user-create.html b/app/modules/tenancy/templates/tenancy/admin/user-create.html
index a512899c..401d9ba1 100644
--- a/app/modules/tenancy/templates/tenancy/admin/user-create.html
+++ b/app/modules/tenancy/templates/tenancy/admin/user-create.html
@@ -189,5 +189,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='admin/js/user-create.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='admin/js/user-create.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/merchant/login.html b/app/modules/tenancy/templates/tenancy/merchant/login.html
index eafc74ce..92e6e6f8 100644
--- a/app/modules/tenancy/templates/tenancy/merchant/login.html
+++ b/app/modules/tenancy/templates/tenancy/merchant/login.html
@@ -107,16 +107,16 @@
     <!-- Scripts - ORDER MATTERS! -->
 
     <!-- 1. Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 2. Icons -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. Utils -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 4. API Client -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 5. Alpine.js v3 with CDN fallback -->
     <script>
@@ -136,6 +136,6 @@
     </script>
 
     <!-- 6. Merchant Login Logic -->
-    <script src="{{ url_for('core_static', path='merchant/js/login.js') }}"></script>
+    <script defer src="{{ url_for('core_static', path='merchant/js/login.js') }}"></script>
 </body>
 </html>
diff --git a/app/modules/tenancy/templates/tenancy/store/login.html b/app/modules/tenancy/templates/tenancy/store/login.html
index 64a86961..e638f64c 100644
--- a/app/modules/tenancy/templates/tenancy/store/login.html
+++ b/app/modules/tenancy/templates/tenancy/store/login.html
@@ -140,21 +140,21 @@
     <!-- Scripts - ORDER MATTERS! -->
 
     <!-- 1. Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 2. Icons -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. Utils -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 4. API Client -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 5. Alpine.js v3 -->
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.14.0/dist/cdn.min.js"></script>
 
     <!-- 6. Login Logic -->
-    <script src="{{ url_for('tenancy_static', path='store/js/login.js') }}"></script>
+    <script defer src="{{ url_for('tenancy_static', path='store/js/login.js') }}"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/modules/tenancy/templates/tenancy/store/profile.html b/app/modules/tenancy/templates/tenancy/store/profile.html
index 6be60b5b..502c645f 100644
--- a/app/modules/tenancy/templates/tenancy/store/profile.html
+++ b/app/modules/tenancy/templates/tenancy/store/profile.html
@@ -202,5 +202,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='store/js/profile.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='store/js/profile.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/store/settings.html b/app/modules/tenancy/templates/tenancy/store/settings.html
index f26f0f31..5858faa0 100644
--- a/app/modules/tenancy/templates/tenancy/store/settings.html
+++ b/app/modules/tenancy/templates/tenancy/store/settings.html
@@ -1402,5 +1402,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='store/js/settings.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='store/js/settings.js') }}"></script>
 {% endblock %}
diff --git a/app/modules/tenancy/templates/tenancy/store/team.html b/app/modules/tenancy/templates/tenancy/store/team.html
index d8e7f42a..3cd61ac5 100644
--- a/app/modules/tenancy/templates/tenancy/store/team.html
+++ b/app/modules/tenancy/templates/tenancy/store/team.html
@@ -289,5 +289,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('tenancy_static', path='store/js/team.js') }}"></script>
+<script defer src="{{ url_for('tenancy_static', path='store/js/team.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/base.html b/app/templates/admin/base.html
index be628e23..5550044a 100644
--- a/app/templates/admin/base.html
+++ b/app/templates/admin/base.html
@@ -98,19 +98,19 @@
     <!-- Core Scripts - ORDER MATTERS! -->
 
     <!-- 1. FIRST: Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 2. SECOND: Icons (before Alpine.js) -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. THIRD: Alpine.js Base Data -->
     <script src="{{ url_for('core_static', path='admin/js/init-alpine.js') }}"></script>
 
     <!-- 4. FOURTH: Utils (standalone utilities) -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 4b. i18n Support -->
-    <script src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
     <script>
         // Initialize i18n with current language and preload modules
         (async function() {
@@ -120,7 +120,7 @@
     </script>
 
     <!-- 5. FIFTH: API Client (depends on Utils) -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 6. SIXTH: Tom Select with CDN fallback -->
     <script>
@@ -138,7 +138,7 @@
     </script>
 
     <!-- 7. SEVENTH: Store Selector (depends on Tom Select and API Client) -->
-    <script src="{{ url_for('core_static', path='shared/js/store-selector.js') }}"></script>
+    <script defer src="{{ url_for('core_static', path='shared/js/store-selector.js') }}"></script>
 
     <!-- 8a. Alpine.js Collapse Plugin (must load before Alpine) -->
     <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/collapse@3.13.3/dist/cdn.min.js"></script>
@@ -174,4 +174,4 @@
     <!-- 12. LAST: Page-specific scripts -->
     {% block extra_scripts %}{% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/templates/merchant/base.html b/app/templates/merchant/base.html
index b6674bf9..2895377b 100644
--- a/app/templates/merchant/base.html
+++ b/app/templates/merchant/base.html
@@ -41,19 +41,19 @@
     <!-- Core Scripts - ORDER MATTERS! -->
 
     <!-- 1. FIRST: Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 2. SECOND: Icons (before Alpine.js) -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. THIRD: Alpine.js Base Data -->
     <script src="{{ url_for('core_static', path='merchant/js/init-alpine.js') }}"></script>
 
     <!-- 4. FOURTH: Utils (standalone utilities) -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 5. FIFTH: API Client (depends on Utils) -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 6. SIXTH: Alpine.js v3 with CDN fallback (with defer) -->
     <script>
diff --git a/app/templates/shared/macros/charts.html b/app/templates/shared/macros/charts.html
index c0be363e..87c65513 100644
--- a/app/templates/shared/macros/charts.html
+++ b/app/templates/shared/macros/charts.html
@@ -5,7 +5,7 @@
 
   Prerequisites:
     Add Chart.js CDN to your base template:
-    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
+    <script defer src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
 
   Usage:
     {% from 'shared/macros/charts.html' import chart_card, line_chart, bar_chart, doughnut_chart %}
diff --git a/app/templates/shared/macros/datepicker.html b/app/templates/shared/macros/datepicker.html
index 85822b27..bfa89090 100644
--- a/app/templates/shared/macros/datepicker.html
+++ b/app/templates/shared/macros/datepicker.html
@@ -7,7 +7,7 @@
     Add Flatpickr CDN to your base template:
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/themes/dark.css">
-    <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
+    <script defer src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
 
   Usage:
     {% from 'shared/macros/datepicker.html' import datepicker, daterange_picker, datetime_picker %}
diff --git a/app/templates/shared/macros/storefront/reviews.html b/app/templates/shared/macros/storefront/reviews.html
index d91ff5d8..ac8c2fb9 100644
--- a/app/templates/shared/macros/storefront/reviews.html
+++ b/app/templates/shared/macros/storefront/reviews.html
@@ -58,7 +58,7 @@
             {% if show_avatar %}
             <div class="w-10 h-10 rounded-full overflow-hidden bg-purple-100 dark:bg-purple-900/30 flex items-center justify-center flex-shrink-0">
                 <template x-if="{{ review_var }}.author_avatar">
-                    <img :src="{{ review_var }}.author_avatar" :alt="{{ review_var }}.author_name" class="w-full h-full object-cover">
+                    <img loading="lazy" :src="{{ review_var }}.author_avatar" :alt="{{ review_var }}.author_name" class="w-full h-full object-cover">
                 </template>
                 <template x-if="!{{ review_var }}.author_avatar">
                     <span class="text-sm font-medium text-purple-600 dark:text-purple-400" x-text="{{ review_var }}.author_name?.charAt(0)?.toUpperCase()"></span>
@@ -111,7 +111,7 @@
                 type="button"
                 class="w-16 h-16 rounded-lg overflow-hidden border border-gray-200 dark:border-gray-700 hover:border-purple-500 transition-colors"
             >
-                <img :src="image" alt="Review image" class="w-full h-full object-cover">
+                <img loading="lazy" :src="image" alt="Review image" class="w-full h-full object-cover">
             </button>
         </template>
     </div>
@@ -353,7 +353,7 @@
         <div class="flex flex-wrap gap-2">
             <template x-for="(image, index) in {{ images_model }} || []" :key="index">
                 <div class="relative w-20 h-20 rounded-lg overflow-hidden group">
-                    <img :src="image" alt="Review image" class="w-full h-full object-cover">
+                    <img loading="lazy" :src="image" alt="Review image" class="w-full h-full object-cover">
                     <button
                         type="button"
                         @click="{{ images_model }}.splice(index, 1)"
diff --git a/app/templates/shared/macros/storefront/search-bar.html b/app/templates/shared/macros/storefront/search-bar.html
index bebf6bd8..2f5cffec 100644
--- a/app/templates/shared/macros/storefront/search-bar.html
+++ b/app/templates/shared/macros/storefront/search-bar.html
@@ -247,7 +247,7 @@
                                 </div>
                             </template>
                             <template x-if="typeof suggestion === 'object' && suggestion.image">
-                                <img :src="suggestion.image" :alt="suggestion.name" class="w-10 h-10 object-cover rounded">
+                                <img loading="lazy" :src="suggestion.image" :alt="suggestion.name" class="w-10 h-10 object-cover rounded">
                             </template>
                         </button>
                     </li>
@@ -434,7 +434,7 @@
                             class="w-full flex items-center gap-4 px-4 py-3 text-left hover:bg-gray-50 dark:hover:bg-gray-800"
                         >
                             <template x-if="typeof suggestion === 'object' && suggestion.image">
-                                <img :src="suggestion.image" :alt="suggestion.name" class="w-12 h-12 object-cover rounded">
+                                <img loading="lazy" :src="suggestion.image" :alt="suggestion.name" class="w-12 h-12 object-cover rounded">
                             </template>
                             <template x-if="typeof suggestion === 'string' || !suggestion.image">
                                 <span class="w-12 h-12 flex items-center justify-center bg-gray-100 dark:bg-gray-700 rounded">
@@ -574,7 +574,7 @@
                         :href="product.url"
                         class="flex items-center gap-3 px-4 py-2 hover:bg-gray-50 dark:hover:bg-gray-700/50"
                     >
-                        <img :src="product.image" :alt="product.name" class="w-10 h-10 object-cover rounded">
+                        <img loading="lazy" :src="product.image" :alt="product.name" class="w-10 h-10 object-cover rounded">
                         <div class="flex-1 min-w-0">
                             <p class="text-sm text-gray-900 dark:text-white truncate" x-text="product.name"></p>
                             <p class="text-sm text-purple-600 dark:text-purple-400 font-medium" x-text="'$' + product.price"></p>
diff --git a/app/templates/store/base.html b/app/templates/store/base.html
index fdc3b49d..e99db24e 100644
--- a/app/templates/store/base.html
+++ b/app/templates/store/base.html
@@ -48,7 +48,7 @@
     <!-- Core Scripts - ORDER MATTERS! -->
 
     <!-- 1. FIRST: Log Configuration -->
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     <!-- 1.5: Store Configuration (resolved via PlatformSettingsService) -->
     <script>
@@ -60,16 +60,16 @@
     </script>
 
     <!-- 2. SECOND: Icons (before Alpine.js) -->
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     <!-- 3. THIRD: Alpine.js Base Data -->
     <script src="{{ url_for('core_static', path='store/js/init-alpine.js') }}"></script>
 
     <!-- 4. FOURTH: Utils (standalone utilities) -->
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     <!-- 4b. i18n Support -->
-    <script src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
     <script>
         // Initialize i18n with dashboard language and preload modules
         (async function() {
@@ -79,13 +79,13 @@
     </script>
 
     <!-- 5. FIFTH: API Client (depends on Utils) -->
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 6. SIXTH: Feature Store (depends on API Client, registers with Alpine) -->
-    <script src="{{ url_for('billing_static', path='shared/js/feature-store.js') }}"></script>
+    <script defer src="{{ url_for('billing_static', path='shared/js/feature-store.js') }}"></script>
 
     <!-- 7. SEVENTH: Upgrade Prompts (depends on API Client, registers with Alpine) -->
-    <script src="{{ url_for('billing_static', path='shared/js/upgrade-prompts.js') }}"></script>
+    <script defer src="{{ url_for('billing_static', path='shared/js/upgrade-prompts.js') }}"></script>
 
     <!-- 8. EIGHTH: Alpine.js v3 with CDN fallback (with defer) -->
     <script>
@@ -109,4 +109,4 @@
     <!-- 9. LAST: Page-specific scripts -->
     {% block extra_scripts %}{% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/templates/storefront/base.html b/app/templates/storefront/base.html
index b4543065..0aca4b33 100644
--- a/app/templates/storefront/base.html
+++ b/app/templates/storefront/base.html
@@ -306,7 +306,7 @@
     {# JavaScript Loading Order (CRITICAL - must be in this order) #}
 
     {# 1. Log Configuration (must load first) #}
-    <script src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/log-config.js') }}"></script>
 
     {# 2. Global Shop Configuration (resolved via PlatformSettingsService) #}
     <script>
@@ -318,16 +318,16 @@
     </script>
 
     {# 3. Icon System #}
-    <script src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/icons.js') }}"></script>
 
     {# 4. Base Shop Layout (Alpine.js component - must load before Alpine) #}
-    <script src="{{ url_for('static', path='storefront/js/storefront-layout.js') }}"></script>
+    <script defer src="{{ url_for('static', path='storefront/js/storefront-layout.js') }}"></script>
 
     {# 5. Utilities #}
-    <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
 
     {# 5b. i18n Support #}
-    <script src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/i18n.js') }}"></script>
     <script>
         // Initialize i18n with storefront language and preload modules
         (async function() {
@@ -337,7 +337,7 @@
     </script>
 
     {# 6. API Client #}
-    <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
+    <script defer src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     {# 7. Alpine.js with CDN fallback (deferred - loads last) #}
     <script>
@@ -365,4 +365,4 @@
     <div id="toast-container" class="fixed bottom-4 right-4 z-50"></div>
 
 </body>
-</html>
\ No newline at end of file
+</html>