diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..f42cf6ac4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.json linguist-language=jsonc
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3bcb0dd2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+node_modules/
+
+# Shopify CLI files
+.shopify/
+
+## Release files
+release
+*.zip
+
+# custom
+*.md
+.theme-check.yml
+.shopifyignore
\ No newline at end of file
diff --git a/blocks/_announcement.liquid b/blocks/_announcement.liquid
index bf37fb5f3..ae96fda9b 100644
--- a/blocks/_announcement.liquid
+++ b/blocks/_announcement.liquid
@@ -19,13 +19,13 @@
       {% render 'typography-style', settings: block_settings, preset: 'custom' %}
       --width: 100%;
       --text-align: center;
-      --line-height: 1;
+      --line-height: 1.4;
     "
     {{ block.shopify_attributes }}
     aria-hidden="{% if block_index == 0 %}false{% else %}true{% endif %}"
   >
     <p class="announcement-bar__text">
-      {{ block.settings.text }}
+      {{ block.settings.text | split: '||' | join: '<br>' }}
     </p>
 
     {% if block_settings.link != blank %}
diff --git a/blocks/ai_gen_block_2a866df.liquid b/blocks/ai_gen_block_2a866df.liquid
new file mode 100644
index 000000000..ee889c081
--- /dev/null
+++ b/blocks/ai_gen_block_2a866df.liquid
@@ -0,0 +1,298 @@
+{% doc %}
+  @prompt
+    Can you make a custom policies tab that has a title "policies", lists all the policies below with links and is centered, make it centred, and make the policies all on one line
+{% enddoc %}
+{% assign ai_gen_id = block.id | replace: '_', '' | downcase %}
+
+{% style %}
+  .ai-policies-tab-{{ ai_gen_id }} {
+    display: block;
+    width: {{ block.settings.desktop_width_percent }}%;
+    max-width: 100%;
+    margin: 0 auto;
+    padding: {{ block.settings.padding_top }}px {{ block.settings.padding_horizontal }}px {{ block.settings.padding_bottom }}px;
+    background-color: {{ block.settings.background_color }};
+    border-radius: {{ block.settings.border_radius }}px;
+    text-align: center;
+  }
+
+  .ai-policies-tab__title-{{ ai_gen_id }} {
+    margin: 0 0 {{ block.settings.title_spacing }}px;
+    color: {{ block.settings.title_color }};
+    font-size: {{ block.settings.title_size }}px;
+    font-weight: 700;
+  }
+
+  .ai-policies-tab__list-{{ ai_gen_id }} {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: {{ block.settings.link_spacing }}px;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .ai-policies-tab__item-{{ ai_gen_id }} {
+    margin: 0;
+  }
+
+  .ai-policies-tab__link-{{ ai_gen_id }} {
+    color: {{ block.settings.link_color }};
+    font-size: {{ block.settings.link_size }}px;
+    text-decoration: {{ block.settings.link_underline }};
+    transition: color 0.2s ease;
+    white-space: nowrap;
+  }
+
+  .ai-policies-tab__link-{{ ai_gen_id }}:hover {
+    color: {{ block.settings.link_hover_color }};
+  }
+
+  .ai-policies-tab__empty-{{ ai_gen_id }} {
+    color: {{ block.settings.title_color }};
+    opacity: 0.6;
+    font-size: {{ block.settings.link_size }}px;
+    font-style: italic;
+  }
+
+  @media screen and (max-width: 749px) {
+    .ai-policies-tab-{{ ai_gen_id }} {
+      padding: {{ block.settings.padding_top | times: 0.7 }}px {{ block.settings.padding_horizontal | times: 0.7 }}px {{ block.settings.padding_bottom | times: 0.7 }}px;
+    }
+
+    .ai-policies-tab__title-{{ ai_gen_id }} {
+      font-size: {{ block.settings.title_size | times: 0.8 }}px;
+    }
+
+    .ai-policies-tab__link-{{ ai_gen_id }} {
+      font-size: {{ block.settings.link_size | times: 0.9 }}px;
+    }
+  }
+{% endstyle %}
+
+<div class="ai-policies-tab-{{ ai_gen_id }}" {{ block.shopify_attributes }}>
+  <h2 class="ai-policies-tab__title-{{ ai_gen_id }}">{{ block.settings.title }}</h2>
+  
+  {% liquid
+    assign has_policies = false
+    if shop.privacy_policy or shop.refund_policy or shop.shipping_policy or shop.terms_of_service or shop.contact_information
+      assign has_policies = true
+    endif
+  %}
+
+  {% if has_policies %}
+    <ul class="ai-policies-tab__list-{{ ai_gen_id }}">
+      {% if shop.privacy_policy %}
+        <li class="ai-policies-tab__item-{{ ai_gen_id }}">
+          <a href="{{ shop.privacy_policy.url }}" class="ai-policies-tab__link-{{ ai_gen_id }}">
+            {{ shop.privacy_policy.title }}
+          </a>
+        </li>
+      {% endif %}
+
+      {% if shop.refund_policy %}
+        <li class="ai-policies-tab__item-{{ ai_gen_id }}">
+          <a href="{{ shop.refund_policy.url }}" class="ai-policies-tab__link-{{ ai_gen_id }}">
+            {{ shop.refund_policy.title }}
+          </a>
+        </li>
+      {% endif %}
+
+      {% if shop.shipping_policy %}
+        <li class="ai-policies-tab__item-{{ ai_gen_id }}">
+          <a href="{{ shop.shipping_policy.url }}" class="ai-policies-tab__link-{{ ai_gen_id }}">
+            {{ shop.shipping_policy.title }}
+          </a>
+        </li>
+      {% endif %}
+
+      {% if shop.terms_of_service %}
+        <li class="ai-policies-tab__item-{{ ai_gen_id }}">
+          <a href="{{ shop.terms_of_service.url }}" class="ai-policies-tab__link-{{ ai_gen_id }}">
+            {{ shop.terms_of_service.title }}
+          </a>
+        </li>
+      {% endif %}
+
+      {% if shop.contact_information %}
+        <li class="ai-policies-tab__item-{{ ai_gen_id }}">
+          <a href="{{ shop.contact_information.url }}" class="ai-policies-tab__link-{{ ai_gen_id }}">
+            {{ shop.contact_information.title }}
+          </a>
+        </li>
+      {% endif %}
+    </ul>
+  {% else %}
+    <p class="ai-policies-tab__empty-{{ ai_gen_id }}">
+      No policies have been added yet. Add them in your store settings.
+    </p>
+  {% endif %}
+</div>
+
+{% schema %}
+{
+  "name": "Policies",
+  "settings": [
+    {
+      "type": "header",
+      "content": "Content"
+    },
+    {
+      "type": "text",
+      "id": "title",
+      "label": "Title",
+      "default": "Policies"
+    },
+    {
+      "type": "range",
+      "id": "desktop_width_percent",
+      "label": "Desktop width",
+      "min": 50,
+      "max": 100,
+      "step": 5,
+      "unit": "%",
+      "default": 100
+    },
+    {
+      "type": "header",
+      "content": "Style"
+    },
+    {
+      "type": "color",
+      "id": "background_color",
+      "label": "Background color",
+      "default": "#FFFFFF"
+    },
+    {
+      "type": "range",
+      "id": "border_radius",
+      "label": "Border radius",
+      "min": 0,
+      "max": 40,
+      "step": 2,
+      "unit": "px",
+      "default": 0
+    },
+    {
+      "type": "range",
+      "id": "padding_top",
+      "label": "Padding top",
+      "min": 0,
+      "max": 100,
+      "step": 5,
+      "unit": "px",
+      "default": 40
+    },
+    {
+      "type": "range",
+      "id": "padding_bottom",
+      "label": "Padding bottom",
+      "min": 0,
+      "max": 100,
+      "step": 5,
+      "unit": "px",
+      "default": 40
+    },
+    {
+      "type": "range",
+      "id": "padding_horizontal",
+      "label": "Padding horizontal",
+      "min": 0,
+      "max": 100,
+      "step": 5,
+      "unit": "px",
+      "default": 20
+    },
+    {
+      "type": "header",
+      "content": "Title"
+    },
+    {
+      "type": "color",
+      "id": "title_color",
+      "label": "Color",
+      "default": "#121212"
+    },
+    {
+      "type": "range",
+      "id": "title_size",
+      "label": "Size",
+      "min": 16,
+      "max": 48,
+      "step": 2,
+      "unit": "px",
+      "default": 32
+    },
+    {
+      "type": "range",
+      "id": "title_spacing",
+      "label": "Spacing below",
+      "min": 10,
+      "max": 50,
+      "step": 5,
+      "unit": "px",
+      "default": 25
+    },
+    {
+      "type": "header",
+      "content": "Links"
+    },
+    {
+      "type": "color",
+      "id": "link_color",
+      "label": "Color",
+      "default": "#121212"
+    },
+    {
+      "type": "color",
+      "id": "link_hover_color",
+      "label": "Hover color",
+      "default": "#333333"
+    },
+    {
+      "type": "range",
+      "id": "link_size",
+      "label": "Size",
+      "min": 12,
+      "max": 24,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "select",
+      "id": "link_underline",
+      "label": "Underline",
+      "options": [
+        {
+          "value": "none",
+          "label": "None"
+        },
+        {
+          "value": "underline",
+          "label": "Underline"
+        }
+      ],
+      "default": "none"
+    },
+    {
+      "type": "range",
+      "id": "link_spacing",
+      "label": "Spacing between",
+      "min": 5,
+      "max": 50,
+      "step": 5,
+      "unit": "px",
+      "default": 20
+    }
+  ],
+  "presets": [
+    {
+      "name": "Policies"
+    }
+  ]
+}
+{% endschema %}
\ No newline at end of file
diff --git a/blocks/ai_gen_block_b2fcd10.liquid b/blocks/ai_gen_block_b2fcd10.liquid
new file mode 100644
index 000000000..87b9b6197
--- /dev/null
+++ b/blocks/ai_gen_block_b2fcd10.liquid
@@ -0,0 +1,312 @@
+{% doc %}
+  @prompt
+    can i create a product safety warning section for products of this type
+{% enddoc %}
+{% assign ai_gen_id = block.id | replace: '_', '' | downcase %}
+
+{% style %}
+  .ai-safety-warning-{{ ai_gen_id }} {
+    display: block;
+    width: {{ block.settings.desktop_width_percent }}%;
+    max-width: 100%;
+    padding: {{ block.settings.padding }}px;
+    background-color: {{ block.settings.background_color }};
+    border: {{ block.settings.border_width }}px solid {{ block.settings.border_color }};
+    border-radius: {{ block.settings.border_radius }}px;
+    margin: {{ block.settings.margin_top }}px 0 {{ block.settings.margin_bottom }}px;
+  }
+
+  .ai-safety-warning-header-{{ ai_gen_id }} {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: {{ block.settings.spacing }}px;
+  }
+
+  .ai-safety-warning-icon-{{ ai_gen_id }} {
+    flex-shrink: 0;
+    width: {{ block.settings.icon_size }}px;
+    height: {{ block.settings.icon_size }}px;
+    color: {{ block.settings.icon_color }};
+  }
+
+  .ai-safety-warning-title-{{ ai_gen_id }} {
+    margin: 0;
+    font-size: {{ block.settings.title_size }}px;
+    font-weight: 600;
+    color: {{ block.settings.text_color }};
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} {
+    color: {{ block.settings.text_color }};
+    font-size: {{ block.settings.text_size }}px;
+    line-height: 1.6;
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} p {
+    margin: 0 0 {{ block.settings.spacing }}px;
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} p:last-child {
+    margin-bottom: 0;
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} ul,
+  .ai-safety-warning-content-{{ ai_gen_id }} ol {
+    margin: 0 0 {{ block.settings.spacing }}px;
+    padding-left: 20px;
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} li {
+    margin-bottom: 8px;
+  }
+
+  .ai-safety-warning-content-{{ ai_gen_id }} li:last-child {
+    margin-bottom: 0;
+  }
+
+  @media screen and (max-width: 749px) {
+    .ai-safety-warning-{{ ai_gen_id }} {
+      width: 100%;
+    }
+  }
+{% endstyle %}
+
+<div class="ai-safety-warning-{{ ai_gen_id }}" {{ block.shopify_attributes }}>
+  <div class="ai-safety-warning-header-{{ ai_gen_id }}">
+    {% if block.settings.show_icon %}
+      <div class="ai-safety-warning-icon-{{ ai_gen_id }}">
+        {% if block.settings.icon_style == 'warning' %}
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path>
+            <line x1="12" y1="9" x2="12" y2="13"></line>
+            <line x1="12" y1="17" x2="12.01" y2="17"></line>
+          </svg>
+        {% elsif block.settings.icon_style == 'alert' %}
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <circle cx="12" cy="12" r="10"></circle>
+            <line x1="12" y1="8" x2="12" y2="12"></line>
+            <line x1="12" y1="16" x2="12.01" y2="16"></line>
+          </svg>
+        {% elsif block.settings.icon_style == 'info' %}
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <circle cx="12" cy="12" r="10"></circle>
+            <line x1="12" y1="16" x2="12" y2="12"></line>
+            <line x1="12" y1="8" x2="12.01" y2="8"></line>
+          </svg>
+        {% else %}
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path>
+            <line x1="12" y1="9" x2="12" y2="13"></line>
+            <line x1="12" y1="17" x2="12.01" y2="17"></line>
+          </svg>
+        {% endif %}
+      </div>
+    {% endif %}
+    
+    {% if block.settings.title != blank %}
+      <h3 class="ai-safety-warning-title-{{ ai_gen_id }}">{{ block.settings.title }}</h3>
+    {% endif %}
+  </div>
+
+  {% if block.settings.content != blank %}
+    <div class="ai-safety-warning-content-{{ ai_gen_id }}">
+      {{ block.settings.content }}
+    </div>
+  {% endif %}
+</div>
+
+{% schema %}
+{
+  "name": "Product safety warning",
+  "settings": [
+    {
+      "type": "header",
+      "content": "Content"
+    },
+    {
+      "type": "text",
+      "id": "title",
+      "label": "Title",
+      "default": "Safety Warning"
+    },
+    {
+      "type": "richtext",
+      "id": "content",
+      "label": "Warning text",
+      "default": "<p><strong>Choking hazard:</strong> Small parts. Not suitable for children under 3 years.</p><p><strong>Keep away from:</strong> Heat sources, open flames, and direct sunlight.</p><p><strong>Adult supervision required</strong> when used by children.</p>"
+    },
+    {
+      "type": "header",
+      "content": "Icon"
+    },
+    {
+      "type": "checkbox",
+      "id": "show_icon",
+      "label": "Show icon",
+      "default": true
+    },
+    {
+      "type": "select",
+      "id": "icon_style",
+      "label": "Icon style",
+      "options": [
+        {
+          "value": "warning",
+          "label": "Warning triangle"
+        },
+        {
+          "value": "alert",
+          "label": "Alert circle"
+        },
+        {
+          "value": "info",
+          "label": "Info circle"
+        }
+      ],
+      "default": "warning"
+    },
+    {
+      "type": "range",
+      "id": "icon_size",
+      "label": "Icon size",
+      "min": 16,
+      "max": 48,
+      "step": 2,
+      "unit": "px",
+      "default": 24
+    },
+    {
+      "type": "color",
+      "id": "icon_color",
+      "label": "Icon color",
+      "default": "#D82C0D"
+    },
+    {
+      "type": "header",
+      "content": "Style"
+    },
+    {
+      "type": "color",
+      "id": "background_color",
+      "label": "Background",
+      "default": "#FFF4E6"
+    },
+    {
+      "type": "color",
+      "id": "text_color",
+      "label": "Text",
+      "default": "#121212"
+    },
+    {
+      "type": "color",
+      "id": "border_color",
+      "label": "Border",
+      "default": "#FFB84D"
+    },
+    {
+      "type": "range",
+      "id": "border_width",
+      "label": "Border width",
+      "min": 0,
+      "max": 4,
+      "step": 1,
+      "unit": "px",
+      "default": 1
+    },
+    {
+      "type": "range",
+      "id": "border_radius",
+      "label": "Border radius",
+      "min": 0,
+      "max": 24,
+      "step": 2,
+      "unit": "px",
+      "default": 8
+    },
+    {
+      "type": "range",
+      "id": "padding",
+      "label": "Padding",
+      "min": 8,
+      "max": 40,
+      "step": 2,
+      "unit": "px",
+      "default": 20
+    },
+    {
+      "type": "range",
+      "id": "spacing",
+      "label": "Content spacing",
+      "min": 4,
+      "max": 24,
+      "step": 2,
+      "unit": "px",
+      "default": 12
+    },
+    {
+      "type": "header",
+      "content": "Typography"
+    },
+    {
+      "type": "range",
+      "id": "title_size",
+      "label": "Title size",
+      "min": 12,
+      "max": 32,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "range",
+      "id": "text_size",
+      "label": "Text size",
+      "min": 10,
+      "max": 24,
+      "step": 1,
+      "unit": "px",
+      "default": 14
+    },
+    {
+      "type": "header",
+      "content": "Layout"
+    },
+    {
+      "type": "range",
+      "id": "desktop_width_percent",
+      "label": "Desktop width",
+      "min": 50,
+      "max": 100,
+      "step": 5,
+      "unit": "%",
+      "default": 100
+    },
+    {
+      "type": "range",
+      "id": "margin_top",
+      "label": "Margin top",
+      "min": 0,
+      "max": 40,
+      "step": 4,
+      "unit": "px",
+      "default": 0
+    },
+    {
+      "type": "range",
+      "id": "margin_bottom",
+      "label": "Margin bottom",
+      "min": 0,
+      "max": 40,
+      "step": 4,
+      "unit": "px",
+      "default": 0
+    }
+  ],
+  "presets": [
+    {
+      "name": "Product safety warning"
+    }
+  ]
+}
+{% endschema %}
\ No newline at end of file
diff --git a/blocks/social-links.liquid b/blocks/social-links.liquid
index 803e2b2e8..cf149ec70 100644
--- a/blocks/social-links.liquid
+++ b/blocks/social-links.liquid
@@ -3,7 +3,7 @@
   {{ block.shopify_attributes }}
 >
   {% liquid
-    assign social_links = 'facebook_url,instagram_url,youtube_url,tiktok_url,twitter_url,threads_url,linkedin_url,bluesky_url,snapchat_url,pinterest_url,tumblr_url,vimeo_url,custom_url' | split: ','
+    assign social_links = 'facebook_url,instagram_url,youtube_url,tiktok_url,twitter_url,threads_url,linkedin_url,bluesky_url,snapchat_url,pinterest_url,tumblr_url,vimeo_url,whatsapp_url,custom_url' | split: ','
   %}
 
   {% for link_key in social_links %}
@@ -38,6 +38,8 @@
             assign platform = 'tumblr'
           when 'vimeo_url'
             assign platform = 'vimeo'
+          when 'whatsapp_url'
+            assign platform = 'whatsapp'
           when 'custom_url'
             # For custom URLs, extract domain from URL for platform identification
             assign platform = link_url | split: '//' | last | remove: 'www.' | split: '.' | first
@@ -224,6 +226,11 @@
       "id": "vimeo_url",
       "label": "t:options.vimeo"
     },
+    {
+      "type": "url",
+      "id": "whatsapp_url",
+      "label": "t:options.whatsapp"
+    },
     {
       "type": "url",
       "id": "custom_url",
diff --git a/config/settings_data.json b/config/settings_data.json
index 41beca196..a6765718a 100644
--- a/config/settings_data.json
+++ b/config/settings_data.json
@@ -7,10 +7,11 @@
  * made to this file may be overwritten.
  * ------------------------------------------------------------
  */
- {
+{
   "current": {
-    "logo_height": 36,
-    "logo_height_mobile": 28,
+    "logo": "shopify://shop_images/logo_210_60.svg",
+    "logo_height": 50,
+    "logo_height_mobile": 40,
     "type_body_font": "inter_n4",
     "type_subheading_font": "inter_n5",
     "type_heading_font": "inter_n7",
@@ -54,7 +55,6 @@
     "button_border_radius_primary": 14,
     "secondary_button_border_width": 1,
     "button_border_radius_secondary": 14,
-    "button_font_weight_secondary": "default",
     "cart_type": "drawer",
     "cart_price_font": "subheading",
     "show_cart_note": false,
@@ -77,111 +77,112 @@
     "variant_button_border_width": 1,
     "variant_button_radius": 14,
     "variant_button_width": "equal-width-buttons",
+    "button_font_weight_secondary": "default",
     "content_for_index": [],
     "color_schemes": {
       "scheme-1": {
         "settings": {
           "background": "#ffffff",
-          "foreground_heading": "#000000",
-          "foreground": "#000000cf",
-          "primary": "#000000cf",
-          "primary_hover": "#000000",
-          "border": "#0000000f",
-          "shadow": "#000000",
-          "primary_button_background": "#000000",
+          "foreground_heading": "#121212",
+          "foreground": "#121212cf",
+          "primary": "#121212cf",
+          "primary_hover": "#121212",
+          "border": "#12121221",
+          "shadow": "#121212",
+          "primary_button_background": "#121212",
           "primary_button_text": "#ffffff",
-          "primary_button_border": "#000000",
+          "primary_button_border": "#121212",
           "primary_button_hover_background": "#333333",
           "primary_button_hover_text": "#ffffff",
-          "primary_button_hover_border": "#000000",
+          "primary_button_hover_border": "#121212",
           "secondary_button_background": "rgba(0,0,0,0)",
-          "secondary_button_text": "#000000",
-          "secondary_button_border": "#000000",
-          "secondary_button_hover_background": "#fafafa",
+          "secondary_button_text": "#121212",
+          "secondary_button_border": "#121212",
+          "secondary_button_hover_background": "#f5f5f5",
           "secondary_button_hover_text": "#333333",
           "secondary_button_hover_border": "#333333",
           "input_background": "#ffffffc7",
-          "input_text_color": "#333333",
-          "input_border_color": "#dfdfdf",
-          "input_hover_background": "#00000003",
+          "input_text_color": "#121212",
+          "input_border_color": "#12121221",
+          "input_hover_background": "#f5f5f5",
           "variant_background_color": "#ffffff",
-          "variant_text_color": "#000000",
-          "variant_border_color": "#00000021",
+          "variant_text_color": "#121212",
+          "variant_border_color": "#12121221",
           "variant_hover_background_color": "#f5f5f5",
-          "variant_hover_text_color": "#000000",
+          "variant_hover_text_color": "#121212",
           "variant_hover_border_color": "#e6e6e6",
-          "selected_variant_background_color": "#000000",
+          "selected_variant_background_color": "#121212",
           "selected_variant_text_color": "#ffffff",
-          "selected_variant_border_color": "#000000",
-          "selected_variant_hover_background_color": "#1a1a1a",
+          "selected_variant_border_color": "#121212",
+          "selected_variant_hover_background_color": "#333333",
           "selected_variant_hover_text_color": "#ffffff",
-          "selected_variant_hover_border_color": "#1a1a1a"
+          "selected_variant_hover_border_color": "#333333"
         }
       },
       "scheme-2": {
         "settings": {
-          "background": "#f5f5f5",
-          "foreground_heading": "#000000",
-          "foreground": "#000000cf",
-          "primary": "#000000cf",
-          "primary_hover": "#ffffff",
-          "border": "#dfdfdf",
-          "shadow": "#000000",
-          "primary_button_background": "#000000",
-          "primary_button_text": "#ffffff",
-          "primary_button_border": "#000000",
+          "background": "#f3f3f3",
+          "foreground_heading": "#121212",
+          "foreground": "#121212cf",
+          "primary": "#121212cf",
+          "primary_hover": "#121212",
+          "border": "#12121221",
+          "shadow": "#121212",
+          "primary_button_background": "#121212",
+          "primary_button_text": "#f3f3f3",
+          "primary_button_border": "#121212",
           "primary_button_hover_background": "#333333",
           "primary_button_hover_text": "#ffffff",
           "primary_button_hover_border": "#333333",
           "secondary_button_background": "rgba(0,0,0,0)",
-          "secondary_button_text": "#000000",
-          "secondary_button_border": "#000000",
+          "secondary_button_text": "#121212",
+          "secondary_button_border": "#121212",
           "secondary_button_hover_background": "#ffffff5c",
-          "secondary_button_hover_text": "#000000",
+          "secondary_button_hover_text": "#121212",
           "secondary_button_hover_border": "#333333ba",
           "input_background": "rgba(0,0,0,0)",
-          "input_text_color": "#00000087",
-          "input_border_color": "#00000021",
+          "input_text_color": "#121212",
+          "input_border_color": "#12121221",
           "input_hover_background": "#ffffff5c",
           "variant_background_color": "#ffffff",
-          "variant_text_color": "#000000",
+          "variant_text_color": "#121212",
           "variant_border_color": "#e6e6e6",
           "variant_hover_background_color": "#f5f5f5",
-          "variant_hover_text_color": "#000000",
+          "variant_hover_text_color": "#121212",
           "variant_hover_border_color": "#e6e6e6",
-          "selected_variant_background_color": "#000000",
+          "selected_variant_background_color": "#121212",
           "selected_variant_text_color": "#ffffff",
-          "selected_variant_border_color": "#000000",
-          "selected_variant_hover_background_color": "#1a1a1a",
+          "selected_variant_border_color": "#121212",
+          "selected_variant_hover_background_color": "#333333",
           "selected_variant_hover_text_color": "#ffffff",
-          "selected_variant_hover_border_color": "#1a1a1a"
+          "selected_variant_hover_border_color": "#333333"
         }
       },
       "scheme-3": {
         "settings": {
-          "background": "#eef1ea",
-          "foreground_heading": "#000000",
-          "foreground": "#000000cf",
-          "primary": "#000000cf",
-          "primary_hover": "#000000",
-          "border": "#000000cf",
-          "shadow": "#000000",
-          "primary_button_background": "#000000",
-          "primary_button_text": "#ffffff",
-          "primary_button_border": "#000000",
-          "primary_button_hover_background": "#333333",
+          "background": "#242833",
+          "foreground_heading": "#ffffff",
+          "foreground": "#ffffff",
+          "primary": "#ffffff",
+          "primary_hover": "#ffffffb0",
+          "border": "#ffffffb0",
+          "shadow": "#121212",
+          "primary_button_background": "#ffffff",
+          "primary_button_text": "#000000",
+          "primary_button_border": "#ffffff",
+          "primary_button_hover_background": "#000000",
           "primary_button_hover_text": "#ffffff",
-          "primary_button_hover_border": "#333333",
+          "primary_button_hover_border": "#000000",
           "secondary_button_background": "rgba(0,0,0,0)",
-          "secondary_button_text": "#000000",
-          "secondary_button_border": "#000000",
-          "secondary_button_hover_background": "#ffffff5c",
-          "secondary_button_hover_text": "#000000cf",
-          "secondary_button_hover_border": "#000000cf",
-          "input_background": "rgba(0,0,0,0)",
-          "input_text_color": "#000000cf",
-          "input_border_color": "#000000cf",
-          "input_hover_background": "#ffffff5c",
+          "secondary_button_text": "#ffffff",
+          "secondary_button_border": "#ffffffb0",
+          "secondary_button_hover_background": "#ffffff0a",
+          "secondary_button_hover_text": "#ffffffed",
+          "secondary_button_hover_border": "#ffffffb0",
+          "input_background": "#242833",
+          "input_text_color": "#ffffffed",
+          "input_border_color": "#ffffffb0",
+          "input_hover_background": "#ffffff0a",
           "variant_background_color": "#ffffff",
           "variant_text_color": "#000000",
           "variant_border_color": "#e6e6e6",
@@ -198,54 +199,54 @@
       },
       "scheme-4": {
         "settings": {
-          "background": "#e1edf5",
-          "foreground_heading": "#000000",
-          "foreground": "#000000cf",
-          "primary": "#000000cf",
-          "primary_hover": "#000000",
-          "border": "#1d368680",
-          "shadow": "#000000",
-          "primary_button_background": "#000000",
-          "primary_button_text": "#ffffff",
-          "primary_button_border": "#1d3686",
-          "primary_button_hover_background": "#333333",
+          "background": "#121212",
+          "foreground_heading": "#ffffff",
+          "foreground": "#ffffff",
+          "primary": "#ffffff",
+          "primary_hover": "#ffffffb0",
+          "border": "#ffffffb0",
+          "shadow": "#121212",
+          "primary_button_background": "#ffffff",
+          "primary_button_text": "#121212",
+          "primary_button_border": "#ffffff",
+          "primary_button_hover_background": "#000000",
           "primary_button_hover_text": "#ffffff",
           "primary_button_hover_border": "#000000",
           "secondary_button_background": "rgba(0,0,0,0)",
-          "secondary_button_text": "#000000",
-          "secondary_button_border": "#000000",
-          "secondary_button_hover_background": "#ffffff5c",
-          "secondary_button_hover_text": "#000000cf",
-          "secondary_button_hover_border": "#000000cf",
-          "input_background": "rgba(0,0,0,0)",
-          "input_text_color": "#000000cf",
-          "input_border_color": "#000000cf",
-          "input_hover_background": "#ffffff5c",
+          "secondary_button_text": "#ffffff",
+          "secondary_button_border": "#ffffffb0",
+          "secondary_button_hover_background": "#ffffff0a",
+          "secondary_button_hover_text": "#ffffffed",
+          "secondary_button_hover_border": "#ffffffb0",
+          "input_background": "#121212",
+          "input_text_color": "#ffffffed",
+          "input_border_color": "#ffffffb0",
+          "input_hover_background": "#ffffff0a",
           "variant_background_color": "#ffffff",
-          "variant_text_color": "#000000",
+          "variant_text_color": "#121212",
           "variant_border_color": "#e6e6e6",
           "variant_hover_background_color": "#f5f5f5",
-          "variant_hover_text_color": "#000000",
+          "variant_hover_text_color": "#121212",
           "variant_hover_border_color": "#e6e6e6",
-          "selected_variant_background_color": "#000000",
-          "selected_variant_text_color": "#ffffff",
-          "selected_variant_border_color": "#000000",
-          "selected_variant_hover_background_color": "#1a1a1a",
-          "selected_variant_hover_text_color": "#ffffff",
-          "selected_variant_hover_border_color": "#1a1a1a"
+          "selected_variant_background_color": "#ffffff",
+          "selected_variant_text_color": "#121212",
+          "selected_variant_border_color": "#ffffff",
+          "selected_variant_hover_background_color": "#f0f0f0",
+          "selected_variant_hover_text_color": "#121212",
+          "selected_variant_hover_border_color": "#f0f0f0"
         }
       },
       "scheme-5": {
         "settings": {
-          "background": "#333333",
+          "background": "#4e6b9e",
           "foreground_heading": "#ffffff",
           "foreground": "#ffffff",
           "primary": "#ffffff",
           "primary_hover": "#ffffffb0",
           "border": "#ffffffb0",
-          "shadow": "#000000",
+          "shadow": "#121212",
           "primary_button_background": "#ffffff",
-          "primary_button_text": "#000000",
+          "primary_button_text": "#4e6b9e",
           "primary_button_border": "#ffffff",
           "primary_button_hover_background": "#000000",
           "primary_button_hover_text": "#ffffff",
@@ -256,22 +257,22 @@
           "secondary_button_hover_background": "#ffffff0a",
           "secondary_button_hover_text": "#ffffffed",
           "secondary_button_hover_border": "#ffffffb0",
-          "input_background": "#333333",
+          "input_background": "#4e6b9e",
           "input_text_color": "#ffffffed",
           "input_border_color": "#ffffffb0",
           "input_hover_background": "#ffffff0a",
           "variant_background_color": "#ffffff",
-          "variant_text_color": "#000000",
-          "variant_border_color": "#e6e6e6",
+          "variant_text_color": "#4e6b9e",
+          "variant_border_color": "#4e6b9e66",
           "variant_hover_background_color": "#f5f5f5",
-          "variant_hover_text_color": "#000000",
-          "variant_hover_border_color": "#e6e6e6",
-          "selected_variant_background_color": "#000000",
+          "variant_hover_text_color": "#4e6b9e",
+          "variant_hover_border_color": "#4e6b9e",
+          "selected_variant_background_color": "#4e6b9e",
           "selected_variant_text_color": "#ffffff",
-          "selected_variant_border_color": "#000000",
-          "selected_variant_hover_background_color": "#1a1a1a",
+          "selected_variant_border_color": "#4e6b9e",
+          "selected_variant_hover_background_color": "#2339a0",
           "selected_variant_hover_text_color": "#ffffff",
-          "selected_variant_hover_border_color": "#1a1a1a"
+          "selected_variant_hover_border_color": "#394fc0"
         }
       },
       "scheme-6": {
@@ -359,22 +360,22 @@
       "color_schemes": {
         "scheme-1": {
           "settings": {
-            "background": "#ffffff",
-            "foreground_heading": "#000000",
-            "foreground": "#000000cf",
-            "primary": "#000000cf",
-            "primary_hover": "#000000",
-            "border": "#0000000f",
-            "shadow": "#000000",
-            "primary_button_background": "#000000",
-            "primary_button_text": "#ffffff",
-            "primary_button_border": "#000000",
+            "background": "#FFFFFF",
+            "foreground_heading": "#121212",
+            "foreground": "#121212cf",
+            "primary": "#121212cf",
+            "primary_hover": "#121212",
+            "border": "#12121220",
+            "shadow": "#121212",
+            "primary_button_background": "#121212",
+            "primary_button_text": "#FFFFFF",
+            "primary_button_border": "#121212",
             "primary_button_hover_background": "#333333",
-            "primary_button_hover_text": "#ffffff",
-            "primary_button_hover_border": "#000000",
+            "primary_button_hover_text": "#FFFFFF",
+            "primary_button_hover_border": "#121212",
             "secondary_button_background": "rgba(0,0,0,0)",
-            "secondary_button_text": "#000000",
-            "secondary_button_border": "#000000",
+            "secondary_button_text": "#121212",
+            "secondary_button_border": "#121212",
             "secondary_button_hover_background": "#fafafa",
             "secondary_button_hover_text": "#333333",
             "secondary_button_hover_border": "#333333",
@@ -382,77 +383,77 @@
             "input_text_color": "#333333",
             "input_border_color": "#dfdfdf",
             "input_hover_background": "#00000003",
-            "variant_background_color": "#ffffff",
-            "variant_text_color": "#000000",
+            "variant_background_color": "#FFFFFF",
+            "variant_text_color": "#121212",
             "variant_border_color": "#00000021",
             "variant_hover_background_color": "#f5f5f5",
-            "variant_hover_text_color": "#000000",
+            "variant_hover_text_color": "#121212",
             "variant_hover_border_color": "#e6e6e6",
-            "selected_variant_background_color": "#000000",
-            "selected_variant_text_color": "#ffffff",
-            "selected_variant_border_color": "#000000",
+            "selected_variant_background_color": "#121212",
+            "selected_variant_text_color": "#FFFFFF",
+            "selected_variant_border_color": "#121212",
             "selected_variant_hover_background_color": "#1a1a1a",
-            "selected_variant_hover_text_color": "#ffffff",
+            "selected_variant_hover_text_color": "#FFFFFF",
             "selected_variant_hover_border_color": "#1a1a1a"
           }
         },
         "scheme-2": {
           "settings": {
-            "background": "#f5f5f5",
-            "foreground_heading": "#000000",
-            "foreground": "#000000cf",
-            "primary": "#000000cf",
+            "background": "#F3F3F3",
+            "foreground_heading": "#121212",
+            "foreground": "#121212cf",
+            "primary": "#121212cf",
             "primary_hover": "#ffffff",
             "border": "#DFDFDF",
-            "shadow": "#000000",
-            "primary_button_background": "#000000",
-            "primary_button_text": "#ffffff",
-            "primary_button_border": "#000000",
+            "shadow": "#121212",
+            "primary_button_background": "#121212",
+            "primary_button_text": "#F3F3F3",
+            "primary_button_border": "#121212",
             "primary_button_hover_background": "#333333",
-            "primary_button_hover_text": "#ffffff",
+            "primary_button_hover_text": "#FFFFFF",
             "primary_button_hover_border": "#333333",
             "secondary_button_background": "rgba(0,0,0,0)",
-            "secondary_button_text": "#000000",
-            "secondary_button_border": "#000000",
+            "secondary_button_text": "#121212",
+            "secondary_button_border": "#121212",
             "secondary_button_hover_background": "#ffffff5c",
-            "secondary_button_hover_text": "#000000",
+            "secondary_button_hover_text": "#121212",
             "secondary_button_hover_border": "#333333ba",
             "input_background": "rgba(0,0,0,0)",
             "input_text_color": "#00000087",
             "input_border_color": "#00000021",
             "input_hover_background": "#ffffff5c",
-            "variant_background_color": "#ffffff",
-            "variant_text_color": "#000000",
+            "variant_background_color": "#FFFFFF",
+            "variant_text_color": "#121212",
             "variant_border_color": "#e6e6e6",
             "variant_hover_background_color": "#f5f5f5",
-            "variant_hover_text_color": "#000000",
+            "variant_hover_text_color": "#121212",
             "variant_hover_border_color": "#e6e6e6",
-            "selected_variant_background_color": "#000000",
-            "selected_variant_text_color": "#ffffff",
-            "selected_variant_border_color": "#000000",
+            "selected_variant_background_color": "#121212",
+            "selected_variant_text_color": "#FFFFFF",
+            "selected_variant_border_color": "#121212",
             "selected_variant_hover_background_color": "#1a1a1a",
-            "selected_variant_hover_text_color": "#ffffff",
+            "selected_variant_hover_text_color": "#FFFFFF",
             "selected_variant_hover_border_color": "#1a1a1a"
           }
         },
         "scheme-3": {
           "settings": {
-            "background": "#eef1ea",
+            "background": "#242833",
             "foreground_heading": "#000000",
             "foreground": "#000000cf",
             "primary": "#000000cf",
             "primary_hover": "#000000",
             "border": "#000000cf",
-            "shadow": "#000000",
-            "primary_button_background": "#000000",
-            "primary_button_text": "#ffffff",
-            "primary_button_border": "#000000",
+            "shadow": "#121212",
+            "primary_button_background": "#FFFFFF",
+            "primary_button_text": "#000000",
+            "primary_button_border": "#FFFFFF",
             "primary_button_hover_background": "#333333",
-            "primary_button_hover_text": "#ffffff",
+            "primary_button_hover_text": "#FFFFFF",
             "primary_button_hover_border": "#333333",
             "secondary_button_background": "rgba(0,0,0,0)",
-            "secondary_button_text": "#000000",
-            "secondary_button_border": "#000000",
+            "secondary_button_text": "#FFFFFF",
+            "secondary_button_border": "#FFFFFF",
             "secondary_button_hover_background": "#ffffff5c",
             "secondary_button_hover_text": "#000000cf",
             "secondary_button_hover_border": "#000000cf",
@@ -460,38 +461,38 @@
             "input_text_color": "#000000cf",
             "input_border_color": "#000000cf",
             "input_hover_background": "#ffffff5c",
-            "variant_background_color": "#ffffff",
+            "variant_background_color": "#FFFFFF",
             "variant_text_color": "#000000",
             "variant_border_color": "#e6e6e6",
             "variant_hover_background_color": "#f5f5f5",
             "variant_hover_text_color": "#000000",
             "variant_hover_border_color": "#e6e6e6",
             "selected_variant_background_color": "#000000",
-            "selected_variant_text_color": "#ffffff",
+            "selected_variant_text_color": "#FFFFFF",
             "selected_variant_border_color": "#000000",
             "selected_variant_hover_background_color": "#1a1a1a",
-            "selected_variant_hover_text_color": "#ffffff",
+            "selected_variant_hover_text_color": "#FFFFFF",
             "selected_variant_hover_border_color": "#1a1a1a"
           }
         },
         "scheme-4": {
           "settings": {
-            "background": "#e1edf5",
+            "background": "#121212",
             "foreground_heading": "#000000",
             "foreground": "#000000cf",
             "primary": "#000000cf",
             "primary_hover": "#000000",
             "border": "#1d368680",
-            "shadow": "#000000",
-            "primary_button_background": "#000000",
-            "primary_button_text": "#ffffff",
-            "primary_button_border": "#1d3686",
+            "shadow": "#121212",
+            "primary_button_background": "#FFFFFF",
+            "primary_button_text": "#121212",
+            "primary_button_border": "#FFFFFF",
             "primary_button_hover_background": "#333333",
-            "primary_button_hover_text": "#ffffff",
+            "primary_button_hover_text": "#FFFFFF",
             "primary_button_hover_border": "#000000",
             "secondary_button_background": "rgba(0,0,0,0)",
-            "secondary_button_text": "#000000",
-            "secondary_button_border": "#000000",
+            "secondary_button_text": "#FFFFFF",
+            "secondary_button_border": "#FFFFFF",
             "secondary_button_hover_background": "#ffffff5c",
             "secondary_button_hover_text": "#000000cf",
             "secondary_button_hover_border": "#000000cf",
@@ -499,31 +500,31 @@
             "input_text_color": "#000000cf",
             "input_border_color": "#000000cf",
             "input_hover_background": "#ffffff5c",
-            "variant_background_color": "#ffffff",
-            "variant_text_color": "#000000",
+            "variant_background_color": "#FFFFFF",
+            "variant_text_color": "#121212",
             "variant_border_color": "#e6e6e6",
             "variant_hover_background_color": "#f5f5f5",
-            "variant_hover_text_color": "#000000",
+            "variant_hover_text_color": "#121212",
             "variant_hover_border_color": "#e6e6e6",
-            "selected_variant_background_color": "#000000",
-            "selected_variant_text_color": "#ffffff",
-            "selected_variant_border_color": "#000000",
+            "selected_variant_background_color": "#121212",
+            "selected_variant_text_color": "#FFFFFF",
+            "selected_variant_border_color": "#121212",
             "selected_variant_hover_background_color": "#1a1a1a",
-            "selected_variant_hover_text_color": "#ffffff",
+            "selected_variant_hover_text_color": "#FFFFFF",
             "selected_variant_hover_border_color": "#1a1a1a"
           }
         },
         "scheme-5": {
           "settings": {
-            "background": "#333333",
+            "background": "#4E6B9E",
             "foreground_heading": "#ffffff",
             "foreground": "#ffffff",
             "primary": "#ffffff",
             "primary_hover": "#ffffffb0",
             "border": "#ffffffb0",
-            "shadow": "#000000",
-            "primary_button_background": "#ffffff",
-            "primary_button_text": "#000000",
+            "shadow": "#121212",
+            "primary_button_background": "#FFFFFF",
+            "primary_button_text": "#4E6B9E",
             "primary_button_border": "#ffffff",
             "primary_button_hover_background": "#000000",
             "primary_button_hover_text": "#ffffff",
@@ -534,33 +535,33 @@
             "secondary_button_hover_background": "#ffffff0a",
             "secondary_button_hover_text": "#ffffffed",
             "secondary_button_hover_border": "#ffffffb0",
-            "input_background": "#333333",
+            "input_background": "#4E6B9E",
             "input_text_color": "#ffffffed",
             "input_border_color": "#ffffffb0",
             "input_hover_background": "#ffffff0a",
-            "variant_background_color": "#ffffff",
-            "variant_text_color": "#000000",
-            "variant_border_color": "#e6e6e6",
+            "variant_background_color": "#FFFFFF",
+            "variant_text_color": "#4E6B9E",
+            "variant_border_color": "#4E6B9E66",
             "variant_hover_background_color": "#f5f5f5",
-            "variant_hover_text_color": "#000000",
-            "variant_hover_border_color": "#e6e6e6",
-            "selected_variant_background_color": "#000000",
-            "selected_variant_text_color": "#ffffff",
-            "selected_variant_border_color": "#000000",
-            "selected_variant_hover_background_color": "#1a1a1a",
-            "selected_variant_hover_text_color": "#ffffff",
-            "selected_variant_hover_border_color": "#1a1a1a"
+            "variant_hover_text_color": "#4E6B9E",
+            "variant_hover_border_color": "#4E6B9E",
+            "selected_variant_background_color": "#4E6B9E",
+            "selected_variant_text_color": "#FFFFFF",
+            "selected_variant_border_color": "#4E6B9E",
+            "selected_variant_hover_background_color": "#3d5475",
+            "selected_variant_hover_text_color": "#FFFFFF",
+            "selected_variant_hover_border_color": "#3d5475"
           }
         },
         "scheme-6": {
           "settings": {
             "background": "rgba(0,0,0,0)",
             "foreground_heading": "#ffffff",
-            "foreground": "#ffffff",
-            "primary": "#ffffff",
+            "foreground": "#f2f2f2",
+            "primary": "#eaeaea",
             "primary_hover": "#ffffffb0",
             "border": "#e6e6e6",
-            "shadow": "#000000",
+            "shadow": "#121212",
             "primary_button_background": "#ffffff",
             "primary_button_text": "#000000",
             "primary_button_border": "#ffffff",
diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json
index f21b6729f..1010cb895 100644
--- a/locales/en.default.schema.json
+++ b/locales/en.default.schema.json
@@ -740,6 +740,7 @@
     "vimeo": "Vimeo",
     // Icon option for washing machine or laundry symbol
     "washing": "Washing",
+    "whatsapp": "WhatsApp",
     "wide": "Wide",
     "youtube": "YouTube",
     "with_hints": "With hints",
diff --git a/sections/ase-color-palette.liquid b/sections/ase-color-palette.liquid
new file mode 100644
index 000000000..d63c02e1a
--- /dev/null
+++ b/sections/ase-color-palette.liquid
@@ -0,0 +1,507 @@
+{% liquid
+  assign color_filter = nil
+  assign filter_option = section.settings.filter_option | downcase
+
+  for filter in collection.filters
+    assign filter_label_down = filter.label | downcase
+    if filter_label_down == filter_option
+      assign color_filter = filter
+      break
+    endif
+  endfor
+
+  assign has_swatch = false
+  if color_filter != blank
+    assign swatch_index = color_filter.values | find_index: 'swatch'
+    if swatch_index != null
+      assign has_swatch = true
+    endif
+  endif
+
+  assign columns_desktop = section.settings.columns_desktop
+  assign columns_mobile = section.settings.columns_mobile
+  assign gap = section.settings.grid_gap
+  assign gap_mobile = gap | divided_by: 2
+%}
+
+{% if color_filter != blank and color_filter.values.size > 0 %}
+  <div class="section-background color-{{ section.settings.color_scheme }}"></div>
+  <div
+    class="section section--{{ section.settings.section_width }} color-{{ section.settings.color_scheme }}"
+    style="{% render 'spacing-padding', settings: section.settings %}"
+  >
+    <div class="ase-color-grid">
+      <button
+        type="button"
+        class="ase-color-grid__toggle"
+        data-color-grid-toggle
+        aria-expanded="{{ section.settings.default_open }}"
+      >
+        {% if section.settings.heading != blank %}
+          <span class="ase-color-grid__heading" style="font-size: {{ section.settings.heading_font_size }}px;">
+            {{ section.settings.heading }}
+          </span>
+        {% endif %}
+        <span class="ase-color-grid__chevron">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="20" height="20">
+            <polyline points="6 9 12 15 18 9"></polyline>
+          </svg>
+        </span>
+      </button>
+
+      <div class="ase-color-grid__collapsible{% unless section.settings.default_open %} ase-color-grid__collapsible--closed{% endunless %}" data-color-grid-collapsible>
+      <ul
+        class="ase-color-grid__list"
+        style="
+          --grid-desktop-columns: {{ columns_desktop }};
+          --grid-mobile-columns: {{ columns_mobile }};
+          --grid-gap: {{ gap }}px;
+          --grid-gap-mobile: {{ gap_mobile }}px;
+        "
+      >
+        {%- comment -%} Show All button {%- endcomment -%}
+        <li class="ase-color-grid__item">
+          <button
+            type="button"
+            class="ase-color-grid__card {% unless color_filter.active_values.size > 0 %}ase-color-grid__card--active{% endunless %}"
+            data-color-grid-clear
+            aria-label="{{ section.settings.show_all_label }}"
+          >
+            <span class="ase-color-grid__swatch ase-color-grid__show-all">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="40%" height="40%">
+                <line x1="18" y1="6" x2="6" y2="18"></line>
+                <line x1="6" y1="6" x2="18" y2="18"></line>
+              </svg>
+            </span>
+            <span class="ase-color-grid__label">{{ section.settings.show_all_label }}</span>
+          </button>
+        </li>
+
+        {%- for value in color_filter.values -%}
+          {%- if value.count > 0 or value.active -%}
+            <li class="ase-color-grid__item">
+              <button
+                type="button"
+                class="ase-color-grid__card {% if value.active %}ase-color-grid__card--active{% endif %}"
+                data-color-grid-filter
+                data-param-name="{{ value.param_name }}"
+                data-param-value="{{ value.value }}"
+                aria-label="{{ value.label }}"
+                aria-pressed="{{ value.active }}"
+              >
+                <span class="ase-color-grid__swatch">
+                  {% if has_swatch %}
+                    {% render 'swatch', swatch: value.swatch, mode: 'filter' %}
+                  {% else %}
+                    <span class="ase-color-grid__color-fallback">{{ value.label | truncate: 2, '' }}</span>
+                  {% endif %}
+                </span>
+                <span class="ase-color-grid__label">{{ value.label }}</span>
+              </button>
+            </li>
+          {%- endif -%}
+        {%- endfor -%}
+      </ul>
+      </div>
+    </div>
+  </div>
+{% endif %}
+
+{% stylesheet %}
+  .ase-color-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  .ase-color-grid__toggle {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    padding: 0;
+    border: none;
+    background: none;
+    cursor: pointer;
+    color: inherit;
+    font: inherit;
+    text-align: left;
+    gap: 8px;
+  }
+
+  .ase-color-grid__heading {
+    margin: 0;
+    font-weight: 600;
+  }
+
+  .ase-color-grid__chevron {
+    display: flex;
+    align-items: center;
+    transition: transform 0.3s ease;
+  }
+
+  .ase-color-grid__toggle[aria-expanded="false"] .ase-color-grid__chevron {
+    transform: rotate(-90deg);
+  }
+
+  .ase-color-grid__collapsible {
+    display: grid;
+    grid-template-rows: 1fr;
+    transition: grid-template-rows 0.3s ease, opacity 0.3s ease;
+    opacity: 1;
+  }
+
+  .ase-color-grid__collapsible--closed {
+    grid-template-rows: 0fr;
+    opacity: 0;
+  }
+
+  .ase-color-grid__collapsible > ul {
+    overflow: hidden;
+  }
+
+  .ase-color-grid__list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    column-gap: var(--grid-gap-mobile, 8px);
+    row-gap: var(--grid-gap-mobile, 8px);
+  }
+
+  /* Mobile: calc-based columns */
+  .ase-color-grid__item {
+    width: calc(100% / var(--grid-mobile-columns) - var(--grid-gap-mobile) * (var(--grid-mobile-columns) - 1) / var(--grid-mobile-columns));
+    flex-grow: 0;
+    flex-shrink: 0;
+  }
+
+  /* Desktop: calc-based columns */
+  @media screen and (min-width: 750px) {
+    .ase-color-grid__list {
+      column-gap: var(--grid-gap, 16px);
+      row-gap: var(--grid-gap, 16px);
+    }
+
+    .ase-color-grid__item {
+      width: calc(100% / var(--grid-desktop-columns) - var(--grid-gap) * (var(--grid-desktop-columns) - 1) / var(--grid-desktop-columns));
+    }
+  }
+
+  .ase-color-grid__card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+    width: 100%;
+    padding: 12px 8px;
+    border: 2px solid transparent;
+    border-radius: 8px;
+    background: var(--color-background);
+    cursor: pointer;
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+    text-align: center;
+  }
+
+  .ase-color-grid__card:hover {
+    border-color: var(--color-border, rgba(0, 0, 0, 0.12));
+  }
+
+  .ase-color-grid__card--active {
+    border-color: rgba(0, 0, 0, 0.25);
+  }
+
+  .ase-color-grid__swatch {
+    width: 28px;
+    height: 28px;
+    border-radius: 50%;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+  }
+
+  .ase-color-grid__swatch .swatch {
+    width: 100% !important;
+    height: 100% !important;
+    border-radius: 50%;
+  }
+
+  .ase-color-grid__show-all {
+    border: none;
+    background: rgba(0, 0, 0, 0.04);
+    color: var(--color-foreground);
+  }
+
+  .ase-color-grid__label {
+    font-size: 0.8125rem;
+    color: var(--color-foreground);
+    line-height: 1.3;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+  }
+
+  .ase-color-grid__color-fallback {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: var(--color-border, #ccc);
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    color: var(--color-foreground);
+  }
+{% endstylesheet %}
+
+<script>
+  (function() {
+    const section = document.querySelector('[data-section-id="{{ section.id }}"]') || document.getElementById('shopify-section-{{ section.id }}');
+    if (!section) return;
+
+    // Toggle visibility with localStorage persistence
+    const STORAGE_KEY = 'ase-color-grid-open-{{ section.id }}';
+    const toggleBtn = section.querySelector('[data-color-grid-toggle]');
+    const collapsible = section.querySelector('[data-color-grid-collapsible]');
+    if (toggleBtn && collapsible) {
+      // Restore saved state on load
+      const saved = localStorage.getItem(STORAGE_KEY);
+      if (saved !== null) {
+        const isOpen = saved === 'true';
+        toggleBtn.setAttribute('aria-expanded', isOpen);
+        collapsible.classList.toggle('ase-color-grid__collapsible--closed', !isOpen);
+      }
+
+      toggleBtn.addEventListener('click', () => {
+        const isOpen = toggleBtn.getAttribute('aria-expanded') === 'true';
+        toggleBtn.setAttribute('aria-expanded', !isOpen);
+        collapsible.classList.toggle('ase-color-grid__collapsible--closed', isOpen);
+        localStorage.setItem(STORAGE_KEY, !isOpen);
+      });
+    }
+
+    function getFacetsForm() {
+      return document.querySelector('facets-form-component');
+    }
+
+    function buildFilterURL(paramName, paramValue, toggle) {
+      const url = new URL(window.location.href);
+      url.searchParams.delete('page');
+
+      if (toggle) {
+        const existing = url.searchParams.getAll(paramName);
+        if (existing.includes(paramValue)) {
+          url.searchParams.delete(paramName);
+          existing.filter(v => v !== paramValue).forEach(v => url.searchParams.append(paramName, v));
+        } else {
+          url.searchParams.append(paramName, paramValue);
+        }
+      }
+
+      return url.toString();
+    }
+
+    function clearColorFilter() {
+      const url = new URL(window.location.href);
+      url.searchParams.delete('page');
+      const paramName = '{{ color_filter.values[0].param_name | default: "" }}';
+      if (paramName) {
+        url.searchParams.delete(paramName);
+      }
+      return url.toString();
+    }
+
+    function updateActiveStates() {
+      const url = new URL(window.location.href);
+      const paramName = '{{ color_filter.values[0].param_name | default: "" }}';
+      const activeValues = url.searchParams.getAll(paramName);
+
+      // Update color buttons
+      section.querySelectorAll('[data-color-grid-filter]').forEach(b => {
+        const val = b.getAttribute('data-param-value');
+        b.classList.toggle('ase-color-grid__card--active', activeValues.includes(val));
+        b.setAttribute('aria-pressed', activeValues.includes(val));
+      });
+
+      // Update "All" button — active when no filters selected
+      section.querySelectorAll('[data-color-grid-clear]').forEach(b => {
+        b.classList.toggle('ase-color-grid__card--active', activeValues.length === 0);
+      });
+    }
+
+    section.querySelectorAll('[data-color-grid-filter]').forEach(btn => {
+      btn.addEventListener('click', () => {
+        const paramName = btn.getAttribute('data-param-name');
+        const paramValue = btn.getAttribute('data-param-value');
+        const newURL = buildFilterURL(paramName, paramValue, true);
+        const facetsForm = getFacetsForm();
+        if (facetsForm) {
+          facetsForm.updateFiltersByURL(newURL);
+        } else {
+          window.location.href = newURL;
+        }
+        // Update active states immediately in the UI
+        history.replaceState(null, '', newURL);
+        updateActiveStates();
+      });
+    });
+
+    section.querySelectorAll('[data-color-grid-clear]').forEach(btn => {
+      btn.addEventListener('click', () => {
+        const newURL = clearColorFilter();
+        const facetsForm = getFacetsForm();
+        if (facetsForm) {
+          facetsForm.updateFiltersByURL(newURL);
+          history.replaceState(null, '', newURL);
+          updateActiveStates();
+        } else {
+          window.location.href = newURL;
+        }
+      });
+    });
+
+    // Sync active states when the built-in filter changes
+    document.addEventListener('filter:update', () => {
+      // Small delay to let the URL update from the facets component
+      requestAnimationFrame(() => updateActiveStates());
+    });
+  })();
+</script>
+
+{% schema %}
+{
+  "name": "ASE Color palette",
+  "templates": ["collection"],
+  "settings": [
+    {
+      "type": "header",
+      "content": "Filter"
+    },
+    {
+      "type": "text",
+      "id": "filter_option",
+      "label": "Filter option name",
+      "info": "Enter the filter label exactly as it appears in your Shopify filters (e.g., Color, Colour, Material).",
+      "default": "Color"
+    },
+    {
+      "type": "header",
+      "content": "Content"
+    },
+    {
+      "type": "text",
+      "id": "heading",
+      "label": "Heading",
+      "default": "Filter by color"
+    },
+    {
+      "type": "range",
+      "id": "heading_font_size",
+      "label": "Heading font size",
+      "min": 10,
+      "max": 36,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "text",
+      "id": "show_all_label",
+      "label": "Show all label",
+      "default": "All"
+    },
+    {
+      "type": "checkbox",
+      "id": "default_open",
+      "label": "Open by default",
+      "default": true
+    },
+    {
+      "type": "header",
+      "content": "Grid layout"
+    },
+    {
+      "type": "range",
+      "id": "columns_desktop",
+      "label": "Desktop columns",
+      "min": 2,
+      "max": 10,
+      "step": 1,
+      "default": 6
+    },
+    {
+      "type": "select",
+      "id": "columns_mobile",
+      "label": "Mobile columns",
+      "options": [
+        { "value": "2", "label": "2" },
+        { "value": "3", "label": "3" },
+        { "value": "4", "label": "4" }
+      ],
+      "default": "3"
+    },
+    {
+      "type": "range",
+      "id": "grid_gap",
+      "label": "Grid spacing",
+      "min": 4,
+      "max": 32,
+      "step": 2,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "header",
+      "content": "Appearance"
+    },
+    {
+      "type": "color_scheme",
+      "id": "color_scheme",
+      "label": "Color scheme",
+      "default": "scheme-1"
+    },
+    {
+      "type": "select",
+      "id": "section_width",
+      "label": "Width",
+      "options": [
+        { "value": "page-width", "label": "Page" },
+        { "value": "full-width", "label": "Full" }
+      ],
+      "default": "page-width"
+    },
+    {
+      "type": "header",
+      "content": "Padding"
+    },
+    {
+      "type": "range",
+      "id": "padding-block-start",
+      "label": "Top",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 0
+    },
+    {
+      "type": "range",
+      "id": "padding-block-end",
+      "label": "Bottom",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    }
+  ],
+  "presets": [
+    {
+      "name": "ASE Color palette"
+    }
+  ]
+}
+{% endschema %}
diff --git a/sections/ase-featured-products.liquid b/sections/ase-featured-products.liquid
new file mode 100644
index 000000000..41ad5cb83
--- /dev/null
+++ b/sections/ase-featured-products.liquid
@@ -0,0 +1,210 @@
+{% comment %}
+  ASE Featured Products - Hand-pick specific products to display
+{% endcomment %}
+
+<div class="section-background color-{{ section.settings.color_scheme }}"></div>
+<div
+  class="
+    section
+    section--{{ section.settings.section_width }}
+    color-{{ section.settings.color_scheme }}
+    spacing-style
+  "
+  style="
+    {% render 'spacing-style', settings: section.settings %}
+  "
+>
+  {% if section.settings.title != blank %}
+    <div class="ase-featured-products__header" style="text-align: {{ section.settings.heading_alignment }}; margin-bottom: {{ section.settings.heading_spacing }}px;">
+      <h2 class="{{ section.settings.heading_size }}">{{ section.settings.title }}</h2>
+    </div>
+  {% endif %}
+
+  <div
+    class="ase-featured-products__grid"
+    style="
+      --ase-fp-columns: {{ section.settings.columns }};
+      --ase-fp-gap: {{ section.settings.gap }}px;
+    "
+  >
+    {% for block in section.blocks %}
+      {% if block.settings.product != blank %}
+        <div class="ase-featured-products__item" {{ block.shopify_attributes }}>
+          {% render 'resource-card',
+            resource: block.settings.product,
+            resource_type: 'product',
+            image_aspect_ratio: section.settings.image_ratio,
+            image_hover: true,
+            image_sizes: 'auto'
+          %}
+        </div>
+      {% endif %}
+    {% endfor %}
+  </div>
+</div>
+
+{% stylesheet %}
+  .ase-featured-products__grid {
+    display: grid;
+    grid-template-columns: repeat(var(--ase-fp-columns, 3), 1fr);
+    gap: var(--ase-fp-gap, 16px);
+  }
+
+  @media screen and (max-width: 749px) {
+    .ase-featured-products__grid {
+      grid-template-columns: repeat(2, 1fr);
+    }
+  }
+
+  @media screen and (max-width: 449px) {
+    .ase-featured-products__grid {
+      grid-template-columns: 1fr;
+    }
+  }
+{% endstylesheet %}
+
+{% schema %}
+{
+  "name": "ASE Featured Products",
+  "tag": "section",
+  "class": "ase-featured-products",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
+  "settings": [
+    {
+      "type": "inline_richtext",
+      "id": "title",
+      "label": "Heading",
+      "default": "Featured Products"
+    },
+    {
+      "type": "select",
+      "id": "heading_size",
+      "label": "Heading size",
+      "options": [
+        { "value": "h3", "label": "Small" },
+        { "value": "h2", "label": "Medium" },
+        { "value": "h1", "label": "Large" }
+      ],
+      "default": "h2"
+    },
+    {
+      "type": "select",
+      "id": "heading_alignment",
+      "label": "Heading alignment",
+      "options": [
+        { "value": "left", "label": "Left" },
+        { "value": "center", "label": "Center" },
+        { "value": "right", "label": "Right" }
+      ],
+      "default": "left"
+    },
+    {
+      "type": "range",
+      "id": "heading_spacing",
+      "label": "Heading spacing",
+      "min": 0,
+      "max": 60,
+      "step": 4,
+      "unit": "px",
+      "default": 24
+    },
+    {
+      "type": "range",
+      "id": "columns",
+      "label": "Columns",
+      "min": 1,
+      "max": 6,
+      "step": 1,
+      "default": 3
+    },
+    {
+      "type": "range",
+      "id": "gap",
+      "label": "Gap between items",
+      "min": 0,
+      "max": 50,
+      "step": 2,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "select",
+      "id": "image_ratio",
+      "label": "Image ratio",
+      "options": [
+        { "value": "adapt", "label": "Adapt to image" },
+        { "value": "1 / 1", "label": "Square" },
+        { "value": "3 / 4", "label": "Portrait" },
+        { "value": "4 / 3", "label": "Landscape" },
+        { "value": "16 / 9", "label": "Widescreen" }
+      ],
+      "default": "adapt"
+    },
+    {
+      "type": "select",
+      "id": "section_width",
+      "label": "Section width",
+      "options": [
+        { "value": "page-width", "label": "Page width" },
+        { "value": "full-width", "label": "Full width" }
+      ],
+      "default": "page-width"
+    },
+    {
+      "type": "color_scheme",
+      "id": "color_scheme",
+      "label": "Color scheme",
+      "default": "scheme-1"
+    },
+    {
+      "type": "header",
+      "content": "Spacing"
+    },
+    {
+      "type": "range",
+      "id": "padding-block-start",
+      "label": "Top padding",
+      "min": 0,
+      "max": 100,
+      "step": 4,
+      "unit": "px",
+      "default": 40
+    },
+    {
+      "type": "range",
+      "id": "padding-block-end",
+      "label": "Bottom padding",
+      "min": 0,
+      "max": 100,
+      "step": 4,
+      "unit": "px",
+      "default": 40
+    }
+  ],
+  "blocks": [
+    {
+      "type": "product",
+      "name": "Product",
+      "settings": [
+        {
+          "type": "product",
+          "id": "product",
+          "label": "Product"
+        }
+      ]
+    }
+  ],
+  "presets": [
+    {
+      "name": "ASE Featured Products",
+      "blocks": [
+        { "type": "product" },
+        { "type": "product" },
+        { "type": "product" }
+      ]
+    }
+  ]
+}
+{% endschema %}
diff --git a/sections/footer-group.json b/sections/footer-group.json
index 280ae488d..607f1a6c2 100644
--- a/sections/footer-group.json
+++ b/sections/footer-group.json
@@ -7,178 +7,179 @@
  * made to this file may be overwritten.
  * ------------------------------------------------------------
  */
- {
+{
   "type": "footer",
   "name": "t:names.footer",
   "sections": {
-    "footer": {
-      "type": "footer",
+    "divider_3tgLe6": {
+      "type": "divider",
+      "name": "t:names.divider_section",
+      "settings": {
+        "color_scheme": "",
+        "section_width": "full-width",
+        "thickness": 1,
+        "corner_radius": "square",
+        "width_percent": 100,
+        "alignment_horizontal": "center",
+        "padding-block-start": 16,
+        "padding-block-end": 16
+      }
+    },
+    "17712692021bcf299f": {
+      "type": "_blocks",
       "blocks": {
-        "group_wErUQf": {
-          "type": "group",
-          "name": "Join our email list",
+        "ai_gen_block_2a866df_RKwNFK": {
+          "type": "ai_gen_block_2a866df",
           "settings": {
-            "link": "",
-            "open_in_new_tab": false,
-            "content_direction": "column",
-            "vertical_on_mobile": true,
-            "horizontal_alignment": "flex-start",
-            "vertical_alignment": "center",
-            "align_baseline": false,
-            "horizontal_alignment_flex_direction_column": "flex-start",
-            "vertical_alignment_flex_direction_column": "center",
-            "gap": 6,
-            "width": "fill",
-            "custom_width": 100,
-            "width_mobile": "fill",
-            "custom_width_mobile": 100,
-            "height": "fit",
-            "custom_height": 100,
-            "inherit_color_scheme": true,
-            "color_scheme": "",
-            "background_media": "none",
-            "video_position": "cover",
-            "background_image_position": "cover",
-            "border": "none",
-            "border_width": 1,
-            "border_opacity": 100,
+            "title": "Policies",
+            "desktop_width_percent": 100,
+            "background_color": "#ffffff",
             "border_radius": 0,
-            "placeholder": "",
-            "toggle_overlay": false,
-            "overlay_color": "#00000026",
-            "overlay_style": "solid",
-            "gradient_direction": "to top",
+            "padding_top": 15,
+            "padding_bottom": 20,
+            "padding_horizontal": 20,
+            "title_color": "#121212",
+            "title_size": 16,
+            "title_spacing": 15,
+            "link_color": "#121212",
+            "link_hover_color": "#333333",
+            "link_size": 12,
+            "link_underline": "none",
+            "link_spacing": 20
+          },
+          "blocks": {}
+        }
+      },
+      "block_order": [
+        "ai_gen_block_2a866df_RKwNFK"
+      ],
+      "settings": {
+        "content_direction": "column",
+        "vertical_on_mobile": true,
+        "horizontal_alignment": "flex-start",
+        "vertical_alignment": "center",
+        "align_baseline": false,
+        "horizontal_alignment_flex_direction_column": "center",
+        "vertical_alignment_flex_direction_column": "center",
+        "gap": 12,
+        "section_width": "page-width",
+        "section_height": "",
+        "section_height_custom": 50,
+        "color_scheme": "",
+        "background_media": "none",
+        "video_position": "cover",
+        "background_image_position": "cover",
+        "border": "none",
+        "border_width": 1,
+        "border_opacity": 100,
+        "border_radius": 0,
+        "toggle_overlay": false,
+        "overlay_color": "#00000026",
+        "overlay_style": "solid",
+        "gradient_direction": "to top",
+        "padding-block-start": 0,
+        "padding-block-end": 0
+      }
+    },
+    "footer_eHkxBX": {
+      "type": "footer",
+      "blocks": {
+        "social_links_xBwmjm": {
+          "type": "social-links",
+          "name": "t:names.social_media_links",
+          "settings": {
+            "facebook_url": "https://www.facebook.com/asecrystals/",
+            "instagram_url": "https://www.instagram.com/asecrystals",
+            "youtube_url": "",
+            "tiktok_url": "https://www.tiktok.com/@ase.crystals",
+            "twitter_url": "",
+            "threads_url": "",
+            "linkedin_url": "",
+            "bluesky_url": "",
+            "snapchat_url": "",
+            "pinterest_url": "",
+            "tumblr_url": "",
+            "vimeo_url": "",
+            "whatsapp_url": "https://wa.me/16047825025",
+            "custom_url": ""
+          },
+          "blocks": {}
+        }
+      },
+      "block_order": [
+        "social_links_xBwmjm"
+      ],
+      "name": "t:names.footer",
+      "settings": {
+        "section_width": "page-width",
+        "gap": 20,
+        "color_scheme": "scheme-1",
+        "padding-block-start": 20,
+        "padding-block-end": 20
+      }
+    },
+    "footer_QHWT3R": {
+      "type": "footer",
+      "blocks": {
+        "payment_icons_mY8z97": {
+          "type": "payment-icons",
+          "name": "t:names.payment_icons",
+          "settings": {
+            "horizontal_alignment": "center",
+            "gap": 10,
             "padding-block-start": 0,
             "padding-block-end": 0,
             "padding-inline-start": 0,
             "padding-inline-end": 0
           },
-          "blocks": {
-            "text_pF6rVi": {
-              "type": "text",
-              "name": "Heading",
-              "settings": {
-                "text": "<h2>Join our email list</h2>",
-                "width": "100%",
-                "max_width": "normal",
-                "alignment": "left",
-                "type_preset": "h3",
-                "font": "var(--font-body--family)",
-                "font_size": "",
-                "line_height": "normal",
-                "letter_spacing": "normal",
-                "case": "none",
-                "wrap": "pretty",
-                "color": "var(--color-foreground)",
-                "background": false,
-                "background_color": "#00000026",
-                "corner_radius": 0,
-                "padding-block-start": 0,
-                "padding-block-end": 0,
-                "padding-inline-start": 0,
-                "padding-inline-end": 0
-              },
-              "blocks": {}
-            },
-            "text_HafH7P": {
-              "type": "text",
-              "name": "Text",
-              "settings": {
-                "text": "<p>Get exclusive deals and early access to new products.</p>",
-                "width": "100%",
-                "max_width": "normal",
-                "alignment": "left",
-                "type_preset": "rte",
-                "font": "var(--font-body--family)",
-                "font_size": "",
-                "line_height": "normal",
-                "letter_spacing": "normal",
-                "case": "none",
-                "wrap": "pretty",
-                "color": "var(--color-foreground)",
-                "background": false,
-                "background_color": "#00000026",
-                "corner_radius": 0,
-                "padding-block-start": 0,
-                "padding-block-end": 0,
-                "padding-inline-start": 0,
-                "padding-inline-end": 0
-              },
-              "blocks": {}
-            }
-          },
-          "block_order": [
-            "text_pF6rVi",
-            "text_HafH7P"
-          ]
-        },
-        "email-signup_HafH7P": {
-          "type": "email-signup",
-          "name": "Email Signup",
-          "settings": {
-            "width": "fill"
-          }
+          "blocks": {}
         }
       },
       "block_order": [
-        "group_wErUQf",
-        "email-signup_HafH7P"
+        "payment_icons_mY8z97"
       ],
       "name": "t:names.footer",
       "settings": {
         "section_width": "page-width",
         "gap": 20,
-        "color_scheme": "scheme-5",
-        "padding-block-start": 36,
-        "padding-block-end": 36
+        "color_scheme": "scheme-1",
+        "padding-block-start": 20,
+        "padding-block-end": 20
       }
     },
-    "utilities": {
+    "footer_utilities_wiLgXM": {
       "type": "footer-utilities",
-      "settings": {
-        "section_width": "page-width",
-        "gap": 24,
-        "divider_thickness": 1,
-        "color_scheme": "scheme-5",
-        "padding-block-start": 12,
-        "padding-block-end": 16
-      },
       "blocks": {
-        "copyright": {
+        "footer_copyright_97wXpW": {
           "type": "footer-copyright",
+          "name": "t:names.copyright",
           "settings": {
-            "show_powered_by": true,
-            "font_size": "0.75rem",
-            "case": "none"
-          }
-        },
-        "policy_list": {
-          "type": "footer-policy-list",
-          "settings": {
+            "show_powered_by": false,
             "font_size": "0.75rem",
             "case": "none"
-          }
-        },
-        "social_icons": {
-          "type": "social-links",
-          "settings": {
-            "facebook_url": "https://www.facebook.com",
-            "instagram_url": "https://www.instagram.com",
-            "tiktok_url": "https://www.tiktok.com",
-            "twitter_url": "https://www.twitter.com",
-            "youtube_url": "https://www.youtube.com"
-          }
+          },
+          "blocks": {}
         }
       },
       "block_order": [
-        "copyright",
-        "policy_list",
-        "social_icons"
-      ]
+        "footer_copyright_97wXpW"
+      ],
+      "name": "t:names.policies_and_links",
+      "settings": {
+        "section_width": "page-width",
+        "gap": 23,
+        "divider_thickness": 0,
+        "color_scheme": "",
+        "padding-block-start": 20,
+        "padding-block-end": 20
+      }
     }
   },
   "order": [
-    "footer",
-    "utilities"
+    "17712692021bcf299f",
+    "footer_eHkxBX",
+    "divider_3tgLe6",
+    "footer_QHWT3R",
+    "footer_utilities_wiLgXM"
   ]
 }
diff --git a/sections/footer-utilities.liquid b/sections/footer-utilities.liquid
index 15a639094..e3aea22d1 100644
--- a/sections/footer-utilities.liquid
+++ b/sections/footer-utilities.liquid
@@ -48,15 +48,15 @@
 
   /* Dynamic positioning based on number of blocks */
   @media screen and (min-width: 750px) {
-    /* 1 block: Single column, left aligned */
+    /* 1 block: Single column, centered */
     .utilities--blocks-1 {
       grid-template-columns: 1fr;
-      justify-content: start;
+      justify-content: center;
     }
 
     .utilities--blocks-1 > * {
-      justify-self: start;
-      text-align: left;
+      justify-self: center;
+      text-align: center;
     }
 
     /* 2 blocks: Two equal columns, start and end aligned */
diff --git a/sections/header-announcements.liquid b/sections/header-announcements.liquid
index 586c58e7a..b09a7be23 100644
--- a/sections/header-announcements.liquid
+++ b/sections/header-announcements.liquid
@@ -1,3 +1,15 @@
+{% liquid
+  assign social_platforms = 'facebook,instagram,youtube,tiktok,twitter,threads,linkedin,bluesky,snapchat,pinterest,tumblr,vimeo,whatsapp' | split: ','
+  assign has_social_links = false
+  for platform in social_platforms
+    assign setting_key = platform | append: '_url'
+    if section.settings[setting_key] != blank
+      assign has_social_links = true
+      break
+    endif
+  endfor
+%}
+
 {% if section.blocks.size > 1 %}
   <script
     src="{{ 'announcement-bar.js' | asset_url }}"
@@ -20,20 +32,52 @@
     endif
   %}
 
-  <announcement-bar-component
-    class="announcement-bar__slider"
-    {% if autoplay == true %}
-      autoplay="{{ section.settings.speed }}" aria-live="polite"
-    {% endif %}
-  >
-    {% if show_arrows %}
-      {% render 'slideshow-arrows', icon_style: 'chevron' %}
+  <div class="announcement-bar__inner{% if has_social_links %} announcement-bar__inner--has-social{% endif %}">
+    {% if has_social_links %}
+      <div class="announcement-bar__social">
+        {% for platform in social_platforms %}
+          {% liquid
+            assign setting_key = platform | append: '_url'
+            assign link_url = section.settings[setting_key]
+          %}
+          {% if link_url != blank %}
+            <a
+              href="{{ link_url }}"
+              class="announcement-bar__social-link"
+              target="_blank"
+              rel="noopener noreferrer"
+              aria-label="{{ platform | capitalize }}"
+            >
+              <svg
+                class="announcement-bar__social-icon icon-default"
+                aria-hidden="true"
+                focusable="false"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 20 20"
+              >
+                {%- render 'icon', icon: platform -%}
+              </svg>
+            </a>
+          {% endif %}
+        {% endfor %}
+      </div>
     {% endif %}
 
-    <div class="announcement-bar__slides">
-      {% content_for 'blocks' %}
-    </div>
-  </announcement-bar-component>
+    <announcement-bar-component
+      class="announcement-bar__slider"
+      {% if autoplay == true %}
+        autoplay="{{ section.settings.speed }}" aria-live="polite"
+      {% endif %}
+    >
+      {% if show_arrows %}
+        {% render 'slideshow-arrows', icon_style: 'chevron' %}
+      {% endif %}
+
+      <div class="announcement-bar__slides">
+        {% content_for 'blocks' %}
+      </div>
+    </announcement-bar-component>
+  </div>
 </aside>
 
 {% stylesheet %}
@@ -119,6 +163,44 @@
     position: absolute;
     inset: 0;
   }
+
+  .announcement-bar__inner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .announcement-bar__inner--has-social {
+    gap: var(--gap-md);
+  }
+
+  .announcement-bar__inner--has-social .announcement-bar__slider {
+    flex: 1;
+    min-width: 0;
+  }
+
+  .announcement-bar__social {
+    display: none;
+    flex-shrink: 0;
+
+    @media screen and (min-width: 750px) {
+      display: flex;
+      align-items: center;
+      gap: var(--gap-sm);
+    }
+  }
+
+  .announcement-bar__social-link {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: currentColor;
+  }
+
+  .announcement-bar__social-icon {
+    width: var(--icon-size-lg);
+    height: var(--icon-size-lg);
+  }
 {% endstylesheet %}
 
 {% schema %}
@@ -201,6 +283,75 @@
       "step": 1,
       "unit": "px",
       "default": 15
+    },
+    {
+      "type": "header",
+      "content": "t:names.social_media_links"
+    },
+    {
+      "type": "url",
+      "id": "facebook_url",
+      "label": "t:options.facebook"
+    },
+    {
+      "type": "url",
+      "id": "instagram_url",
+      "label": "t:options.instagram"
+    },
+    {
+      "type": "url",
+      "id": "youtube_url",
+      "label": "t:options.youtube"
+    },
+    {
+      "type": "url",
+      "id": "tiktok_url",
+      "label": "t:options.tiktok"
+    },
+    {
+      "type": "url",
+      "id": "twitter_url",
+      "label": "t:options.twitter"
+    },
+    {
+      "type": "url",
+      "id": "threads_url",
+      "label": "t:options.threads"
+    },
+    {
+      "type": "url",
+      "id": "linkedin_url",
+      "label": "t:options.linkedin"
+    },
+    {
+      "type": "url",
+      "id": "bluesky_url",
+      "label": "t:options.bluesky"
+    },
+    {
+      "type": "url",
+      "id": "snapchat_url",
+      "label": "t:options.snapchat"
+    },
+    {
+      "type": "url",
+      "id": "pinterest_url",
+      "label": "t:options.pinterest"
+    },
+    {
+      "type": "url",
+      "id": "tumblr_url",
+      "label": "t:options.tumblr"
+    },
+    {
+      "type": "url",
+      "id": "vimeo_url",
+      "label": "t:options.vimeo"
+    },
+    {
+      "type": "url",
+      "id": "whatsapp_url",
+      "label": "t:options.whatsapp"
     }
   ],
   "presets": [
diff --git a/sections/header-group.json b/sections/header-group.json
index 99314087e..d33934208 100644
--- a/sections/header-group.json
+++ b/sections/header-group.json
@@ -11,34 +11,47 @@
   "type": "header",
   "name": "t:names.header",
   "sections": {
-    "header_announcements_9jGBFp": {
+    "header_announcements_cA9VrL": {
       "type": "header-announcements",
       "blocks": {
-        "announcement_BxgCk9": {
+        "announcement_kTNgBf": {
           "type": "_announcement",
           "settings": {
-            "text": "Welcome to our store",
+            "text": "Artistic Sports Essentials and Crystals since 2014. We ship to Canada and US. || ☎ +1 604-782-5025",
             "link": "",
-            "font": "var(--font-subheading--family)",
-            "font_size": "0.75rem",
+            "font": "var(--font-body--family)",
+            "font_size": "0.875rem",
             "weight": "",
-            "letter_spacing": "normal",
+            "letter_spacing": "loose",
             "case": "none"
           },
           "blocks": {}
         }
       },
       "block_order": [
-        "announcement_BxgCk9"
+        "announcement_kTNgBf"
       ],
       "name": "t:names.announcement_bar",
       "settings": {
-        "speed": 5,
+        "speed": 2,
         "section_width": "page-width",
-        "color_scheme": "scheme-1",
-        "divider_width": 1,
-        "padding-block-start": 15,
-        "padding-block-end": 15
+        "color_scheme": "scheme-5",
+        "divider_width": 0,
+        "padding-block-start": 20,
+        "padding-block-end": 20,
+        "facebook_url": "https://www.facebook.com/asecrystals/",
+        "instagram_url": "https://www.instagram.com/asecrystals",
+        "youtube_url": "",
+        "tiktok_url": "https://www.tiktok.com/@ase.crystals",
+        "twitter_url": "",
+        "threads_url": "",
+        "linkedin_url": "",
+        "bluesky_url": "",
+        "snapchat_url": "",
+        "pinterest_url": "",
+        "tumblr_url": "",
+        "vimeo_url": "",
+        "whatsapp_url": "https://wa.me/16047825025"
       }
     },
     "header_section": {
@@ -61,7 +74,7 @@
           "static": true,
           "settings": {
             "menu": "main-menu",
-            "color_scheme": "",
+            "color_scheme": "scheme-1",
             "type_font_primary_size": "0.875rem",
             "menu_font_style": "inverse",
             "type_font_primary_link": "body",
@@ -109,10 +122,25 @@
         "enable_transparent_header_collection": false,
         "collection_color_scheme": "default"
       }
+    },
+    "divider_bVTdVf": {
+      "type": "divider",
+      "name": "t:names.divider_section",
+      "settings": {
+        "color_scheme": "",
+        "section_width": "full-width",
+        "thickness": 1,
+        "corner_radius": "square",
+        "width_percent": 100,
+        "alignment_horizontal": "center",
+        "padding-block-start": 16,
+        "padding-block-end": 16
+      }
     }
   },
   "order": [
-    "header_announcements_9jGBFp",
-    "header_section"
+    "header_announcements_cA9VrL",
+    "header_section",
+    "divider_bVTdVf"
   ]
 }
diff --git a/sections/product-safety-warnings.liquid b/sections/product-safety-warnings.liquid
new file mode 100644
index 000000000..e52120aa0
--- /dev/null
+++ b/sections/product-safety-warnings.liquid
@@ -0,0 +1,232 @@
+{% liquid
+  assign show_warning = false
+
+  if section.settings.show_for_all_products
+    assign show_warning = true
+  elsif product != blank and section.settings.collection_handles != blank
+    assign target_names = section.settings.collection_handles | split: ',' 
+    for collection in product.collections
+      assign collection_title_down = collection.title | downcase | strip
+      for name in target_names
+        assign trimmed_name = name | downcase | strip
+        if collection_title_down == trimmed_name
+          assign show_warning = true
+          break
+        endif
+      endfor
+      if show_warning
+        break
+      endif
+    endfor
+  endif
+%}
+
+{% if show_warning %}
+  <div class="section-background color-{{ section.settings.color_scheme }}"></div>
+  <div
+    class="section section--{{ section.settings.section_width }} spacing-style color-{{ section.settings.color_scheme }}"
+    style="{% render 'spacing-padding', settings: section.settings %}"
+  >
+    <div class="safety-warning">
+      {% if section.settings.show_icon %}
+        <div class="safety-warning__icon" style="width: {{ section.settings.icon_size }}px; height: {{ section.settings.icon_size }}px;" aria-hidden="true">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          >
+            <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path>
+            <line x1="12" y1="9" x2="12" y2="13"></line>
+            <line x1="12" y1="17" x2="12.01" y2="17"></line>
+          </svg>
+        </div>
+      {% endif %}
+      <div class="safety-warning__content">
+        {% if section.settings.heading != blank %}
+          <p class="safety-warning__heading" style="font-size: {{ section.settings.heading_font_size }}px;">{{ section.settings.heading }}</p>
+        {% endif %}
+        <div class="safety-warning__text" style="font-size: {{ section.settings.text_font_size }}px;">{{ section.settings.warning_text }}</div>
+      </div>
+    </div>
+  </div>
+{% endif %}
+
+{% stylesheet %}
+  .safety-warning {
+    display: flex;
+    align-items: flex-start;
+    gap: var(--gap-md, 16px);
+    padding: var(--gap-md, 16px);
+  }
+
+  .safety-warning__icon {
+    flex-shrink: 0;
+    width: 24px;
+    height: 24px;
+    color: var(--color-foreground);
+  }
+
+  .safety-warning__icon svg {
+    width: 100%;
+    height: 100%;
+  }
+
+  .safety-warning__content {
+    display: flex;
+    flex-direction: column;
+    gap: var(--gap-xs, 4px);
+  }
+
+  .safety-warning__heading {
+    margin: 0;
+    font-weight: bold;
+  }
+
+  .safety-warning__text {
+    margin: 0;
+  }
+
+  .safety-warning__text p {
+    margin: 0;
+  }
+{% endstylesheet %}
+
+{% schema %}
+{
+  "name": "Safety warnings",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
+  "settings": [
+    {
+      "type": "header",
+      "content": "Visibility"
+    },
+    {
+      "type": "text",
+      "id": "collection_handles",
+      "label": "Collection names",
+      "info": "Comma-separated list of collection titles as they appear in your Shopify admin. Case-insensitive.",
+      "default": "Preciosa VIVA12\u00ae HF"
+    },
+    {
+      "type": "checkbox",
+      "id": "show_for_all_products",
+      "label": "Show for all products",
+      "info": "Override the collection tag and show on every product.",
+      "default": false
+    },
+    {
+      "type": "header",
+      "content": "Content"
+    },
+    {
+      "type": "checkbox",
+      "id": "show_icon",
+      "label": "Show warning icon",
+      "default": true
+    },
+    {
+      "type": "text",
+      "id": "heading",
+      "label": "Heading",
+      "default": "WARNING"
+    },
+    {
+      "type": "richtext",
+      "id": "warning_text",
+      "label": "Warning text",
+      "default": "<p>Small parts. Choking hazard. Not suitable for small children.</p>"
+    },
+    {
+      "type": "header",
+      "content": "Appearance"
+    },
+    {
+      "type": "range",
+      "id": "icon_size",
+      "label": "Icon size",
+      "min": 16,
+      "max": 48,
+      "step": 2,
+      "unit": "px",
+      "default": 24
+    },
+    {
+      "type": "range",
+      "id": "heading_font_size",
+      "label": "Heading font size",
+      "min": 10,
+      "max": 36,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "range",
+      "id": "text_font_size",
+      "label": "Text font size",
+      "min": 10,
+      "max": 36,
+      "step": 1,
+      "unit": "px",
+      "default": 14
+    },
+    {
+      "type": "color_scheme",
+      "id": "color_scheme",
+      "label": "Color scheme",
+      "default": "scheme-1"
+    },
+    {
+      "type": "select",
+      "id": "section_width",
+      "label": "Width",
+      "options": [
+        {
+          "value": "page-width",
+          "label": "Page"
+        },
+        {
+          "value": "full-width",
+          "label": "Full"
+        }
+      ],
+      "default": "page-width"
+    },
+    {
+      "type": "header",
+      "content": "Padding"
+    },
+    {
+      "type": "range",
+      "id": "padding-block-start",
+      "label": "Top",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 20
+    },
+    {
+      "type": "range",
+      "id": "padding-block-end",
+      "label": "Bottom",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 20
+    }
+  ],
+  "presets": [
+    {
+      "name": "Safety warnings"
+    }
+  ]
+}
+{% endschema %}
diff --git a/sections/tr-color-palette.liquid b/sections/tr-color-palette.liquid
new file mode 100644
index 000000000..75a9f1f99
--- /dev/null
+++ b/sections/tr-color-palette.liquid
@@ -0,0 +1,380 @@
+{% liquid
+  assign color_filter = nil
+  assign filter_option = section.settings.filter_option | downcase
+
+  for filter in collection.filters
+    assign filter_label_down = filter.label | downcase
+    if filter_label_down == filter_option
+      assign color_filter = filter
+      break
+    endif
+  endfor
+
+  assign has_swatch = false
+  if color_filter != blank
+    assign swatch_index = color_filter.values | find_index: 'swatch'
+    if swatch_index != null
+      assign has_swatch = true
+    endif
+  endif
+%}
+
+{% if color_filter != blank and color_filter.values.size > 0 %}
+  <div class="section-background color-{{ section.settings.color_scheme }}"></div>
+  <div
+    class="section section--{{ section.settings.section_width }} color-{{ section.settings.color_scheme }}"
+    style="{% render 'spacing-padding', settings: section.settings %}"
+  >
+    <div class="color-grid">
+      {% if section.settings.heading != blank %}
+        <p class="color-grid__heading" style="font-size: {{ section.settings.heading_font_size }}px;">
+          {{ section.settings.heading }}
+        </p>
+      {% endif %}
+
+      <div
+        class="color-grid__swatches"
+        style="--swatch-size: {{ section.settings.swatch_size }}px; --swatch-gap: {{ section.settings.swatch_gap }}px;"
+      >
+        {%- comment -%} Show All button {%- endcomment -%}
+        <button
+          type="button"
+          class="color-grid__swatch-btn color-grid__show-all {% unless color_filter.active_values.size > 0 %}color-grid__swatch-btn--active{% endunless %}"
+          data-color-grid-clear
+          aria-label="{{ section.settings.show_all_label }}"
+        >
+          <span class="color-grid__show-all-circle" style="width: {{ section.settings.swatch_size }}px; height: {{ section.settings.swatch_size }}px;">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="60%" height="60%">
+              <line x1="18" y1="6" x2="6" y2="18"></line>
+              <line x1="6" y1="6" x2="18" y2="18"></line>
+            </svg>
+          </span>
+          {% if section.settings.show_labels %}
+            <span class="color-grid__label">{{ section.settings.show_all_label }}</span>
+          {% endif %}
+        </button>
+
+        {%- for value in color_filter.values -%}
+          {%- if value.count > 0 or value.active -%}
+            <button
+              type="button"
+              class="color-grid__swatch-btn {% if value.active %}color-grid__swatch-btn--active{% endif %}"
+              data-color-grid-filter
+              data-param-name="{{ value.param_name }}"
+              data-param-value="{{ value.value }}"
+              aria-label="{{ value.label }}"
+              aria-pressed="{{ value.active }}"
+            >
+              <span class="color-grid__swatch-wrapper" style="width: {{ section.settings.swatch_size }}px; height: {{ section.settings.swatch_size }}px;">
+                {% if has_swatch %}
+                  {% render 'swatch', swatch: value.swatch, mode: 'filter' %}
+                {% else %}
+                  <span class="color-grid__color-fallback">{{ value.label | truncate: 2, '' }}</span>
+                {% endif %}
+              </span>
+              {% if section.settings.show_labels %}
+                <span class="color-grid__label">{{ value.label }}</span>
+              {% endif %}
+            </button>
+          {%- endif -%}
+        {%- endfor -%}
+      </div>
+    </div>
+  </div>
+{% endif %}
+
+{% stylesheet %}
+  .color-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .color-grid__heading {
+    margin: 0;
+    font-weight: 600;
+  }
+
+  .color-grid__swatches {
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--swatch-gap, 10px);
+    align-items: flex-start;
+  }
+
+  .color-grid__swatch-btn {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 4px;
+    padding: 0;
+    border: none;
+    background: none;
+    cursor: pointer;
+    transition: opacity 0.15s ease;
+    position: relative;
+    width: calc(var(--swatch-size, 36px) + 24px);
+  }
+
+  .color-grid__swatch-btn:hover {
+    opacity: 0.8;
+  }
+
+  .color-grid__swatch-wrapper {
+    border-radius: 50%;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 2px solid transparent;
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+    box-sizing: content-box;
+  }
+
+  .color-grid__swatch-wrapper .swatch {
+    width: 100% !important;
+    height: 100% !important;
+    border-radius: 50%;
+  }
+
+  .color-grid__swatch-btn--active .color-grid__swatch-wrapper {
+    border-color: var(--color-foreground);
+    box-shadow: 0 0 0 2px var(--color-background), 0 0 0 4px var(--color-foreground);
+  }
+
+  .color-grid__show-all-circle {
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 2px solid var(--color-border, rgba(0, 0, 0, 0.12));
+    box-sizing: content-box;
+    color: var(--color-foreground);
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+  }
+
+  .color-grid__show-all.color-grid__swatch-btn--active .color-grid__show-all-circle {
+    border-color: var(--color-foreground);
+    box-shadow: 0 0 0 2px var(--color-background), 0 0 0 4px var(--color-foreground);
+  }
+
+  .color-grid__label {
+    font-size: 0.75rem;
+    color: var(--color-foreground);
+    width: 100%;
+    text-align: center;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    line-height: 1.3;
+  }
+
+  .color-grid__color-fallback {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: var(--color-border, #ccc);
+    font-size: 0.625rem;
+    text-transform: uppercase;
+    color: var(--color-foreground);
+  }
+{% endstylesheet %}
+
+<script>
+  (function() {
+    const section = document.querySelector('[data-section-id="{{ section.id }}"]') || document.getElementById('shopify-section-{{ section.id }}');
+    if (!section) return;
+
+    function getFacetsForm() {
+      return document.querySelector('facets-form-component');
+    }
+
+    function buildFilterURL(paramName, paramValue, toggle) {
+      const url = new URL(window.location.href);
+      // Remove page param
+      url.searchParams.delete('page');
+
+      if (toggle) {
+        // If already active, remove it; otherwise add it
+        const existing = url.searchParams.getAll(paramName);
+        if (existing.includes(paramValue)) {
+          // Remove this specific value
+          url.searchParams.delete(paramName);
+          existing.filter(v => v !== paramValue).forEach(v => url.searchParams.append(paramName, v));
+        } else {
+          url.searchParams.append(paramName, paramValue);
+        }
+      }
+
+      return url.toString();
+    }
+
+    function clearColorFilter() {
+      const url = new URL(window.location.href);
+      url.searchParams.delete('page');
+      // Remove all params matching our filter option
+      const paramName = '{{ color_filter.values[0].param_name | default: "" }}';
+      if (paramName) {
+        url.searchParams.delete(paramName);
+      }
+      return url.toString();
+    }
+
+    // Color swatch click handlers
+    section.querySelectorAll('[data-color-grid-filter]').forEach(btn => {
+      btn.addEventListener('click', () => {
+        const paramName = btn.getAttribute('data-param-name');
+        const paramValue = btn.getAttribute('data-param-value');
+        const newURL = buildFilterURL(paramName, paramValue, true);
+        const facetsForm = getFacetsForm();
+        if (facetsForm) {
+          facetsForm.updateFiltersByURL(newURL);
+        } else {
+          window.location.href = newURL;
+        }
+      });
+    });
+
+    // Show All click handler
+    section.querySelectorAll('[data-color-grid-clear]').forEach(btn => {
+      btn.addEventListener('click', () => {
+        const newURL = clearColorFilter();
+        const facetsForm = getFacetsForm();
+        if (facetsForm) {
+          facetsForm.updateFiltersByURL(newURL);
+        } else {
+          window.location.href = newURL;
+        }
+      });
+    });
+  })();
+</script>
+
+{% schema %}
+{
+  "name": "TR Color palette",
+  "templates": ["collection"],
+  "settings": [
+    {
+      "type": "header",
+      "content": "Filter"
+    },
+    {
+      "type": "text",
+      "id": "filter_option",
+      "label": "Filter option name",
+      "info": "Enter the filter label exactly as it appears in your Shopify filters (e.g., Color, Colour, Material).",
+      "default": "Color"
+    },
+    {
+      "type": "header",
+      "content": "Content"
+    },
+    {
+      "type": "text",
+      "id": "heading",
+      "label": "Heading",
+      "default": "Filter by color"
+    },
+    {
+      "type": "range",
+      "id": "heading_font_size",
+      "label": "Heading font size",
+      "min": 10,
+      "max": 36,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    },
+    {
+      "type": "text",
+      "id": "show_all_label",
+      "label": "Show all label",
+      "default": "All"
+    },
+    {
+      "type": "checkbox",
+      "id": "show_labels",
+      "label": "Show color labels",
+      "default": true
+    },
+    {
+      "type": "header",
+      "content": "Appearance"
+    },
+    {
+      "type": "range",
+      "id": "swatch_size",
+      "label": "Swatch size",
+      "min": 20,
+      "max": 64,
+      "step": 2,
+      "unit": "px",
+      "default": 28
+    },
+    {
+      "type": "range",
+      "id": "swatch_gap",
+      "label": "Swatch spacing",
+      "min": 4,
+      "max": 24,
+      "step": 2,
+      "unit": "px",
+      "default": 10
+    },
+    {
+      "type": "color_scheme",
+      "id": "color_scheme",
+      "label": "Color scheme",
+      "default": "scheme-1"
+    },
+    {
+      "type": "select",
+      "id": "section_width",
+      "label": "Width",
+      "options": [
+        {
+          "value": "page-width",
+          "label": "Page"
+        },
+        {
+          "value": "full-width",
+          "label": "Full"
+        }
+      ],
+      "default": "page-width"
+    },
+    {
+      "type": "header",
+      "content": "Padding"
+    },
+    {
+      "type": "range",
+      "id": "padding-block-start",
+      "label": "Top",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 0
+    },
+    {
+      "type": "range",
+      "id": "padding-block-end",
+      "label": "Bottom",
+      "min": 0,
+      "max": 100,
+      "step": 1,
+      "unit": "px",
+      "default": 16
+    }
+  ],
+  "presets": [
+    {
+      "name": "TR Color palette"
+    }
+  ]
+}
+{% endschema %}
diff --git a/snippets/collection-card.liquid b/snippets/collection-card.liquid
index 80866e60b..a00e8a0a5 100644
--- a/snippets/collection-card.liquid
+++ b/snippets/collection-card.liquid
@@ -159,4 +159,44 @@
       aspect-ratio: 99;
     }
   }
+  /* Hover zoom for collection images
+     - Adds a subtle scale transform to the image inside a collection card
+     - `transition` defines the animation timing and easing
+     - `will-change: transform` gives the browser a hint to optimize for animation
+     - `transform-origin: center center` makes the image scale from its center
+  */
+  .collection-card__image .image-block__image {
+    transition: transform 240ms cubic-bezier(.2,.8,.2,1);
+    will-change: transform;
+    transform-origin: center center;
+  }
+
+  /* Respect users who prefer reduced motion:
+     - Remove transitions when `prefers-reduced-motion: reduce` is set
+  */
+  @media (prefers-reduced-motion: reduce) {
+    .collection-card__image .image-block__image {
+      transition: none;
+    }
+  }
+
+  /* Apply the zoom effect only on devices that support hover and have a
+     fine pointer (usually non-touch desktop devices). This prevents the
+     scale effect from triggering on touch devices where hover isn't meaningful.
+  */
+  @media (hover: hover) and (pointer: fine) {
+    .collection-card:hover .collection-card__image .image-block__image,
+    .collection-card:focus-within .collection-card__image .image-block__image {
+      transform: scale(1.06);
+    }
+  }
+
+  /* Arrow nudge for inline links in card content
+     - Moves the generated ::after arrow slightly to the right on hover/focus
+     - A micro-interaction that signals the link is actionable
+  */
+  .collection-card__content a:hover::after,
+  .collection-card__content a:focus::after {
+    transform: translateX(4px);
+  }
 {% endstylesheet %}
diff --git a/snippets/header-actions.liquid b/snippets/header-actions.liquid
index d19ac8b25..5c629cbec 100644
--- a/snippets/header-actions.liquid
+++ b/snippets/header-actions.liquid
@@ -26,6 +26,27 @@
 <header-actions
   {{- block.shopify_attributes -}}
 >
+  <a
+    href="https://wa.me/16047825025"
+    target="_blank"
+    rel="noopener noreferrer"
+    class="header-actions__action header-actions__whatsapp desktop:hidden"
+    aria-label="WhatsApp"
+  >
+    <svg
+      class="header-actions__whatsapp-icon"
+      aria-hidden="true"
+      focusable="false"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 20 20"
+      width="22"
+      height="22"
+      fill="currentColor"
+    >
+      {%- render 'icon', icon: 'whatsapp' -%}
+    </svg>
+  </a>
+
   {% if shop.customer_accounts_enabled %}
     <script
       src="{{ 'dialog.js' | asset_url }}"
@@ -211,9 +232,26 @@
       {{ cart_icon }}
     </a>
   {% endif %}
+
 </header-actions>
 
 {% stylesheet %}
+  .header-actions__whatsapp {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #25D366;
+    text-decoration: none;
+    padding: 0;
+    min-width: var(--minimum-touch-target);
+    min-height: var(--minimum-touch-target);
+    order: -1;
+  }
+
+  .header-actions__whatsapp:hover {
+    color: #128C7E;
+  }
+
   .account-popover {
     --account-popover-min-width: 22rem;
     --account-actions-max-width: 22rem;
diff --git a/snippets/mega-menu-list.liquid b/snippets/mega-menu-list.liquid
index 873afdbbb..5541f308d 100644
--- a/snippets/mega-menu-list.liquid
+++ b/snippets/mega-menu-list.liquid
@@ -71,71 +71,79 @@
     endif
   endif
 %}
+{% liquid
+  # Count ungrouped links (links without children) to determine if we need an "Other" column
+  assign ungrouped_links_count = 0
+  for link in parent_link.links
+    if link.links == blank
+      assign ungrouped_links_count = ungrouped_links_count | plus: 1
+    endif
+  endfor
+%}
 <ul
   data-menu-list-id="{{ id }}"
   class="mega-menu__list list-unstyled"
   style="--menu-image-border-radius: {{ image_border_radius }}px;"
 >
+  {% comment %} First pass: render only links that have children (grouped headers) {% endcomment %}
   {% for link in parent_link.links %}
-    {% liquid
-      # Decide whether to open a column span, and how many columns of the grid to span
-      if forloop.first or open_column_span == false
-        assign open_column_span = true
-
-        # Don't allow orphan links in a column
-        assign break_after_modulo = link.links.size | modulo: links_before_wrap
-        if break_after_modulo == 1
-          assign links_before_wrap = links_before_wrap | minus: 1
-        endif
-        assign break_after_float = links_before_wrap | times: 1.0
-        assign column_span = link.links.size | divided_by: break_after_float | ceil | at_least: 1
-        assign column_count = column_count | plus: column_span
-        assign should_break_columns = true
-        assign span_class = ''
-
-        if menu_content_type == 'collection_images'
-          assign should_break_columns = false
-          # For collection image mode, we have an 8-column grid when 4 or fewer parent links are used. Set column span to 2 in that case, otherwise use 1 column
-          if parent_link.links.size <= 4
-            assign span_class = 'mega-menu__column--wide-collection-image'
+    {% if link.links != blank %}
+      {% liquid
+        # Decide whether to open a column span, and how many columns of the grid to span
+        if open_column_span == false
+          assign open_column_span = true
+
+          # Don't allow orphan links in a column
+          assign break_after_modulo = link.links.size | modulo: links_before_wrap
+          if break_after_modulo == 1
+            assign links_before_wrap = links_before_wrap | minus: 1
+          endif
+          assign break_after_float = links_before_wrap | times: 1.0
+          assign column_span = link.links.size | divided_by: break_after_float | ceil | at_least: 1
+          assign column_count = column_count | plus: column_span
+          assign should_break_columns = true
+          assign span_class = ''
+
+          if menu_content_type == 'collection_images'
+            assign should_break_columns = false
+            if parent_link.links.size <= 4
+              assign span_class = 'mega-menu__column--wide-collection-image'
+            endif
+          else
+            assign span_class = 'mega-menu__column--span-' | append: column_span
           endif
-        else
-          # For all other modes, column span is determined by the number of links in the parent link
-          assign span_class = 'mega-menu__column--span-' | append: column_span
+          echo '<li class="mega-menu__column ' | append: span_class | append: '">'
         endif
-        echo '<li class="mega-menu__column ' | append: span_class | append: '">'
-      endif
-    %}
-    <div>
-      <a
-        href="{{ link.url }}"
-        class="mega-menu__link {% if link.links != blank %}mega-menu__link--parent{% endif %}"
-      >
-        {% if menu_content_type == 'collection_images' %}
-          {%- capture collection_image_sizes -%}
-            {%- if parent_link.links.size <= 4 -%}
-              {%- assign columns_per_item = 2 -%}
-            {%- else -%}
-              {%- assign columns_per_item = 1 -%}
-            {%- endif -%}
-            {%- render 'util-mega-menu-img-sizes-attr',
-              menu_content_type: 'collection_images',
-              settings: settings,
-              grid_columns: grid_columns_count,
-              grid_columns_tablet: grid_columns_count_tablet,
-              grid_columns_collection_images: grid_columns_count_collection_images,
-              parent_links_size: parent_link.links.size,
-              columns_per_item: columns_per_item
-            -%}
-          {%- endcapture -%}
-
-          {% render 'link-featured-image', link: link, class: 'mega-menu__link-image', sizes: collection_image_sizes %}
-        {% endif %}
-        <span class="wrap-text">
-          {{- link.title -}}
-        </span>
-      </a>
-      {% if link.links != blank %}
+      %}
+      <div>
+        <a
+          href="{{ link.url }}"
+          class="mega-menu__link mega-menu__link--parent"
+        >
+          {% if menu_content_type == 'collection_images' %}
+            {%- capture collection_image_sizes -%}
+              {%- if parent_link.links.size <= 4 -%}
+                {%- assign columns_per_item = 2 -%}
+              {%- else -%}
+                {%- assign columns_per_item = 1 -%}
+              {%- endif -%}
+              {%- render 'util-mega-menu-img-sizes-attr',
+                menu_content_type: 'collection_images',
+                settings: settings,
+                grid_columns: grid_columns_count,
+                grid_columns_tablet: grid_columns_count_tablet,
+                grid_columns_collection_images: grid_columns_count_collection_images,
+                parent_links_size: parent_link.links.size,
+                columns_per_item: columns_per_item
+              -%}
+            {%- endcapture -%}
+
+            {% render 'link-featured-image', link: link, class: 'mega-menu__link-image', sizes: collection_image_sizes %}
+          {% endif %}
+          <span class="wrap-text">
+            {{- link.title -}}
+          </span>
+        </a>
         <ul
           class="list-unstyled"
           {% if should_break_columns %}
@@ -158,28 +166,85 @@
             </li>
           {% endfor %}
         </ul>
-      {% endif %}
-    </div>
+      </div>
+
+      {% liquid
+        assign next_linklist = parent_link.links[forloop.index]
+        assign close_column = false
+
+        if forloop.last and ungrouped_links_count == 0
+          assign close_column = true
+        elsif menu_content_type == 'collection_images'
+          assign close_column = true
+        elsif next_linklist.links != blank
+          assign close_column = true
+        elsif link.links != blank and next_linklist.links == blank
+          assign close_column = true
+        endif
 
-    {% liquid
-      # Check conditions for closing the span at the end of each iteration, then close the span if needed
-      assign next_linklist = parent_link.links[forloop.index]
-
-      if forloop.last
-        assign open_column_span = false
-      elsif menu_content_type == 'collection_images'
-        assign open_column_span = false
-      elsif next_linklist.links != blank
-        assign open_column_span = false
-      elsif link.links != blank and next_linklist.links == blank
-        assign open_column_span = false
-      endif
+        if close_column
+          assign open_column_span = false
+          echo '</li>'
+        endif
+      %}
+    {% endif %}
+  {% endfor %}
 
-      if open_column_span == false
-        echo '</li>'
+  {% comment %} Second pass: render ungrouped links under "Other" header {% endcomment %}
+  {% if ungrouped_links_count > 0 %}
+    {% liquid
+      assign other_column_span = ungrouped_links_count | divided_by: 10.0 | ceil | at_least: 1
+      assign column_count = column_count | plus: other_column_span
+      assign other_span_class = 'mega-menu__column--span-' | append: other_column_span
+      if menu_content_type == 'collection_images'
+        assign other_span_class = ''
+        if parent_link.links.size <= 4
+          assign other_span_class = 'mega-menu__column--wide-collection-image'
+        endif
       endif
     %}
-  {% endfor %}
+    <li class="mega-menu__column {{ other_span_class }}">
+      <div>
+        <span class="mega-menu__link mega-menu__link--parent">
+          <span class="wrap-text">Other</span>
+        </span>
+        <ul class="list-unstyled">
+          {% for link in parent_link.links %}
+            {% if link.links == blank %}
+              <li>
+                <a
+                  href="{{ link.url }}"
+                  class="mega-menu__link"
+                >
+                  {% if menu_content_type == 'collection_images' %}
+                    {%- capture collection_image_sizes -%}
+                      {%- if parent_link.links.size <= 4 -%}
+                        {%- assign columns_per_item = 2 -%}
+                      {%- else -%}
+                        {%- assign columns_per_item = 1 -%}
+                      {%- endif -%}
+                      {%- render 'util-mega-menu-img-sizes-attr',
+                        menu_content_type: 'collection_images',
+                        settings: settings,
+                        grid_columns: grid_columns_count,
+                        grid_columns_tablet: grid_columns_count_tablet,
+                        grid_columns_collection_images: grid_columns_count_collection_images,
+                        parent_links_size: parent_link.links.size,
+                        columns_per_item: columns_per_item
+                      -%}
+                    {%- endcapture -%}
+
+                    {% render 'link-featured-image', link: link, class: 'mega-menu__link-image', sizes: collection_image_sizes %}
+                  {% endif %}
+                  <span class="wrap-text">{{- link.title -}}</span>
+                </a>
+              </li>
+            {% endif %}
+          {% endfor %}
+        </ul>
+      </div>
+    </li>
+  {% endif %}
 </ul>
 
 {% liquid
diff --git a/templates/collection.ase-color-palette.json b/templates/collection.ase-color-palette.json
new file mode 100644
index 000000000..d1057d691
--- /dev/null
+++ b/templates/collection.ase-color-palette.json
@@ -0,0 +1,268 @@
+/*
+ * ------------------------------------------------------------
+ * IMPORTANT: The contents of this file are auto-generated.
+ *
+ * This file may be updated by the Shopify admin theme editor
+ * or related systems. Please exercise caution as any changes
+ * made to this file may be overwritten.
+ * ------------------------------------------------------------
+ */
+{
+  "sections": {
+    "section": {
+      "type": "section",
+      "blocks": {
+        "text_title": {
+          "type": "text",
+          "name": "Title",
+          "settings": {
+            "text": "<h1>{{ closest.collection.title }}</h1>",
+            "width": "fit-content",
+            "max_width": "normal",
+            "alignment": "left",
+            "type_preset": "h2",
+            "font": "var(--font-primary--family)",
+            "font_size": "",
+            "line_height": "normal",
+            "letter_spacing": "normal",
+            "case": "none",
+            "wrap": "pretty",
+            "color": "",
+            "background": false,
+            "background_color": "#00000026",
+            "corner_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {}
+        },
+        "text_desc": {
+          "type": "text",
+          "name": "Description",
+          "settings": {
+            "text": "{{ closest.collection.description }}",
+            "width": "fit-content",
+            "max_width": "none",
+            "alignment": "left",
+            "type_preset": "rte",
+            "font": "var(--font-primary--family)",
+            "font_size": "",
+            "line_height": "normal",
+            "letter_spacing": "normal",
+            "case": "none",
+            "wrap": "pretty",
+            "color": "",
+            "background": false,
+            "background_color": "#00000026",
+            "corner_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {}
+        }
+      },
+      "block_order": [
+        "text_title",
+        "text_desc"
+      ],
+      "name": "Collection heading",
+      "settings": {
+        "content_direction": "column",
+        "vertical_on_mobile": true,
+        "horizontal_alignment": "flex-start",
+        "vertical_alignment": "center",
+        "align_baseline": false,
+        "horizontal_alignment_flex_direction_column": "flex-start",
+        "vertical_alignment_flex_direction_column": "center",
+        "gap": 12,
+        "section_width": "page-width",
+        "section_height": "",
+        "section_height_custom": 50,
+        "color_scheme": "scheme-1",
+        "background_media": "none",
+        "video_position": "cover",
+        "background_image_position": "cover",
+        "border": "none",
+        "border_width": 1,
+        "border_opacity": 100,
+        "border_radius": 0,
+        "toggle_overlay": false,
+        "overlay_color": "#00000026",
+        "overlay_style": "solid",
+        "gradient_direction": "to top",
+        "padding-block-start": 48,
+        "padding-block-end": 48
+      }
+    },
+    "color_grid": {
+      "type": "ase-color-palette",
+      "settings": {
+        "filter_option": "Color",
+        "heading": "Filter by color",
+        "heading_font_size": 16,
+        "show_all_label": "All",
+        "columns_desktop": 6,
+        "columns_mobile": "3",
+        "grid_gap": 16,
+        "color_scheme": "scheme-1",
+        "section_width": "page-width",
+        "padding-block-start": 0,
+        "padding-block-end": 16
+      }
+    },
+    "main": {
+      "type": "main-collection",
+      "blocks": {
+        "filters": {
+          "type": "filters",
+          "static": true,
+          "settings": {
+            "enable_filtering": true,
+            "filter_style": "horizontal",
+            "filter_width": "centered",
+            "text_label_case": "default",
+            "show_swatch_label": true,
+            "show_filter_label": false,
+            "enable_sorting": true,
+            "enable_grid_density": true,
+            "inherit_color_scheme": true,
+            "color_scheme": "",
+            "padding-block-start": 8,
+            "padding-block-end": 8,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0,
+            "facets_margin_bottom": 8,
+            "facets_margin_right": 20
+          },
+          "blocks": {}
+        },
+        "product-card": {
+          "type": "_product-card",
+          "static": true,
+          "settings": {
+            "product_card_gap": 4,
+            "inherit_color_scheme": true,
+            "color_scheme": "",
+            "border": "none",
+            "border_width": 1,
+            "border_opacity": 100,
+            "border_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {
+            "card-gallery": {
+              "type": "_product-card-gallery",
+              "settings": {
+                "image_ratio": "adapt",
+                "border": "none",
+                "border_width": 1,
+                "border_opacity": 100,
+                "border_radius": 0,
+                "padding-block-start": 0,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "product_title": {
+              "type": "product-title",
+              "name": "t:names.product_title",
+              "settings": {
+                "width": "100%",
+                "max_width": "normal",
+                "alignment": "left",
+                "type_preset": "rte",
+                "font": "var(--font-body--family)",
+                "font_size": "1rem",
+                "line_height": "normal",
+                "letter_spacing": "normal",
+                "case": "none",
+                "wrap": "pretty",
+                "color": "var(--color-foreground)",
+                "background": false,
+                "background_color": "#00000026",
+                "corner_radius": 0,
+                "padding-block-start": 4,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "price": {
+              "type": "price",
+              "settings": {
+                "show_sale_price_first": true,
+                "show_installments": false,
+                "show_tax_info": false,
+                "type_preset": "h6",
+                "width": "100%",
+                "alignment": "left",
+                "font": "var(--font-body--family)",
+                "font_size": "1rem",
+                "line_height": "normal",
+                "letter_spacing": "normal",
+                "case": "none",
+                "color": "var(--color-foreground)",
+                "padding-block-start": 0,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "swatches": {
+              "type": "swatches",
+              "name": "t:names.swatches",
+              "settings": {
+                "product_swatches_alignment": "flex-start",
+                "product_swatches_alignment_mobile": "flex-start",
+                "hide_padding": false,
+                "product_swatches_padding_top": 4,
+                "product_swatches_padding_bottom": 0,
+                "product_swatches_padding_left": 0,
+                "product_swatches_padding_right": 0
+              },
+              "blocks": {}
+            }
+          },
+          "block_order": [
+            "card-gallery",
+            "product_title",
+            "price",
+            "swatches"
+          ]
+        }
+      },
+      "settings": {
+        "layout_type": "grid",
+        "product_card_size": "medium",
+        "mobile_product_card_size": "small",
+        "enable_infinite_scroll": true,
+        "products_per_page": 24,
+        "product_grid_width": "centered",
+        "full_width_on_mobile": true,
+        "columns_gap_horizontal": 16,
+        "columns_gap_vertical": 24,
+        "padding-inline-start": 0,
+        "padding-inline-end": 0,
+        "color_scheme": "scheme-1",
+        "padding-block-start": 0,
+        "padding-block-end": 32
+      }
+    }
+  },
+  "order": [
+    "section",
+    "color_grid",
+    "main"
+  ]
+}
diff --git a/templates/collection.json b/templates/collection.json
index 963bcf532..96f81b8e7 100644
--- a/templates/collection.json
+++ b/templates/collection.json
@@ -7,7 +7,7 @@
  * made to this file may be overwritten.
  * ------------------------------------------------------------
  */
- {
+{
   "sections": {
     "section": {
       "type": "section",
@@ -44,7 +44,7 @@
           "settings": {
             "text": "{{ closest.collection.description }}",
             "width": "fit-content",
-            "max_width": "normal",
+            "max_width": "none",
             "alignment": "left",
             "type_preset": "rte",
             "font": "var(--font-primary--family)",
@@ -109,7 +109,7 @@
             "filter_style": "horizontal",
             "filter_width": "centered",
             "text_label_case": "default",
-            "show_swatch_label": false,
+            "show_swatch_label": true,
             "show_filter_label": false,
             "enable_sorting": true,
             "enable_grid_density": true,
@@ -208,11 +208,14 @@
               "name": "t:names.swatches",
               "settings": {
                 "product_swatches_alignment": "flex-start",
+                "product_swatches_alignment_mobile": "flex-start",
+                "hide_padding": false,
                 "product_swatches_padding_top": 4,
                 "product_swatches_padding_bottom": 0,
                 "product_swatches_padding_left": 0,
                 "product_swatches_padding_right": 0
-              }
+              },
+              "blocks": {}
             }
           },
           "block_order": [
@@ -227,6 +230,8 @@
         "layout_type": "grid",
         "product_card_size": "medium",
         "mobile_product_card_size": "small",
+        "enable_infinite_scroll": true,
+        "products_per_page": 24,
         "product_grid_width": "centered",
         "full_width_on_mobile": true,
         "columns_gap_horizontal": 16,
diff --git a/templates/collection.tr-color-palette.json b/templates/collection.tr-color-palette.json
new file mode 100644
index 000000000..431e98748
--- /dev/null
+++ b/templates/collection.tr-color-palette.json
@@ -0,0 +1,268 @@
+/*
+ * ------------------------------------------------------------
+ * IMPORTANT: The contents of this file are auto-generated.
+ *
+ * This file may be updated by the Shopify admin theme editor
+ * or related systems. Please exercise caution as any changes
+ * made to this file may be overwritten.
+ * ------------------------------------------------------------
+ */
+{
+  "sections": {
+    "section": {
+      "type": "section",
+      "blocks": {
+        "text_title": {
+          "type": "text",
+          "name": "Title",
+          "settings": {
+            "text": "<h1>{{ closest.collection.title }}</h1>",
+            "width": "fit-content",
+            "max_width": "normal",
+            "alignment": "left",
+            "type_preset": "h2",
+            "font": "var(--font-primary--family)",
+            "font_size": "",
+            "line_height": "normal",
+            "letter_spacing": "normal",
+            "case": "none",
+            "wrap": "pretty",
+            "color": "",
+            "background": false,
+            "background_color": "#00000026",
+            "corner_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {}
+        },
+        "text_desc": {
+          "type": "text",
+          "name": "Description",
+          "settings": {
+            "text": "{{ closest.collection.description }}",
+            "width": "fit-content",
+            "max_width": "none",
+            "alignment": "left",
+            "type_preset": "rte",
+            "font": "var(--font-primary--family)",
+            "font_size": "",
+            "line_height": "normal",
+            "letter_spacing": "normal",
+            "case": "none",
+            "wrap": "pretty",
+            "color": "",
+            "background": false,
+            "background_color": "#00000026",
+            "corner_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {}
+        }
+      },
+      "block_order": [
+        "text_title",
+        "text_desc"
+      ],
+      "name": "Collection heading",
+      "settings": {
+        "content_direction": "column",
+        "vertical_on_mobile": true,
+        "horizontal_alignment": "flex-start",
+        "vertical_alignment": "center",
+        "align_baseline": false,
+        "horizontal_alignment_flex_direction_column": "flex-start",
+        "vertical_alignment_flex_direction_column": "center",
+        "gap": 12,
+        "section_width": "page-width",
+        "section_height": "",
+        "section_height_custom": 50,
+        "color_scheme": "scheme-1",
+        "background_media": "none",
+        "video_position": "cover",
+        "background_image_position": "cover",
+        "border": "none",
+        "border_width": 1,
+        "border_opacity": 100,
+        "border_radius": 0,
+        "toggle_overlay": false,
+        "overlay_color": "#00000026",
+        "overlay_style": "solid",
+        "gradient_direction": "to top",
+        "padding-block-start": 48,
+        "padding-block-end": 48
+      }
+    },
+    "color_grid": {
+      "type": "tr-color-palette",
+      "settings": {
+        "filter_option": "Color",
+        "heading": "Filter by color",
+        "heading_font_size": 16,
+        "show_all_label": "All",
+        "show_labels": true,
+        "swatch_size": 28,
+        "swatch_gap": 10,
+        "color_scheme": "scheme-1",
+        "section_width": "page-width",
+        "padding-block-start": 0,
+        "padding-block-end": 16
+      }
+    },
+    "main": {
+      "type": "main-collection",
+      "blocks": {
+        "filters": {
+          "type": "filters",
+          "static": true,
+          "settings": {
+            "enable_filtering": true,
+            "filter_style": "horizontal",
+            "filter_width": "centered",
+            "text_label_case": "default",
+            "show_swatch_label": true,
+            "show_filter_label": false,
+            "enable_sorting": true,
+            "enable_grid_density": true,
+            "inherit_color_scheme": true,
+            "color_scheme": "",
+            "padding-block-start": 8,
+            "padding-block-end": 8,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0,
+            "facets_margin_bottom": 8,
+            "facets_margin_right": 20
+          },
+          "blocks": {}
+        },
+        "product-card": {
+          "type": "_product-card",
+          "static": true,
+          "settings": {
+            "product_card_gap": 4,
+            "inherit_color_scheme": true,
+            "color_scheme": "",
+            "border": "none",
+            "border_width": 1,
+            "border_opacity": 100,
+            "border_radius": 0,
+            "padding-block-start": 0,
+            "padding-block-end": 0,
+            "padding-inline-start": 0,
+            "padding-inline-end": 0
+          },
+          "blocks": {
+            "card-gallery": {
+              "type": "_product-card-gallery",
+              "settings": {
+                "image_ratio": "adapt",
+                "border": "none",
+                "border_width": 1,
+                "border_opacity": 100,
+                "border_radius": 0,
+                "padding-block-start": 0,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "product_title": {
+              "type": "product-title",
+              "name": "t:names.product_title",
+              "settings": {
+                "width": "100%",
+                "max_width": "normal",
+                "alignment": "left",
+                "type_preset": "rte",
+                "font": "var(--font-body--family)",
+                "font_size": "1rem",
+                "line_height": "normal",
+                "letter_spacing": "normal",
+                "case": "none",
+                "wrap": "pretty",
+                "color": "var(--color-foreground)",
+                "background": false,
+                "background_color": "#00000026",
+                "corner_radius": 0,
+                "padding-block-start": 4,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "price": {
+              "type": "price",
+              "settings": {
+                "show_sale_price_first": true,
+                "show_installments": false,
+                "show_tax_info": false,
+                "type_preset": "h6",
+                "width": "100%",
+                "alignment": "left",
+                "font": "var(--font-body--family)",
+                "font_size": "1rem",
+                "line_height": "normal",
+                "letter_spacing": "normal",
+                "case": "none",
+                "color": "var(--color-foreground)",
+                "padding-block-start": 0,
+                "padding-block-end": 0,
+                "padding-inline-start": 0,
+                "padding-inline-end": 0
+              },
+              "blocks": {}
+            },
+            "swatches": {
+              "type": "swatches",
+              "name": "t:names.swatches",
+              "settings": {
+                "product_swatches_alignment": "flex-start",
+                "product_swatches_alignment_mobile": "flex-start",
+                "hide_padding": false,
+                "product_swatches_padding_top": 4,
+                "product_swatches_padding_bottom": 0,
+                "product_swatches_padding_left": 0,
+                "product_swatches_padding_right": 0
+              },
+              "blocks": {}
+            }
+          },
+          "block_order": [
+            "card-gallery",
+            "product_title",
+            "price",
+            "swatches"
+          ]
+        }
+      },
+      "settings": {
+        "layout_type": "grid",
+        "product_card_size": "medium",
+        "mobile_product_card_size": "small",
+        "enable_infinite_scroll": true,
+        "products_per_page": 24,
+        "product_grid_width": "centered",
+        "full_width_on_mobile": true,
+        "columns_gap_horizontal": 16,
+        "columns_gap_vertical": 24,
+        "padding-inline-start": 0,
+        "padding-inline-end": 0,
+        "color_scheme": "scheme-1",
+        "padding-block-start": 0,
+        "padding-block-end": 32
+      }
+    }
+  },
+  "order": [
+    "section",
+    "color_grid",
+    "main"
+  ]
+}
diff --git a/templates/index.json b/templates/index.json
index c110afca1..ed7e72fb1 100644
--- a/templates/index.json
+++ b/templates/index.json
@@ -7,133 +7,73 @@
  * made to this file may be overwritten.
  * ------------------------------------------------------------
  */
- {
+{
   "sections": {
-    "hero_jVaWmY": {
-      "type": "hero",
+    "ase_featured_products_GVWy4Q": {
+      "type": "ase-featured-products",
       "blocks": {
-        "text_YLPk4p": {
-          "type": "text",
-          "name": "t:names.heading",
+        "product_CRGggp": {
+          "type": "product",
           "settings": {
-            "text": "<p>Browse our latest products</p>",
-            "width": "fit-content",
-            "max_width": "normal",
-            "alignment": "left",
-            "type_preset": "h2",
-            "font": "var(--font-body--family)",
-            "font_size": "1rem",
-            "line_height": "normal",
-            "letter_spacing": "normal",
-            "case": "none",
-            "wrap": "pretty",
-            "color": "var(--color-foreground-heading)",
-            "background": false,
-            "background_color": "#00000026",
-            "corner_radius": 0,
-            "padding-block-start": 0,
-            "padding-block-end": 0,
-            "padding-inline-start": 0,
-            "padding-inline-end": 0
-          },
-          "blocks": {}
+            "product": "fabric-sample-cards"
+          }
         },
-        "button_H9gpTf": {
-          "type": "button",
-          "name": "t:names.button",
+        "product_nDyXXd": {
+          "type": "product",
           "settings": {
-            "label": "Shop all",
-            "link": "shopify://collections/all",
-            "open_in_new_tab": false,
-            "style_class": "button-secondary",
-            "width": "fit-content",
-            "custom_width": 100,
-            "width_mobile": "fit-content",
-            "custom_width_mobile": 100
-          },
-          "blocks": {}
+            "product": "rhinestones-sample-card-page-size"
+          }
         }
       },
       "block_order": [
-        "text_YLPk4p",
-        "button_H9gpTf"
+        "product_CRGggp",
+        "product_nDyXXd"
       ],
-      "name": "t:names.hero",
+      "name": "ASE Featured Products",
       "settings": {
-        "media_type_1": "image",
-        "media_type_2": "image",
-        "link": "",
-        "open_in_new_tab": false,
-        "content_direction": "column",
-        "vertical_on_mobile": true,
-        "horizontal_alignment": "space-between",
-        "vertical_alignment": "flex-end",
-        "align_baseline": true,
-        "horizontal_alignment_flex_direction_column": "center",
-        "vertical_alignment_flex_direction_column": "flex-end",
-        "gap": 24,
+        "title": "",
+        "heading_size": "h3",
+        "heading_alignment": "left",
+        "heading_spacing": 12,
+        "columns": 5,
+        "gap": 16,
+        "image_ratio": "adapt",
         "section_width": "page-width",
-        "section_height": "medium",
-        "section_height_custom": 50,
-        "color_scheme": "scheme-6",
-        "toggle_overlay": true,
-        "overlay_color": "#12121266",
-        "overlay_style": "solid",
-        "gradient_direction": "to bottom",
-        "blurred_reflection": false,
-        "reflection_opacity": 75,
-        "padding-block-start": 100,
-        "padding-block-end": 72
+        "color_scheme": "",
+        "padding-block-start": 0,
+        "padding-block-end": 0
       }
     },
-    "product_list_fa6P9H": {
-      "type": "product-list",
+    "collection_list_AYBmXc": {
+      "type": "collection-list",
       "blocks": {
-        "static-header": {
-          "type": "_product-list-content",
-          "name": "t:names.header",
+        "static-collection-card": {
+          "type": "_collection-card",
+          "name": "t:names.collection_card",
           "static": true,
           "settings": {
-            "content_direction": "row",
-            "vertical_on_mobile": false,
-            "horizontal_alignment": "space-between",
-            "vertical_alignment": "flex-end",
-            "align_baseline": true,
-            "horizontal_alignment_flex_direction_column": "flex-start",
-            "vertical_alignment_flex_direction_column": "center",
-            "gap": 12,
-            "width": "fill",
-            "custom_width": 100,
-            "width_mobile": "fill",
-            "custom_width_mobile": 100,
-            "height": "fit",
-            "custom_height": 100,
+            "placement": "below_image",
+            "horizontal_alignment": "flex-start",
+            "vertical_alignment": "center",
+            "collection_card_gap": 8,
             "inherit_color_scheme": true,
             "color_scheme": "",
-            "background_media": "none",
-            "video_position": "cover",
-            "background_image_position": "cover",
             "border": "none",
             "border_width": 1,
             "border_opacity": 100,
-            "border_radius": 0,
-            "padding-block-start": 0,
-            "padding-block-end": 0,
-            "padding-inline-start": 0,
-            "padding-inline-end": 0
+            "border_radius": 0
           },
           "blocks": {
-            "product_list_text_YFtzcL": {
-              "type": "_product-list-text",
+            "collection_title_LYyjEb": {
+              "type": "collection-title",
               "name": "t:names.collection_title",
               "settings": {
-                "text": "<h3>{{ closest.collection.title }}</h3>",
                 "width": "fit-content",
                 "max_width": "normal",
                 "alignment": "left",
-                "type_preset": "h4",
+                "type_preset": "custom",
                 "font": "var(--font-body--family)",
-                "font_size": "",
+                "font_size": "1rem",
                 "line_height": "normal",
                 "letter_spacing": "normal",
                 "case": "none",
@@ -149,140 +89,74 @@
               },
               "blocks": {}
             },
-            "product_list_button_MWeP9V": {
-              "type": "_product-list-button",
-              "name": "t:names.product_list_button",
-              "settings": {
-                "label": "View all",
-                "open_in_new_tab": false,
-                "style_class": "link",
-                "width": "fit-content",
-                "custom_width": 100,
-                "width_mobile": "fit-content",
-                "custom_width_mobile": 100
-              },
-              "blocks": {}
-            }
-          },
-          "block_order": [
-            "product_list_text_YFtzcL",
-            "product_list_button_MWeP9V"
-          ]
-        },
-        "static-product-card": {
-          "type": "_product-card",
-          "name": "t:names.product_card",
-          "static": true,
-          "settings": {
-            "product_card_gap": 4,
-            "inherit_color_scheme": true,
-            "color_scheme": "",
-            "border": "none",
-            "border_width": 1,
-            "border_opacity": 100,
-            "border_radius": 0,
-            "padding-block-start": 0,
-            "padding-block-end": 0,
-            "padding-inline-start": 0,
-            "padding-inline-end": 0
-          },
-          "blocks": {
-            "product_card_gallery_677WP3": {
-              "type": "_product-card-gallery",
-              "name": "t:names.product_card_media",
+            "collection-card-image": {
+              "type": "_collection-card-image",
+              "name": "t:names.collection_card_image",
+              "static": true,
               "settings": {
-                "image_ratio": "adapt",
+                "image_ratio": "square",
+                "toggle_overlay": false,
+                "overlay_color": "#00000026",
+                "overlay_style": "solid",
+                "gradient_direction": "to top",
                 "border": "none",
                 "border_width": 1,
                 "border_opacity": 100,
-                "border_radius": 0,
-                "padding-block-start": 0,
-                "padding-block-end": 0,
-                "padding-inline-start": 0,
-                "padding-inline-end": 0
-              },
-              "blocks": {}
-            },
-            "product_title_YXxMTj": {
-              "type": "product-title",
-              "name": "t:names.product_title",
-              "settings": {
-                "width": "100%",
-                "max_width": "normal",
-                "alignment": "left",
-                "type_preset": "rte",
-                "font": "var(--font-body--family)",
-                "font_size": "1rem",
-                "line_height": "normal",
-                "letter_spacing": "normal",
-                "case": "none",
-                "wrap": "pretty",
-                "color": "var(--color-foreground)",
-                "background": false,
-                "background_color": "#00000026",
-                "corner_radius": 0,
-                "padding-block-start": 4,
-                "padding-block-end": 0,
-                "padding-inline-start": 0,
-                "padding-inline-end": 0
-              },
-              "blocks": {}
-            },
-            "price_JQzVV4": {
-              "type": "price",
-              "name": "t:names.product_price",
-              "settings": {
-                "show_sale_price_first": true,
-                "show_installments": false,
-                "show_tax_info": false,
-                "type_preset": "h6",
-                "width": "100%",
-                "alignment": "left",
-                "font": "var(--font-body--family)",
-                "font_size": "1rem",
-                "line_height": "normal",
-                "letter_spacing": "normal",
-                "case": "none",
-                "color": "var(--color-foreground)",
-                "padding-block-start": 0,
-                "padding-block-end": 0,
-                "padding-inline-start": 0,
-                "padding-inline-end": 0
+                "border_radius": 14
               },
               "blocks": {}
             }
           },
           "block_order": [
-            "product_card_gallery_677WP3",
-            "product_title_YXxMTj",
-            "price_JQzVV4"
+            "collection_title_LYyjEb"
           ]
         }
       },
-      "name": "t:names.featured_collection",
+      "name": "t:names.collections_carousel",
       "settings": {
-        "collection": "all",
+        "collection_list": [
+          "fabric",
+          "spandex",
+          "lining",
+          "mesh",
+          "stretch-lace",
+          "sparkly-spandex",
+          "stretchy-velvet",
+          "shiny-spandex",
+          "fringes",
+          "appliques",
+          "cabochon-fb-hf",
+          "preciosa-viva12-fb-hf",
+          "nalheads",
+          "preciosa-sew-on",
+          "premium-dmc-fb-hf",
+          "premium-dmc-sew-on",
+          "swarovski-emelents-fb-hf",
+          "acrylic-beads",
+          "threads",
+          "tools-and-accessories"
+        ],
         "layout_type": "grid",
         "carousel_on_mobile": false,
-        "max_products": 8,
-        "columns": 4,
+        "columns": 5,
         "mobile_columns": "2",
         "mobile_card_size": "60cqw",
         "columns_gap": 8,
-        "rows_gap": 24,
-        "icons_style": "arrow",
-        "icons_shape": "none",
+        "bento_gap": 8,
+        "rows_gap": 8,
+        "max_collections": 4,
+        "icons_style": "none",
+        "icons_shape": "circle",
         "section_width": "page-width",
-        "horizontal_alignment": "flex-start",
-        "gap": 28,
-        "color_scheme": "scheme-1",
+        "gap": 12,
+        "color_scheme": "",
         "padding-block-start": 48,
         "padding-block-end": 48
       }
     }
   },
   "order": [
-    "hero_jVaWmY",
-    "product_list_fa6P9H"
+    "ase_featured_products_GVWy4Q",
+    "collection_list_AYBmXc"
   ]
 }
diff --git a/templates/page.json b/templates/page.json
index 328e2c2a4..bcd6f34cc 100644
--- a/templates/page.json
+++ b/templates/page.json
@@ -1,3 +1,12 @@
+/*
+ * ------------------------------------------------------------
+ * IMPORTANT: The contents of this file are auto-generated.
+ *
+ * This file may be updated by the Shopify admin theme editor
+ * or related systems. Please exercise caution as any changes
+ * made to this file may be overwritten.
+ * ------------------------------------------------------------
+ */
 {
   "sections": {
     "main": {
@@ -10,7 +19,7 @@
             "text": "<h1>{{ closest.page.title }}</h1>",
             "width": "100%",
             "max_width": "normal",
-            "alignment": "left",
+            "alignment": "center",
             "type_preset": "h2",
             "font": "var(--font-primary--family)",
             "font_size": "",
@@ -35,7 +44,10 @@
           "blocks": {}
         }
       },
-      "block_order": ["heading", "page-content"],
+      "block_order": [
+        "heading",
+        "page-content"
+      ],
       "settings": {
         "content_direction": "column",
         "gap": 32,
@@ -45,5 +57,7 @@
       }
     }
   },
-  "order": ["main"]
+  "order": [
+    "main"
+  ]
 }
diff --git a/templates/product.json b/templates/product.json
index 0a822f45b..679c79a6f 100644
--- a/templates/product.json
+++ b/templates/product.json
@@ -7,7 +7,7 @@
  * made to this file may be overwritten.
  * ------------------------------------------------------------
  */
- {
+{
   "sections": {
     "main": {
       "type": "product-information",
@@ -25,6 +25,7 @@
             "slideshow_mobile_controls_style": "dots",
             "thumbnail_position": "right",
             "thumbnail_width": 44,
+            "thumbnail_radius": 0,
             "aspect_ratio": "adapt",
             "constrain_to_viewport": true,
             "media_fit": "contain",
@@ -71,8 +72,6 @@
               "type": "group",
               "name": "Header",
               "settings": {
-                "link": "",
-                "open_in_new_tab": false,
                 "content_direction": "column",
                 "vertical_on_mobile": true,
                 "horizontal_alignment": "flex-start",
@@ -96,11 +95,13 @@
                 "border_width": 1,
                 "border_opacity": 100,
                 "border_radius": 0,
-                "placeholder": "",
                 "toggle_overlay": false,
                 "overlay_color": "#00000026",
                 "overlay_style": "solid",
                 "gradient_direction": "to top",
+                "link": "",
+                "open_in_new_tab": false,
+                "placeholder": "",
                 "padding-block-start": 0,
                 "padding-block-end": 0,
                 "padding-inline-start": 0,
@@ -263,11 +264,29 @@
         "equal_columns": false,
         "limit_details_width": false,
         "gap": 48,
+        "enable_sticky_add_to_cart": true,
         "color_scheme": "",
         "padding-block-start": 0,
         "padding-block-end": 0
       }
     },
+    "safety_warnings": {
+      "type": "product-safety-warnings",
+      "settings": {
+        "collection_handles": "Preciosa VIVA12® HF, Swarovski Elements®, Premium DMC Flat-Back Hot-Fix Machine-Cut Glass Rhinestones, Premium DMC Sew-On Flat-Back Machine-Cut Glass Rhinestones, Preciosa® Sew-On, Cabochons FB HF, Acrylic Mirrors, Preciosa VIVA12® NoHF, Nalheads",
+        "show_for_all_products": false,
+        "show_icon": false,
+        "heading": "WARNING",
+        "warning_text": "<p>Small parts. Choking hazard. Not suitable for small children.</p>",
+        "icon_size": 24,
+        "heading_font_size": 14,
+        "text_font_size": 12,
+        "color_scheme": "scheme-1",
+        "section_width": "page-width",
+        "padding-block-start": 20,
+        "padding-block-end": 20
+      }
+    },
     "product_recommendations_qggXJq": {
       "type": "product-recommendations",
       "blocks": {
@@ -389,6 +408,7 @@
       "block_order": [
         "text_cbcgyb"
       ],
+      "disabled": true,
       "name": "t:names.product_recommendations",
       "settings": {
         "product": "{{ closest.product }}",
@@ -408,10 +428,72 @@
         "padding-block-start": 48,
         "padding-block-end": 48
       }
+    },
+    "17712757341f59fb2f": {
+      "type": "_blocks",
+      "blocks": {
+        "ai_gen_block_b2fcd10_ejJymK": {
+          "type": "ai_gen_block_b2fcd10",
+          "disabled": true,
+          "settings": {
+            "title": "Warning",
+            "content": "<p>Choking hazard. Small parts. Not suitable for small children.</p>",
+            "show_icon": false,
+            "icon_style": "warning",
+            "icon_size": 20,
+            "icon_color": "#121212",
+            "background_color": "#ffffff",
+            "text_color": "#121212",
+            "border_color": "#ffffff",
+            "border_width": 1,
+            "border_radius": 8,
+            "padding": 20,
+            "spacing": 12,
+            "title_size": 13,
+            "text_size": 12,
+            "desktop_width_percent": 100,
+            "margin_top": 0,
+            "margin_bottom": 0
+          },
+          "blocks": {}
+        }
+      },
+      "block_order": [
+        "ai_gen_block_b2fcd10_ejJymK"
+      ],
+      "settings": {
+        "content_direction": "column",
+        "vertical_on_mobile": true,
+        "horizontal_alignment": "flex-start",
+        "vertical_alignment": "center",
+        "align_baseline": false,
+        "horizontal_alignment_flex_direction_column": "flex-start",
+        "vertical_alignment_flex_direction_column": "center",
+        "gap": 12,
+        "section_width": "page-width",
+        "section_height": "",
+        "section_height_custom": 50,
+        "color_scheme": "",
+        "background_media": "none",
+        "video_position": "cover",
+        "background_image_position": "cover",
+        "border": "none",
+        "border_width": 1,
+        "border_opacity": 100,
+        "border_radius": 0,
+        "toggle_overlay": false,
+        "overlay_color": "#00000026",
+        "overlay_style": "solid",
+        "gradient_direction": "to top",
+        "padding-block-start": 0,
+        "padding-block-end": 0
+      }
     }
   },
   "order": [
     "main",
-    "product_recommendations_qggXJq"
+    "safety_warnings",
+    "product_recommendations_qggXJq",
+    "17712757341f59fb2f"
   ]
 }