diff --git a/.gitmodules b/.gitmodules
index 990288b..fd180c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "systems/search_ui"]
-	path = systems/search_ui
-	url = https://git2.tavasi.ir/front/search_ui.git
-[submodule "systems/research_ui"]
-	path = systems/research_ui
-	url = https://git2.tavasi.ir/front/research_ui.git
-[submodule "systems/hadith_ui"]
-	path = systems/hadith_ui
-	url = https://git2.tavasi.ir/front/hadith_ui.git
-[submodule "systems/chat_ui"]
-	path = systems/chat_ui
-	url = https://git2.tavasi.ir/front/chat_ui.git
+[submodule "systems/haditha_ui"]
+	path = systems/haditha_ui
+	url = https://git2.tavasi.ir/front/haditha_ui.git
diff --git a/assets/common/scss/_sahel_light.scss b/assets/common/scss/_sahel_light.scss
new file mode 100644
index 0000000..4f9df75
--- /dev/null
+++ b/assets/common/scss/_sahel_light.scss
@@ -0,0 +1,10 @@
+@font-face {
+  font-family: sahel;
+  src: url("../fonts/sahel/Farsi-Digits/Sahel-FD.eot");
+  src: url("../fonts/sahel/Farsi-Digits/Sahel-FD.eot?#iefix")
+      format("embedded-opentype"),
+    url("../fonts/sahel/Farsi-Digits/Sahel-FD.woff2") format("woff2"),
+    url("../fonts/sahel/Farsi-Digits/Sahel-FD.woff") format("woff"),
+    url("../fonts/sahel/Farsi-Digits/Sahel-FD.ttf") format("truetype");
+  font-weight: normal;
+}
diff --git a/components/forms/PropertyBuilder.vue b/components/forms/PropertyBuilder.vue
index 813db4d..ddc7c2e 100644
--- a/components/forms/PropertyBuilder.vue
+++ b/components/forms/PropertyBuilder.vue
@@ -100,8 +100,7 @@
 import repoApi from "@apis/repoApi";
 import { mapState } from "pinia";
 import HttpService from "@services/httpService";
-import { useEntityStore } from "~/systems/search_ui/stores/entityStore";
-import { useCommonStore } from "~/systems/search_ui/stores/useCommonStore";
+import { useCommonStore } from "@stores/useCommonStore";
 /**
  * @vue-data {Object} [listUpdatedText = {}] - متن‌های به‌روزشده در لیست.
  * @vue-data {undefined} [httpService = undefined] - سرویس HTTP برای درخواست‌ها.
@@ -153,18 +152,18 @@ export default {
       fetchingData: false,
       httpService: undefined,
       entity_source: undefined,
-      entity_id : undefined,
+      entity_id: undefined,
       render: 1,
       selectedCard: null,
       listUpdatedText: {},
     };
   },
   computed: {
-    ...mapGetters(useEntityStore, [
-      // "selectedItemEntityGetter",
+    ...mapGetters(useCommonStore, [
+      "userPermisionGetter",
+      "currentUser",
       "activeTabGetter",
     ]),
-    ...mapGetters(useCommonStore,["userPermisionGetter", "currentUser"]),
   },
   methods: {
     // ...mapMutations("entity", ["SET_ITEM_ENTITY"]),
@@ -313,17 +312,14 @@ export default {
       }
     },
 
-
     async getEntityInfo() {
       if (this.fetchingData) return;
 
       let key = this.$route.params.key;
       let entityId = this.$route.params.id ?? this.entity_id;
-      if(key == "qasection" || key == "rgsection")
-        key = "qaqanon"
+      if (key == "qasection" || key == "rgsection") key = "qaqanon";
 
-
-        // console.log("qaqanon", entityId)
+      // console.log("qaqanon", entityId)
       //if (!(key == "qasection" || key == "rgsection") || !entityId) {
       if (!entityId) {
         return;
@@ -410,7 +406,6 @@ export default {
       }
     },
 
-
     /**
      * هندلر برای رویداد فشردن کلید.
      * @param {Event} event - رویداد فشردن کلید.
diff --git a/components/global/BreadCrumb.vue b/components/global/BreadCrumb.vue
index dffe0e9..b65104e 100644
--- a/components/global/BreadCrumb.vue
+++ b/components/global/BreadCrumb.vue
@@ -54,7 +54,7 @@
 
 <script>
 import { mapState } from "pinia";
-import { useEntityStore } from "~/systems/search_ui/stores/entityStore";
+import { useCommonStore } from "@stores/entityStore";
 
 export default {
   props: {
@@ -71,7 +71,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(useEntityStore, ["vuexEntityGetter"]),
+    ...mapState(useCommonStore, ["vuexEntityGetter"]),
   },
   methods: {
     normalPathKey(title = "") {
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 74c4395..e1f94ad 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,10 +2,7 @@
 import fs from "fs-extra";
 import path from "path";
 
-import chat from "./routes/chat";
 import haditha from "./routes/haditha";
-import search from "./routes/search";
-import research from "./routes/research";
 
 const envs = import.meta.env;
 let sassEnvVariables = "";
@@ -25,10 +22,7 @@ export default defineNuxtConfig({
       if (buildName == "haditha") {
         const sourceDir = path.resolve(
           __dirname,
-          `systems/${buildName.substring(
-            0,
-            buildName.length - 1
-          )}_ui/assets/${buildName}/images`
+          `systems/${buildName}_ui/assets/${buildName}/images`
         ); // Source folder (e.g., assets/images)
         const targetDir = path.resolve(__dirname, `public/img/${buildName}`); // Target folder (e.g., public/images)
 
@@ -44,7 +38,7 @@ export default defineNuxtConfig({
 
     "pages:extend"(pages) {
       // Add custom routes
-      pages.push(...search, ...research, ...haditha, ...chat);
+      pages.push(...haditha);
     },
   },
 
@@ -101,10 +95,7 @@ export default defineNuxtConfig({
     customCollections: [
       {
         prefix: "haditha",
-        dir: `./systems/${buildName.substring(
-          0,
-          buildName.length - 1
-        )}_ui/assets/${buildName}/font-icons/*.svg`,
+        dir: `./systems/${buildName}_ui/assets/${buildName}/font-icons/*.svg`,
       },
     ],
   },
@@ -134,12 +125,12 @@ export default defineNuxtConfig({
   },
   plugins: [
     { src: "~/plugins/api.ts", mode: "client" },
-    { src: "~/plugins/vuelidate.ts", mode: "client" },
-    { src: "~/plugins/bootstrap.client.ts", mode: "client" },
-    { src: "~/plugins/vueJalaliMoment.ts", mode: "client" },
-    { src: "~/plugins/vueDraggable.client.ts", ssr: false, mode: "client" },
-    { src: "~/plugins/vue3TreeVue.client.ts" },
-    { src: "~/plugins/vue3PersianDateTimePicker.client.ts" },
+    // { src: "~/plugins/vuelidate.ts", mode: "client" },
+    // { src: "~/plugins/bootstrap.client.ts", mode: "client" },
+    // { src: "~/plugins/vueJalaliMoment.ts", mode: "client" },
+    // { src: "~/plugins/vueDraggable.client.ts", ssr: false, mode: "client" },
+    // { src: "~/plugins/vue3TreeVue.client.ts" },
+    // { src: "~/plugins/vue3PersianDateTimePicker.client.ts" },
     // { src: "~/plugins/vueTreeList.client.ts", ssr: false, mode: "client" },
     // { src: "~/plugins/vueJsTree.ts" },
   ],
@@ -168,10 +159,10 @@ export default defineNuxtConfig({
     "@utils": "~/utils",
     "@manuals": "~/manuals",
     "@pages": "~/pages",
-    "@search": "~/systems/search_ui",
-    "@research": "~/systems/research_ui",
-    "@haditha": "~/systems/hadith_ui",
-    "@chat": "~/systems/chat_ui",
+    // "@search": "~/systems/search_ui",
+    // "@research": "~/systems/research_ui",
+    "@haditha": "~/systems/haditha_ui",
+    // "@chat": "~/systems/chat_ui",
   },
   vite: {
     assetsInclude: ["**/*.svg"],
diff --git a/routes/chat.ts b/routes/chat.ts
deleted file mode 100644
index 4d7958a..0000000
--- a/routes/chat.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-export default [
-  {
-    path: "/chat",
-    file: "@chat/pages/index.vue",
-    children: [
-      {
-        path: "",
-        redirect: { name: "unReads" },
-      },
-      {
-        path: "all/list",
-        name: "all",
-        file: "@chat/pages/Chat.vue",
-        meta: {
-          breadcrumb: "همه",
-        },
-      },
-      {
-        path: "privates/list",
-        name: "privates",
-        file: "@chat/pages/Chat.vue",
-        meta: {
-          breadcrumb: "خصوصی ها",
-        },
-      },
-      {
-        path: "groups/list",
-        name: "groups",
-        file: "@chat/pages/Chat.vue",
-
-        meta: {
-          breadcrumb: "گروه ها",
-        },
-      },
-      {
-        path: "lobbies/list",
-        name: "lobbies",
-        file: "@chat/pages/Chat.vue",
-
-        meta: {
-          breadcrumb: "تالارها",
-        },
-      },
-      {
-        path: "unreads/list",
-        name: "unReads",
-        file: "@chat/pages/Chat.vue",
-
-        meta: {
-          breadcrumb: "نخوانده",
-        },
-      },
-      {
-        path: "my-messages/list",
-        name: "myMessages",
-        file: "@chat/pages/Chat.vue",
-
-        meta: {
-          breadcrumb: "پیام های من",
-        },
-      },
-    ],
-  },
-];
diff --git a/routes/haditha.ts b/routes/haditha.ts
index 69fda5e..a127bf0 100644
--- a/routes/haditha.ts
+++ b/routes/haditha.ts
@@ -2,58 +2,58 @@ export default [
   {
     name: "haditha",
     path: "/haditha",
-    file: "~/systems/hadith_ui/pages/haditha/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/index.vue",
   },
   {
     name: "hadithaSearch",
     path: "/haditha/search",
-    file: "~/systems/hadith_ui/pages/haditha/search/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/search/index.vue",
   },
   {
     name: "hadithaSearchShow",
     path: "/haditha/search/:id/:slug?",
-    file: "~/systems/hadith_ui/pages/haditha/search/[id]/[slug]/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/search/[id]/[slug]/index.vue",
   },
 
   {
     name: "hadithaChatBot",
     path: "/haditha/chat-bot",
-    file: "~/systems/hadith_ui/pages/haditha/chat-bot.vue",
+    file: "~/systems/haditha_ui/pages/haditha/chat-bot.vue",
   },
   {
     name: "hadithaFavorites",
     path: "/haditha/favorites",
-    file: "~/systems/hadith_ui/pages/haditha/favorites/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/favorites/index.vue",
   },
   {
     name: "hadithaLibrary",
     path: "/haditha/library",
-    file: "~/systems/hadith_ui/pages/haditha/library/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/library/index.vue",
   },
   {
     name: "hadithaLibraryShow",
     path: "/haditha/library/:id/:slug?",
-    file: "~/systems/hadith_ui/pages/haditha/library/[id]/[slug]/index.vue",
+    file: "~/systems/haditha_ui/pages/haditha/library/[id]/[slug]/index.vue",
   },
   {
     name: "hadithaAbout",
     path: "/haditha/about-us",
-    file: "~/systems/hadith_ui/pages/haditha/public-pages/about-us.vue",
+    file: "~/systems/haditha_ui/pages/haditha/public-pages/about-us.vue",
   },
   {
     name: "hadithaContact",
     path: "/haditha/contact-us",
-    file: "~/systems/hadith_ui/pages/haditha/public-pages/contactus.vue",
+    file: "~/systems/haditha_ui/pages/haditha/public-pages/contactus.vue",
   },
   {
     name: "hadithaRules",
     path: "/haditha/rules",
-    file: "~/systems/hadith_ui/pages/haditha/public-pages/rules.vue",
+    file: "~/systems/haditha_ui/pages/haditha/public-pages/rules.vue",
   },
 
   {
     name: "hadithaLogin",
     path: "/haditha/login",
-    file: "~/systems/hadith_ui/pages/haditha/login.vue",
+    file: "~/systems/haditha_ui/pages/haditha/login.vue",
   }
 ];
diff --git a/routes/research.ts b/routes/research.ts
deleted file mode 100644
index aad5db6..0000000
--- a/routes/research.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export default [
-  {
-    name: "myResearches",
-    path: "/research/research-home",
-    file: "~/systems/research_ui/pages/index.vue",
-  },
-  {
-    name: "TermPage",
-    path: "/research/research-term",
-    file: "~/systems/research_ui/pages/TermPage.vue",
-  },
-];
diff --git a/routes/search.ts b/routes/search.ts
deleted file mode 100644
index 8aaeba3..0000000
--- a/routes/search.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export default [
-  {
-    name: "search",
-    path: "/search",
-    file: "~/systems/search_ui/pages/search/index.vue",
-  },
-  {
-    name: "searchNavigation",
-    path: "/search/lists",
-    file: "~/systems/search_ui/pages/search/lists.vue",
-  },
-  {
-    name: "searchChart",
-    path: "/search/charts",
-    file: "~/systems/search_ui/pages/search/charts.vue",
-  },
-  {
-    name: "showEntity",
-    path: "/search/:key/:id/show",
-    file: "~/systems/search_ui/pages/search/(show)/[key]/[id]/index.vue",
-  },
-  {
-    name: "navigationView",
-    path: "/search/:key/:id/list",
-    file: "~/systems/search_ui/pages/search/(show)/[key]/[id]/index.vue",
-  },
-  {
-    name: "entityResearch",
-    path: "/search/:key/:id/research",
-    file: "~/systems/search_ui/pages/search/(show)/[key]/[id]/index.vue",
-  },
-  {
-    name: "entityResearch",
-    path: "/search/:key/:id/detail",
-    file: "~/systems/search_ui/pages/search/(show)/[key]/[id]/index.vue",
-  },
-];
diff --git a/stores/commonStore.ts b/stores/commonStore.ts
index 59bf5e9..3ebef6b 100644
--- a/stores/commonStore.ts
+++ b/stores/commonStore.ts
@@ -29,6 +29,8 @@ export const useCommonStore = defineStore("commonStore", {
     storage: piniaPluginPersistedstate.localStorage(),
   },
   state: () => ({
+    vuexEntity: undefined, //پیدا نکردم
+
     // admin
     helpSchema: undefined as helpSchema | undefined,
     helpActiveSchema: undefined as helpActiveSchema | undefined,
@@ -87,6 +89,9 @@ export const useCommonStore = defineStore("commonStore", {
     sidebarMenu: {},
   }),
   getters: {
+    vuexEntityGetter(state) {
+      return state.vuexEntity;
+    },
     // admin
     helpSchemaGetter(state) {
       return state.helpSchema;
@@ -151,6 +156,9 @@ export const useCommonStore = defineStore("commonStore", {
     isShowHilightGetter: (state) => state.isShowHilight,
   },
   actions: {
+    vuexEntitySetter(vuexEntity = undefined) {
+      this.vuexEntity = vuexEntity;
+    },
     // admin
     helpSchemaSetter(helpSchema = undefined) {
       this.helpSchema = helpSchema;
@@ -185,7 +193,6 @@ export const useCommonStore = defineStore("commonStore", {
       this.collapsed = isCollapsed;
     },
 
-  
     SET_SECTIONS(jahatSection: JahatSection) {
       this.jahatSection = jahatSection;
     },
@@ -254,7 +261,6 @@ export const useCommonStore = defineStore("commonStore", {
     clearUser() {
       this.$reset();
     },
-    
 
     async getState() {
       const settingsApi = (await import("~/apis/adminApi")).default;
diff --git a/systems/chat_ui b/systems/chat_ui
deleted file mode 160000
index ce54af8..0000000
--- a/systems/chat_ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ce54af871a476562e3c1af352ddc2b1f6387d14b
diff --git a/systems/hadith_ui b/systems/hadith_ui
deleted file mode 160000
index 30cad30..0000000
--- a/systems/hadith_ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 30cad3040c56d83f6a576513446ca3a9e6d30ea6
diff --git a/systems/haditha_ui b/systems/haditha_ui
new file mode 160000
index 0000000..39528cf
--- /dev/null
+++ b/systems/haditha_ui
@@ -0,0 +1 @@
+Subproject commit 39528cfc046579aa69ad4b7668b0165552d844ba
diff --git a/systems/research_ui b/systems/research_ui
deleted file mode 160000
index c3aa660..0000000
--- a/systems/research_ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3aa6605ff449226a04817f0fb29a4b0f77654bc
diff --git a/systems/search_ui b/systems/search_ui
deleted file mode 160000
index 10369ca..0000000
--- a/systems/search_ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 10369cae2b704c8b563a5fe0624a9c724bbdf054