diff --git a/angular/angular.json b/angular/angular.json
index 280d84f..a75b12e 100644
--- a/angular/angular.json
+++ b/angular/angular.json
@@ -10,7 +10,8 @@
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
-          "style": "scss"
+          "style": "scss",
+          "changeDetection": "OnPush"
         }
       },
       "root": "",
diff --git a/angular/package-lock.json b/angular/package-lock.json
index cd9cc3a..6792077 100644
--- a/angular/package-lock.json
+++ b/angular/package-lock.json
@@ -17,7 +17,7 @@
         "@angular/platform-browser": "^15.2.1",
         "@angular/platform-browser-dynamic": "^15.2.1",
         "@angular/router": "^15.2.1",
-        "@baloise/design-system-components-angular": "^12.13.0",
+        "@baloise/design-system-components-angular": "0.0.0-snapshot-20230426131950",
         "@baloise/web-app-unsupported-browsers": "^3.0.0",
         "@baloise/web-app-validators-angular": "^3.6.1",
         "rxjs": "~7.8.0",
@@ -2274,17 +2274,17 @@
       }
     },
     "node_modules/@baloise/design-system-components": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-12.13.0.tgz",
-      "integrity": "sha512-fILabu4fAqfNr515fe5kTPRPXjDygJZaumuBXL8nEVha74dJ0q7sMnzEXTcybVYRNgECn8aTGUAclYjjgALGLg==",
-      "dependencies": {
-        "@baloise/design-system-css": "12.13.0",
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-icons": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0",
-        "@baloise/web-app-utils": "3.11.0",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-w+rePg4DxUYzEUOIW/HGslc0GCzRGfqyWSiXoJcZ5ZjYb90yxNdOIpgQ4scXOuoDz+8B1nHyQ252YaXF/SWudw==",
+      "dependencies": {
+        "@baloise/design-system-css": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-icons": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426131950",
+        "@baloise/web-app-utils": "3.11.1",
         "@popperjs/core": "~2.11.4",
-        "@stencil/core": "~2.20.0",
+        "@stencil/core": "~3.2.0",
         "big.js": "~6.2.1",
         "contactjs": "~2.1.6",
         "date-fns": "~2.29.3",
@@ -2305,11 +2305,11 @@
       }
     },
     "node_modules/@baloise/design-system-components-angular": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-angular/-/design-system-components-angular-12.13.0.tgz",
-      "integrity": "sha512-5PrmNzlGLSAwp5a1dHb7zgB4fFme3g8zTP/NMraARMPvTNaHg3pSQrJrFrJbtqm9XtUFPzMXyTngpJwlGB7Ibg==",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-angular/-/design-system-components-angular-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Ir/weYLAtGRkvjEVqm5WcTYIW6TgJP1Qqahi9tTSBOFmKcMDBtj23gciddh2R9NPuDptVEeqeMlruTaOq8oCCQ==",
       "dependencies": {
-        "@baloise/design-system-components": "12.13.0",
+        "@baloise/design-system-components": "0.0.0-snapshot-20230426131950",
         "tslib": "^2.2.0"
       },
       "peerDependencies": {
@@ -2322,28 +2322,28 @@
       }
     },
     "node_modules/@baloise/design-system-css": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-12.13.0.tgz",
-      "integrity": "sha512-LwxKBydjwzubVngmZO8aaj7dqldfIIKxqUiBrFgXcKgRAUNuPOUr0ZUuJO2hKYCEa8VKvG7kNO3bIUl8+74ItA==",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Cu33Uu3PaLGkimFiNZUXOO0XeqcUEcDK30YP7dJ+bFsUWSQ/srk9nsdVx346uAa2wFsKPCUWDF3Dhgmq0pO6Pg==",
       "dependencies": {
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0"
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426131950"
       }
     },
     "node_modules/@baloise/design-system-fonts": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-12.13.0.tgz",
-      "integrity": "sha512-xcrMNe3hBPrifJVSdpcxoXSJ/2+JP9xeomKzR2fEZAJsNF8V72jq3VnpusQbvH+nivxlMEsTqcnHMhRJU90ivQ=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Fddxi+dtdb1HoqJ9oEErkVaQg3ANrLVXN5UuqebAnj4bxbirPMmhvfh8sDRFlnS+5ATl91cQ/NJECqJT4g9hMA=="
     },
     "node_modules/@baloise/design-system-icons": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-12.13.0.tgz",
-      "integrity": "sha512-+A+gzBSFW0m5vnNdL5B7ZwQPvX/VwxdEekUN/7owk5eANY5Y4UxxkSxc3TFvk/LJ5XbLN2i7EO7XdOeR3DLWsA=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-mBnNIrTy+aTzFuKqnHaoso03PrsLFxU6i2aJ4jIu6YaeGFIa6dFL66TwOG4FXSyTeuoYgbg8p+GiEjV/foy1Og=="
     },
     "node_modules/@baloise/design-system-tokens": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-12.13.0.tgz",
-      "integrity": "sha512-djWn1eZ9CsRTNl9HinpAcJ+nWh8ecZndfIl7y61UgTsgBDTBOJk/1D8uAUJzI6hIe1e8pn8SEO9BlwoqD++3tQ=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-gD8Dj1NnjevA0fPsszcHxJvtSjDf6XQqQ0B1NbTjlMBGdOC35D+wZrIJq/JbiD7/gk8m0qazhRD/9qnFw+KJdA=="
     },
     "node_modules/@baloise/web-app-unsupported-browsers": {
       "version": "3.7.3",
@@ -2352,13 +2352,12 @@
       "hasInstallScript": true
     },
     "node_modules/@baloise/web-app-utils": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.0.tgz",
-      "integrity": "sha512-C992qUuGFWkN16E4c788wbYFpwTiTx5dO3IySl4bZTmPhvNPyxIPwaMrLvlL2daNkJuMfYFFk4NE7yAlnMHaUw==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.1.tgz",
+      "integrity": "sha512-+ccSXhi4s3XahCQ8M67YDyETOuBkYJZRfaE+DcLeKe1QAb01B2OUF8xTv7/C/MQi55PKeZDXL5vniobLnp+ilQ==",
       "dependencies": {
         "date-fns": "^2.28.0",
         "lodash.camelcase": "^4.3.0",
-        "lodash.isarray": "^4.0.0",
         "lodash.isboolean": "^3.0.3",
         "lodash.isdate": "^4.0.1",
         "lodash.isequal": "^4.5.0",
@@ -3116,14 +3115,14 @@
       "dev": true
     },
     "node_modules/@stencil/core": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.20.0.tgz",
-      "integrity": "sha512-ka+eOW+dNteXIfLCRipNbbAlBEQjqJ2fkx3fxzlKgnNHEQMdZiuIjlWt63KzvOJStNeuADdQXo89BB1dC2VRUw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-Ybm4NteQBScLq3H0JML/uqo4nWjNpZw1HAAURtR5LlRm7ptzNKO5S8EnHp3m05/uyTzeh9yLpUFHY7bxGNdYLg==",
       "bin": {
         "stencil": "bin/stencil"
       },
       "engines": {
-        "node": ">=12.10.0",
+        "node": ">=14.10.0",
         "npm": ">=6.0.0"
       }
     },
@@ -13378,17 +13377,17 @@
       }
     },
     "@baloise/design-system-components": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-12.13.0.tgz",
-      "integrity": "sha512-fILabu4fAqfNr515fe5kTPRPXjDygJZaumuBXL8nEVha74dJ0q7sMnzEXTcybVYRNgECn8aTGUAclYjjgALGLg==",
-      "requires": {
-        "@baloise/design-system-css": "12.13.0",
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-icons": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0",
-        "@baloise/web-app-utils": "3.11.0",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-w+rePg4DxUYzEUOIW/HGslc0GCzRGfqyWSiXoJcZ5ZjYb90yxNdOIpgQ4scXOuoDz+8B1nHyQ252YaXF/SWudw==",
+      "requires": {
+        "@baloise/design-system-css": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-icons": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426131950",
+        "@baloise/web-app-utils": "3.11.1",
         "@popperjs/core": "~2.11.4",
-        "@stencil/core": "~2.20.0",
+        "@stencil/core": "~3.2.0",
         "big.js": "~6.2.1",
         "contactjs": "~2.1.6",
         "date-fns": "~2.29.3",
@@ -13409,37 +13408,37 @@
       }
     },
     "@baloise/design-system-components-angular": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-angular/-/design-system-components-angular-12.13.0.tgz",
-      "integrity": "sha512-5PrmNzlGLSAwp5a1dHb7zgB4fFme3g8zTP/NMraARMPvTNaHg3pSQrJrFrJbtqm9XtUFPzMXyTngpJwlGB7Ibg==",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-angular/-/design-system-components-angular-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Ir/weYLAtGRkvjEVqm5WcTYIW6TgJP1Qqahi9tTSBOFmKcMDBtj23gciddh2R9NPuDptVEeqeMlruTaOq8oCCQ==",
       "requires": {
-        "@baloise/design-system-components": "12.13.0",
+        "@baloise/design-system-components": "0.0.0-snapshot-20230426131950",
         "tslib": "^2.2.0"
       }
     },
     "@baloise/design-system-css": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-12.13.0.tgz",
-      "integrity": "sha512-LwxKBydjwzubVngmZO8aaj7dqldfIIKxqUiBrFgXcKgRAUNuPOUr0ZUuJO2hKYCEa8VKvG7kNO3bIUl8+74ItA==",
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Cu33Uu3PaLGkimFiNZUXOO0XeqcUEcDK30YP7dJ+bFsUWSQ/srk9nsdVx346uAa2wFsKPCUWDF3Dhgmq0pO6Pg==",
       "requires": {
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0"
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426131950",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426131950"
       }
     },
     "@baloise/design-system-fonts": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-12.13.0.tgz",
-      "integrity": "sha512-xcrMNe3hBPrifJVSdpcxoXSJ/2+JP9xeomKzR2fEZAJsNF8V72jq3VnpusQbvH+nivxlMEsTqcnHMhRJU90ivQ=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-Fddxi+dtdb1HoqJ9oEErkVaQg3ANrLVXN5UuqebAnj4bxbirPMmhvfh8sDRFlnS+5ATl91cQ/NJECqJT4g9hMA=="
     },
     "@baloise/design-system-icons": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-12.13.0.tgz",
-      "integrity": "sha512-+A+gzBSFW0m5vnNdL5B7ZwQPvX/VwxdEekUN/7owk5eANY5Y4UxxkSxc3TFvk/LJ5XbLN2i7EO7XdOeR3DLWsA=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-mBnNIrTy+aTzFuKqnHaoso03PrsLFxU6i2aJ4jIu6YaeGFIa6dFL66TwOG4FXSyTeuoYgbg8p+GiEjV/foy1Og=="
     },
     "@baloise/design-system-tokens": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-12.13.0.tgz",
-      "integrity": "sha512-djWn1eZ9CsRTNl9HinpAcJ+nWh8ecZndfIl7y61UgTsgBDTBOJk/1D8uAUJzI6hIe1e8pn8SEO9BlwoqD++3tQ=="
+      "version": "0.0.0-snapshot-20230426131950",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-0.0.0-snapshot-20230426131950.tgz",
+      "integrity": "sha512-gD8Dj1NnjevA0fPsszcHxJvtSjDf6XQqQ0B1NbTjlMBGdOC35D+wZrIJq/JbiD7/gk8m0qazhRD/9qnFw+KJdA=="
     },
     "@baloise/web-app-unsupported-browsers": {
       "version": "3.7.3",
@@ -13447,13 +13446,12 @@
       "integrity": "sha512-hHsLwL+ONg1GwgIpMyZUoYy2aqup4aRPDINk51JeNmJ1V1ROrd/1zPtxuEUpibvEeNcWOzd0fxmYrpAlM13jtQ=="
     },
     "@baloise/web-app-utils": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.0.tgz",
-      "integrity": "sha512-C992qUuGFWkN16E4c788wbYFpwTiTx5dO3IySl4bZTmPhvNPyxIPwaMrLvlL2daNkJuMfYFFk4NE7yAlnMHaUw==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.1.tgz",
+      "integrity": "sha512-+ccSXhi4s3XahCQ8M67YDyETOuBkYJZRfaE+DcLeKe1QAb01B2OUF8xTv7/C/MQi55PKeZDXL5vniobLnp+ilQ==",
       "requires": {
         "date-fns": "^2.28.0",
         "lodash.camelcase": "^4.3.0",
-        "lodash.isarray": "^4.0.0",
         "lodash.isboolean": "^3.0.3",
         "lodash.isdate": "^4.0.1",
         "lodash.isequal": "^4.5.0",
@@ -13917,9 +13915,9 @@
       "dev": true
     },
     "@stencil/core": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.20.0.tgz",
-      "integrity": "sha512-ka+eOW+dNteXIfLCRipNbbAlBEQjqJ2fkx3fxzlKgnNHEQMdZiuIjlWt63KzvOJStNeuADdQXo89BB1dC2VRUw=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-Ybm4NteQBScLq3H0JML/uqo4nWjNpZw1HAAURtR5LlRm7ptzNKO5S8EnHp3m05/uyTzeh9yLpUFHY7bxGNdYLg=="
     },
     "@tootallnate/once": {
       "version": "2.0.0",
diff --git a/angular/package.json b/angular/package.json
index 5f78e86..0cca25f 100644
--- a/angular/package.json
+++ b/angular/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser": "^15.2.1",
     "@angular/platform-browser-dynamic": "^15.2.1",
     "@angular/router": "^15.2.1",
-    "@baloise/design-system-components-angular": "^12.13.0",
+    "@baloise/design-system-components-angular": "0.0.0-snapshot-20230426131950",
     "@baloise/web-app-unsupported-browsers": "^3.0.0",
     "@baloise/web-app-validators-angular": "^3.6.1",
     "rxjs": "~7.8.0",
diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html
index 6223ac0..6823901 100644
--- a/angular/src/app/app.component.html
+++ b/angular/src/app/app.component.html
@@ -48,7 +48,7 @@
         A tiny use case of how to call tabs component
       </bal-card-subtitle>
       <bal-card-content>
-        <bal-tabs border="true" fullwidth="true" interface="tabs" [(ngModel)]="navigationModel">
+        <bal-tabs border="true" fullwidth="true" interface="tabs" [value]="navigationModel">
           <bal-tab-item *ngFor="let item of navigationItems" [value]="item.value" [disabled]="item.disabled"
             [label]="item.label">
           </bal-tab-item>
diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.ts
index 4ba3814..7ddcc9b 100644
--- a/angular/src/app/app.module.ts
+++ b/angular/src/app/app.module.ts
@@ -1,6 +1,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import {BalCoreModule, BalTextModule} from '@baloise/design-system-components-angular';
+import { BaloiseDesignSystemModule } from '@baloise/design-system-components-angular';
 import { AppComponent } from './app.component';
 import { PropertyComponent } from './property/property.component';
 import { EventComponent } from './event/event.component';
@@ -8,7 +8,7 @@ import { ModalComponent } from './modal/modal.component';
 import { MethodComponent } from './method/method.component';
 import { FormsSubModule } from './forms/forms-sub.module';
 import { SharedModule } from './shared/shared.module';
-import * as balIcons from '@baloise/design-system-icons'
+import * as balIcons from '@baloise/design-system-icons';
 
 @NgModule({
   declarations: [
@@ -16,11 +16,11 @@ import * as balIcons from '@baloise/design-system-icons'
     PropertyComponent,
     EventComponent,
     MethodComponent,
-    ModalComponent
+    ModalComponent,
   ],
   imports: [
     BrowserModule,
-    BalCoreModule.forRoot({
+    BaloiseDesignSystemModule.forRoot({
       defaults: {
         region: 'CH',
         language: 'en',
@@ -30,7 +30,6 @@ import * as balIcons from '@baloise/design-system-icons'
     }),
     SharedModule,
     FormsSubModule,
-    BalTextModule,
   ],
   providers: [],
   bootstrap: [AppComponent],
diff --git a/angular/src/app/event/event.component.spec.ts b/angular/src/app/event/event.component.spec.ts
index 72c4f57..6bd3657 100644
--- a/angular/src/app/event/event.component.spec.ts
+++ b/angular/src/app/event/event.component.spec.ts
@@ -1,16 +1,13 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import {
-  BalInputModule,
-  BalTextModule,
-} from '@baloise/design-system-components-angular';
+import { BaloiseDesignSystemModule } from '@baloise/design-system-components-angular';
 import { EventComponent } from './event.component';
 
 describe('EventComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [EventComponent],
-      imports: [BalInputModule, BalTextModule],
+      imports: [BaloiseDesignSystemModule],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
diff --git a/angular/src/app/method/method.component.ts b/angular/src/app/method/method.component.ts
index 8aa24fb..a418200 100644
--- a/angular/src/app/method/method.component.ts
+++ b/angular/src/app/method/method.component.ts
@@ -1,9 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
 import type { Components } from '@baloise/design-system-components';
-// import { ProxyComponent } from '@baloise/design-system-components-angular';
-export interface ProxyComponent<T> {
-  el: T;
-}
+import { ProxyComponent } from '@baloise/design-system-components-angular';
 
 @Component({
   selector: 'app-method',
diff --git a/angular/src/app/property/property.component.ts b/angular/src/app/property/property.component.ts
index 81ab0b2..d84a7fa 100644
--- a/angular/src/app/property/property.component.ts
+++ b/angular/src/app/property/property.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
-import { Props } from '@baloise/design-system-components';
 
 @Component({
   selector: 'app-property',
   templateUrl: './property.component.html',
 })
 export class PropertyComponent {
-  myColor: Props.BalButtonColor = 'info';
+  myColor: BalProps.BalButtonColor = 'info';
 }
diff --git a/angular/src/app/shared/shared.module.ts b/angular/src/app/shared/shared.module.ts
index 6a68a00..0eb15c5 100644
--- a/angular/src/app/shared/shared.module.ts
+++ b/angular/src/app/shared/shared.module.ts
@@ -1,23 +1,7 @@
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {
-  BalButtonModule,
-  BalCardModule,
-  BalCheckboxModule,
-  BalDatepickerModule,
-  BalFieldModule,
-  BalFooterModule,
-  BalHeadingModule,
-  BalInputModule,
-  BalLogoModule,
-  BalNavbarModule,
-  BalRadioModule,
-  BalSelectModule,
-  BalStageModule, BalTabsModule,
-  BalToastModule,
-  BalModalModule
-} from '@baloise/design-system-components-angular';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { BaloiseDesignSystemModule } from '@baloise/design-system-components-angular';
 
 const commonModules = [
   /**
@@ -29,22 +13,7 @@ const commonModules = [
   /**
    * Design System Modules
    */
-  BalFieldModule,
-  BalInputModule,
-  BalSelectModule,
-  BalHeadingModule,
-  BalButtonModule,
-  BalFooterModule,
-  BalNavbarModule,
-  BalLogoModule,
-  BalStageModule,
-  BalCardModule,
-  BalToastModule,
-  BalCheckboxModule,
-  BalRadioModule,
-  BalDatepickerModule,
-  BalTabsModule,
-  BalModalModule
+  BaloiseDesignSystemModule,
 ];
 
 @NgModule({
@@ -52,5 +21,4 @@ const commonModules = [
   imports: [...commonModules],
   exports: [...commonModules],
 })
-export class SharedModule {
-}
+export class SharedModule {}
diff --git a/angular/src/main.ts b/angular/src/main.ts
index c58dc05..fbf76ea 100644
--- a/angular/src/main.ts
+++ b/angular/src/main.ts
@@ -1,7 +1,5 @@
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
 import { AppModule } from './app/app.module';
 
-
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));
diff --git a/react/package-lock.json b/react/package-lock.json
index 7793276..485eb8c 100644
--- a/react/package-lock.json
+++ b/react/package-lock.json
@@ -8,7 +8,7 @@
       "name": "react-example",
       "version": "0.1.0",
       "dependencies": {
-        "@baloise/design-system-components-react": "^12.13.0",
+        "@baloise/design-system-components-react": "0.0.0-snapshot-20230426115952",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
@@ -1865,17 +1865,17 @@
       }
     },
     "node_modules/@baloise/design-system-components": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-12.13.0.tgz",
-      "integrity": "sha512-fILabu4fAqfNr515fe5kTPRPXjDygJZaumuBXL8nEVha74dJ0q7sMnzEXTcybVYRNgECn8aTGUAclYjjgALGLg==",
-      "dependencies": {
-        "@baloise/design-system-css": "12.13.0",
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-icons": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0",
-        "@baloise/web-app-utils": "3.11.0",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-I8SRh1LUJ+QkyDG9TVI0UAeto9GLbPTb8qfeiFr7/2FOUYVzAvXJukEKKlCZdZjjM+RA7eLegUoJ0tjbvx2lCw==",
+      "dependencies": {
+        "@baloise/design-system-css": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-icons": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426115952",
+        "@baloise/web-app-utils": "3.11.1",
         "@popperjs/core": "~2.11.4",
-        "@stencil/core": "~2.20.0",
+        "@stencil/core": "~3.2.0",
         "big.js": "~6.2.1",
         "contactjs": "~2.1.6",
         "date-fns": "~2.29.3",
@@ -1896,11 +1896,11 @@
       }
     },
     "node_modules/@baloise/design-system-components-react": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-react/-/design-system-components-react-12.13.0.tgz",
-      "integrity": "sha512-71WMFT3vdICC8eZ4F9PljxINlOt9YAQTB5+STHN+4Q//Ehz8vCwNBLJb2niqU1VgcXwCHzkrwjoQQYZShcNj1Q==",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-react/-/design-system-components-react-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-BzozFNrWhsc2q345SDWjsgILZ7YRPMFKK5JkQTn5zI4AM+gyQDdgbR0/opWOfnN/PMTFerj/M82kB3HEOSVKYQ==",
       "dependencies": {
-        "@baloise/design-system-components": "12.13.0",
+        "@baloise/design-system-components": "0.0.0-snapshot-20230426115952",
         "tslib": "*"
       },
       "peerDependencies": {
@@ -1921,37 +1921,36 @@
       }
     },
     "node_modules/@baloise/design-system-css": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-12.13.0.tgz",
-      "integrity": "sha512-LwxKBydjwzubVngmZO8aaj7dqldfIIKxqUiBrFgXcKgRAUNuPOUr0ZUuJO2hKYCEa8VKvG7kNO3bIUl8+74ItA==",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-BrMv6eNP8om2gON6ZHtaZS75ICs6MZyhkLvPgH9MjIWbryrwJW7bd3mdB80f6ogbNF2L+KSmGsSt0EZMldHptw==",
       "dependencies": {
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0"
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426115952"
       }
     },
     "node_modules/@baloise/design-system-fonts": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-12.13.0.tgz",
-      "integrity": "sha512-xcrMNe3hBPrifJVSdpcxoXSJ/2+JP9xeomKzR2fEZAJsNF8V72jq3VnpusQbvH+nivxlMEsTqcnHMhRJU90ivQ=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-rS6ddNKjOjLAVG+jVu0GrP+trnb171sqMapBtTMKkxB768J30/PET5h7S9URZvyP8mZgj0ubnnoOzAv0mkv/Pw=="
     },
     "node_modules/@baloise/design-system-icons": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-12.13.0.tgz",
-      "integrity": "sha512-+A+gzBSFW0m5vnNdL5B7ZwQPvX/VwxdEekUN/7owk5eANY5Y4UxxkSxc3TFvk/LJ5XbLN2i7EO7XdOeR3DLWsA=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-tVxS6sH208GdXxH3U7DJgoGWHBLh6Unu4beSoN74pH18cwhF4RA3FNYTMBZL5Tg4HN17tdGerkxr0w7c9rPhSw=="
     },
     "node_modules/@baloise/design-system-tokens": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-12.13.0.tgz",
-      "integrity": "sha512-djWn1eZ9CsRTNl9HinpAcJ+nWh8ecZndfIl7y61UgTsgBDTBOJk/1D8uAUJzI6hIe1e8pn8SEO9BlwoqD++3tQ=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-i2gk7mKLe/ey54QdIgarEV/vitgDAUm+c7/11+5CoIduY0dR+Fs3SJ4lYcjQxB9GPXvHFsEh+CSWCi9xehkSwA=="
     },
     "node_modules/@baloise/web-app-utils": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.0.tgz",
-      "integrity": "sha512-C992qUuGFWkN16E4c788wbYFpwTiTx5dO3IySl4bZTmPhvNPyxIPwaMrLvlL2daNkJuMfYFFk4NE7yAlnMHaUw==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.1.tgz",
+      "integrity": "sha512-+ccSXhi4s3XahCQ8M67YDyETOuBkYJZRfaE+DcLeKe1QAb01B2OUF8xTv7/C/MQi55PKeZDXL5vniobLnp+ilQ==",
       "dependencies": {
         "date-fns": "^2.28.0",
         "lodash.camelcase": "^4.3.0",
-        "lodash.isarray": "^4.0.0",
         "lodash.isboolean": "^3.0.3",
         "lodash.isdate": "^4.0.1",
         "lodash.isequal": "^4.5.0",
@@ -3306,14 +3305,14 @@
       }
     },
     "node_modules/@stencil/core": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.20.0.tgz",
-      "integrity": "sha512-ka+eOW+dNteXIfLCRipNbbAlBEQjqJ2fkx3fxzlKgnNHEQMdZiuIjlWt63KzvOJStNeuADdQXo89BB1dC2VRUw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-Ybm4NteQBScLq3H0JML/uqo4nWjNpZw1HAAURtR5LlRm7ptzNKO5S8EnHp3m05/uyTzeh9yLpUFHY7bxGNdYLg==",
       "bin": {
         "stencil": "bin/stencil"
       },
       "engines": {
-        "node": ">=12.10.0",
+        "node": ">=14.10.0",
         "npm": ">=6.0.0"
       }
     },
@@ -11727,12 +11726,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.isarray": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz",
-      "integrity": "sha512-V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g==",
-      "deprecated": "This package is deprecated. Use Array.isArray."
-    },
     "node_modules/lodash.isboolean": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
@@ -18574,17 +18567,17 @@
       }
     },
     "@baloise/design-system-components": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-12.13.0.tgz",
-      "integrity": "sha512-fILabu4fAqfNr515fe5kTPRPXjDygJZaumuBXL8nEVha74dJ0q7sMnzEXTcybVYRNgECn8aTGUAclYjjgALGLg==",
-      "requires": {
-        "@baloise/design-system-css": "12.13.0",
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-icons": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0",
-        "@baloise/web-app-utils": "3.11.0",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components/-/design-system-components-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-I8SRh1LUJ+QkyDG9TVI0UAeto9GLbPTb8qfeiFr7/2FOUYVzAvXJukEKKlCZdZjjM+RA7eLegUoJ0tjbvx2lCw==",
+      "requires": {
+        "@baloise/design-system-css": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-icons": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426115952",
+        "@baloise/web-app-utils": "3.11.1",
         "@popperjs/core": "~2.11.4",
-        "@stencil/core": "~2.20.0",
+        "@stencil/core": "~3.2.0",
         "big.js": "~6.2.1",
         "contactjs": "~2.1.6",
         "date-fns": "~2.29.3",
@@ -18612,46 +18605,45 @@
       }
     },
     "@baloise/design-system-components-react": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-react/-/design-system-components-react-12.13.0.tgz",
-      "integrity": "sha512-71WMFT3vdICC8eZ4F9PljxINlOt9YAQTB5+STHN+4Q//Ehz8vCwNBLJb2niqU1VgcXwCHzkrwjoQQYZShcNj1Q==",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-components-react/-/design-system-components-react-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-BzozFNrWhsc2q345SDWjsgILZ7YRPMFKK5JkQTn5zI4AM+gyQDdgbR0/opWOfnN/PMTFerj/M82kB3HEOSVKYQ==",
       "requires": {
-        "@baloise/design-system-components": "12.13.0",
+        "@baloise/design-system-components": "0.0.0-snapshot-20230426115952",
         "tslib": "*"
       }
     },
     "@baloise/design-system-css": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-12.13.0.tgz",
-      "integrity": "sha512-LwxKBydjwzubVngmZO8aaj7dqldfIIKxqUiBrFgXcKgRAUNuPOUr0ZUuJO2hKYCEa8VKvG7kNO3bIUl8+74ItA==",
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-css/-/design-system-css-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-BrMv6eNP8om2gON6ZHtaZS75ICs6MZyhkLvPgH9MjIWbryrwJW7bd3mdB80f6ogbNF2L+KSmGsSt0EZMldHptw==",
       "requires": {
-        "@baloise/design-system-fonts": "12.13.0",
-        "@baloise/design-system-tokens": "12.13.0"
+        "@baloise/design-system-fonts": "0.0.0-snapshot-20230426115952",
+        "@baloise/design-system-tokens": "0.0.0-snapshot-20230426115952"
       }
     },
     "@baloise/design-system-fonts": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-12.13.0.tgz",
-      "integrity": "sha512-xcrMNe3hBPrifJVSdpcxoXSJ/2+JP9xeomKzR2fEZAJsNF8V72jq3VnpusQbvH+nivxlMEsTqcnHMhRJU90ivQ=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-fonts/-/design-system-fonts-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-rS6ddNKjOjLAVG+jVu0GrP+trnb171sqMapBtTMKkxB768J30/PET5h7S9URZvyP8mZgj0ubnnoOzAv0mkv/Pw=="
     },
     "@baloise/design-system-icons": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-12.13.0.tgz",
-      "integrity": "sha512-+A+gzBSFW0m5vnNdL5B7ZwQPvX/VwxdEekUN/7owk5eANY5Y4UxxkSxc3TFvk/LJ5XbLN2i7EO7XdOeR3DLWsA=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-icons/-/design-system-icons-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-tVxS6sH208GdXxH3U7DJgoGWHBLh6Unu4beSoN74pH18cwhF4RA3FNYTMBZL5Tg4HN17tdGerkxr0w7c9rPhSw=="
     },
     "@baloise/design-system-tokens": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-12.13.0.tgz",
-      "integrity": "sha512-djWn1eZ9CsRTNl9HinpAcJ+nWh8ecZndfIl7y61UgTsgBDTBOJk/1D8uAUJzI6hIe1e8pn8SEO9BlwoqD++3tQ=="
+      "version": "0.0.0-snapshot-20230426115952",
+      "resolved": "https://registry.npmjs.org/@baloise/design-system-tokens/-/design-system-tokens-0.0.0-snapshot-20230426115952.tgz",
+      "integrity": "sha512-i2gk7mKLe/ey54QdIgarEV/vitgDAUm+c7/11+5CoIduY0dR+Fs3SJ4lYcjQxB9GPXvHFsEh+CSWCi9xehkSwA=="
     },
     "@baloise/web-app-utils": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.0.tgz",
-      "integrity": "sha512-C992qUuGFWkN16E4c788wbYFpwTiTx5dO3IySl4bZTmPhvNPyxIPwaMrLvlL2daNkJuMfYFFk4NE7yAlnMHaUw==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/@baloise/web-app-utils/-/web-app-utils-3.11.1.tgz",
+      "integrity": "sha512-+ccSXhi4s3XahCQ8M67YDyETOuBkYJZRfaE+DcLeKe1QAb01B2OUF8xTv7/C/MQi55PKeZDXL5vniobLnp+ilQ==",
       "requires": {
         "date-fns": "^2.28.0",
         "lodash.camelcase": "^4.3.0",
-        "lodash.isarray": "^4.0.0",
         "lodash.isboolean": "^3.0.3",
         "lodash.isdate": "^4.0.1",
         "lodash.isequal": "^4.5.0",
@@ -19562,9 +19554,9 @@
       }
     },
     "@stencil/core": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.20.0.tgz",
-      "integrity": "sha512-ka+eOW+dNteXIfLCRipNbbAlBEQjqJ2fkx3fxzlKgnNHEQMdZiuIjlWt63KzvOJStNeuADdQXo89BB1dC2VRUw=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-3.2.1.tgz",
+      "integrity": "sha512-Ybm4NteQBScLq3H0JML/uqo4nWjNpZw1HAAURtR5LlRm7ptzNKO5S8EnHp3m05/uyTzeh9yLpUFHY7bxGNdYLg=="
     },
     "@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
@@ -25713,11 +25705,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "lodash.isarray": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz",
-      "integrity": "sha512-V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g=="
-    },
     "lodash.isboolean": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
diff --git a/react/package.json b/react/package.json
index d1a3a7c..28f58e6 100644
--- a/react/package.json
+++ b/react/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@baloise/design-system-components-react": "^12.13.0",
+    "@baloise/design-system-components-react": "0.0.0-snapshot-20230426115952",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
diff --git a/react/src/components/EventComponent.tsx b/react/src/components/EventComponent.tsx
index c558d1f..a068dac 100644
--- a/react/src/components/EventComponent.tsx
+++ b/react/src/components/EventComponent.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 import { BalInput, BalText } from "@baloise/design-system-components-react";
 
 function EventComponent() {
-  const [myName, setMyName] = useState<string | undefined>();
+  const [myName, setMyName] = useState<BalEvents.BalInputInputDetail>();
 
   return (
     <div>
diff --git a/react/src/components/PropertyComponent.tsx b/react/src/components/PropertyComponent.tsx
index 6283109..71628c8 100644
--- a/react/src/components/PropertyComponent.tsx
+++ b/react/src/components/PropertyComponent.tsx
@@ -1,12 +1,11 @@
 import { useState } from "react";
-import type { Props } from "@baloise/design-system-components";
 import {
   BalButton,
   BalButtonGroup,
 } from "@baloise/design-system-components-react";
 
 function PropertyComponent() {
-  const [myColor] = useState<Props.BalButtonColor>("info");
+  const [myColor] = useState<BalProps.BalButtonColor>("info");
 
   return (
     <BalButtonGroup>