diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index b82e019..c8a3abe 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -75,11 +75,11 @@ export default function AboutPage() {
               icon: CheckCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g&_wi=2",
                   imageAlt: "منتجات معتمدة",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l&_wi=2",
                   imageAlt: "معايير الجودة",
                 },
               ],
@@ -90,11 +90,11 @@ export default function AboutPage() {
               icon: AlertCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre&_wi=2",
                   imageAlt: "فريق متخصص",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv&_wi=2",
                   imageAlt: "خبرة احترافية",
                 },
               ],
@@ -105,11 +105,11 @@ export default function AboutPage() {
               icon: Zap,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=okibu4",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=okibu4&_wi=2",
                   imageAlt: "خدمة العملاء",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v&_wi=1",
                   imageAlt: "دعم الفريق",
                 },
               ],
@@ -156,7 +156,7 @@ export default function AboutPage() {
             rows: 5,
           }}
           useInvertedBackground={false}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v&_wi=2"
           mediaAnimation="slide-up"
           mediaPosition="left"
           buttonText="أرسل الطلب"
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 4cb4dc7..a2eefd0 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -74,7 +74,7 @@ export default function ContactPage() {
             rows: 5,
           }}
           useInvertedBackground={false}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v&_wi=4"
           mediaAnimation="slide-up"
           mediaPosition="left"
           buttonText="أرسل الطلب"
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 590a34c..612bbab 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,33 +1,67 @@
 import type { Metadata } from "next";
 import { Halant } from "next/font/google";
 import { Inter } from "next/font/google";
+import { Public_Sans } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
-import { Public_Sans } from "next/font/google";
 
+const halant = Halant({
+  variable: "--font-halant",
+  subsets: ["latin"],
+  weight: ["300", "400", "500", "600", "700"],
+});
 
-
-export const metadata: Metadata = {
-  title: "Webild components 2",
-  description: "Generated by create next app",
-};
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
 
 const publicSans = Public_Sans({
   variable: "--font-public-sans",
   subsets: ["latin"],
 });
 
+export const metadata: Metadata = {
+  title: "مجموعة العطيشان للسلامة - أنظمة إنذار وإطفاء الحريق في مكة",
+  description: "شركة موثوقة في مكة لتركيب وصيانة أنظمة إنذار الحريق والإطفاء الآلية. خدمة دعم فني 24/7 - اتصل على 050 384 7143",
+  keywords: "أنظمة السلامة مكة، إنذار حريق، نظام إطفاء، معدات السلامة، تركيب إنذار",
+  metadataBase: new URL("https://otaishansafety.com"),
+  alternates: {
+    canonical: "https://otaishansafety.com",
+  },
+  openGraph: {
+    title: "مجموعة العطيشان للسلامة",
+    description: "أنظمة السلامة والحماية من الحريق الموثوقة في مكة",
+    url: "https://otaishansafety.com",
+    siteName: "مجموعة العطيشان للسلامة",
+    type: "website",
+    images: [
+      {
+        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4dql2r",
+        alt: "نظام إنذار حريق احترافي لوحة تحكم",
+      },
+    ],
+  },
+  twitter: {
+    card: "summary_large_image",
+    title: "مجموعة العطيشان للسلامة",
+    description: "أنظمة السلامة والحماية من الحريق الموثوقة في مكة",
+  },
+};
+
 export default function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang="ar" dir="rtl" suppressHydrationWarning>
       <ServiceWrapper>
-        <body className={`${publicSans.variable} antialiased`}>
+        <body
+          className={`${halant.variable} ${inter.variable} ${publicSans.variable} antialiased`}
+        >
           <Tag />
           {children}
           <script
@@ -39,4 +73,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9309f5d..4f26644 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -78,7 +78,7 @@ export default function HomePage() {
               imageAlt: "نظام إنذار حريق احترافي",
             },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=okibu4",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=okibu4&_wi=1",
               imageAlt: "فريق التركيب المتخصص",
             },
           ]}
@@ -129,11 +129,11 @@ export default function HomePage() {
               icon: AlertCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ma8cok",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ma8cok&_wi=1",
                   imageAlt: "نظام الإنذار",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=y6nj3z",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=y6nj3z&_wi=1",
                   imageAlt: "كاشف الدخان",
                 },
               ],
@@ -144,11 +144,11 @@ export default function HomePage() {
               icon: Zap,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=swgacu",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=swgacu&_wi=1",
                   imageAlt: "نظام الإطفاء",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9hzr5o",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9hzr5o&_wi=1",
                   imageAlt: "نظام الرش",
                 },
               ],
@@ -159,11 +159,11 @@ export default function HomePage() {
               icon: Shield,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ddgam6",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ddgam6&_wi=1",
                   imageAlt: "طفاية حريق",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=473ghl",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=473ghl&_wi=1",
                   imageAlt: "معدات السلامة",
                 },
               ],
@@ -174,11 +174,11 @@ export default function HomePage() {
               icon: CheckCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre&_wi=1",
                   imageAlt: "خدمة الصيانة",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv&_wi=1",
                   imageAlt: "فريق الفحص",
                 },
               ],
@@ -245,42 +245,42 @@ export default function HomePage() {
               id: "1",
               name: "لوحات التحكم الذكية",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g&_wi=1",
               imageAlt: "لوحات التحكم الذكية",
             },
             {
               id: "2",
               name: "كواشف الدخان والحرارة",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l&_wi=1",
               imageAlt: "كواشف الدخان والحرارة",
             },
             {
               id: "3",
               name: "أنظمة رش الماء",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=98i0kx",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=98i0kx&_wi=1",
               imageAlt: "أنظمة رش الماء",
             },
             {
               id: "4",
               name: "طفايات الحريق المتنوعة",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q8ar7w",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q8ar7w&_wi=1",
               imageAlt: "طفايات الحريق المتنوعة",
             },
             {
               id: "5",
               name: "خراطيم ومعدات الربط",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0o5q7m",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0o5q7m&_wi=1",
               imageAlt: "خراطيم ومعدات الربط",
             },
             {
               id: "6",
               name: "أنظمة الغاز الخامل",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ffuzhd",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ffuzhd&_wi=1",
               imageAlt: "أنظمة الغاز الخامل",
             },
           ]}
diff --git a/src/app/products/page.tsx b/src/app/products/page.tsx
index 0dd1569..5e7c7fe 100644
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -52,42 +52,42 @@ export default function ProductsPage() {
               id: "1",
               name: "لوحات التحكم الذكية",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nv1n1g&_wi=3",
               imageAlt: "لوحة ذكية تحكم إنذار متطورة",
             },
             {
               id: "2",
               name: "كواشف الدخان والحرارة",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=4ibg0l&_wi=3",
               imageAlt: "كاشف الدخان والحرارة المدمج",
             },
             {
               id: "3",
               name: "أنظمة رش الماء",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=98i0kx",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=98i0kx&_wi=2",
               imageAlt: "نظام رش الماء المركزي الكامل",
             },
             {
               id: "4",
               name: "طفايات الحريق المتنوعة",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q8ar7w",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=q8ar7w&_wi=2",
               imageAlt: "أنواع طفايات الحريق المختلفة",
             },
             {
               id: "5",
               name: "خراطيم ومعدات الربط",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0o5q7m",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=0o5q7m&_wi=2",
               imageAlt: "خراطيم الحريق المرنة والقوية",
             },
             {
               id: "6",
               name: "أنظمة الغاز الخامل",
               price: "تواصل معنا",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ffuzhd",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ffuzhd&_wi=2",
               imageAlt: "نظام الغاز الخامل للإطفاء",
             },
           ]}
@@ -154,7 +154,7 @@ export default function ProductsPage() {
             rows: 5,
           }}
           useInvertedBackground={false}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=hsc93v&_wi=3"
           imageAlt="اجتماع فريق السلامة والحماية"
           mediaAnimation="slide-up"
           mediaPosition="left"
diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index 635e046..088c279 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -54,11 +54,11 @@ export default function ServicesPage() {
               icon: AlertCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ma8cok",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ma8cok&_wi=2",
                   imageAlt: "نظام الإنذار",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=y6nj3z",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=y6nj3z&_wi=2",
                   imageAlt: "كاشف الدخان",
                 },
               ],
@@ -69,11 +69,11 @@ export default function ServicesPage() {
               icon: Zap,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=swgacu",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=swgacu&_wi=2",
                   imageAlt: "نظام الإطفاء",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9hzr5o",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9hzr5o&_wi=2",
                   imageAlt: "نظام الرش",
                 },
               ],
@@ -84,11 +84,11 @@ export default function ServicesPage() {
               icon: Shield,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ddgam6",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ddgam6&_wi=2",
                   imageAlt: "طفاية حريق",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=473ghl",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=473ghl&_wi=2",
                   imageAlt: "معدات السلامة",
                 },
               ],
@@ -99,11 +99,11 @@ export default function ServicesPage() {
               icon: CheckCircle,
               mediaItems: [
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2s0vre&_wi=3",
                   imageAlt: "خدمة الصيانة",
                 },
                 {
-                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv",
+                  imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=a66fuv&_wi=3",
                   imageAlt: "فريق الفحص",
                 },
               ],