diff --git a/public/images/grilles/supply-air.jpg b/public/images/grilles/supply-air.jpg
new file mode 100644
index 0000000..9263569
Binary files /dev/null and b/public/images/grilles/supply-air.jpg differ
diff --git a/src/components/common/Footer.astro b/src/components/common/Footer.astro
index b4c1b93..0e685db 100644
--- a/src/components/common/Footer.astro
+++ b/src/components/common/Footer.astro
@@ -9,7 +9,7 @@ const companyInfo = {
 };
 
 const productLinks = [
-  { title: "ท่อพีพีอาร์", href: "/ท่อ-ppr-thai-ppr" },
+  { title: "ระบบท่อ", href: "/ท่อ-ppr-thai-ppr" },
   { title: "ท่อ HDPE", href: "/ท่อ-hdpe" },
   { title: "ท่อ UPVC", href: "/ท่อ-upvc" },
   { title: "เครื่องเชื่อมท่อ", href: "/เครื่องเชื่อม-hdpe" },
diff --git a/src/components/common/Header.astro b/src/components/common/Header.astro
index ba89945..d786bbe 100644
--- a/src/components/common/Header.astro
+++ b/src/components/common/Header.astro
@@ -6,7 +6,7 @@ const navItems = [
 
 const productCategories = [
   {
-    title: "ท่อพีพีอาร์",
+    title: "ระบบท่อ",
     items: [
       { label: "ไทยพีพีอาร์", href: "/ท่อ-ppr-thai-ppr" },
       { label: "ท่อ PPR ตราช้าง", href: "/ท่อ-ppr-scg" },
@@ -58,7 +58,7 @@ const productCategories = [
       { label: "Armaflex", href: "/armflex" },
       { label: "Aeroflex", href: "/aeroflex" },
       { label: "Maxflex", href: "/maxflex" },
-      { label: "เทอร์โมเบรค Thermobreak", href: "/เทอร์โมเบรค-thermobreak" },
+      { label: "Thermobreak", href: "/เทอร์โมเบรค-thermobreak" },
       { label: "Realflex", href: "/realflex" },
       { label: "ตู้ดับเพลิง", href: "/ตู้ดับเพลิง" },
       { label: "รั้วเทวดา", href: "/รั้วเทวดา" },
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index eecb440..5ec548b 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -122,7 +122,7 @@ const organizationSchema = {
 
 const categories = [
   {
-    name: 'ท่อพีพีอาร์',
+    name: 'ระบบท่อ',
     slug: '/ท่อ-ppr-thai-ppr',
     subcategories: [
       { name: 'ไทยพีพีอาร์', slug: '/ท่อ-ppr-thai-ppr' },
@@ -176,7 +176,7 @@ const categories = [
       { name: 'Armaflex', slug: '/armflex' },
       { name: 'Aeroflex', slug: '/aeroflex' },
       { name: 'Maxflex', slug: '/maxflex' },
-      { name: 'เทอร์โมเบรค', slug: '/เทอร์โมเบรค-thermobreak' },
+      { name: 'Thermobreak', slug: '/เทอร์โมเบรค-thermobreak' },
     ]
   },
   {
@@ -315,7 +315,7 @@ if (jsonLd) {
 
 const productLinks = [
   { title: "ไทยพีพีอาร์", href: "/ท่อ-ppr-thai-ppr" },
-  { title: "เทอร์โมเบรค", href: "/เทอร์โมเบรค-thermobreak" },
+  { title: "Thermobreak", href: "/เทอร์โมเบรค-thermobreak" },
   { title: "กริลแอร์", href: "/grilles" },
   { title: "หัวจ่ายแอร์ Ball Jet", href: "/หัวจ่าย-ball-jet" },
   { title: "ท่อ HDPE", href: "/ท่อ-hdpe" },
diff --git a/src/pages/all-products.astro b/src/pages/all-products.astro
index dd1505a..0a61d63 100644
--- a/src/pages/all-products.astro
+++ b/src/pages/all-products.astro
@@ -4,12 +4,12 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
 // Categories match the main menu in BaseLayout.astro (header dropdown order)
 const products = [
   // ท่อพีพีอาร์ (6 items - matches main menu)
-  { name: "ไทยพีพีอาร์", href: "/ท่อ-ppr-thai-ppr", image: "/images/products-cropped/ppr-pipe_000C.jpg", category: "ท่อพีพีอาร์" },
-  { name: "ท่อ PPR ตราช้าง", href: "/ท่อ-ppr-scg", image: "/images/products-cropped/ppr-scg.jpg", category: "ท่อพีพีอาร์" },
-  { name: "ท่อ HDPE", href: "/ท่อ-hdpe", image: "/images/products-cropped/hdpe001.png", category: "ท่อพีพีอาร์" },
-  { name: "ท่อ UPVC", href: "/ท่อ-upvc", image: "/images/products-cropped/upvc-pipe_000C.jpg", category: "ท่อพีพีอาร์" },
-  { name: "ท่อ Syler", href: "/ท่อ-syler", image: "/images/products-cropped/syler-pipe-cold-water.jpg", category: "ท่อพีพีอาร์" },
-  { name: "ท่อ XYLENT", href: "/ท่อ-xy-lent", image: "/images/products-cropped/XYLENT_001.png", category: "ท่อพีพีอาร์" },
+  { name: "ไทยพีพีอาร์", href: "/ท่อ-ppr-thai-ppr", image: "/images/products-cropped/ppr-pipe_000C.jpg", category: "ระบบท่อ" },
+  { name: "ท่อ PPR ตราช้าง", href: "/ท่อ-ppr-scg", image: "/images/products-cropped/ppr-scg.jpg", category: "ระบบท่อ" },
+  { name: "ท่อ HDPE", href: "/ท่อ-hdpe", image: "/images/products-cropped/hdpe001.png", category: "ระบบท่อ" },
+  { name: "ท่อ UPVC", href: "/ท่อ-upvc", image: "/images/products-cropped/upvc-pipe_000C.jpg", category: "ระบบท่อ" },
+  { name: "ท่อ Syler", href: "/ท่อ-syler", image: "/images/products-cropped/syler-pipe-cold-water.jpg", category: "ระบบท่อ" },
+  { name: "ท่อ XYLENT", href: "/ท่อ-xy-lent", image: "/images/products-cropped/XYLENT_001.png", category: "ระบบท่อ" },
 
   // เครื่องเชื่อมท่อ (4 items)
   { name: "เครื่องเชื่อม HDPE", href: "/เครื่องเชื่อม-hdpe", image: "/images/HDPE-welding-crop.jpg", category: "เครื่องเชื่อมท่อ" },
@@ -35,7 +35,7 @@ const products = [
   { name: "Armaflex", href: "/armflex", image: "/images/armflex/armaflex-sheet-roll.jpg", category: "ฉนวนหุ้มท่อ" },
   { name: "Aeroflex", href: "/aeroflex", image: "/images/aeroflex/aerocel-d-al-real.jpg", category: "ฉนวนหุ้มท่อ" },
   { name: "Maxflex", href: "/maxflex", image: "/images/maxflex/maxflex-fsk-foil.jpg", category: "ฉนวนหุ้มท่อ" },
-  { name: "เทอร์โมเบรค Thermobreak", href: "/เทอร์โมเบรค-thermobreak", image: "/images/thermobreak/thermobreak-main.jpg", category: "ฉนวนหุ้มท่อ" },
+  { name: "Thermobreak", href: "/เทอร์โมเบรค-thermobreak", image: "/images/thermobreak/thermobreak-main.jpg", category: "ฉนวนหุ้มท่อ" },
 
   // ระบบรั้ว (2 items)
   { name: "รั้วเทวดา", href: "/รั้วเทวดา", image: "/images/tevada/LINE_ALBUM_รั้วเทวดา_260522_1.jpg", category: "ระบบรั้ว" },
@@ -44,7 +44,7 @@ const products = [
 
 // Categories match main menu in BaseLayout.astro
 const categories = [
-  { name: "ท่อพีพีอาร์", id: "ppr" },
+  { name: "ระบบท่อ", id: "ppr" },
   { name: "เครื่องเชื่อมท่อ", id: "welding" },
   { name: "ระบบน้ำ", id: "water" },
   { name: "อุปกรณ์ปรับอากาศ", id: "ac" },
diff --git a/src/pages/grilles.astro b/src/pages/grilles.astro
index 73b32d7..b9eca08 100644
--- a/src/pages/grilles.astro
+++ b/src/pages/grilles.astro
@@ -165,6 +165,7 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
             </ul>
 
             <div class="flex flex-wrap justify-center gap-4 my-8">
+              <img src="/images/grilles/supply-air.jpg" alt="Supply Air Grille (หน้ากากลมส่ง)" class="max-w-lg w-full h-auto rounded-lg shadow-md" width="500" height="567" loading="lazy" />
               <img src="/images/grilles/linear-slot-content.jpg" alt="Linear Slot" class="max-w-lg w-full h-auto rounded-lg shadow-md" width="500" height="300" loading="lazy" />
               <img src="/images/grilles/air-grille-content.jpg" alt="หน้ากากแอร์" class="max-w-lg w-full h-auto rounded-lg shadow-md" width="500" height="300" loading="lazy" />
             </div>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 2d2c70f..33db7df 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -105,7 +105,7 @@ const articles = (await getCollection('blog')).sort(
 
           <!-- Card 2 - Medium, back right -->
           <div class="absolute top-16 right-4 lg:right-12 w-40 lg:w-52 rounded-2xl shadow-2xl overflow-hidden animate-float-delayed-1 glass-strong tilt-card">
-            <img src="/images/thermobreak/thermobreak-main.jpg" alt="เทอร์โมเบรค" class="w-full h-full object-cover" loading="lazy" />
+            <img src="/images/thermobreak/thermobreak-main.jpg" alt="Thermobreak" class="w-full h-full object-cover" loading="lazy" />
           </div>
 
           <!-- Card 3 - Large, center front -->
@@ -264,7 +264,7 @@ const articles = (await getCollection('blog')).sort(
           <div class="aspect-square img-hover relative overflow-hidden">
             <img
               src="/images/thermobreak/thermobreak-main.jpg"
-              alt="เทอร์โมเบรค ฉนวนหุ้มท่อ"
+              alt="Thermobreak"
               class="w-full h-full object-cover transition-transform duration-700 group-hover:scale-110"
               loading="lazy"
             />
@@ -280,7 +280,7 @@ const articles = (await getCollection('blog')).sort(
           </div>
           <div class="p-6">
             <div class="flex items-center justify-between mb-2">
-              <h3 class="text-xl font-bold text-primary-700 group-hover:text-primary-600 transition-colors">เทอร์โมเบรค</h3>
+              <h3 class="text-xl font-bold text-primary-700 group-hover:text-primary-600 transition-colors">Thermobreak</h3>
               <svg class="w-5 h-5 text-neutral-400 group-hover:text-primary-500 group-hover:translate-x-1 transition-all" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 8l4 4m0 0l-4 4m4-4H3" />
               </svg>
@@ -318,10 +318,10 @@ const articles = (await getCollection('blog')).sort(
       <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 lg:gap-6" data-animate-stagger>
         <!-- Category 1: ท่อพีพีอาร์ (ไทย PPR) -->
         <a href="/all-products?filter=ppr" class="group relative h-64 rounded-3xl overflow-hidden border border-neutral-200 hover:shadow-2xl transition-all duration-500 hover:-translate-y-1">
-          <img src="/images/products-cropped/ppr-pipe_000C.jpg" alt="ท่อพีพีอาร์" class="absolute inset-0 w-full h-full object-cover transition-transform duration-700 group-hover:scale-110" loading="lazy" />
+          <img src="/images/products-cropped/ppr-pipe_000C.jpg" alt="ระบบท่อ" class="absolute inset-0 w-full h-full object-cover transition-transform duration-700 group-hover:scale-110" loading="lazy" />
           <div class="absolute inset-0 bg-gradient-to-t from-neutral-900/90 via-neutral-900/40 to-transparent"></div>
           <div class="relative h-full flex flex-col justify-end p-6 text-white">
-            <h3 class="text-xl font-bold mb-1">ท่อพีพีอาร์</h3>
+            <h3 class="text-xl font-bold mb-1">ระบบท่อ</h3>
             <p class="text-sm text-white/80 mb-2">6 รายการ</p>
             <span class="inline-flex items-center gap-1 text-sm font-medium group-hover:gap-2 transition-all">
               ดูสินค้า
@@ -346,7 +346,7 @@ const articles = (await getCollection('blog')).sort(
 
         <!-- Category 3: ระบบน้ำ -->
         <a href="/all-products?filter=water" class="group relative h-64 rounded-3xl overflow-hidden border border-neutral-200 hover:shadow-2xl transition-all duration-500 hover:-translate-y-1">
-          <img src="/images/products-cropped/water-pump_000C.jpg" alt="ระบบน้ำ" class="absolute inset-0 w-full h-full object-cover transition-transform duration-700 group-hover:scale-110" loading="lazy" />
+          <img src="/images/products-cropped/valve_000C.jpg" alt="ระบบน้ำ" class="absolute inset-0 w-full h-full object-cover transition-transform duration-700 group-hover:scale-110" loading="lazy" />
           <div class="absolute inset-0 bg-gradient-to-t from-neutral-900/90 via-neutral-900/40 to-transparent"></div>
           <div class="relative h-full flex flex-col justify-end p-6 text-white">
             <h3 class="text-xl font-bold mb-1">ระบบน้ำ</h3>
diff --git a/src/pages/ระบบน้ำ.astro b/src/pages/ระบบน้ำ.astro
index 19ffd9f..4d20dbc 100644
--- a/src/pages/ระบบน้ำ.astro
+++ b/src/pages/ระบบน้ำ.astro
@@ -60,7 +60,7 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
             </div>
           </div>
           <div>
-            <img src="/images/products-cropped/water-pump_000C.jpg" alt="ระบบน้ำ" class="rounded-2xl" loading="eager" />
+            <img src="/images/products-cropped/valve_000C.jpg" alt="ระบบน้ำ" class="rounded-2xl" loading="eager" />
           </div>
         </div>
       </div>
@@ -82,7 +82,7 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
 
           <a href="/water-pump" class="group overflow-hidden block bg-white rounded-xl border border-neutral-200 hover:border-primary-300 hover:shadow-lg transition-all">
             <div class="aspect-square overflow-hidden">
-              <img src="/images/products-cropped/water-pump_000C.jpg" alt="ปั๊มน้ำ" class="w-full h-full object-cover group-hover:scale-105 transition-transform" loading="lazy" />
+              <img src="/images/products-cropped/valve_000C.jpg" alt="ปั๊มน้ำ" class="w-full h-full object-cover group-hover:scale-105 transition-transform" loading="lazy" />
             </div>
             <div class="p-4 text-center">
               <h3 class="text-lg font-bold text-neutral-800 group-hover:text-primary-600 transition-colors">ปั๊มน้ำ</h3>