diff --git a/packages/stark-ui/assets/stark-ui-bundle.scss b/packages/stark-ui/assets/stark-ui-bundle.scss
new file mode 100644
index 0000000000..f139081b10
--- /dev/null
+++ b/packages/stark-ui/assets/stark-ui-bundle.scss
@@ -0,0 +1,42 @@
+@import "./themes/button-theme";
+@import "./themes/card-theme";
+/* Stark styles */
+@import "./styles/header";
+/* Stark components */
+@import "../src/modules/app-logo/components/app-logo-theme";
+@import "../src/modules/app-logo/components/app-logo.component";
+@import "../src/modules/app-data/components/app-data.component";
+@import "../src/modules/app-data/components/app-data-theme";
+@import "../src/modules/app-footer/components/app-footer.component";
+@import "../src/modules/app-footer/components/app-footer-theme";
+@import "../src/modules/app-menu/components/app-menu-theme";
+@import "../src/modules/app-menu/components/app-menu.component";
+@import "../src/modules/action-bar/components/action-bar-theme";
+@import "../src/modules/action-bar/components/action-bar.component";
+@import "../src/modules/app-sidebar/components/app-sidebar-theme";
+@import "../src/modules/app-sidebar/components/app-sidebar.component";
+@import "../src/modules/breadcrumb/components/breadcrumb.component";
+@import "../src/modules/collapsible/components/collapsible-theme";
+@import "../src/modules/collapsible/components/collapsible.component";
+@import "../src/modules/date-range-picker/components/date-range-picker.component";
+@import "../src/modules/language-selector/components/language-selector.component";
+@import "../src/modules/message-pane/components/message-pane.component";
+@import "../src/modules/message-pane/components/message-pane-theme";
+@import "../src/modules/minimap/components/minimap.component";
+@import "../src/modules/minimap/components/minimap-theme";
+@import "../src/modules/slider/components/slider-theme";
+@import "../src/modules/pagination/components/pagination.component";
+@import "../src/modules/pagination/components/pagination-theme";
+@import "../src/modules/pretty-print/components/pretty-print.component";
+@import "../src/modules/table/components/table.component";
+@import "../src/modules/table/components/table-theme";
+@import "../src/modules/table/components/dialogs/multisort.component";
+@import "../src/modules/dropdown/components/dropdown-theme";
+@import "../src/modules/toast-notification/components/toast-notification.component";
+@import "../src/modules/toast-notification/components/toast-notification-theme";
+@import "../src/modules/dropdown/components/dropdown.component";
+/* Stark session-ui pages */
+@import "../src/modules/session-ui/pages/login/login-page.component";
+@import "../src/modules/session-ui/pages/preloading/preloading-page.component";
+@import "../src/modules/session-ui/pages/session-expired/session-expired-page.component";
+@import "../src/modules/session-ui/pages/session-logout/session-logout-page.component";
diff --git a/showcase/src/styles/_stark-styles.scss b/showcase/src/styles/_stark-styles.scss
deleted file mode 100644
index b8814bed9c..0000000000
--- a/showcase/src/styles/_stark-styles.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-IMPORTANT: Stark styles are provided as SCSS styles so they should be imported in a SCSS file!
-*/
-/* Stark styles */
-@import "~@nationalbankbelgium/stark-ui/assets/styles/header";
-
-/* Stark components */
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-logo/components/app-logo-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-logo/components/app-logo.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-data/components/app-data.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-data/components/app-data-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-footer/components/app-footer.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-footer/components/app-footer-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-menu/components/app-menu-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-menu/components/app-menu.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/action-bar/components/action-bar-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/action-bar/components/action-bar.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-sidebar/components/app-sidebar-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-sidebar/components/app-sidebar.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/breadcrumb/components/breadcrumb.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/collapsible/components/collapsible-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/collapsible/components/collapsible.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/date-range-picker/components/date-range-picker.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/language-selector/components/language-selector.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/message-pane/components/message-pane.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/message-pane/components/message-pane-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/minimap/components/minimap.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/minimap/components/minimap-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/slider/components/slider-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/pagination/components/pagination.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/pagination/components/pagination-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/pretty-print/components/pretty-print.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/table/components/table.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/table/components/table-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/table/components/dialogs/multisort.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/dropdown/components/dropdown-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/toast-notification/components/toast-notification.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/toast-notification/components/toast-notification-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/dropdown/components/dropdown.component";
-
-/* Stark session-ui pages */
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/login/login-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/preloading/preloading-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/session-expired/session-expired-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/session-logout/session-logout-page.component";
diff --git a/showcase/src/styles/_theme.scss b/showcase/src/styles/_theme.scss
index f5302d9af0..dc7fa1bd43 100644
--- a/showcase/src/styles/_theme.scss
+++ b/showcase/src/styles/_theme.scss
@@ -1,10 +1,5 @@
-@import "~@angular/material/theming";
-@import "variables";
-
-/* Stark NG Material themes */
 @import "~@nationalbankbelgium/stark-ui/assets/themes/theming";
-@import "~@nationalbankbelgium/stark-ui/assets/themes/button-theme";
-@import "~@nationalbankbelgium/stark-ui/assets/themes/card-theme";
+@import "variables";
 
 @import "../app/app.component-theme";
 @import "../app/shared/components/example-viewer/example-viewer-theme";
diff --git a/showcase/src/styles/styles.scss b/showcase/src/styles/styles.scss
index 567d5ace21..e14b205309 100644
--- a/showcase/src/styles/styles.scss
+++ b/showcase/src/styles/styles.scss
@@ -1,9 +1,14 @@
-@import "basscss-missing-variables.pcss"; /* FIXME: Remove this import once the issue in basscss is solved (see: https://github.com/basscss/basscss/issues/257) */
+@import "basscss-missing-variables.pcss";
+/* FIXME: Remove this import once the issue in basscss is solved (see: https://github.com/basscss/basscss/issues/257) */
 @import "~basscss/css/basscss.css";
 @import "~prismjs/themes/prism-okaidia.css";
-
+/*
+Import the local theme file first to set the correct variables, see:
+  - https://stark.nbb.be/showcase/latest/styleguide/typography
+  - https://stark.nbb.be/showcase/latest/styleguide/colors
+ */
 @import "theme";
-@import "stark-styles.scss";
+@import "~@nationalbankbelgium/stark-ui/assets/stark-ui-bundle";
 @import "../app/app.component";
 @import "../app/shared/components/reference-block/reference-block.component";
 @import "../app/shared/components/table-of-contents/table-of-contents.component";
diff --git a/starter/src/styles/_stark-styles.scss b/starter/src/styles/_stark-styles.scss
deleted file mode 100644
index 1c2e0fd391..0000000000
--- a/starter/src/styles/_stark-styles.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-IMPORTANT: Stark styles are provided as SCSS styles so they should be imported in a SCSS file!
-*/
-/* Stark styles */
-@import "~@nationalbankbelgium/stark-ui/assets/styles/header";
-
-/* Stark components */
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-footer/components/app-footer.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-footer/components/app-footer-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-logo/components/app-logo-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-logo/components/app-logo.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-menu/components/app-menu-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-menu/components/app-menu.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-sidebar/components/app-sidebar-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/app-sidebar/components/app-sidebar.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/dropdown/components/dropdown-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/language-selector/components/language-selector.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/toast-notification/components/toast-notification.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/toast-notification/components/toast-notification-theme";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/components/session-timeout-warning-dialog.component";
-
-/* Stark session-ui pages */
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/login/login-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/preloading/preloading-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/session-expired/session-expired-page.component";
-@import "~@nationalbankbelgium/stark-ui/src/modules/session-ui/pages/session-logout/session-logout-page.component";
diff --git a/starter/src/styles/_theme.scss b/starter/src/styles/_theme.scss
index 4df05be254..9132fb6059 100644
--- a/starter/src/styles/_theme.scss
+++ b/starter/src/styles/_theme.scss
@@ -1,7 +1 @@
-@import "~@angular/material/theming";
 @import "variables";
-
-/* Stark NG Material themes */
-@import "~@nationalbankbelgium/stark-ui/assets/themes/theming";
-@import "~@nationalbankbelgium/stark-ui/assets/themes/button-theme";
-@import "~@nationalbankbelgium/stark-ui/assets/themes/card-theme";
diff --git a/starter/src/styles/styles.scss b/starter/src/styles/styles.scss
index 52de30699a..3de505971e 100644
--- a/starter/src/styles/styles.scss
+++ b/starter/src/styles/styles.scss
@@ -1,3 +1,6 @@
+/*
+IMPORTANT: Stark styles are provided as SCSS styles so they should be imported in a SCSS file!
+*/
+@import "~@nationalbankbelgium/stark-ui/assets/stark-ui";
 @import "theme";
-@import "stark-styles.scss";
-@import "../app/app.component.scss";
+@import "../app/app.component";