diff --git a/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift b/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift
index 379c8d921f..15fd42380c 100644
--- a/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift
+++ b/RevenueCatUI/Templates/MultiPackageBoldTemplate.swift
@@ -143,8 +143,8 @@ private struct MultiPackageTemplateContent: View {
                 textWithIntroOffer: package.localization.offerDetailsWithIntroOffer,
                 introEligibility: self.introEligibility[package.content],
                 foregroundColor: selected
-                    ? .white
-                    : .black,
+                    ? self.configuration.colors.backgroundColor
+                    : self.configuration.colors.text1Color,
                 alignment: alignment
             )
             .fixedSize(horizontal: false, vertical: true)
@@ -154,7 +154,6 @@ private struct MultiPackageTemplateContent: View {
         .padding()
         .multilineTextAlignment(.leading)
         .frame(maxWidth: .infinity, alignment: alignment)
-        .foregroundColor(self.configuration.colors.text1Color)
         .overlay {
             if selected {
                 EmptyView()
diff --git a/RevenueCatUI/Templates/OnePackageStandardTemplate.swift b/RevenueCatUI/Templates/OnePackageStandardTemplate.swift
index 41dea2d681..4efe81fc52 100644
--- a/RevenueCatUI/Templates/OnePackageStandardTemplate.swift
+++ b/RevenueCatUI/Templates/OnePackageStandardTemplate.swift
@@ -72,10 +72,10 @@ private struct OnePackageTemplateContent: View {
             IntroEligibilityStateView(
                 textWithNoIntroOffer: self.localization.offerDetails,
                 textWithIntroOffer: self.localization.offerDetailsWithIntroOffer,
-                introEligibility: self.introEligibility
+                introEligibility: self.introEligibility,
+                foregroundColor: self.configuration.colors.text1Color
             )
             .font(self.configuration.mode.offerDetailsFont)
-            .foregroundColor(self.configuration.colors.text1Color)
 
             self.button
                 .padding(.horizontal)
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png
index c8242f1574..ea3970ee88 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testDarkMode.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png
index 7ab6c871e3..4759e65ec7 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/MultiPackageBoldPaywallViewTests/iOS16-testSamplePaywall.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png
index ad5de4546f..6c9710f5f3 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testDarkMode.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png
index 704742b1be..62c1e46f8f 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywall.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png
index 82358d5683..e63424e087 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIneligibleIntroOffer.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png
index 81045d9836..a4e7b27f54 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithIntroOffer.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png
index 305b02a341..ee4c27f20e 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OnePackageStandardPaywallViewTests/iOS16-testSamplePaywallWithLoadingEligibility.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testDefaultPaywall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testDefaultPaywall.1.png
index 4766561148..d690c4047e 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testDefaultPaywall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testDefaultPaywall.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testLoadingPaywallView.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testLoadingPaywallView.1.png
index 3464d8b031..6e316ba145 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testLoadingPaywallView.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/OtherPaywallViewTests/iOS16-testLoadingPaywallView.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png
index 642b815849..57e7c73275 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility1.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png
index f54e26940a..29213c5718 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility3.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility5.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility5.1.png
index 99c17a9e1b..1317a8ab44 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility5.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testAccessibility5.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png
index 97153019f0..ffb0a882a6 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testLarge.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png
index 65fe805474..db323229a3 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testMedium.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png
index 9ed2735d62..9bcf125daf 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testSmall.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png
index 97153019f0..ffb0a882a6 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXLarge.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png
index f2f4aefee8..0d68ce4a2d 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXSmall.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png
index 802a1562a5..e313fc1d36 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXLarge.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png
index c45f14f6e3..862c5c3213 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewDynamicTypeTests/iOS16-testXXXLarge.1.png differ
diff --git a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewLocalizationTests/iOS16-testSpanish.1.png b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewLocalizationTests/iOS16-testSpanish.1.png
index bd3ab071f1..a16f8a753d 100644
Binary files a/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewLocalizationTests/iOS16-testSpanish.1.png and b/Tests/RevenueCatUITests/Templates/__Snapshots__/PaywallViewLocalizationTests/iOS16-testSpanish.1.png differ