diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
index 4710abd175..f865d6da43 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
+++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.scss
@@ -8,59 +8,54 @@ adf-aspect-list-dialog {
     }
 }
 
-.adf {
-    &-aspect-list-dialog-title {
-        font-size: large;
-        font-weight: 200;
-        margin-top: 0;
+.adf-aspect-list-dialog-title {
+    font-size: large;
+    font-weight: 200;
+    margin-top: 0;
+}
+
+.adf-aspect-list-dialog-description {
+    font-size: small;
+    line-height: normal;
+}
+
+.adf-aspect-list-dialog-information {
+    display: flex;
+    justify-content: space-between;
+    padding-bottom: 4px;
+    padding-left: 4px;
+    padding-right: 4px;
+    font-size: small;
+}
+
+.adf-aspect-list-dialog {
+    justify-content: space-between;
+    padding-left: 4px;
+    padding-right: 4px;
+    padding-top: 0;
+
+    &::before {
+        display: none;
     }
+}
 
-    &-aspect-list-dialog-description {
-        font-size: small;
-        line-height: normal;
-    }
+.adf-aspect-dialog-content {
+    padding: 0;
+    margin-bottom: 8px;
 
-    &-aspect-list-dialog-information {
-        display: flex;
-        justify-content: space-between;
-        padding-bottom: 4px;
-        padding-left: 4px;
-        padding-right: 4px;
-        font-size: small;
-    }
-
-    &-aspect-list-dialog {
-        justify-content: space-between;
-        padding-left: 4px;
-        padding-right: 4px;
-        padding-top: 0;
-
-        #{ms.$mat-dialog-content} {
-            padding: 0;
+    .adf-aspect-property-table {
+        .adf-aspect-property-table-cell {
+            font-size: smaller;
+            color: var(--adf-theme-foreground-text-color-087);
         }
 
-        &::before {
-            display: none;
-        }
-    }
-
-    &-aspect-dialog-content {
-        margin-bottom: 8px;
-
-        .adf-aspect-property-table {
-            .adf-aspect-property-table-cell {
-                font-size: smaller;
-                color: var(--adf-theme-foreground-text-color-087);
+        .adf-aspect-property-table-column {
+            &-name {
+                width: 30%;
             }
 
-            .adf-aspect-property-table-column {
-                &-name {
-                    width: 30%;
-                }
-
-                &-title {
-                    width: 50%;
-                }
+            &-title {
+                width: 50%;
             }
         }
     }
diff --git a/lib/content-services/src/lib/mat-selectors.scss b/lib/content-services/src/lib/mat-selectors.scss
index 5d1e8a9626..67c862710a 100644
--- a/lib/content-services/src/lib/mat-selectors.scss
+++ b/lib/content-services/src/lib/mat-selectors.scss
@@ -1,96 +1,38 @@
 /* Variables in this file are used in the Angular Material library. Do not modify them unless you know what you are doing. */
 
-$material-icons: '.material-icons';
 $mat-icon: '.mat-icon';
-$mat-icon-button: '.mat-mdc-icon-button';
-$mat-icon-button-hover: '.mdc-icon-button__ripple';
-$mat-accent: '.mat-accent';
 $mat-focused: '.mat-focused';
 $mat-line: '.mat-line';
 $mat-tab-label: '.mat-mdc-tab';
-$mat-tab-label-active: '.mdc-tab--active';
-$mat-tab-label-content: '.mdc-tab__content';
-$mat-tab-label-container: '.mat-mdc-tab-label-container';
 $mat-expansion-panel-body: '.mat-expansion-panel-body';
 $mat-tab-label-text: '.mdc-tab__text-label';
-$mat-tab-list: '.mat-mdc-tab-list';
-$mat-tab-body: '.mat-mdc-tab-body';
-$mat-tab-body-wrapper: '.mat-mdc-tab-body-wrapper';
-$mat-tab-body-content: '.mat-mdc-tab-body-content';
 $mat-tab-header: '.mat-mdc-tab-header';
-$mat-tab-labels: '.mat-mdc-tab-labels';
-$mat-tab-ink-bar: '.mdc-tab-indicator';
 $mat-chip: '.mat-mdc-chip';
-$mat-chip-list: '.mat-mdc-chip-list';
-$mat-chip-list-wrapper: '.mat-chip-list-wrapper';
 $mat-checkbox: '.mat-mdc-checkbox';
 $mat-checkbox-box: '.mdc-checkbox';
-$mat-checkbox-frame: '.mdc-checkbox__checkmark';
-$mat-checkbox-label: '.mdc-label';
-$mat-checkbox-checked: '.mat-mdc-checkbox-checked';
 $mat-button: '.mat-mdc-button';
 $mat-button-label: '.mdc-button__label';
-$mat-button-label-text: '.mdc-button__label';
-$mat-radio-checked: '.mat-mdc-radio-checked';
-$mat-radio-label: '.mdc-label';
-$mat-progress-bar: '.mat-mdc-progress-bar';
-$mat-progress-spinner: '.mat-mdc-progress-spinner';
 $mat-form-field: '.mat-mdc-form-field';
 $mat-form-field-flex: '.mat-mdc-form-field-flex';
-$mat-form-field-outline: '.mat-mdc-form-field-outline';
 $mat-form-field-wrapper: '.mat-mdc-text-field-wrapper';
 $mat-line-ripple: '.mdc-line-ripple';
 $mat-form-field-subscript-wrapper: '.mat-mdc-form-field-subscript-wrapper';
-$mat-form-field-prefix: '.mat-mdc-form-field-text-prefix';
-$mat-form-field-suffix: '.mat-mdc-form-field-text-suffix';
 $mat-form-text-field-infix: '.mat-mdc-form-text-infix';
 $mat-form-field-label: '.mat-mdc-floating-label';
-$mat-form-field-invalid: '.mat-form-field-invalid';
 $mat-form-field-appearance-outline: '.mat-form-field-appearance-outline';
 $mat-text-field-outlined: '.mdc-text-field--outlined';
 $mat-text-field-outlined-thick: '.mdc-text-field--outlined-thick';
-$mat-text-field-focused: '.mdc-text-field--focused';
-$mat-dialog-actions: '.mat-mdc-dialog-actions';
-$mat-dialog-container: '.mdc-dialog__container';
-$mat-dialog-content: '.mat-mdc-dialog-content';
-$mat-button-toggle: '.mat-button-toggle';
-$mat-button-toggle-checked: '.mat-button-toggle-checked';
-$mat-button-touch-target: '.mat-mdc-button-touch-target';
 $mat-input-element: '.mat-mdc-input-element';
 $mat-card: '.mat-mdc-card';
-$mat-card-actions: '.mat-mdc-card-actions';
-$mat-card-header-text: '.mat-mdc-card-header-text';
-$mat-card-title: '.mat-mdc-card-title';
 $mat-card-content: '.mat-mdc-card-content';
-$mat-mini-fab: '.mat-mdc-mini-fab';
 $mat-list-item-primary-text: '.mdc-list-item__primary-text';
 $mat-list-item-end: '.mdc-list-item__end';
-$mat-table: '.mat-mdc-table';
-$mat-header-row: '.mat-mdc-header-row';
-$mat-row: '.mat-mdc-row';
 $mat-select: '.mat-mdc-select';
-$mat-select-value: '.mat-select-value';
-$mat-select-value-text: '.mat-mdc-select-value-text';
-$mat-select-panel: '.mat-mdc-select-panel';
-$mat-grid-tile: '.mat-grid-tile';
-$mat-sidenav-content: '.mat-sidenav-content';
-$mat-drawer-transition: '.mat-drawer-transition';
-$mat-drawer-content: '.mat-drawer-content';
-$mat-subheader: '.mat-mdc-subheader';
 $mat-menu-panel: '.mat-mdc-menu-panel';
-$mat-menu-content: '.mat-mdc-menu-content';
 $mat-expansion-panel: '.mat-expansion-panel';
-$mat-expansion-panel-header: '.mat-expansion-panel-header';
-$mat-expanded: '.mat-expanded';
 $mat-calendar: '.mat-calendar';
 $mat-calendar-header: '.mat-calendar-header';
-$mat-calendar-content: '.mat-calendar-content';
-$mat-calendar-table-header: '.mat-calendar-table-header';
-$mat-calendar-body-disabled: '.mat-calendar-body-disabled';
 $mat-toolbar: '.mat-toolbar';
-$mat-slide-toggle: '.mat-mdc-slide-toggle';
-$mat-list-item-content: '.mdc-list-item__content';
-$mat-list-item-unscoped-content: '.mat-mdc-list-item-unscoped-content';
 $mat-text-field-no-label: '.mdc-text-field--no-label';
 $mat-form-field-infix: '.mat-mdc-form-field-infix';
 $mat-form-field-hide-placeholder: '.mat-form-field-hide-placeholder';
@@ -98,93 +40,24 @@ $mat-form-field-hint-wrapper: '.mat-mdc-form-field-hint-wrapper';
 $mat-form-field-error-wrapper: '.mat-mdc-form-field-error-wrapper';
 $mat-form-field-error: '.mat-mdc-form-field-error';
 $mat-checkbox-background: '.mdc-checkbox__background';
-$mat-dialog-content: '.mdc-dialog__content';
 $mat-floating-label: '.mdc-floating-label';
-$mat-floating-label-above: '.mdc-floating-label--float-above';
 $mat-select-arrow-wrapper: '.mat-mdc-select-arrow-wrapper';
 $mat-dialog-title: '.mdc-dialog__title';
 $mat-expansion-panel-body: '.mat-expansion-panel-body';
 $mat-dialog-surface: '.mat-mdc-dialog-surface';
 $mdc-dialog: '.mdc-dialog';
-$mat-text-filed-input: '.mdc-text-field__input';
-$mat-floating-label-float-above: '.mdc-floating-label--float-above';
-$mat-floating-label-required: '.mdc-floating-label--required';
 $mat-evolution-chip: '.mdc-evolution-chip';
 $mat-standard-chip: '.mat-mdc-standard-chip';
-$mat-evolution-chip-action: '.mdc-evolution-chip__action';
-$mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label';
 $mat-notched-outline: '.mdc-notched-outline';
 $mat-evolution-chip-graphic: '.mdc-evolution-chip__graphic';
 $mat-select-trigger: '.mat-mdc-select-trigger';
 $mat-select-arrow: '.mat-mdc-select-arrow';
 $mat-notched-outline-leading: '.mdc-notched-outline__leading';
 $mat-notched-outline-trailing: '.mdc-notched-outline__trailing';
-$mat-notched-outline-notch: '.mdc-notched-outline__notch';
 $mat-evolution-chip-set: '.mdc-evolution-chip-set';
-$mat-mdc-button: '.mdc-button';
-$mat-outlined-button: '.mat-mdc-outlined-button';
-$mat-button-base: '.mat-mdc-button-base';
-$mat-button-touch-target: '.mat-mdc-button-touch-target';
-$mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label';
 $cdk-overlay-pane: '.cdk-overlay-pane';
-$cdk-drag-preview: '.cdk-drag-preview';
-$mat-snackbar: '.mdc-snackbar';
-$mat-snack-bar-container: '.mat-mdc-snack-bar-container';
-$mat-snackbar-label: '.mdc-snackbar__label';
-$mat-datetimepicker-dialog: '.mat-datetimepicker-dialog';
-$mat-tab-indicator-underline: '.mdc-tab-indicator__content--underline';
-$mat-autocomplete-panel: '.mat-mdc-autocomplete-panel';
-$mat-menu-surface: '.mdc-menu-surface';
-$mat-text-field-filled: '.mdc-text-field--filled';
-$mat-text-field-disabled: '.mdc-text-field--disabled';
-$mat-form-field-focus-overlay: '.mat-mdc-form-field-focus-overlay';
 $mat-form-field-error-wrapper: '.mat-mdc-form-field-error-wrapper';
-$mat-text-field-textarea: '.mdc-text-field--textarea';
 $mat-list-item-disabled: '.mdc-list-item--disabled';
-$mat-chip-focus-overlay: '.mat-mdc-chip-focus-overlay';
-$mat-primary: '.mat-primary';
-$mat-checkbox-touch-target: '.mat-mdc-checkbox-touch-target';
 $mat-switch: '.mdc-switch';
-$mat-switch-ripple: '.mdc-switch-ripple';
-$mat-switch-selected: '.mdc-switch--selected';
-$mat-switch-checked: '.mdc-switch--checked';
-$mat-switch-handle-track: '.mdc-switch__handle-track';
-$mat-switch-handle: '.mdc-switch__handle';
-$mat-switch-track: '.mdc-switch__track';
-$mat-switch-icons: '.mdc-switch__icons';
-$mat-switch-shadow: '.mdc-switch__shadow';
-$mat-switch-unselected: '.mdc-switch--unselected';
-$mat-chip-action: '.mat-mdc-chip-action';
-$mat-chip-graphic: '.mat-mdc-chip-graphic';
-$mat-data-table-row: '.mdc-data-table__row';
-$mat-data-table-cell: '.mdc-data-table__cell';
-$mat-data-table-header-cell: '.mdc-data-table__header-cell';
-$mat-toolbar-single-row: '.mat-toolbar-single-row';
-$mat-toolbar-multiple-row: '.mat-toolbar-multiple-row';
-$mat-unthemed: '.mat-unthemed';
-$mat-calendar-period-button: '.mat-calendar-period-button';
-$mat-radio-button: '.mat-mdc-radio-button';
-$mat-radio: '.mdc-radio';
-$mat-tab-ripple: '.mdc-tab__ripple';
-$mat-tab-disabled: '.mat-mdc-tab-disabled';
-$mat-tab-group: '.mat-mdc-tab-group';
-$mat-tab-group-stretch: '.mat-mdc-tab-group-stretch-tabs';
 $mat-list-item: '.mdc-list-item';
-$mat-menu-item: '.mat-mdc-menu-item';
-$mat-icon-no-color: '.mat-icon-no-color';
-$mat-submenu-icon: '.mat-menu-submenu-icon';
-$mat-mdc-submenu-icon: '.mat-mdc-menu-submenu-icon';
-$mdc-form-field: '.mdc-form-field';
-$mat-divider-horizontal: '.mat-divider-horizontal';
-$mat-accordion: '.mat-accordion';
-$mdc-list: '.mdc-list';
-$mat-form-field-icon-suffix: '.mat-mdc-form-field-icon-suffix';
 $mat-text-field: '.mdc-text-field';
-$mat-form-field-disabled: '.mat-form-field-disabled';
-$mat-select-disabled: '.mat-mdc-select-disabled';
-$mat-select-value: '.mat-mdc-select-value';
-$mat-checkbox-native-control: '.mdc-checkbox__native-control';
-$mat-checkbox-selected: '.mdc-checkbox--selected';
-$mat-checkbox-ripple: '.mat-mdc-checkbox-ripple';
-$mat-list-base: '.mat-mdc-list-base';
-$mat-card-header: '.mat-mdc-card-header';
diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.html b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.html
index 9451bf8bde..7121466836 100644
--- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.html
+++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.html
@@ -1,5 +1,5 @@
 <h1 mat-dialog-title>{{ title | translate }}</h1>
-<mat-dialog-content>
+<mat-dialog-content class="adf-edit-json-dialog-content">
     <textarea [(ngModel)]="value" [attr.readonly]="!editable ? true : null"></textarea>
 </mat-dialog-content>
 
diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.scss b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.scss
index 3e6bb3b703..c23c542d70 100644
--- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.scss
+++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.scss
@@ -1,7 +1,5 @@
-@use '../../styles/mat-selectors' as ms;
-
 .adf-edit-json-dialog {
-    #{ms.$mat-dialog-content} {
+    .adf-edit-json-dialog-content {
         height: 300px;
         overflow: hidden;
     }
diff --git a/lib/core/src/lib/form/components/form-renderer.component.html b/lib/core/src/lib/form/components/form-renderer.component.html
index 217bf1b785..fa9fdd267d 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.html
+++ b/lib/core/src/lib/form/components/form-renderer.component.html
@@ -68,18 +68,3 @@
         </div>
     </div>
 </ng-template>
-
-<!--
-For debugging and data visualisation purposes,
-will be removed during future revisions
--->
-<div *ngIf="showDebugButton" class="adf-form-debug-container">
-    <mat-slide-toggle [(ngModel)]="debugMode">Debug mode</mat-slide-toggle>
-    <div *ngIf="debugMode">
-        <h4>Values</h4>
-        <pre>{{ formDefinition.values | json }}</pre>
-
-        <h4>Form</h4>
-        <pre>{{ formDefinition.json | json }}</pre>
-    </div>
-</div>
diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss
index c2e840a9c1..11578990db 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -150,19 +150,6 @@
         text-overflow: ellipsis;
     }
 
-    &-form-debug-container {
-        padding: 10px;
-    }
-
-    &-form-debug-container .adf-debug-toggle-text {
-        padding-left: 15px;
-        cursor: pointer;
-    }
-
-    &-form-debug-container .adf-debug-toggle-text:hover {
-        font-weight: bold;
-    }
-
     &-form-reload-button {
         position: absolute;
         right: 12px;
diff --git a/lib/core/src/lib/form/components/form-renderer.component.ts b/lib/core/src/lib/form/components/form-renderer.component.ts
index de3797b466..ee143b7c7f 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.ts
+++ b/lib/core/src/lib/form/components/form-renderer.component.ts
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-import { JsonPipe, NgClass, NgForOf, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common';
+import { NgClass, NgForOf, NgIf, NgStyle, NgTemplateOutlet } from '@angular/common';
 import { Component, Inject, Injector, Input, OnDestroy, OnInit, Optional, ViewEncapsulation } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatTabsModule } from '@angular/material/tabs';
 import { TranslateModule } from '@ngx-translate/core';
 import { FormRulesManager, formRulesManagerFactory } from '../models/form-rules.model';
@@ -53,9 +52,7 @@ import { FormSectionComponent } from './form-section/form-section.component';
         MatIconModule,
         NgStyle,
         FormFieldComponent,
-        MatSlideToggleModule,
         FormsModule,
-        JsonPipe,
         NgClass,
         HeaderWidgetComponent,
         FormSectionComponent
@@ -63,10 +60,6 @@ import { FormSectionComponent } from './form-section/form-section.component';
     encapsulation: ViewEncapsulation.None
 })
 export class FormRendererComponent<T> implements OnInit, OnDestroy {
-    /** Toggle debug options. */
-    @Input()
-    showDebugButton: boolean = false;
-
     @Input({ required: true })
     formDefinition: FormModel;
 
diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss
index e3490f7959..f44e0aa23e 100644
--- a/lib/core/src/lib/styles/_mat-selectors.scss
+++ b/lib/core/src/lib/styles/_mat-selectors.scss
@@ -1,41 +1,21 @@
-$material-icons: '.material-icons';
 $mat-icon: '.mat-icon';
-$mat-icon-button: '.mat-mdc-icon-button';
-$mat-icon-button-hover: '.mdc-icon-button__ripple';
-$mat-accent: '.mat-accent';
 $mat-focused: '.mat-focused';
 $mat-line: '.mat-line';
 $mat-tab-label: '.mat-mdc-tab';
 $mat-tab-label-active: '.mdc-tab--active';
-$mat-tab-label-content: '.mdc-tab__content';
 $mat-tab-label-container: '.mat-mdc-tab-label-container';
-$mat-expansion-panel-body: '.mat-expansion-panel-body';
 $mat-tab-label-text: '.mdc-tab__text-label';
-$mat-tab-list: '.mat-mdc-tab-list';
 $mat-tab-body: '.mat-mdc-tab-body';
-$mat-tab-body-wrapper: '.mat-mdc-tab-body-wrapper';
 $mat-tab-body-content: '.mat-mdc-tab-body-content';
-$mat-tab-header: '.mat-mdc-tab-header';
-$mat-tab-labels: '.mat-mdc-tab-labels';
 $mat-tab-ink-bar: '.mdc-tab-indicator';
 $mat-chip: '.mat-mdc-chip';
 $mat-chip-list: '.mat-mdc-chip-list';
-$mat-chip-list-wrapper: '.mat-chip-list-wrapper';
 $mat-checkbox: '.mat-mdc-checkbox';
-$mat-checkbox-box: '.mdc-checkbox';
-$mat-checkbox-frame: '.mdc-checkbox__checkmark';
 $mat-checkbox-label: '.mdc-label';
-$mat-checkbox-checked: '.mat-mdc-checkbox-checked';
 $mat-button: '.mat-mdc-button';
 $mat-button-label: '.mdc-button__label';
-$mat-button-label-text: '.mdc-button__label';
-$mat-radio-checked: '.mat-mdc-radio-checked';
-$mat-radio-label: '.mdc-label';
-$mat-progress-bar: '.mat-mdc-progress-bar';
-$mat-progress-spinner: '.mat-mdc-progress-spinner';
 $mat-form-field: '.mat-mdc-form-field';
 $mat-form-field-flex: '.mat-mdc-form-field-flex';
-$mat-form-field-outline: '.mat-mdc-form-field-outline';
 $mat-form-field-wrapper: '.mat-mdc-text-field-wrapper';
 $mat-line-ripple: '.mdc-line-ripple';
 $mat-form-field-subscript-wrapper: '.mat-mdc-form-field-subscript-wrapper';
@@ -44,37 +24,22 @@ $mat-form-field-suffix: '.mat-mdc-form-field-text-suffix';
 $mat-form-text-field-infix: '.mat-mdc-form-text-infix';
 $mat-form-field-label: '.mat-mdc-floating-label';
 $mat-form-field-invalid: '.mat-form-field-invalid';
-$mat-form-field-appearance-outline: '.mat-form-field-appearance-outline';
-$mat-text-field-outlined: '.mdc-text-field--outlined';
-$mat-text-field-outlined-thick: '.mdc-text-field--outlined-thick';
 $mat-text-field-focused: '.mdc-text-field--focused';
-$mat-dialog-actions: '.mat-mdc-dialog-actions';
 $mat-dialog-container: '.mdc-dialog__container';
-$mat-dialog-content: '.mat-mdc-dialog-content';
-$mat-button-toggle: '.mat-button-toggle';
-$mat-button-toggle-checked: '.mat-button-toggle-checked';
 $mat-button-touch-target: '.mat-mdc-button-touch-target';
 $mat-input-element: '.mat-mdc-input-element';
 $mat-card: '.mat-mdc-card';
-$mat-card-actions: '.mat-mdc-card-actions';
 $mat-card-header-text: '.mat-mdc-card-header-text';
-$mat-card-title: '.mat-mdc-card-title';
-$mat-card-content: '.mat-mdc-card-content';
-$mat-mini-fab: '.mat-mdc-mini-fab';
-$mat-list-item-primary-text: '.mdc-list-item__primary-text';
-$mat-list-item-end: '.mdc-list-item__end';
 $mat-table: '.mat-mdc-table';
 $mat-header-row: '.mat-mdc-header-row';
 $mat-row: '.mat-mdc-row';
 $mat-select: '.mat-mdc-select';
 $mat-select-value: '.mat-select-value';
-$mat-select-value-text: '.mat-mdc-select-value-text';
 $mat-select-panel: '.mat-mdc-select-panel';
 $mat-grid-tile: '.mat-grid-tile';
 $mat-sidenav-content: '.mat-sidenav-content';
 $mat-drawer-transition: '.mat-drawer-transition';
 $mat-drawer-content: '.mat-drawer-content';
-$mat-subheader: '.mat-mdc-subheader';
 $mat-menu-panel: '.mat-mdc-menu-panel';
 $mat-menu-content: '.mat-mdc-menu-content';
 $mat-expansion-panel: '.mat-expansion-panel';
@@ -86,105 +51,34 @@ $mat-calendar-content: '.mat-calendar-content';
 $mat-calendar-table-header: '.mat-calendar-table-header';
 $mat-calendar-body-disabled: '.mat-calendar-body-disabled';
 $mat-toolbar: '.mat-toolbar';
-$mat-slide-toggle: '.mat-mdc-slide-toggle';
-$mat-list-item-content: '.mdc-list-item__content';
 $mat-list-item-unscoped-content: '.mat-mdc-list-item-unscoped-content';
 $mat-text-field-no-label: '.mdc-text-field--no-label';
 $mat-form-field-infix: '.mat-mdc-form-field-infix';
-$mat-form-field-hide-placeholder: '.mat-form-field-hide-placeholder';
-$mat-form-field-hint-wrapper: '.mat-mdc-form-field-hint-wrapper';
 $mat-form-field-error-wrapper: '.mat-mdc-form-field-error-wrapper';
 $mat-form-field-error: '.mat-mdc-form-field-error';
 $mat-checkbox-background: '.mdc-checkbox__background';
-$mat-dialog-content: '.mdc-dialog__content';
 $mat-floating-label: '.mdc-floating-label';
 $mat-floating-label-above: '.mdc-floating-label--float-above';
-$mat-select-arrow-wrapper: '.mat-mdc-select-arrow-wrapper';
-$mat-dialog-title: '.mdc-dialog__title';
-$mat-expansion-panel-body: '.mat-expansion-panel-body';
 $mat-dialog-surface: '.mat-mdc-dialog-surface';
-$mdc-dialog: '.mdc-dialog';
-$mat-text-filed-input: '.mdc-text-field__input';
-$mat-floating-label-float-above: '.mdc-floating-label--float-above';
 $mat-floating-label-required: '.mdc-floating-label--required';
 $mat-evolution-chip: '.mdc-evolution-chip';
-$mat-standard-chip: '.mat-mdc-standard-chip';
 $mat-evolution-chip-action: '.mdc-evolution-chip__action';
 $mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label';
 $mat-notched-outline: '.mdc-notched-outline';
 $mat-evolution-chip-graphic: '.mdc-evolution-chip__graphic';
 $mat-select-trigger: '.mat-mdc-select-trigger';
-$mat-select-arrow: '.mat-mdc-select-arrow';
-$mat-notched-outline-leading: '.mdc-notched-outline__leading';
-$mat-notched-outline-trailing: '.mdc-notched-outline__trailing';
-$mat-notched-outline-notch: '.mdc-notched-outline__notch';
-$mat-evolution-chip-set: '.mdc-evolution-chip-set';
-$mat-mdc-button: '.mdc-button';
-$mat-outlined-button: '.mat-mdc-outlined-button';
 $mat-button-base: '.mat-mdc-button-base';
 $mat-button-touch-target: '.mat-mdc-button-touch-target';
-$mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label';
-$cdk-overlay-pane: '.cdk-overlay-pane';
 $cdk-drag-preview: '.cdk-drag-preview';
 $mat-snackbar: '.mdc-snackbar';
 $mat-snack-bar-container: '.mat-mdc-snack-bar-container';
 $mat-snackbar-label: '.mdc-snackbar__label';
 $mat-datetimepicker-dialog: '.mat-datetimepicker-dialog';
 $mat-tab-indicator-underline: '.mdc-tab-indicator__content--underline';
-$mat-autocomplete-panel: '.mat-mdc-autocomplete-panel';
-$mat-menu-surface: '.mdc-menu-surface';
-$mat-text-field-filled: '.mdc-text-field--filled';
-$mat-text-field-disabled: '.mdc-text-field--disabled';
-$mat-form-field-focus-overlay: '.mat-mdc-form-field-focus-overlay';
-$mat-form-field-error-wrapper: '.mat-mdc-form-field-error-wrapper';
-$mat-text-field-textarea: '.mdc-text-field--textarea';
-$mat-list-item-disabled: '.mdc-list-item--disabled';
-$mat-chip-focus-overlay: '.mat-mdc-chip-focus-overlay';
-$mat-primary: '.mat-primary';
-$mat-checkbox-touch-target: '.mat-mdc-checkbox-touch-target';
-$mat-switch: '.mdc-switch';
-$mat-switch-ripple: '.mdc-switch-ripple';
-$mat-switch-selected: '.mdc-switch--selected';
-$mat-switch-checked: '.mdc-switch--checked';
-$mat-switch-handle-track: '.mdc-switch__handle-track';
-$mat-switch-handle: '.mdc-switch__handle';
-$mat-switch-track: '.mdc-switch__track';
-$mat-switch-icons: '.mdc-switch__icons';
-$mat-switch-shadow: '.mdc-switch__shadow';
-$mat-switch-unselected: '.mdc-switch--unselected';
-$mat-chip-action: '.mat-mdc-chip-action';
-$mat-chip-graphic: '.mat-mdc-chip-graphic';
-$mat-data-table-row: '.mdc-data-table__row';
-$mat-data-table-cell: '.mdc-data-table__cell';
-$mat-data-table-header-cell: '.mdc-data-table__header-cell';
-$mat-toolbar-single-row: '.mat-toolbar-single-row';
-$mat-toolbar-multiple-row: '.mat-toolbar-multiple-row';
-$mat-unthemed: '.mat-unthemed';
-$mat-calendar-period-button: '.mat-calendar-period-button';
-$mat-radio-button: '.mat-mdc-radio-button';
-$mat-radio: '.mdc-radio';
-$mat-tab-ripple: '.mdc-tab__ripple';
-$mat-tab-disabled: '.mat-mdc-tab-disabled';
-$mat-tab-group: '.mat-mdc-tab-group';
-$mat-tab-group-stretch: '.mat-mdc-tab-group-stretch-tabs';
 $mat-list-item: '.mdc-list-item';
-$mat-menu-item: '.mat-mdc-menu-item';
-$mat-icon-no-color: '.mat-icon-no-color';
-$mat-submenu-icon: '.mat-menu-submenu-icon';
-$mat-mdc-submenu-icon: '.mat-mdc-menu-submenu-icon';
-$mdc-form-field: '.mdc-form-field';
-$mat-divider-horizontal: '.mat-divider-horizontal';
-$mat-accordion: '.mat-accordion';
-$mdc-list: '.mdc-list';
 $mat-form-field-icon-suffix: '.mat-mdc-form-field-icon-suffix';
 $mat-text-field: '.mdc-text-field';
-$mat-form-field-disabled: '.mat-form-field-disabled';
-$mat-select-disabled: '.mat-mdc-select-disabled';
 $mat-select-value: '.mat-mdc-select-value';
-$mat-checkbox-native-control: '.mdc-checkbox__native-control';
-$mat-checkbox-selected: '.mdc-checkbox--selected';
-$mat-checkbox-ripple: '.mat-mdc-checkbox-ripple';
-$mat-list-base: '.mat-mdc-list-base';
 $mat-card-header: '.mat-mdc-card-header';
 $mat-datetimepicker-calendar: '.mat-datetimepicker-calendar';
 $mat-datetimepicker-calendar-header: '.mat-datetimepicker-calendar-header';
diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss
index d03ac94614..35d956b8e4 100644
--- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss
+++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.scss
@@ -79,7 +79,7 @@
         max-height: 100px;
         max-width: 300px;
 
-        #{ms.$mat-progress-bar} {
+        .adf-loader-item-progress-bar {
             max-width: 300px;
             margin: 0;
             position: absolute;