diff --git a/npm/ng-packs/packages/account/src/lib/account.module.ts b/npm/ng-packs/packages/account/src/lib/account.module.ts
index 3923ff4e17..93a496f8b5 100644
--- a/npm/ng-packs/packages/account/src/lib/account.module.ts
+++ b/npm/ng-packs/packages/account/src/lib/account.module.ts
@@ -3,7 +3,6 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule, Provider } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { TableModule } from 'primeng/table';
 import { AccountRoutingModule } from './account-routing.module';
 import { ChangePasswordComponent } from './components/change-password/change-password.component';
 import { LoginComponent } from './components/login/login.component';
@@ -29,7 +28,6 @@ import { AuthWrapperComponent } from './components/auth-wrapper/auth-wrapper.com
     CoreModule,
     AccountRoutingModule,
     ThemeSharedModule,
-    TableModule,
     NgbDropdownModule,
     NgxValidateCoreModule,
   ],
diff --git a/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts
index 7e7f932e24..56d0874ebd 100644
--- a/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts
+++ b/npm/ng-packs/packages/core/src/lib/actions/config.actions.ts
@@ -1,4 +1,4 @@
-import { ABP } from '../models';
+import { ABP } from '../models/common';
 
 export class PatchRouteByName {
   static readonly type = '[Config] Patch Route By Name';
diff --git a/npm/ng-packs/packages/core/src/lib/utils/route-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/route-utils.ts
index 8bbbee60ec..51abe4218b 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/route-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/route-utils.ts
@@ -1,4 +1,4 @@
-import { ABP } from '../models';
+import { ABP } from '../models/common';
 
 export function organizeRoutes(
   routes: ABP.FullRoute[],
@@ -33,7 +33,10 @@ export function organizeRoutes(
   return filteredRoutes;
 }
 
-export function setChildRoute(routes: ABP.FullRoute[], parentNameArr: ABP.FullRoute[]): ABP.FullRoute[] {
+export function setChildRoute(
+  routes: ABP.FullRoute[],
+  parentNameArr: ABP.FullRoute[],
+): ABP.FullRoute[] {
   return routes.map(route => {
     if (route.children && route.children.length) {
       route.children = setChildRoute(route.children, parentNameArr);
diff --git a/npm/ng-packs/packages/identity/src/lib/identity.module.ts b/npm/ng-packs/packages/identity/src/lib/identity.module.ts
index 20a332c6ce..f11562a11f 100644
--- a/npm/ng-packs/packages/identity/src/lib/identity.module.ts
+++ b/npm/ng-packs/packages/identity/src/lib/identity.module.ts
@@ -8,7 +8,6 @@ import { NgbTabsetModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { UsersComponent } from './components/users/users.component';
 import { PermissionManagementModule } from '@abp/ng.permission-management';
-import { TableModule } from 'primeng/table';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
 
 @NgModule({
@@ -19,7 +18,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
     IdentityRoutingModule,
     NgbTabsetModule,
     ThemeSharedModule,
-    TableModule,
     NgbDropdownModule,
     PermissionManagementModule,
     NgxValidateCoreModule,
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts
index 218eda45fa..707762ff4b 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management.module.ts
@@ -3,7 +3,6 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule, Provider } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { NgxsModule } from '@ngxs/store';
-import { TableModule } from 'primeng/table';
 import { TenantsComponent } from './components/tenants/tenants.component';
 import { TenantManagementState } from './states/tenant-management.state';
 import { TenantManagementRoutingModule } from './tenant-management-routing.module';
@@ -17,7 +16,6 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
     NgxsModule.forFeature([TenantManagementState]),
     NgxValidateCoreModule,
     CoreModule,
-    TableModule,
     ThemeSharedModule,
     NgbDropdownModule,
     FeatureManagementModule,
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 00d651f9af..827983b15f 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
@@ -4,7 +4,6 @@ import { NgModule } from '@angular/core';
 import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 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';
@@ -21,7 +20,6 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
     ThemeSharedModule,
     NgbCollapseModule,
     NgbDropdownModule,
-    ToastModule,
     NgxValidateCoreModule,
     NgxsModule.forFeature([LayoutState]),
     NgxValidateCoreModule.forRoot({
@@ -29,9 +27,11 @@ export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, Empt
       blueprints: {
         email: 'AbpAccount::ThisFieldIsNotAValidEmailAddress.',
         max: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
-        maxlength: 'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthoOf{0}[{{ requiredLength }}]',
+        maxlength:
+          'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthoOf{0}[{{ requiredLength }}]',
         min: 'AbpAccount::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
-        minlength: 'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}[{{ requiredLength }}]',
+        minlength:
+          'AbpAccount::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}[{{ requiredLength }}]',
         required: 'AbpAccount::ThisFieldIsRequired.',
         passwordMismatch: 'AbpIdentity::Identity.PasswordConfirmationFailed',
       },
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
index 7975fd9833..fedf870c4a 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
@@ -190,8 +190,8 @@ export class ErrorHandler {
       if (body.details) {
         message = body.details;
         title = body.message;
-      } else if (body.code) {
-        title = body.code;
+      } else if (body.message) {
+        title = DEFAULT_ERROR_MESSAGES.defaultError.title;
         message = body.message;
       } else {
         message = body.message || DEFAULT_ERROR_MESSAGES.defaultError.title;
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
index aa2481419d..918ed4e314 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts
@@ -3,7 +3,6 @@ import { Component } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { NgxsModule } from '@ngxs/store';
-import { MessageService } from 'primeng/components/common/messageservice';
 import { ConfirmationService } from '../services/confirmation.service';
 import { ThemeSharedModule } from '../theme-shared.module';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -24,7 +23,6 @@ describe('ConfirmationService', () => {
   const createComponent = createComponentFactory({
     component: DummyComponent,
     imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
-    providers: [MessageService],
     mocks: [OAuthService],
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
index aa22e9c567..d2f2c11e3d 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.handler.spec.ts
@@ -6,7 +6,6 @@ import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
 import { NgxsModule, Store } from '@ngxs/store';
 import { DEFAULT_ERROR_MESSAGES, ErrorHandler } from '../handlers';
 import { ThemeSharedModule } from '../theme-shared.module';
-import { MessageService } from 'primeng/components/common/messageservice';
 import { RouterError, RouterDataResolved } from '@ngxs/router-plugin';
 import { NavigationError, ResolveEnd } from '@angular/router';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
index ead6d29a23..3bdf2e9d07 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts
@@ -1,8 +1,6 @@
 import { LocalizationPipe } from '@abp/ng.core';
 import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
 import { Store } from '@ngxs/store';
-import { MessageService } from 'primeng/components/common/messageservice';
-import { ToastModule } from 'primeng/toast';
 import { timer } from 'rxjs';
 import { ButtonComponent, ConfirmationComponent, ModalComponent } from '../components';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -16,9 +14,8 @@ describe('ModalComponent', () => {
   let disappearFn;
   const createHost = createHostFactory({
     component: ModalComponent,
-    imports: [ToastModule, RouterTestingModule],
+    imports: [RouterTestingModule],
     declarations: [ConfirmationComponent, LocalizationPipe, ButtonComponent],
-    providers: [MessageService],
     mocks: [Store],
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts
index 7c342174e6..f359518099 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/table-sort.directive.spec.ts
@@ -1,5 +1,4 @@
 import { SpectatorDirective, createDirectiveFactory } from '@ngneat/spectator/jest';
-import { TableModule, Table } from 'primeng/table';
 import { TableSortDirective } from '../directives/table-sort.directive';
 
 describe('TableSortDirective', () => {
@@ -7,11 +6,12 @@ describe('TableSortDirective', () => {
   let directive: TableSortDirective;
   const createDirective = createDirectiveFactory({
     directive: TableSortDirective,
-    imports: [TableModule],
   });
 
   beforeEach(() => {
-    spectator = createDirective(`<p-table [value]="[1,4,2]" [abpTableSort]="{ order: 'asc' }"></p-table>`);
+    spectator = createDirective(
+      `<p-table [value]="[1,4,2]" [abpTableSort]="{ order: 'asc' }"></p-table>`,
+    );
     directive = spectator.directive;
   });
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
index 23e99b8204..1ac1116c78 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
@@ -3,7 +3,6 @@ import { Component } from '@angular/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
 import { NgxsModule } from '@ngxs/store';
-import { MessageService } from 'primeng/components/common/messageservice';
 import { ToasterService } from '../services/toaster.service';
 import { ThemeSharedModule } from '../theme-shared.module';
 import { OAuthService } from 'angular-oauth2-oidc';
@@ -24,7 +23,6 @@ describe('ToasterService', () => {
   const createComponent = createComponentFactory({
     component: DummyComponent,
     imports: [CoreModule, ThemeSharedModule.forRoot(), NgxsModule.forRoot(), RouterTestingModule],
-    providers: [MessageService],
     mocks: [OAuthService],
   });
 
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 69d719fe08..33e6144446 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
@@ -3,8 +3,6 @@ import { DatePipe } from '@angular/common';
 import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core';
 import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { MessageService } from 'primeng/components/common/messageservice';
-import { ToastModule } from 'primeng/toast';
 import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component';
 import { ButtonComponent } from './components/button/button.component';
 import { ChartComponent } from './components/chart/chart.component';
@@ -40,7 +38,7 @@ export function appendScript(injector: Injector) {
 }
 
 @NgModule({
-  imports: [CoreModule, ToastModule, NgxValidateCoreModule],
+  imports: [CoreModule, NgxValidateCoreModule],
   declarations: [
     BreadcrumbComponent,
     ButtonComponent,
@@ -92,7 +90,6 @@ export class ThemeSharedModule {
           deps: [Injector],
           useFactory: appendScript,
         },
-        { provide: MessageService, useClass: MessageService },
         { provide: HTTP_ERROR_CONFIG, useValue: options.httpErrorConfig },
         {
           provide: 'HTTP_ERROR_CONFIG',