diff --git a/projects/ssr-tests/jest.config.js b/projects/ssr-tests/jest.config.js
index 925500093f7..f0aea45398b 100644
--- a/projects/ssr-tests/jest.config.js
+++ b/projects/ssr-tests/jest.config.js
@@ -1,23 +1,14 @@
 const { pathsToModuleNameMapper } = require('ts-jest');
 const { compilerOptions } = require('./tsconfig.json');
-const { defaultTransformerOptions } = require('jest-preset-angular/presets');
 
 /** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 module.exports = {
-  preset: 'jest-preset-angular',
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
     prefix: '<rootDir>/',
   }),
-  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
   testMatch: ['**/+(*.)+(spec).+(ts)'],
   transform: {
-    '^.+\\.(ts|js|mjs|html|svg)$': [
-      'jest-preset-angular',
-      {
-        ...defaultTransformerOptions,
-        tsconfig: '<rootDir>/tsconfig.json',
-      },
-    ],
+    '^.+\\.(ts|js|mjs)$': ['ts-jest'],
   },
 
   collectCoverage: false,
diff --git a/projects/ssr-tests/setup-jest.ts b/projects/ssr-tests/setup-jest.ts
deleted file mode 100644
index 2b340f94b88..00000000000
--- a/projects/ssr-tests/setup-jest.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
- * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import 'jest-preset-angular/setup-jest';
-import 'zone.js';
diff --git a/projects/storefrontstyles/scss/_mixins.scss b/projects/storefrontstyles/scss/_mixins.scss
index 5e6ed09bbd0..71fef98a7cc 100644
--- a/projects/storefrontstyles/scss/_mixins.scss
+++ b/projects/storefrontstyles/scss/_mixins.scss
@@ -1 +1,2 @@
 @import 'cxbase/mixins';
+@import 'theme/high-contrast/mixins/mixins';
diff --git a/projects/storefrontstyles/scss/_site-theme.scss b/projects/storefrontstyles/scss/_site-theme.scss
new file mode 100644
index 00000000000..a473cd3f76b
--- /dev/null
+++ b/projects/storefrontstyles/scss/_site-theme.scss
@@ -0,0 +1,3 @@
+@import 'theme/high-contrast/dark/variables';
+@import 'theme/high-contrast/light/variables';
+@import 'theme/high-contrast/high-contrast';
diff --git a/projects/storefrontstyles/scss/_theme.scss b/projects/storefrontstyles/scss/_theme.scss
index d5ff3b7ac88..ab0c0ba9639 100644
--- a/projects/storefrontstyles/scss/_theme.scss
+++ b/projects/storefrontstyles/scss/_theme.scss
@@ -8,9 +8,5 @@
 
 //old theme to be commented out on next major or with impex
 @import 'theme/santorini/variables';
-@import 'theme/high-contrast/dark/variables';
-@import 'theme/high-contrast/light/variables';
-@import 'theme/high-contrast/high-contrast';
-@import 'theme/high-contrast/mixins/mixins';
 // new theme below to uncomment on next major or with impex
 // @import 'theme/santorini-updated/variables';
diff --git a/projects/storefrontstyles/scss/app.scss b/projects/storefrontstyles/scss/app.scss
index bd0b56afc40..9d6f517ff00 100644
--- a/projects/storefrontstyles/scss/app.scss
+++ b/projects/storefrontstyles/scss/app.scss
@@ -45,3 +45,4 @@
 @import 'misc/hamburger';
 @import 'misc/dialog';
 @import 'misc/table';
+@import 'site-theme';
diff --git a/projects/storefrontstyles/scss/components/myaccount/_consent-management.scss b/projects/storefrontstyles/scss/components/myaccount/_consent-management.scss
index c46dbca3d95..cd4228adb26 100644
--- a/projects/storefrontstyles/scss/components/myaccount/_consent-management.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/_consent-management.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 %cx-consent-management {
   .cx-consent-action-links {
     text-align: end;
diff --git a/projects/storefrontstyles/scss/components/myaccount/_cx-my-account-v2-notification-preference.scss b/projects/storefrontstyles/scss/components/myaccount/_cx-my-account-v2-notification-preference.scss
index 22796de0879..44c845c653d 100644
--- a/projects/storefrontstyles/scss/components/myaccount/_cx-my-account-v2-notification-preference.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/_cx-my-account-v2-notification-preference.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 %cx-my-account-v2-notification-preference {
   .np-content-center {
     -ms-flex-pack: center;
diff --git a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
index 7f070c10926..5839ddbbd96 100644
--- a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
+++ b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-dialog.scss
@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 %cx-anonymous-consent-dialog {
   color: var(--cx-color-text);
   background-color: rgba(0, 0, 0, 0.5);
diff --git a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
index d3cf2e04ded..94a50425c27 100644
--- a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
+++ b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss
@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 // To control visual effects while searching the searchbox requires
 // some CSS rules to the outer elements.
 %cx-searchbox__body {
diff --git a/projects/storefrontstyles/scss/components/pwa/add-to-home-screen-banner/_add-to-home-screen-banner.scss b/projects/storefrontstyles/scss/components/pwa/add-to-home-screen-banner/_add-to-home-screen-banner.scss
index 301fac5b6e8..de3178097b7 100644
--- a/projects/storefrontstyles/scss/components/pwa/add-to-home-screen-banner/_add-to-home-screen-banner.scss
+++ b/projects/storefrontstyles/scss/components/pwa/add-to-home-screen-banner/_add-to-home-screen-banner.scss
@@ -1,5 +1,3 @@
-@import '../../../theme';
-
 %cx-add-to-home-screen-banner {
   .cx-add-to-home-screen-banner {
     background-color: var(--cx-color-background);
diff --git a/projects/storefrontstyles/scss/cxbase/_mixins.scss b/projects/storefrontstyles/scss/cxbase/_mixins.scss
index 8cb54bc1f8a..4d2ba07742d 100644
--- a/projects/storefrontstyles/scss/cxbase/_mixins.scss
+++ b/projects/storefrontstyles/scss/cxbase/_mixins.scss
@@ -2,8 +2,6 @@
 // lower level bootstrap variables. Hence we import the variables here,
 // to make the mixins reusable. In order to have the right variables
 // we load variables through the theme import.  */
-@import '../theme';
-
 @import 'bootstrap/scss/_mixins';
 
 @import './mixins/reset';
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss b/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss
index f9ae34a0e38..a22cbdcb76e 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../functions';
 @import '../../mixins';
 .accordion {
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/alert.scss b/projects/storefrontstyles/scss/cxbase/blocks/alert.scss
index 88505265d0c..84948e38bd5 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/alert.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/alert.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 @import 'bootstrap/scss/alert';
 
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
index ade3f546c5d..93dc1341928 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/buttons';
 
 button {
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/card.scss b/projects/storefrontstyles/scss/cxbase/blocks/card.scss
index ac88b5e311a..33885dad6ed 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/card.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/card.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/card';
 
 .card {
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/carousel.scss b/projects/storefrontstyles/scss/cxbase/blocks/carousel.scss
index e311e144c3b..59265646bad 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/carousel.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/carousel.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 
 // None of the styles here below are customizable at component level
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/dropdown.scss b/projects/storefrontstyles/scss/cxbase/blocks/dropdown.scss
index 88e7303113d..4c0dde3d729 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/dropdown.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/dropdown.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/dropdown';
 
 $cx-dropdown-toggle-border-color: 'inverse' !important;
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
index 4981053ce73..50240ed2934 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/custom-forms';
 
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/message.scss b/projects/storefrontstyles/scss/cxbase/blocks/message.scss
index efe05f923d1..dabdb85beec 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/message.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/message.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../mixins';
 
 .cx-message {
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/modal.scss b/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
index c4fecd9c179..8abc0778a14 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/modal.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/modal';
 @import 'bootstrap/scss/close';
 
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/tables.scss b/projects/storefrontstyles/scss/cxbase/blocks/tables.scss
index 598ea5712a0..0a067915a69 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/tables.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/tables.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .table {
   width: 100%;
 
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/tabs.scss b/projects/storefrontstyles/scss/cxbase/blocks/tabs.scss
index 6d462eb2bde..d95625fab01 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/tabs.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/tabs.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 ul[role='tablist'] {
   .nav-link {
     border: none;
diff --git a/projects/storefrontstyles/scss/cxbase/blocks/tooltip.scss b/projects/storefrontstyles/scss/cxbase/blocks/tooltip.scss
index a5213a283ed..278aa148553 100644
--- a/projects/storefrontstyles/scss/cxbase/blocks/tooltip.scss
+++ b/projects/storefrontstyles/scss/cxbase/blocks/tooltip.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import 'bootstrap/scss/tooltip';
 
 .bs-tooltip-left {
diff --git a/projects/storefrontstyles/scss/cxbase/layout/app.scss b/projects/storefrontstyles/scss/cxbase/layout/app.scss
index 50feb2f520e..1b7ecd314cd 100644
--- a/projects/storefrontstyles/scss/cxbase/layout/app.scss
+++ b/projects/storefrontstyles/scss/cxbase/layout/app.scss
@@ -1,4 +1,3 @@
-@import '../../theme';
 @import '../../functions';
 @import '../../mixins';
 
diff --git a/projects/storefrontstyles/scss/cxbase/layout/page.scss b/projects/storefrontstyles/scss/cxbase/layout/page.scss
index eaf931436f6..b42db7bfcc0 100644
--- a/projects/storefrontstyles/scss/cxbase/layout/page.scss
+++ b/projects/storefrontstyles/scss/cxbase/layout/page.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .cx-page {
   padding-bottom: 120px;
 }
diff --git a/projects/storefrontstyles/scss/cxbase/layout/section.scss b/projects/storefrontstyles/scss/cxbase/layout/section.scss
index 0a7b2a563b5..2dc8d6957c8 100644
--- a/projects/storefrontstyles/scss/cxbase/layout/section.scss
+++ b/projects/storefrontstyles/scss/cxbase/layout/section.scss
@@ -1,5 +1,3 @@
-@import '../../theme';
-
 .cx-section {
   margin-bottom: var(--cx-margin-bottom, 50px);
   &:last-child {
diff --git a/projects/storefrontstyles/scss/root.scss b/projects/storefrontstyles/scss/root.scss
index 9a039496cd2..bbe9f5c678a 100644
--- a/projects/storefrontstyles/scss/root.scss
+++ b/projects/storefrontstyles/scss/root.scss
@@ -1,5 +1,3 @@
-@import 'theme';
-
 :root {
   @each $color, $value in $theme-colors {
     --cx-color-#{$color}: #{$value};