diff --git a/uniquely/keep-pwa/package.json b/uniquely/keep-pwa/package.json
index 2601bd2456..25f6eaedd1 100644
--- a/uniquely/keep-pwa/package.json
+++ b/uniquely/keep-pwa/package.json
@@ -4,6 +4,9 @@
   "description": "Alwatr Keep PWA.",
   "type": "module",
   "author": "S. Ali Mihandoost <ali.mihandoost@gmail.com> (https://ali.mihandoost.com)",
+  "contributors": [
+    "S. Amir Mohammad Najafi <njfamirm@gmail.com> (https://njfamirm.ir)"
+  ],
   "private": true,
   "engines": {
     "node": ">=18.13.0",
diff --git a/uniquely/keep-pwa/src/content/home-page-en.ts b/uniquely/keep-pwa/src/content/home-page-en.ts
index 34d9424643..2fd89e2ca0 100644
--- a/uniquely/keep-pwa/src/content/home-page-en.ts
+++ b/uniquely/keep-pwa/src/content/home-page-en.ts
@@ -1,4 +1,5 @@
 /* eslint-disable max-len */
+import {languageButtonClickEventListener} from '../manager/context.js';
 
 import type {PageHomeContent} from '../type.js';
 
@@ -7,15 +8,18 @@ export const homePageContent: PageHomeContent = {
     type: 'center',
     headline: 'Keep Collection',
     startIcon: {icon: 'menu-outline', flipRtl: true},
-    endIconList: [{icon: 'globe-outline', clickSignalId: 'language-button-click-event'}],
+    endIconList: [{icon: 'globe-outline', clickSignalId: languageButtonClickEventListener.id}],
   },
   about: {
     elevated: 1,
     stated: true,
     wide: true,
     headline: 'About Us',
-    description:
-      'Keep is an Iranian holding company in the field of building materials and stone veneer manufacturing. It is engaged in the production and distribution of construction services. The factory operates with the aim of distributing construction products in Iranian and international markets. The products produced by this collection are of high quality and are accompanied by experienced staff committed to customer satisfaction.',
+    slot: `
+      Keep is an Iranian holding company in the field of building materials and stone veneer manufacturing. It is engaged in the production and distribution of construction services.<br />
+      The factory operates with the aim of distributing construction products in Iranian and international markets.<br />
+      The products produced by this collection are of high quality and are accompanied by experienced staff committed to customer satisfaction.
+    `,
   },
   product: {
     elevated: 1,
diff --git a/uniquely/keep-pwa/src/content/home-page-fa.ts b/uniquely/keep-pwa/src/content/home-page-fa.ts
index 2a84d7e7dc..0639863bb0 100644
--- a/uniquely/keep-pwa/src/content/home-page-fa.ts
+++ b/uniquely/keep-pwa/src/content/home-page-fa.ts
@@ -2,6 +2,8 @@
 
 import {replaceNumber} from '@alwatr/i18n';
 
+import {languageButtonClickEventListener} from '../manager/context.js';
+
 import type {PageHomeContent} from '../type.js';
 
 export const homePageContent: PageHomeContent = {
@@ -9,14 +11,18 @@ export const homePageContent: PageHomeContent = {
     type: 'center',
     headline: 'مجموعه کیپ',
     startIcon: {icon: 'menu-outline', flipRtl: true},
-    endIconList: [{icon: 'globe-outline', clickSignalId: 'language-button-click-event'}],
+    endIconList: [{icon: 'globe-outline', clickSignalId: languageButtonClickEventListener.id}],
   },
   about: {
     elevated: 1,
     stated: true,
     wide: true,
     headline: 'درباره ما',
-    description: 'شرکت تولیدی keep مصالح ساختمانی و اسکوپ  سنگ‌نما هلدینگی ایرانی است که در زمینه تولید و توزیع خدمات ساختمانی فعالیت دارد. این کارخانه با هدف توزیع محصولات ساختمانی در بازارهای ایرانی و خارجی مشغول به فعالیت می‌باشد. محصولات تولیدی این مجموعه با کیفیت بالا و کادری مجرب و تعهد به اصول جلب رضایت مشتری می‌باشد.',
+    slot: `
+      شرکت تولیدی Keep مصالح ساختمانی و اسکوپ  سنگ‌نما هلدینگی ایرانی است که در زمینه تولید و توزیع خدمات ساختمانی فعالیت دارد.<br />
+      این کارخانه با هدف توزیع محصولات ساختمانی در بازارهای ایرانی و خارجی مشغول به فعالیت می‌باشد.<br />
+      محصولات تولیدی این مجموعه با کیفیت بالا و کادری مجرب و تعهد به اصول جلب رضایت مشتری می‌باشد.
+    `,
   },
   product: {
     elevated: 1,
diff --git a/uniquely/keep-pwa/src/manager/context.ts b/uniquely/keep-pwa/src/manager/context.ts
index cdfd3cce59..629e6cccb7 100644
--- a/uniquely/keep-pwa/src/manager/context.ts
+++ b/uniquely/keep-pwa/src/manager/context.ts
@@ -6,10 +6,10 @@ import type {ClickSignalType} from '@alwatr/type';
 export * from '@alwatr/pwa-helper/context.js';
 
 export const homePageContentContextProvider =
-  contextProvider.bind<PageHomeContent>('home-page-content-context');
+  contextProvider.bind<PageHomeContent>('home_page_content_context');
 export const homePageContentContextConsumer =
   contextConsumer.bind<PageHomeContent>(homePageContentContextProvider.id);
 
-export const languageButtonClickEventListener = eventListener.bind<ClickSignalType>('language-button-click-event');
+export const languageButtonClickEventListener = eventListener.bind<ClickSignalType>('language_button_click_event');
 
-export const submitFormCommandTrigger = commandTrigger.bind<FormData, boolean>('submit-form-command');
+export const submitFormCommandTrigger = commandTrigger.bind<FormData, boolean>('submit_form_command');
diff --git a/uniquely/keep-pwa/src/ui/page/404.ts b/uniquely/keep-pwa/src/ui/page/404.ts
index 258a1f3643..426d013b52 100644
--- a/uniquely/keep-pwa/src/ui/page/404.ts
+++ b/uniquely/keep-pwa/src/ui/page/404.ts
@@ -21,7 +21,7 @@ declare global {
 }
 
 /**
- * Alwatr Demo Home Page
+ * Alwatr 404 Page
  */
 @customElement('alwatr-page-404')
 export class AlwatrPage404 extends UnresolvedMixin(LocalizeMixin(SignalMixin(AlwatrBaseElement))) {
diff --git a/uniquely/keep-pwa/src/ui/page/home.ts b/uniquely/keep-pwa/src/ui/page/home.ts
index 668eb1eaa5..266cc16f35 100644
--- a/uniquely/keep-pwa/src/ui/page/home.ts
+++ b/uniquely/keep-pwa/src/ui/page/home.ts
@@ -10,7 +10,7 @@ import {
   mapIterable,
   UnresolvedMixin,
 } from '@alwatr/element';
-import {localeContextConsumer, message} from '@alwatr/i18n';
+import {message} from '@alwatr/i18n';
 import '@alwatr/ui-kit/card/icon-box.js';
 
 import {homePageContentContextConsumer, topAppBarContextProvider} from '../../manager/context.js';
@@ -74,15 +74,12 @@ export class AlwatrPageHome extends UnresolvedMixin(SignalMixin(AlwatrBaseElemen
   }
 
   protected* _menuTemplate(): unknown {
-    yield html`<img class="logo" src="image/keep.svg" alt="Keep Company Logo" />`;
+    yield html`<img class="logo" src="image/keep.svg" alt="Keep Collection Logo" />`;
     yield this._boxTemplate(this?.content?.about);
     yield this._boxTemplate(this?.content?.product);
     yield html`<alwatr-collaboration-box></alwatr-collaboration-box>`;
     yield this._boxTemplate(this?.content?.catalogue);
     yield mapIterable(this, this?.content?.socialList, this._boxTemplate, message('loading'));
-    if (localeContextConsumer.getValue()?.language === 'fa') {
-      yield this._boxTemplate(this?.content?.agency as BoxType);
-    }
   }
 
   protected _boxTemplate(box?: BoxType): unknown {