diff --git a/npm/ng-packs/packages/cms-kit/README.md b/npm/ng-packs/packages/cms-kit/README.md
index e0fd2fce15..a471ac2eb2 100644
--- a/npm/ng-packs/packages/cms-kit/README.md
+++ b/npm/ng-packs/packages/cms-kit/README.md
@@ -21,7 +21,6 @@ npm install @abp/ng.cms-kit
 
 ```typescript
 import { provideCmsKitAdminConfig } from '@abp/ng.cms-kit/admin/config';
-import { createRoutes } from '@abp/ng.cms-kit/admin';
 
 // In your app config
 export const appConfig: ApplicationConfig = {
@@ -34,7 +33,7 @@ export const appConfig: ApplicationConfig = {
 // In your routes
 export const routes: Routes = [
   {
-    path: 'cms-kit',
+    path: 'cms',
     loadChildren: () => import('@abp/ng.cms-kit/admin').then(m => m.createRoutes()),
   },
 ];
@@ -44,7 +43,6 @@ export const routes: Routes = [
 
 ```typescript
 import { provideCmsKitPublicConfig } from '@abp/ng.cms-kit/public/config';
-import { createRoutes } from '@abp/ng.cms-kit/public';
 
 // In your app config
 export const appConfig: ApplicationConfig = {
@@ -57,7 +55,7 @@ export const appConfig: ApplicationConfig = {
 // In your routes
 export const routes: Routes = [
   {
-    path: 'cms-kit',
+    path: 'cms',
     loadChildren: () => import('@abp/ng.cms-kit/public').then(m => m.createRoutes()),
   },
 ];
diff --git a/npm/ng-packs/packages/cms-kit/package.json b/npm/ng-packs/packages/cms-kit/package.json
index 6f5c6f8016..db04bd00b7 100644
--- a/npm/ng-packs/packages/cms-kit/package.json
+++ b/npm/ng-packs/packages/cms-kit/package.json
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@abp/ng.components": "~10.0.0-rc.3",
+    "@abp/ng.setting-management": "~10.0.0-rc.3",
     "@abp/ng.theme.shared": "~10.0.0-rc.3",
     "@toast-ui/editor": "~3.0.0",
     "codemirror": "~6.0.0",
diff --git a/npm/ng-packs/packages/cms-kit/public/config/src/providers/route.provider.ts b/npm/ng-packs/packages/cms-kit/public/config/src/providers/route.provider.ts
index e4ce26c5e1..dfb2f1394d 100644
--- a/npm/ng-packs/packages/cms-kit/public/config/src/providers/route.provider.ts
+++ b/npm/ng-packs/packages/cms-kit/public/config/src/providers/route.provider.ts
@@ -13,17 +13,17 @@ export function configureRoutes() {
   const routesService = inject(RoutesService);
   routesService.add([
     {
-      path: '/cms-kit/pages/:slug',
+      path: '/cms/pages/:slug',
       name: eCmsKitPublicRouteNames.Pages,
       requiredPolicy: eCmsKitPublicPolicyNames.Pages,
     },
     {
-      path: '/cms-kit/blogs',
+      path: '/cms/blogs',
       name: eCmsKitPublicRouteNames.Blogs,
       requiredPolicy: eCmsKitPublicPolicyNames.Blogs,
     },
     {
-      path: '/cms-kit/blogs/:blogSlug/:blogPostSlug',
+      path: '/cms/blogs/:blogSlug/:blogPostSlug',
       name: eCmsKitPublicRouteNames.BlogPosts,
       requiredPolicy: eCmsKitPublicPolicyNames.Blogs,
     },
diff --git a/npm/ng-packs/packages/cms-kit/public/config/src/public-api.ts b/npm/ng-packs/packages/cms-kit/public/config/src/public-api.ts
index 0003cebbef..f02a1bd71c 100644
--- a/npm/ng-packs/packages/cms-kit/public/config/src/public-api.ts
+++ b/npm/ng-packs/packages/cms-kit/public/config/src/public-api.ts
@@ -1,2 +1,3 @@
+// TODO public configuration will be implemented later
 export * from './enums';
 export * from './providers';
diff --git a/npm/ng-packs/packages/cms-kit/public/src/lib/cms-kit-public.routes.ts b/npm/ng-packs/packages/cms-kit/public/src/lib/cms-kit-public.routes.ts
index 3d6cdea1dc..d059b27de6 100644
--- a/npm/ng-packs/packages/cms-kit/public/src/lib/cms-kit-public.routes.ts
+++ b/npm/ng-packs/packages/cms-kit/public/src/lib/cms-kit-public.routes.ts
@@ -1,7 +1,6 @@
 import { Routes } from '@angular/router';
 import { Provider } from '@angular/core';
-import { RouterOutletComponent, ReplaceableRouteContainerComponent } from '@abp/ng.core';
-import { eCmsKitPublicComponents } from './enums';
+import { RouterOutletComponent } from '@abp/ng.core';
 
 export interface CmsKitPublicConfigOptions {
   // Extension point contributors
diff --git a/npm/ng-packs/packages/cms-kit/public/src/lib/components/index.ts b/npm/ng-packs/packages/cms-kit/public/src/lib/components/index.ts
index d96c0b7b47..ee1fdc5abf 100644
--- a/npm/ng-packs/packages/cms-kit/public/src/lib/components/index.ts
+++ b/npm/ng-packs/packages/cms-kit/public/src/lib/components/index.ts
@@ -1,5 +1 @@
 // Components will be exported here
-// export * from './pages';
-// export * from './blogs';
-// export * from './comments';
-// export * from './shared';
diff --git a/npm/ng-packs/packages/cms-kit/public/src/lib/public-api.ts b/npm/ng-packs/packages/cms-kit/public/src/lib/public-api.ts
index f1724c6076..85877964c4 100644
--- a/npm/ng-packs/packages/cms-kit/public/src/lib/public-api.ts
+++ b/npm/ng-packs/packages/cms-kit/public/src/lib/public-api.ts
@@ -1,7 +1,4 @@
-// export * from './components';
 export * from './enums';
 export * from './models';
-// export * from './services';
 export * from './tokens';
 export * from './resolvers';
-// export * from './cms-kit-public.routes';
diff --git a/npm/ng-packs/packages/cms-kit/public/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/cms-kit/public/src/lib/resolvers/extensions.resolver.ts
index 092c5367bf..44540414cd 100644
--- a/npm/ng-packs/packages/cms-kit/public/src/lib/resolvers/extensions.resolver.ts
+++ b/npm/ng-packs/packages/cms-kit/public/src/lib/resolvers/extensions.resolver.ts
@@ -1,7 +1,6 @@
 import { ResolveFn } from '@angular/router';
 
 // Resolvers will be defined here
-// Example:
 // export const cmsKitPublicResolver: ResolveFn<any> = (route, state) => {
 //   // Resolver implementation
 //   return null;
diff --git a/npm/ng-packs/packages/cms-kit/public/src/lib/services/index.ts b/npm/ng-packs/packages/cms-kit/public/src/lib/services/index.ts
deleted file mode 100644
index 159868b2f3..0000000000
--- a/npm/ng-packs/packages/cms-kit/public/src/lib/services/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Services will be exported here
-// export * from './pages';
-// export * from './blogs';
-// export * from './comments';
-// export * from './menus';
-// export * from './global-resources';
-// export * from './marked-items';
diff --git a/npm/ng-packs/packages/cms-kit/src/components/toast-ui/toastui-editor.component.ts b/npm/ng-packs/packages/cms-kit/src/components/toast-ui/toastui-editor.component.ts
index 00095ef5ce..321c883bb5 100644
--- a/npm/ng-packs/packages/cms-kit/src/components/toast-ui/toastui-editor.component.ts
+++ b/npm/ng-packs/packages/cms-kit/src/components/toast-ui/toastui-editor.component.ts
@@ -1,5 +1,5 @@
-import { AbpLocalStorageService } from '@abp/ng.core';
 import { isPlatformBrowser } from '@angular/common';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import {
   Component,
   AfterViewInit,
@@ -7,12 +7,12 @@ import {
   ElementRef,
   forwardRef,
   inject,
-  DOCUMENT,
   PLATFORM_ID,
 } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import Editor from '@toast-ui/editor';
 
+import { AbpLocalStorageService } from '@abp/ng.core';
+
 @Component({
   selector: 'abp-toastui-editor',
   template: `<div #editorContainer></div>`,
@@ -31,7 +31,6 @@ export class ToastuiEditorComponent implements AfterViewInit, ControlValueAccess
   private editor!: Editor;
   private value = '';
 
-  private document = inject(DOCUMENT);
   private platformId = inject(PLATFORM_ID);
   private localStorageService = inject(AbpLocalStorageService);