diff --git a/projects/core/src/directives/input-autosize.directive.ts b/projects/core/src/directives/input-autosize.directive.ts
index 80fe8b96..e3942cc6 100644
--- a/projects/core/src/directives/input-autosize.directive.ts
+++ b/projects/core/src/directives/input-autosize.directive.ts
@@ -1,8 +1,8 @@
 import { Directive, ElementRef, inject, NgZone, OnInit } from '@angular/core';
+import { MatInput } from '@angular/material/input';
 import { debounceTime, fromEvent, mergeWith, of, startWith, takeUntil } from 'rxjs';
 
 import { NgxDestroy } from './destroy';
-import { MatInput } from '@angular/material/input';
 
 @Directive({
     selector: '[ngx-input-autosize][matInput], [ngx-input-autosize] [matInput]',
diff --git a/projects/date-picker/src/datepicker-with-time/datepicker-with-time.component.ts b/projects/date-picker/src/datepicker-with-time/datepicker-with-time.component.ts
index 16a248ff..39ab1e03 100644
--- a/projects/date-picker/src/datepicker-with-time/datepicker-with-time.component.ts
+++ b/projects/date-picker/src/datepicker-with-time/datepicker-with-time.component.ts
@@ -1,5 +1,6 @@
 import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, inject, OnDestroy, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { DateAdapter } from '@angular/material/core';
 import { MatDatepicker, MatDatepickerInput, MatDatepickerModule, MatDateSelectionModel } from '@angular/material/datepicker';
 import { NgxDestroy } from '@hug/ngx-core';
@@ -8,7 +9,6 @@ import { cloneDeep } from 'lodash-es';
 import { delay, filter, map, takeUntil, tap } from 'rxjs';
 
 import { DATE_TIME_ADAPTER, DateTimeAdapter } from '../date-adapter/date-time-adapter';
-import { MatButtonModule } from '@angular/material/button';
 
 
 @Component({
diff --git a/projects/demo-app/src/app/date-picker/date-picker-demo.component.ts b/projects/demo-app/src/app/date-picker/date-picker-demo.component.ts
index eb8d1038..6585845e 100644
--- a/projects/demo-app/src/app/date-picker/date-picker-demo.component.ts
+++ b/projects/demo-app/src/app/date-picker/date-picker-demo.component.ts
@@ -10,8 +10,13 @@ import { AsyncPipe, DatePipe, NgIf, registerLocaleData } from '@angular/common';
 import localeFrCh from '@angular/common/locales/fr-CH';
 import { ChangeDetectionStrategy, Component, Injectable, LOCALE_ID, ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, ValidationErrors } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatDateFormats } from '@angular/material/core';
 import { DateRange, MatCalendarCellClassFunction, MatDatepickerModule } from '@angular/material/datepicker';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatTabsModule } from '@angular/material/tabs';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { DateFnsAdapter } from '@angular/material-date-fns-adapter';
 import { NgxDestroy, setLocale } from '@hug/ngx-core';
@@ -19,11 +24,6 @@ import { NgxDatepickerButtonsComponent, NgxDatepickerMaskDirective, NgxDatepicke
 import { addDays, addMonths, endOfMonth, startOfDay, startOfMonth } from 'date-fns';
 import { frCH } from 'date-fns/locale';
 import { debounceTime, ReplaySubject, takeUntil } from 'rxjs';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatTabsModule } from '@angular/material/tabs';
 
 registerLocaleData(localeFrCh);
 setLocale(frCH);
diff --git a/projects/status/src/status-detail/status-detail.module.ts b/projects/status/src/status-detail/status-detail.module.ts
index 3e02b9ab..7f2111ec 100644
--- a/projects/status/src/status-detail/status-detail.module.ts
+++ b/projects/status/src/status-detail/status-detail.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { NgxAbstractLazyModule } from '@hug/ngx-core';
 import { NgxMessageBoxComponent } from '@hug/ngx-message-box';
 
 import { NgxStatusDetailComponent } from './status-detail.component';
-import { MatButtonModule } from '@angular/material/button';
 
 @NgModule({
     declarations: [NgxStatusDetailComponent],
diff --git a/projects/status/src/status.module.ts b/projects/status/src/status.module.ts
index 4c8debc5..85afd3b9 100644
--- a/projects/status/src/status.module.ts
+++ b/projects/status/src/status.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { NgxAbstractLazyModule } from '@hug/ngx-core';
 import { NgxSnackbarComponent } from '@hug/ngx-snackbar';
 
 import { NgxStatusComponent } from './status.component';
-import { MatButtonModule } from '@angular/material/button';
 
 @NgModule({
     declarations: [NgxStatusComponent],