diff --git a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
index a016eccd775..94294d63e3b 100644
--- a/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
+++ b/feature-libs/pickup-in-store/styles/_set-preferred-store.scss
@@ -16,6 +16,7 @@
       text-decoration: underline;
       border: none;
       background: none;
+      color: inherit;
 
       @include forFeature('a11yVisibleFocusOverflows') {
         padding-inline-start: 0;
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 724b55cc42e..d26e77a328a 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -419,7 +419,7 @@ if (environment.cpq) {
         a11yHideConsentButtonWhenBannerVisible: true,
         a11yRepeatingButtonsUniqueLabels: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,
-        useSiteThemeService: false,
+        useSiteThemeService: true,
         enableConsecutiveCharactersPasswordRequirement: true,
         enablePasswordsCannotMatchInPasswordUpdateForm: true,
         allPageMetaResolversEnabledInCsr: true,
diff --git a/projects/storefrontstyles/scss/components/content/tab/_tab.scss b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
index f6cad2b2917..64a176b4774 100644
--- a/projects/storefrontstyles/scss/components/content/tab/_tab.scss
+++ b/projects/storefrontstyles/scss/components/content/tab/_tab.scss
@@ -104,6 +104,7 @@
       background-color: var(--cx-tab-btn-bg-color);
       border: var(--cx-tab-btn-border);
       border-radius: var(--cx-tab-btn-border-radius);
+      color: inherit;
     }
   }
 
@@ -119,6 +120,7 @@
       text-align: start;
       height: 63px;
       position: relative;
+      color: inherit;
 
       &:before {
         margin: 0px 15px;
diff --git a/projects/storefrontstyles/scss/components/product/_star-rating.scss b/projects/storefrontstyles/scss/components/product/_star-rating.scss
index 28638f69f02..8db7d2975be 100644
--- a/projects/storefrontstyles/scss/components/product/_star-rating.scss
+++ b/projects/storefrontstyles/scss/components/product/_star-rating.scss
@@ -24,7 +24,7 @@
           var(--cx-color-primary) 0%,
           var(--cx-color-primary)
             calc((var(--star-fill, 0) - #{$i} + 1) * 100%),
-          var(--cx-color-medium) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
+          var(--cx-color-dark) calc((var(--star-fill, 0) - #{$i} + 1) * 100%)
         );
         // somehow we cannot move the text related clip and fill color outside this loop.
         // most likely they cannot come before the definition of the background.