diff --git a/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts b/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
index 5d4d1ab454..05f7a12250 100644
--- a/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
+++ b/npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
@@ -58,6 +58,7 @@ function transformRoutes(routes: Routes = [], wrappers: ABP.FullRoute[] = []): a
 
       if (transformed.length === length) {
         transformed.push({
+          ...route.data.routes,
           path: route.path,
           name: snq(() => route.data.routes.name, route.path),
           children: route.data.routes.children || [],
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
index a978a5c3da..2fe5dabae4 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
@@ -1,22 +1,20 @@
 import { CoreModule } from '@abp/ng.core';
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { ChangePasswordComponent } from './components/change-password/change-password.component';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
+import { NgxsModule } from '@ngxs/store';
+import { ToastModule } from 'primeng/toast';
 import { AccountLayoutComponent } from './components/account-layout/account-layout.component';
 import { ApplicationLayoutComponent } from './components/application-layout/application-layout.component';
 import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component';
 import { LayoutComponent } from './components/layout/layout.component';
-import { ProfileComponent } from './components/profile/profile.component';
-import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { ToastModule } from 'primeng/toast';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { NgxsModule } from '@ngxs/store';
 import { LayoutState } from './states/layout.state';
 
 export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent];
 
 @NgModule({
-  declarations: [...LAYOUTS, LayoutComponent, ChangePasswordComponent, ProfileComponent],
+  declarations: [...LAYOUTS, LayoutComponent],
   imports: [
     CoreModule,
     ThemeSharedModule,
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.html
similarity index 100%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.html
rename to npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.html
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
similarity index 97%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
index 6c372a4620..00d285b3c5 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
@@ -1,5 +1,4 @@
 import { ChangePassword } from '@abp/ng.core';
-import { ToasterService } from '@abp/ng.theme.shared';
 import {
   Component,
   EventEmitter,
@@ -16,6 +15,7 @@ import { comparePasswords } from '@ngx-validate/core';
 import { Store } from '@ngxs/store';
 import snq from 'snq';
 import { finalize } from 'rxjs/operators';
+import { ToasterService } from '../../services/toaster.service';
 
 const { minLength, required } = Validators;
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
index 2e559f366f..3d94c64329 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
@@ -1,5 +1,7 @@
 export * from './button/button.component';
+export * from './change-password/change-password.component';
 export * from './confirmation/confirmation.component';
 export * from './loader-bar/loader-bar.component';
 export * from './modal/modal.component';
+export * from './profile/profile.component';
 export * from './toast/toast.component';
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.html
similarity index 100%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.html
rename to npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.html
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.ts
similarity index 100%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.ts
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index bf2b9e411a..ffa3ee3f44 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -15,6 +15,8 @@ import styles from './contants/styles';
 import { ErrorHandler } from './handlers/error.handler';
 import { ButtonComponent } from './components/button/button.component';
 import { ValidationErrorComponent } from './components/errors/validation-error.component';
+import { ChangePasswordComponent } from './components/change-password/change-password.component';
+import { ProfileComponent } from './components/profile/profile.component';
 
 export function appendScript(injector: Injector) {
   const fn = function() {
@@ -61,8 +63,19 @@ export function appendScript(injector: Injector) {
     ErrorComponent,
     LoaderBarComponent,
     ValidationErrorComponent,
+    ChangePasswordComponent,
+    ProfileComponent,
+  ],
+  exports: [
+    NgbModalModule,
+    ButtonComponent,
+    ConfirmationComponent,
+    ToastComponent,
+    ModalComponent,
+    LoaderBarComponent,
+    ChangePasswordComponent,
+    ProfileComponent,
   ],
-  exports: [NgbModalModule, ButtonComponent, ConfirmationComponent, ToastComponent, ModalComponent, LoaderBarComponent],
   entryComponents: [ErrorComponent, ValidationErrorComponent],
 })
 export class ThemeSharedModule {