diff --git a/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts b/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts
index e611459960..3b948cf63d 100644
--- a/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts
+++ b/npm/ng-packs/packages/core/src/lib/actions/replaceable-components.actions.ts
@@ -1,5 +1,8 @@
 import { ReplaceableComponents } from '../models/replaceable-components';
 
+/**
+ * @see usage: https://github.com/abpframework/abp/pull/2522#issue-358333183
+ */
 export class AddReplaceableComponent {
   static readonly type = '[ReplaceableComponents] Add';
   constructor(public payload: ReplaceableComponents.ReplaceableComponent) {}
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
index ad052a2772..afdb024888 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
 import { ConfirmationService } from '../../services/confirmation.service';
-import { Confirmation, Toaster } from '../../models';
+import { Confirmation } from '../../models/confirmation';
 import { LocalizationService } from '@abp/ng.core';
+import { Toaster } from '../../models/toaster';
 
 @Component({
   selector: 'abp-confirmation',
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html
index c3529e99ff..88d45ff04b 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.html
@@ -5,7 +5,7 @@
   [style.bottom]="bottom || 'auto'"
   [style.left]="left || 'auto'"
   [style.display]="toasts.length ? 'flex' : 'none'"
-  [@toastInOut]="toasts.length - 1 || 0"
+  [@toastInOut]="toasts.length"
 >
   <abp-toast [toast]="toast" *ngFor="let toast of toasts; trackBy: trackByFunc"></abp-toast>
 </div>
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
index 72483622b6..124dcc5185 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast-container/toast-container.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Toaster } from '../../models';
-import { toastInOut } from '../../animations';
+import { Toaster } from '../../models/toaster';
+import { toastInOut } from '../../animations/toast.animations';
 import { ToasterService } from '../../services/toaster.service';
 
 @Component({
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts
index 6cda67167b..b4465934b6 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Toaster } from '../../models';
+import { Toaster } from '../../models/toaster';
 import { ToasterService } from '../../services/toaster.service';
 import { LocalizationService } from '@abp/ng.core';
 import snq from 'snq';