diff --git a/public/theme/css/iran-sans.css b/public/theme/css/iran-sans.css
index cdfee37..2856198 100644
--- a/public/theme/css/iran-sans.css
+++ b/public/theme/css/iran-sans.css
@@ -1,36 +1,47 @@
 @font-face {
     font-family: "iran-sans";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-regular.ttf');
+    src: url('../fonts/iran-sans/iran-sans-regular.ttf') format('truetype');
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-light";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-light.ttf');
+    src: url('../fonts/iran-sans/iran-sans-light.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-medium";
-    src:url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-medium.ttf');
+    src: url('../fonts/iran-sans/iran-sans-medium.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-ultralight";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-ultralight.ttf');
+    src: url('../fonts/iran-sans/iran-sans-ultralight.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-bold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-bold.ttf');
+    src: url('../fonts/iran-sans/iran-sans-bold.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-semibold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-semibold.ttf');
+    src: url('../fonts/iran-sans/iran-sans-semibold.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-extrabold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-extrabold.ttf');
+    src: url('../fonts/iran-sans/iran-sans-extrabold.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-thin";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-thin.ttf');
+    src: url('../fonts/iran-sans/iran-sans-thin.ttf') format('truetype');
+    font-display: swap;
 }
 @font-face {
     font-family: "iran-sans-black";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/iran-sans/iran-sans-black.ttf');
-}
\ No newline at end of file
+    src: url('../fonts/iran-sans/iran-sans-black.ttf') format('truetype');
+    font-display: swap;
+}
diff --git a/public/theme/css/montserrat.css b/public/theme/css/montserrat.css
index 2ba3503..f11063a 100644
--- a/public/theme/css/montserrat.css
+++ b/public/theme/css/montserrat.css
@@ -1,59 +1,73 @@
 @font-face {
     font-family: "montserrat";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-regular.ttf');
+    src: url('../fonts/montserrat/montserrat-regular.ttf') format('truetype');
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-medium";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-medium.ttf');
+    src: url('../fonts/montserrat/montserrat-medium.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-light";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-light.ttf');
+    src: url('../fonts/montserrat/montserrat-light.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-extralight";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-extralight.ttf');
+    src: url('../fonts/montserrat/montserrat-light.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-bold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-bold.ttf');
+    src: url('../fonts/montserrat/montserrat-bold.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-semibold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-semibold.ttf');
+    src: url('../fonts/montserrat/montserrat-semibold.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-extrabold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-extrabold.ttf');
+    src: url('../fonts/montserrat/montserrat-bold.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-thin";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-thin.ttf');
+    src: url('../fonts/montserrat/montserrat-light.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-black";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/montserrat-black.ttf');
+    src: url('../fonts/montserrat/montserrat-bold.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-alternates-regular";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/MontserratAlternates-Regular.ttf');
+    src: url('../fonts/montserrat/montserrat-regular.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-alternates-light";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/MontserratAlternates-Light.ttf');
+    src: url('../fonts/montserrat/montserrat-light.ttf') format('truetype');
+    font-display: swap;
 }
 
 @font-face {
     font-family: "montserrat-alternates-extrabold";
-    src: url('https://cdn.meshkee.com/web-builder/fonts/montserrat/MontserratAlternates-ExtraBold.ttf');
-}
\ No newline at end of file
+    src: url('../fonts/montserrat/montserrat-bold.ttf') format('truetype');
+    font-display: swap;
+}
diff --git a/public/theme/fonts/iran-sans/iran-sans-black.ttf b/public/theme/fonts/iran-sans/iran-sans-black.ttf
new file mode 100644
index 0000000..f9990ff
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-black.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-bold.ttf b/public/theme/fonts/iran-sans/iran-sans-bold.ttf
new file mode 100644
index 0000000..490ae62
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-bold.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-extrabold.ttf b/public/theme/fonts/iran-sans/iran-sans-extrabold.ttf
new file mode 100644
index 0000000..cd28155
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-extrabold.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-light.ttf b/public/theme/fonts/iran-sans/iran-sans-light.ttf
new file mode 100644
index 0000000..6748563
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-light.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-medium.ttf b/public/theme/fonts/iran-sans/iran-sans-medium.ttf
new file mode 100644
index 0000000..806da5f
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-medium.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-regular.ttf b/public/theme/fonts/iran-sans/iran-sans-regular.ttf
new file mode 100644
index 0000000..ad4e6ec
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-regular.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-semibold.ttf b/public/theme/fonts/iran-sans/iran-sans-semibold.ttf
new file mode 100644
index 0000000..f5ea4b4
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-semibold.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-thin.ttf b/public/theme/fonts/iran-sans/iran-sans-thin.ttf
new file mode 100644
index 0000000..fe26001
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-thin.ttf differ
diff --git a/public/theme/fonts/iran-sans/iran-sans-ultralight.ttf b/public/theme/fonts/iran-sans/iran-sans-ultralight.ttf
new file mode 100644
index 0000000..36a7708
Binary files /dev/null and b/public/theme/fonts/iran-sans/iran-sans-ultralight.ttf differ
diff --git a/public/theme/fonts/montserrat/montserrat-bold.ttf b/public/theme/fonts/montserrat/montserrat-bold.ttf
new file mode 100644
index 0000000..9a425b9
Binary files /dev/null and b/public/theme/fonts/montserrat/montserrat-bold.ttf differ
diff --git a/public/theme/fonts/montserrat/montserrat-light.ttf b/public/theme/fonts/montserrat/montserrat-light.ttf
new file mode 100644
index 0000000..a3cf5f5
Binary files /dev/null and b/public/theme/fonts/montserrat/montserrat-light.ttf differ
diff --git a/public/theme/fonts/montserrat/montserrat-medium.ttf b/public/theme/fonts/montserrat/montserrat-medium.ttf
new file mode 100644
index 0000000..db5b1af
Binary files /dev/null and b/public/theme/fonts/montserrat/montserrat-medium.ttf differ
diff --git a/public/theme/fonts/montserrat/montserrat-regular.ttf b/public/theme/fonts/montserrat/montserrat-regular.ttf
new file mode 100644
index 0000000..2a2b2aa
Binary files /dev/null and b/public/theme/fonts/montserrat/montserrat-regular.ttf differ
diff --git a/public/theme/fonts/montserrat/montserrat-semibold.ttf b/public/theme/fonts/montserrat/montserrat-semibold.ttf
new file mode 100644
index 0000000..0ecc667
Binary files /dev/null and b/public/theme/fonts/montserrat/montserrat-semibold.ttf differ
diff --git a/src/components/ThemeStyles.tsx b/src/components/ThemeStyles.tsx
index da3774a..e5b0e0b 100644
--- a/src/components/ThemeStyles.tsx
+++ b/src/components/ThemeStyles.tsx
@@ -1,11 +1,10 @@
 export default function ThemeStyles() {
   const theme = "/theme/css";
-  const cdn = "https://cdn.meshkee.com";
 
   const styles = [
-    `${cdn}/web-builder/global/main-color-image.min.css`,
-    `${cdn}/web-builder/fonts/montserrat/montserrat.css`,
-    `${cdn}/web-builder/fonts/iran-sans/iran-sans.css`,
+    `${theme}/main-color-image.min.css`,
+    `${theme}/montserrat.css`,
+    `${theme}/iran-sans.css`,
     `${theme}/bootstrap.min.css`,
     `${theme}/font-awesome.min.css`,
     `${theme}/fontello.css`,