diff --git a/.env.hadith b/.env.haditha
similarity index 98%
rename from .env.hadith
rename to .env.haditha
index 7e3da48..66a8879 100644
--- a/.env.hadith
+++ b/.env.haditha
@@ -7,9 +7,9 @@ VITE_APP_NAME=Hadith
 ### Relative pathes for systems sass addressing ###
 # 0 : majles.tavasi.ir  1: qanon.parliran.ir
 VITE_BUILD_STATE=0
-VITE_BUILD_NAME=hadith
+VITE_BUILD_NAME=haditha
 
-VITE_IDB_NAME=hadith
+VITE_IDB_NAME=haditha
 VITE_IDB_VERSION=1
 VITE_ENABLE_IDB=1
 
diff --git a/middleware/redirect.global.ts b/middleware/redirect.global.ts
index 856bf34..9538c47 100644
--- a/middleware/redirect.global.ts
+++ b/middleware/redirect.global.ts
@@ -1,4 +1,4 @@
 // middleware/redirect.js
 export default defineNuxtRouteMiddleware((to, from) => {
-  if (buildName() == "hadith" && to.path == '/') return navigateTo({ name: "hadith" });
+  if (buildName() == "haditha" && to.path == '/') return navigateTo({ name: "haditha" });
 });
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 72cb1e5..2d18cb0 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -15,18 +15,24 @@ for (let e in envs) {
 const buildName = import.meta.env.VITE_BUILD_NAME;
 let mainStyle = `~/assets/common/scss/${buildName}-styles.scss`;
 
-if (buildName == "hadith")
-  mainStyle = `~/systems/${buildName}_ui/assets/${buildName}/scss/${buildName}.css`;
+if (buildName == "haditha")
+  mainStyle = `~/systems/${buildName.substring(
+    0,
+    buildName.length - 1
+  )}_ui/assets/${buildName}/scss/${buildName}.css`;
 
 export default defineNuxtConfig({
   hooks: {
     "build:before": () => {
-      if (buildName == "hadith") {
+      if (buildName == "haditha") {
         const sourceDir = path.resolve(
           __dirname,
-          `systems/${buildName}_ui/assets/${buildName}/images`
+          `systems/${buildName.substring(
+            0,
+            buildName.length - 1
+          )}_ui/assets/${buildName}/images`
         ); // Source folder (e.g., assets/images)
-        const targetDir = path.resolve(__dirname, "public/img"); // Target folder (e.g., public/images)
+        const targetDir = path.resolve(__dirname, `public/img/${buildName}`); // Target folder (e.g., public/images)
 
         // Ensure the target directory exists
         fs.ensureDirSync(targetDir);
@@ -89,59 +95,59 @@ export default defineNuxtConfig({
         },
         // --------------------- end: Research routes ---------------------
 
-        // --------------------- start: hadith routes ---------------------
+        // --------------------- start: haditha routes ---------------------
         {
-          name: "hadith",
-          path: "/hadith",
-          file: "~/systems/hadith_ui/pages/hadith/index.vue",
+          name: "haditha",
+          path: "/haditha",
+          file: "~/systems/hadith_ui/pages/haditha/index.vue",
         },
         {
-          name: "hadithSearch",
-          path: "/hadith/search",
-          file: "~/systems/hadith_ui/pages/hadith/search/index.vue",
+          name: "hadithaSearch",
+          path: "/haditha/search",
+          file: "~/systems/hadith_ui/pages/haditha/search/index.vue",
         },
         {
-          name: "hadithChatBot",
-          path: "/hadith/chat-bot",
-          file: "~/systems/hadith_ui/pages/hadith/chat-bot.vue",
+          name: "hadithaChatBot",
+          path: "/haditha/chat-bot",
+          file: "~/systems/hadith_ui/pages/haditha/chat-bot.vue",
         },
         {
-          name: "hadithFavorites",
-          path: "/hadith/favorites",
-          file: "~/systems/hadith_ui/pages/hadith/favorites/index.vue",
+          name: "hadithaFavorites",
+          path: "/haditha/favorites",
+          file: "~/systems/hadith_ui/pages/haditha/favorites/index.vue",
         },
         {
-          name: "hadithLibrary",
-          path: "/hadith/library",
-          file: "~/systems/hadith_ui/pages/hadith/library/index.vue",
+          name: "hadithaLibrary",
+          path: "/haditha/library",
+          file: "~/systems/hadith_ui/pages/haditha/library/index.vue",
         },
         {
-          name: "hadithLibraryShow",
-          path: "/hadith/library/:id/:slug?",
-          file: "~/systems/hadith_ui/pages/hadith/library/[id]/[slug]/index.vue",
+          name: "hadithaLibraryShow",
+          path: "/haditha/library/:id/:slug?",
+          file: "~/systems/hadith_ui/pages/haditha/library/[id]/[slug]/index.vue",
         },
         {
-          name: "hadithAbout",
-          path: "/hadith/about-us",
-          file: "~/systems/hadith_ui/pages/hadith/public-pages/about-us.vue",
+          name: "hadithaAbout",
+          path: "/haditha/about-us",
+          file: "~/systems/hadith_ui/pages/haditha/public-pages/about-us.vue",
         },
         {
-          name: "hadithContact",
-          path: "/hadith/contact-us",
-          file: "~/systems/hadith_ui/pages/hadith/public-pages/ContactUs.vue",
+          name: "hadithaContact",
+          path: "/haditha/contact-us",
+          file: "~/systems/hadith_ui/pages/haditha/public-pages/ContactUs.vue",
         },
         {
-          name: "hadithRules",
-          path: "/hadith/rules",
-          file: "~/systems/hadith_ui/pages/hadith/public-pages/rules.vue",
+          name: "hadithaRules",
+          path: "/haditha/rules",
+          file: "~/systems/hadith_ui/pages/haditha/public-pages/rules.vue",
         },
         {
-          name: "hadithLogin",
-          path: "/hadith/login",
-          file: "~/systems/hadith_ui/pages/hadith/login.vue",
+          name: "hadithaLogin",
+          path: "/haditha/login",
+          file: "~/systems/hadith_ui/pages/haditha/login.vue",
         }
 
-        // --------------------- end: hadith routes ---------------------
+        // --------------------- end: haditha routes ---------------------
       );
     },
   },
@@ -191,10 +197,12 @@ export default defineNuxtConfig({
     // "@nuxtjs/supabase",
   ],
   icon: {
-    customCollections: [{
-      prefix: 'haditha',
-      dir: `./systems/${buildName}_ui/assets/${buildName}/svg`
-    }]
+    customCollections: [
+      {
+        prefix: "haditha",
+        dir: `./systems/${buildName}_ui/assets/${buildName}/font-icons`,
+      },
+    ],
   },
   // ui: {
   //   prefix: 'Nuxt', //Use the prefix option to change the prefix of the components.    Default: U
@@ -209,29 +217,10 @@ export default defineNuxtConfig({
   //   debug: process.env.NODE_ENV === 'development',
   //   mode: 'init'
   // },
-  image: {
-    inject: true,
-    quality: 80,
-    format: ["webp", "jpeg", "jpg", "png", "gif", "avif"],
-    screens: {
-      xs: 320,
-      sm: 576,
-      md: 768,
-      lg: 1199,
-      xl: 1400,
-      xxl: 1600,
-      "2xl": 1920,
-    },
-    presets: {
-      avatar: {
-        modifiers: {
-          format: "jpg",
-          width: 25,
-          height: 24,
-        },
-      },
-    },
-  },
+  // image: {
+  //   provider: "ipx",
+  //   quality: 100,
+  // },
   i18n: {
     vueI18n: "./i18n.config.ts", // if you are using custom path, default
   },
@@ -277,7 +266,7 @@ export default defineNuxtConfig({
     "@pages": "~/pages",
     "@search": "~/systems/search_ui",
     "@research": "~/systems/research_ui",
-    "@hadith": "~/systems/hadith_ui",
+    "@haditha": "~/systems/hadith_ui",
   },
   vite: {
     resolve: {},
diff --git a/package.json b/package.json
index 58306a1..41ae61e 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "postinstall": "nuxt prepare",
     "dev-tavasi": "env-cmd -f .env.tavasi nuxt dev --host --inspect",
     "dev-monir": "env-cmd -f .env.monir nuxt dev --host --inspect",
-    "dev-hadith": "env-cmd -f .env.hadith nuxt dev --host --inspect",
-    "build-hadith": "env-cmd -f .env.hadith nuxt build"
+    "dev-haditha": "env-cmd -f .env.haditha nuxt dev --host --inspect",
+    "build-haditha": "env-cmd -f .env.haditha nuxt build"
   },
   "dependencies": {
     "@nuxt/image": "^1.8.1",
diff --git a/public/img/background.png b/public/img/haditha/background.png
similarity index 100%
rename from public/img/background.png
rename to public/img/haditha/background.png
diff --git a/public/img/background.svg b/public/img/haditha/background.svg
similarity index 100%
rename from public/img/background.svg
rename to public/img/haditha/background.svg
diff --git a/public/img/box-1-bgi.svg b/public/img/haditha/box-1-bgi.svg
similarity index 100%
rename from public/img/box-1-bgi.svg
rename to public/img/haditha/box-1-bgi.svg
diff --git a/public/img/card-one-bgi.png b/public/img/haditha/card-one-bgi.png
similarity index 100%
rename from public/img/card-one-bgi.png
rename to public/img/haditha/card-one-bgi.png
diff --git a/public/img/card-one.png b/public/img/haditha/card-one.png
similarity index 100%
rename from public/img/card-one.png
rename to public/img/haditha/card-one.png
diff --git a/public/img/card-three-bgi.png b/public/img/haditha/card-three-bgi.png
similarity index 100%
rename from public/img/card-three-bgi.png
rename to public/img/haditha/card-three-bgi.png
diff --git a/public/img/card-three.png b/public/img/haditha/card-three.png
similarity index 100%
rename from public/img/card-three.png
rename to public/img/haditha/card-three.png
diff --git a/public/img/card-two-bgi.png b/public/img/haditha/card-two-bgi.png
similarity index 100%
rename from public/img/card-two-bgi.png
rename to public/img/haditha/card-two-bgi.png
diff --git a/public/img/card-two.png b/public/img/haditha/card-two.png
similarity index 100%
rename from public/img/card-two.png
rename to public/img/haditha/card-two.png
diff --git a/public/img/chevron-down.svg b/public/img/haditha/chevron-down.svg
similarity index 100%
rename from public/img/chevron-down.svg
rename to public/img/haditha/chevron-down.svg
diff --git a/public/img/haditha/fav-icons/android-icon-144x144.png b/public/img/haditha/fav-icons/android-icon-144x144.png
new file mode 100644
index 0000000..4fcc24c
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-144x144.png differ
diff --git a/public/img/haditha/fav-icons/android-icon-192x192.png b/public/img/haditha/fav-icons/android-icon-192x192.png
new file mode 100644
index 0000000..c8683e2
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-192x192.png differ
diff --git a/public/img/haditha/fav-icons/android-icon-36x36.png b/public/img/haditha/fav-icons/android-icon-36x36.png
new file mode 100644
index 0000000..d56a1e5
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-36x36.png differ
diff --git a/public/img/haditha/fav-icons/android-icon-48x48.png b/public/img/haditha/fav-icons/android-icon-48x48.png
new file mode 100644
index 0000000..5e46d15
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-48x48.png differ
diff --git a/public/img/haditha/fav-icons/android-icon-72x72.png b/public/img/haditha/fav-icons/android-icon-72x72.png
new file mode 100644
index 0000000..fd6dd34
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-72x72.png differ
diff --git a/public/img/haditha/fav-icons/android-icon-96x96.png b/public/img/haditha/fav-icons/android-icon-96x96.png
new file mode 100644
index 0000000..7020428
Binary files /dev/null and b/public/img/haditha/fav-icons/android-icon-96x96.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-114x114.png b/public/img/haditha/fav-icons/apple-icon-114x114.png
new file mode 100644
index 0000000..7dd32f8
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-114x114.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-120x120.png b/public/img/haditha/fav-icons/apple-icon-120x120.png
new file mode 100644
index 0000000..d9bc867
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-120x120.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-144x144.png b/public/img/haditha/fav-icons/apple-icon-144x144.png
new file mode 100644
index 0000000..4fcc24c
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-144x144.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-152x152.png b/public/img/haditha/fav-icons/apple-icon-152x152.png
new file mode 100644
index 0000000..0879fba
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-152x152.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-180x180.png b/public/img/haditha/fav-icons/apple-icon-180x180.png
new file mode 100644
index 0000000..4d7527b
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-180x180.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-57x57.png b/public/img/haditha/fav-icons/apple-icon-57x57.png
new file mode 100644
index 0000000..e498f7b
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-57x57.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-60x60.png b/public/img/haditha/fav-icons/apple-icon-60x60.png
new file mode 100644
index 0000000..8270b64
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-60x60.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-72x72.png b/public/img/haditha/fav-icons/apple-icon-72x72.png
new file mode 100644
index 0000000..fd6dd34
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-72x72.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-76x76.png b/public/img/haditha/fav-icons/apple-icon-76x76.png
new file mode 100644
index 0000000..e52a334
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-76x76.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon-precomposed.png b/public/img/haditha/fav-icons/apple-icon-precomposed.png
new file mode 100644
index 0000000..2b455ee
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon-precomposed.png differ
diff --git a/public/img/haditha/fav-icons/apple-icon.png b/public/img/haditha/fav-icons/apple-icon.png
new file mode 100644
index 0000000..2b455ee
Binary files /dev/null and b/public/img/haditha/fav-icons/apple-icon.png differ
diff --git a/public/img/haditha/fav-icons/browserconfig.xml b/public/img/haditha/fav-icons/browserconfig.xml
new file mode 100644
index 0000000..c554148
--- /dev/null
+++ b/public/img/haditha/fav-icons/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
diff --git a/public/img/haditha/fav-icons/favicon-16x16.png b/public/img/haditha/fav-icons/favicon-16x16.png
new file mode 100644
index 0000000..ecd0126
Binary files /dev/null and b/public/img/haditha/fav-icons/favicon-16x16.png differ
diff --git a/public/img/haditha/fav-icons/favicon-32x32.png b/public/img/haditha/fav-icons/favicon-32x32.png
new file mode 100644
index 0000000..9f8ea97
Binary files /dev/null and b/public/img/haditha/fav-icons/favicon-32x32.png differ
diff --git a/public/img/haditha/fav-icons/favicon-96x96.png b/public/img/haditha/fav-icons/favicon-96x96.png
new file mode 100644
index 0000000..7020428
Binary files /dev/null and b/public/img/haditha/fav-icons/favicon-96x96.png differ
diff --git a/public/img/haditha/fav-icons/favicon.ico b/public/img/haditha/fav-icons/favicon.ico
new file mode 100644
index 0000000..b85be8f
Binary files /dev/null and b/public/img/haditha/fav-icons/favicon.ico differ
diff --git a/public/img/haditha/fav-icons/manifest.json b/public/img/haditha/fav-icons/manifest.json
new file mode 100644
index 0000000..013d4a6
--- /dev/null
+++ b/public/img/haditha/fav-icons/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/public/img/haditha/fav-icons/ms-icon-144x144.png b/public/img/haditha/fav-icons/ms-icon-144x144.png
new file mode 100644
index 0000000..4fcc24c
Binary files /dev/null and b/public/img/haditha/fav-icons/ms-icon-144x144.png differ
diff --git a/public/img/haditha/fav-icons/ms-icon-150x150.png b/public/img/haditha/fav-icons/ms-icon-150x150.png
new file mode 100644
index 0000000..a014050
Binary files /dev/null and b/public/img/haditha/fav-icons/ms-icon-150x150.png differ
diff --git a/public/img/haditha/fav-icons/ms-icon-310x310.png b/public/img/haditha/fav-icons/ms-icon-310x310.png
new file mode 100644
index 0000000..b86fa21
Binary files /dev/null and b/public/img/haditha/fav-icons/ms-icon-310x310.png differ
diff --git a/public/img/haditha/fav-icons/ms-icon-70x70.png b/public/img/haditha/fav-icons/ms-icon-70x70.png
new file mode 100644
index 0000000..da737c9
Binary files /dev/null and b/public/img/haditha/fav-icons/ms-icon-70x70.png differ
diff --git a/public/img/haditha-title.png b/public/img/haditha/haditha-title.png
similarity index 100%
rename from public/img/haditha-title.png
rename to public/img/haditha/haditha-title.png
diff --git a/public/img/haditha-title.svg b/public/img/haditha/haditha-title.svg
similarity index 100%
rename from public/img/haditha-title.svg
rename to public/img/haditha/haditha-title.svg
diff --git a/public/img/location.png b/public/img/haditha/location.png
similarity index 100%
rename from public/img/location.png
rename to public/img/haditha/location.png
diff --git a/public/img/logo.png b/public/img/haditha/logo.png
similarity index 100%
rename from public/img/logo.png
rename to public/img/haditha/logo.png
diff --git a/public/img/logo.svg b/public/img/haditha/logo.svg
similarity index 100%
rename from public/img/logo.svg
rename to public/img/haditha/logo.svg
diff --git a/public/img/modal-bottom-left-bgi.png b/public/img/haditha/modal-bottom-left-bgi.png
similarity index 100%
rename from public/img/modal-bottom-left-bgi.png
rename to public/img/haditha/modal-bottom-left-bgi.png
diff --git a/public/img/modal-bttom-right-bgi.png b/public/img/haditha/modal-bttom-right-bgi.png
similarity index 100%
rename from public/img/modal-bttom-right-bgi.png
rename to public/img/haditha/modal-bttom-right-bgi.png
diff --git a/public/img/modal-top-bgi.png b/public/img/haditha/modal-top-bgi.png
similarity index 100%
rename from public/img/modal-top-bgi.png
rename to public/img/haditha/modal-top-bgi.png
diff --git a/public/img/no-data.png b/public/img/haditha/no-data.png
similarity index 100%
rename from public/img/no-data.png
rename to public/img/haditha/no-data.png
diff --git a/public/img/robot-indicator.svg b/public/img/haditha/robot-indicator.svg
similarity index 100%
rename from public/img/robot-indicator.svg
rename to public/img/haditha/robot-indicator.svg
diff --git a/public/img/sample-bgi.svg b/public/img/haditha/sample-bgi.svg
similarity index 100%
rename from public/img/sample-bgi.svg
rename to public/img/haditha/sample-bgi.svg
diff --git a/public/img/save.png b/public/img/haditha/save.png
similarity index 100%
rename from public/img/save.png
rename to public/img/haditha/save.png
diff --git a/public/img/section-four_card-five.png b/public/img/haditha/section-four_card-five.png
similarity index 100%
rename from public/img/section-four_card-five.png
rename to public/img/haditha/section-four_card-five.png
diff --git a/public/img/section-four_card-four.png b/public/img/haditha/section-four_card-four.png
similarity index 100%
rename from public/img/section-four_card-four.png
rename to public/img/haditha/section-four_card-four.png
diff --git a/public/img/section-four_card-one.png b/public/img/haditha/section-four_card-one.png
similarity index 100%
rename from public/img/section-four_card-one.png
rename to public/img/haditha/section-four_card-one.png
diff --git a/public/img/section-four_card-three.png b/public/img/haditha/section-four_card-three.png
similarity index 100%
rename from public/img/section-four_card-three.png
rename to public/img/haditha/section-four_card-three.png
diff --git a/public/img/section-four_card-two.png b/public/img/haditha/section-four_card-two.png
similarity index 100%
rename from public/img/section-four_card-two.png
rename to public/img/haditha/section-four_card-two.png
diff --git a/public/img/section-three-bgi.png b/public/img/haditha/section-three-bgi.png
similarity index 100%
rename from public/img/section-three-bgi.png
rename to public/img/haditha/section-three-bgi.png
diff --git a/public/img/section-three-bgi.svg b/public/img/haditha/section-three-bgi.svg
similarity index 100%
rename from public/img/section-three-bgi.svg
rename to public/img/haditha/section-three-bgi.svg
diff --git a/public/img/section-three-logo.png b/public/img/haditha/section-three-logo.png
similarity index 100%
rename from public/img/section-three-logo.png
rename to public/img/haditha/section-three-logo.png
diff --git a/public/img/section-three-logo.svg b/public/img/haditha/section-three-logo.svg
similarity index 100%
rename from public/img/section-three-logo.svg
rename to public/img/haditha/section-three-logo.svg
diff --git a/public/img/sub-header-bgi.png b/public/img/haditha/sub-header-bgi.png
similarity index 100%
rename from public/img/sub-header-bgi.png
rename to public/img/haditha/sub-header-bgi.png
diff --git a/systems/hadith_ui b/systems/hadith_ui
index 658c28e..953d98f 160000
--- a/systems/hadith_ui
+++ b/systems/hadith_ui
@@ -1 +1 @@
-Subproject commit 658c28e45c1cda4c0a27e282639cfdca13f4a34c
+Subproject commit 953d98f3beb62044c320f5fcfb8a000f5e8264d0