diff --git a/layouts/HadithLayout.vue b/layouts/HadithLayout.vue
new file mode 100644
index 0000000..8f6b8b7
--- /dev/null
+++ b/layouts/HadithLayout.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { clearBodyClass } from "@manuals/utilities";
+
+onMounted(() => {
+  clearBodyClass();
+});
+onUnmounted(() => {
+  clearBodyClass();
+});
+</script>
+
+<template>
+  <main class="h-full">
+    <slot name="named-slot"></slot>
+    <slot></slot>
+  </main>
+</template>
\ No newline at end of file
diff --git a/nuxt.config.ts b/nuxt.config.ts
index f803daa..11cabb1 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -75,17 +75,21 @@ export default defineNuxtConfig({
           file: "~/systems/search_ui/pages/search/(show)/[key]/[id]/index.vue",
         },
         // hadith
-
-        {
-          name: "hadithSearch",
-          path: "/hadith/search",
-          file: "~/systems/hadith_ui/pages/hadith/search.vue",
-        },
         {
           name: "hadith",
           path: "/hadith",
           file: "~/systems/hadith_ui/pages/hadith/index.vue",
-        }
+        },
+        {
+          name: "hadithSearch",
+          path: "/hadith/search",
+          file: "~/systems/hadith_ui/pages/hadith/search/index.vue",
+        },
+        // {
+        //   name: "hadithShow",
+        //   path: "/hadith/search/:id/:slug?",
+        //   file: "~/systems/hadith_ui/pages/hadith/search/[id]/[slug]/index.vue",
+        // }
       );
     },
   },
diff --git a/package.json b/package.json
index 617ddf3..28aa698 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +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"
+    "dev-hadith": "env-cmd -f .env.hadith nuxt dev --host --inspect",
+    "build-hadith": "env-cmd -f .env.hadith nuxt build"
   },
   "dependencies": {
     "@nuxt/image": "^1.8.1",
diff --git a/public/img/haditha-title.png b/public/img/haditha-title.png
new file mode 100644
index 0000000..5c04610
Binary files /dev/null and b/public/img/haditha-title.png differ
diff --git a/public/img/haditha-title.svg b/public/img/haditha-title.svg
new file mode 100644
index 0000000..8e0942e
--- /dev/null
+++ b/public/img/haditha-title.svg
@@ -0,0 +1,52 @@
+<svg width="64" height="25" viewBox="0 0 64 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M36.0096 17.6483C37.4078 17.6483 38.5034 17.4396 39.2965 17.0223C40.1103 16.6049 40.6947 15.9788 41.0495 15.1441L39.2965 5.09567L40.5799 4.43829L42.3642 14.7371C42.5103 15.5301 42.9068 16.2188 43.5537 16.8031C44.2215 17.3666 45.0876 17.6483 46.1519 17.6483H47.4667C47.6545 17.6483 47.811 17.7318 47.9362 17.8988C48.0823 18.0657 48.1553 18.264 48.1553 18.4935C48.1553 18.7231 48.0823 18.9213 47.9362 19.0883C47.811 19.2552 47.6545 19.3387 47.4667 19.3387H46.4336C45.2441 19.3387 44.2424 19.0883 43.4285 18.5874C42.6146 18.0657 42.0512 17.3666 41.7381 16.4901C41.2999 17.3875 40.6112 18.0866 39.6721 18.5874C38.733 19.0883 37.5539 19.3387 36.1348 19.3387H33.114L32.9575 17.6483H36.0096Z" fill="url(#paint0_linear_344_2248)"/>
+<path d="M47.4094 19.3387C47.2216 19.3387 47.0651 19.2552 46.9399 19.0883C46.7938 18.9213 46.7208 18.7231 46.7208 18.4935C46.7208 18.2431 46.7938 18.0448 46.9399 17.8988C47.0651 17.7318 47.2216 17.6483 47.4094 17.6483H59.8682L58.9917 11.1998C58.783 9.80161 58.3134 8.75816 57.583 8.06949C56.8735 7.35994 55.9448 7.00517 54.797 7.00517C54.5466 7.00517 54.1501 7.04691 53.6075 7.13039L49.7572 7.75645L49.9137 6.06607L53.5762 5.47131C54.0144 5.4087 54.4318 5.3774 54.8283 5.3774C56.3309 5.3774 57.5726 5.83651 58.5534 6.75475C59.5552 7.65211 60.1708 8.92512 60.4003 10.5738L61.3707 17.6483H64.0002L63.5307 19.3387H47.4094Z" fill="url(#paint1_linear_344_2248)"/>
+<path d="M24.9984 17.6481C26.2506 17.6481 27.2627 17.4185 28.0348 16.9594C28.8279 16.5003 29.3705 15.8429 29.6626 14.9873L27.8783 5.97193L29.287 5.34586L30.8209 12.9526C30.9043 13.37 30.9461 13.8291 30.9461 14.3299C30.9461 15.8534 30.4243 17.0742 29.3809 17.9924C28.3583 18.8898 26.9184 19.3385 25.061 19.3385C21.3002 19.3385 21.1849 17.6481 24.9984 17.6481Z" fill="#1B2132"/>
+<path d="M17.3823 17.0222C18.1962 16.6049 18.7805 15.9788 19.1353 15.144L17.5295 7.59986L18.813 6.94249L20.2686 13.2736L20.4501 14.7371C20.5961 15.5301 20.9927 16.2188 21.6396 16.8031C22.3074 17.3666 23.1735 17.6483 24.2378 17.6483H25.5525C25.7403 17.6483 25.8968 17.7318 26.0221 17.8987C26.1681 18.0657 26.2412 18.2639 26.2412 18.4935C26.2412 18.7231 26.1681 18.9213 26.0221 19.0883C25.8968 19.2552 25.7403 19.3387 25.5525 19.3387H24.5195C23.33 19.3387 22.3283 19.0883 21.5144 18.5874C20.7005 18.0657 20.137 17.3666 19.824 16.4901C19.3857 17.3875 18.6971 18.0866 17.758 18.5874L17.3823 17.0222Z" fill="#1B2132"/>
+<path d="M25.4953 19.3387C25.3075 19.3387 25.1509 19.2552 25.0257 19.0883C24.8797 18.9213 24.8066 18.7231 24.8066 18.4935C24.8066 18.2431 24.8797 18.0448 25.0257 17.8987C25.1509 17.7318 25.3075 17.6483 25.4953 17.6483V19.3387Z" fill="#1B2132"/>
+<path d="M7.2878 19.3381C5.70176 19.3381 4.44962 18.8998 3.53139 18.0233C2.61316 17.1469 2.15404 15.8843 2.15404 14.2356V3.29512L0.606445 3.78424V2.02342L3.50008 1.08821V13.7348C3.50008 16.3434 4.76266 17.6477 7.2878 17.6477H8.00778C8.1956 17.6477 8.35211 17.7312 8.47733 17.8981C8.62341 18.0651 8.69645 18.2633 8.69645 18.4929C8.69645 18.7225 8.62341 18.9207 8.47733 19.0877C8.35211 19.2546 8.1956 19.3381 8.00778 19.3381H7.2878Z" fill="url(#paint2_linear_344_2248)"/>
+<path d="M7.96767 19.3381C7.77985 19.3381 7.62333 19.2546 7.49812 19.0877C7.35203 18.9207 7.27899 18.7225 7.27899 18.4929C7.27899 18.2633 7.35203 18.0651 7.49812 17.8981C7.62333 17.7312 7.77985 17.6477 7.96767 17.6477H11.8806C12.0684 17.6477 12.2249 17.7312 12.3501 17.8981C12.4962 18.0651 12.5693 18.2633 12.5693 18.4929C12.5693 18.7225 12.4962 18.9207 12.3501 19.0877C12.2249 19.2546 12.0684 19.3381 11.8806 19.3381H7.96767Z" fill="url(#paint3_linear_344_2248)"/>
+<path d="M11.8493 19.3381C11.6615 19.3381 11.505 19.2546 11.3797 19.0877C11.2337 18.9207 11.1606 18.7225 11.1606 18.4929C11.1606 18.2425 11.2337 18.0442 11.3797 17.8981C11.505 17.7312 11.6615 17.6477 11.8493 17.6477H14.3849C15.637 17.6477 16.6491 17.4181 17.4213 16.959C18.2143 16.4999 18.7569 15.8425 19.0491 14.9869L17.4213 7.50149L18.83 6.87542L20.2073 12.9522C20.2908 13.3696 20.3325 13.8287 20.3325 14.3295C20.3325 15.853 19.8108 17.0738 18.7673 17.992C17.7448 18.8894 16.3048 19.3381 14.4475 19.3381H11.8493Z" fill="url(#paint4_linear_344_2248)"/>
+<path d="M9.69727 3.04489H16.2397V4.76658H9.69727V3.04489Z" fill="url(#paint5_linear_344_2248)"/>
+<path d="M11.7584 0.215851H13.9105V1.97667H11.7584V0.215851Z" fill="url(#paint6_linear_344_2248)"/>
+<path d="M23.0732 22.9774H29.5844V24.6991H23.0732V22.9774Z" fill="#1B2132"/>
+<defs>
+<linearGradient id="paint0_linear_344_2248" x1="32.8895" y1="7.84648" x2="38.5865" y2="12.6934" gradientUnits="userSpaceOnUse">
+<stop stop-color="#84FFC8"/>
+<stop offset="0.419292" stop-color="#00E03C"/>
+<stop offset="1" stop-color="#1B2132"/>
+</linearGradient>
+<linearGradient id="paint1_linear_344_2248" x1="32.8895" y1="7.84648" x2="38.5865" y2="12.6934" gradientUnits="userSpaceOnUse">
+<stop stop-color="#84FFC8"/>
+<stop offset="0.419292" stop-color="#00E03C"/>
+<stop offset="1" stop-color="#1B2132"/>
+</linearGradient>
+<linearGradient id="paint2_linear_344_2248" x1="0.143793" y1="-2.0274" x2="11.5175" y2="-0.647003" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D284FF"/>
+<stop offset="0.245187" stop-color="#4D00FF"/>
+<stop offset="1" stop-color="#1B2132"/>
+</linearGradient>
+<linearGradient id="paint3_linear_344_2248" x1="0.143793" y1="-2.0274" x2="11.5175" y2="-0.647003" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D284FF"/>
+<stop offset="0.245187" stop-color="#4D00FF"/>
+<stop offset="1" stop-color="#1B2132"/>
+</linearGradient>
+<linearGradient id="paint4_linear_344_2248" x1="0.143793" y1="-2.0274" x2="11.5175" y2="-0.647003" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D284FF"/>
+<stop offset="0.245187" stop-color="#4D00FF"/>
+<stop offset="1" stop-color="#1B2132"/>
+</linearGradient>
+<linearGradient id="paint5_linear_344_2248" x1="9.54382" y1="-0.561046" x2="25.143" y2="2.76377" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D284FF"/>
+<stop offset="0.245187" stop-color="#4D00FF"/>
+<stop offset="0.410433"/>
+<stop offset="1"/>
+</linearGradient>
+<linearGradient id="paint6_linear_344_2248" x1="9.54382" y1="-0.561046" x2="25.143" y2="2.76377" gradientUnits="userSpaceOnUse">
+<stop stop-color="#D284FF"/>
+<stop offset="0.245187" stop-color="#4D00FF"/>
+<stop offset="0.410433"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/public/img/modal-bottom-left-bgi.png b/public/img/modal-bottom-left-bgi.png
new file mode 100644
index 0000000..c380685
Binary files /dev/null and b/public/img/modal-bottom-left-bgi.png differ
diff --git a/public/img/modal-bttom-right-bgi.png b/public/img/modal-bttom-right-bgi.png
new file mode 100644
index 0000000..42ee1ed
Binary files /dev/null and b/public/img/modal-bttom-right-bgi.png differ
diff --git a/public/img/modal-top-bgi.png b/public/img/modal-top-bgi.png
new file mode 100644
index 0000000..0f45805
Binary files /dev/null and b/public/img/modal-top-bgi.png differ
diff --git a/public/img/no-data.png b/public/img/no-data.png
new file mode 100644
index 0000000..c7e372b
Binary files /dev/null and b/public/img/no-data.png differ
diff --git a/public/img/sub-header-bgi.png b/public/img/sub-header-bgi.png
new file mode 100644
index 0000000..2c03807
Binary files /dev/null and b/public/img/sub-header-bgi.png differ
diff --git a/systems/hadith_ui b/systems/hadith_ui
index 1f9ed61..0b60698 160000
--- a/systems/hadith_ui
+++ b/systems/hadith_ui
@@ -1 +1 @@
-Subproject commit 1f9ed61d5bafcd14cf354620ee90ae98cbe44636
+Subproject commit 0b606984b6e6c561f03df702a1cff19fb00ba054