diff --git a/RevenueCat.xcodeproj/project.pbxproj b/RevenueCat.xcodeproj/project.pbxproj
index 08153ac3e1..10bef04a4f 100644
--- a/RevenueCat.xcodeproj/project.pbxproj
+++ b/RevenueCat.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 		1E99F81F2AC5917F0023E26E /* StoreMessagesHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E99F81D2AC5917F0023E26E /* StoreMessagesHelperTests.swift */; };
 		1ED4CA9F2CC25A5F0021AB8F /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ED4CA9E2CC25A5F0021AB8F /* SafariView.swift */; };
 		2C08B2E92CD40DBF0024857B /* ButtonComponentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C08B2E82CD40DBF0024857B /* ButtonComponentTests.swift */; };
+		2C08B3072CD55D660024857B /* FlexHStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C08B3062CD55D590024857B /* FlexHStack.swift */; };
 		2C0B98CD2797070B00C5874F /* PromotionalOffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C0B98CC2797070B00C5874F /* PromotionalOffer.swift */; };
 		2C2AEB0F2CA64E0E00A50F38 /* Template1Preview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AEB0E2CA64E0E00A50F38 /* Template1Preview.swift */; };
 		2C2AEB3B2CA7209F00A50F38 /* PaywallPackageComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AEB3A2CA7209F00A50F38 /* PaywallPackageComponent.swift */; };
@@ -1178,6 +1179,7 @@
 		1E99F81D2AC5917F0023E26E /* StoreMessagesHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreMessagesHelperTests.swift; sourceTree = "<group>"; };
 		1ED4CA9E2CC25A5F0021AB8F /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = "<group>"; };
 		2C08B2E82CD40DBF0024857B /* ButtonComponentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonComponentTests.swift; sourceTree = "<group>"; };
+		2C08B3062CD55D590024857B /* FlexHStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlexHStack.swift; sourceTree = "<group>"; };
 		2C0B98CC2797070B00C5874F /* PromotionalOffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromotionalOffer.swift; sourceTree = "<group>"; };
 		2C2AEB0E2CA64E0E00A50F38 /* Template1Preview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Template1Preview.swift; sourceTree = "<group>"; };
 		2C2AEB3A2CA7209F00A50F38 /* PaywallPackageComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaywallPackageComponent.swift; sourceTree = "<group>"; };
@@ -4495,6 +4497,7 @@
 		88B1BAEA2C813A3C001B7EE5 /* Stack */ = {
 			isa = PBXGroup;
 			children = (
+				2C08B3062CD55D590024857B /* FlexHStack.swift */,
 				88B1BAE82C813A3C001B7EE5 /* StackComponentView.swift */,
 				88B1BAE92C813A3C001B7EE5 /* StackComponentViewModel.swift */,
 			);
@@ -6213,6 +6216,7 @@
 				887A60C12C1D037000E1A461 /* DebugErrorView.swift in Sources */,
 				887A607C2C1D037000E1A461 /* ColorInformation+MultiScheme.swift in Sources */,
 				88B1BAFE2C813A3C001B7EE5 /* ImageComponentViewModel.swift in Sources */,
+				2C08B3072CD55D660024857B /* FlexHStack.swift in Sources */,
 				35C200B12C39254100B9778B /* FeedbackSurveyView.swift in Sources */,
 				35F249CC2C493DCC0058993A /* CustomerCenterPurchasesType.swift in Sources */,
 				887A60672C1D037000E1A461 /* PaywallError.swift in Sources */,
diff --git a/RevenueCatUI/Templates/Components/PaywallComponentTypeTransformers.swift b/RevenueCatUI/Templates/Components/PaywallComponentTypeTransformers.swift
index 8521c5e363..cb7ed8e7e4 100644
--- a/RevenueCatUI/Templates/Components/PaywallComponentTypeTransformers.swift
+++ b/RevenueCatUI/Templates/Components/PaywallComponentTypeTransformers.swift
@@ -60,7 +60,7 @@ extension PaywallComponent.FontWeight {
 
     var fontWeight: Font.Weight {
         switch self {
-        case .ultraLight:
+        case .extraLight:
             return .ultraLight
         case .thin:
             return .thin
@@ -74,7 +74,7 @@ extension PaywallComponent.FontWeight {
             return .semibold
         case .bold:
             return .bold
-        case .heavy:
+        case .extraBold:
             return .heavy
         case .black:
             return .black
@@ -127,6 +127,17 @@ extension PaywallComponent.TwoDimensionAlignment {
 
 extension PaywallComponent.HorizontalAlignment {
 
+    var stackAlignment: SwiftUI.HorizontalAlignment {
+        switch self {
+        case .leading:
+            return .leading
+        case .center:
+            return .center
+        case .trailing:
+            return .trailing
+        }
+    }
+
     var textAlignment: TextAlignment {
         switch self {
         case .leading:
@@ -138,7 +149,7 @@ extension PaywallComponent.HorizontalAlignment {
         }
     }
 
-    var stackAlignment: SwiftUI.Alignment {
+    var frameAlignment: SwiftUI.Alignment {
         switch self {
         case .leading:
             return .leading
diff --git a/RevenueCatUI/Templates/Components/Stack/FlexHStack.swift b/RevenueCatUI/Templates/Components/Stack/FlexHStack.swift
new file mode 100644
index 0000000000..354467be3b
--- /dev/null
+++ b/RevenueCatUI/Templates/Components/Stack/FlexHStack.swift
@@ -0,0 +1,96 @@
+//
+//  Copyright RevenueCat Inc. All Rights Reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      https://opensource.org/licenses/MIT
+//
+//  FlexHStack.swift
+//
+//  Created by Josh Holtz on 11/1/24.
+
+import SwiftUI
+
+#if PAYWALL_COMPONENTS
+
+enum JustifyContent {
+    case start, center, end, spaceBetween, spaceAround, spaceEvenly
+}
+
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+struct FlexHStack: View {
+    let alignment: VerticalAlignment
+    let justifyContent: JustifyContent
+    let spacing: CGFloat?
+    let componentViewModels: [PaywallComponentViewModel]
+
+    let onDismiss: () -> Void
+
+    init(
+        alignment: VerticalAlignment,
+        spacing: CGFloat?,
+        justifyContent: JustifyContent,
+        componentViewModels: [PaywallComponentViewModel],
+        onDismiss: @escaping () -> Void
+    ) {
+        self.alignment = alignment
+        self.spacing = spacing
+        self.justifyContent = justifyContent
+        self.componentViewModels = componentViewModels
+        self.onDismiss = onDismiss
+    }
+
+    var body: some View {
+        HStack(alignment: self.alignment, spacing: self.spacing) {
+            switch justifyContent {
+            case .start:
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                }
+                Spacer()
+
+            case .center:
+                Spacer()
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                }
+                Spacer()
+
+            case .end:
+                Spacer()
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                }
+
+            case .spaceBetween:
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                    if index < self.componentViewModels.count - 1 {
+                        Spacer()
+                    }
+                }
+
+            case .spaceAround:
+                Spacer()
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                    if index < self.componentViewModels.count - 1 {
+                        Spacer()
+                    }
+                }
+                Spacer()
+
+            case .spaceEvenly:
+                ForEach(0..<componentViewModels.count, id: \.self) { index in
+                    Spacer()
+                    ComponentsView(componentViewModels: [self.componentViewModels[index]], onDismiss: self.onDismiss)
+                }
+                Spacer()
+            }
+        }
+    }
+}
+
+#endif
diff --git a/RevenueCatUI/Templates/Components/Stack/StackComponentView.swift b/RevenueCatUI/Templates/Components/Stack/StackComponentView.swift
index 94a2b3e141..8793cbc998 100644
--- a/RevenueCatUI/Templates/Components/Stack/StackComponentView.swift
+++ b/RevenueCatUI/Templates/Components/Stack/StackComponentView.swift
@@ -35,14 +35,53 @@ struct StackComponentView: View {
         Group {
             switch viewModel.dimension {
             case .vertical(let horizontalAlignment):
-                // LazyVStack needed for performance when loading
-                LazyVStack(spacing: viewModel.spacing) {
-                    ComponentsView(componentViewModels: self.viewModel.viewModels, onDismiss: self.onDismiss)
-                    .frame(maxWidth: .infinity, alignment: horizontalAlignment.stackAlignment)
+                Group {
+                    // This is NOT a final implementation of this
+                    // There are some horizontal sizing issues with using LazyVStack
+                    // There are so performance issues with VStack with lots of children
+                    if viewModel.shouldUseVStack {
+                        // VStack when not many things
+                        VStack(
+                            alignment: horizontalAlignment.stackAlignment,
+                            spacing: viewModel.spacing
+                        ) {
+                            ComponentsView(
+                                componentViewModels: self.viewModel.viewModels,
+                                onDismiss: self.onDismiss
+                            )
+                        }
+                    } else {
+                        // LazyVStack needed for performance when loading
+                        LazyVStack(
+                            alignment: horizontalAlignment.stackAlignment,
+                            spacing: viewModel.spacing
+                        ) {
+                            ComponentsView(
+                                componentViewModels: self.viewModel.viewModels,
+                                onDismiss: self.onDismiss
+                            )
+                        }
+                    }
                 }
-            case .horizontal(let verticalAlignment):
-                HStack(alignment: verticalAlignment.stackAlignment, spacing: viewModel.spacing) {
-                    ComponentsView(componentViewModels: self.viewModel.viewModels, onDismiss: self.onDismiss)
+                .applyIf(viewModel.shouldUseFlex) {
+                    $0.frame(
+                        maxWidth: .infinity,
+                        alignment: horizontalAlignment.frameAlignment
+                    )
+                }
+            case .horizontal(let verticalAlignment, let distribution):
+                if viewModel.shouldUseFlex {
+                    FlexHStack(
+                        alignment: verticalAlignment.stackAlignment,
+                        spacing: viewModel.spacing,
+                        justifyContent: distribution.justifyContent,
+                        componentViewModels: self.viewModel.viewModels,
+                        onDismiss: self.onDismiss
+                    )
+                } else {
+                    HStack(alignment: verticalAlignment.stackAlignment, spacing: viewModel.spacing) {
+                        ComponentsView(componentViewModels: self.viewModel.viewModels, onDismiss: self.onDismiss)
+                    }
                 }
             case .zlayer(let alignment):
                 ZStack(alignment: alignment.stackAlignment) {
@@ -65,6 +104,27 @@ struct StackComponentView: View {
 
 }
 
+extension PaywallComponent.FlexDistribution {
+
+    var justifyContent: JustifyContent {
+        switch self {
+        case .start:
+            return .start
+        case .center:
+            return .center
+        case .end:
+            return .end
+        case .spaceBetween:
+            return .spaceBetween
+        case .spaceAround:
+            return .spaceAround
+        case .spaceEvenly:
+            return .spaceEvenly
+        }
+    }
+
+}
+
 struct WidthModifier: ViewModifier {
     var width: PaywallComponent.WidthSize?
 
diff --git a/RevenueCatUI/Templates/Components/Stack/StackComponentViewModel.swift b/RevenueCatUI/Templates/Components/Stack/StackComponentViewModel.swift
index 27cf2386eb..754f88c202 100644
--- a/RevenueCatUI/Templates/Components/Stack/StackComponentViewModel.swift
+++ b/RevenueCatUI/Templates/Components/Stack/StackComponentViewModel.swift
@@ -47,6 +47,33 @@ class StackComponentViewModel {
         self.viewModels = viewModels
     }
 
+    var shouldUseVStack: Bool {
+        switch self.dimension {
+        case .vertical:
+            if viewModels.count < 3 {
+                return true
+            }
+            return false
+        case .horizontal, .zlayer:
+            return false
+        }
+    }
+
+    var shouldUseFlex: Bool {
+        guard let widthType = self.component.width?.type else {
+            return false
+        }
+
+        switch widthType {
+        case .fit:
+            return false
+        case .fill:
+            return true
+        case .fixed:
+            return true
+        }
+    }
+
     var dimension: PaywallComponent.Dimension {
         component.dimension
     }
diff --git a/RevenueCatUI/Templates/Components/TemplateComponentsView.swift b/RevenueCatUI/Templates/Components/TemplateComponentsView.swift
index 78f0ea131b..56e4c05962 100644
--- a/RevenueCatUI/Templates/Components/TemplateComponentsView.swift
+++ b/RevenueCatUI/Templates/Components/TemplateComponentsView.swift
@@ -83,7 +83,7 @@ struct TemplateComponentsView: View {
         self.onDismiss = onDismiss
 
         // Step 0: Decide which ComponentsConfig to use (base is default)
-        let componentsConfig = paywallComponentsData.componentsConfigs.base
+        let componentsConfig = paywallComponentsData.componentsConfig.base
 
         // Step 1: Get localization
         let localization = Self.chooseLocalization(for: paywallComponentsData)
@@ -113,10 +113,11 @@ struct TemplateComponentsView: View {
                 )
             )
 
-            guard packageValidator.isValid else {
-                Logger.error(Strings.paywall_could_not_find_any_packages)
-                throw PackageGroupValidationError.noAvailablePackages("No available packages found")
-            }
+            // WIP: Maybe re-enable this later or add some warnings
+//            guard packageValidator.isValid else {
+//                Logger.error(Strings.paywall_could_not_find_any_packages)
+//                throw PackageGroupValidationError.noAvailablePackages("No available packages found")
+//            }
 
             self.componentViewModel = componentViewModel
             self._paywallState = .init(wrappedValue: PaywallState(
diff --git a/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template1Preview.swift b/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template1Preview.swift
index 465fb938a4..768bd05990 100644
--- a/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template1Preview.swift
+++ b/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template1Preview.swift
@@ -38,7 +38,7 @@ private enum Template1Preview {
     static let title = PaywallComponent.TextComponent(
         text: "title",
         fontFamily: nil,
-        fontWeight: .heavy,
+        fontWeight: .black,
         color: .init(light: "#000000"),
         backgroundColor: nil,
         padding: .zero,
@@ -137,7 +137,7 @@ private enum Template1Preview {
     static let data: PaywallComponentsData = .init(
         templateName: "components",
         assetBaseURL: URL(string: "https://assets.pawwalls.com")!,
-        componentsConfigs: .init(
+        componentsConfig: .init(
             base: .init(
                 stack: .init(
                     components: [
diff --git a/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template5Preview.swift b/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template5Preview.swift
index a080ba0af7..f88d46ae05 100644
--- a/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template5Preview.swift
+++ b/RevenueCatUI/Templates/Components/TemplateComponentsViewPreviews/Template5Preview.swift
@@ -41,7 +41,7 @@ private enum Template5Preview {
     static let title = PaywallComponent.TextComponent(
         text: "title",
         fontFamily: nil,
-        fontWeight: .heavy,
+        fontWeight: .black,
         color: .init(light: "#000000"),
         backgroundColor: nil,
         padding: .zero,
@@ -171,7 +171,7 @@ private enum Template5Preview {
         components: [
             .purchaseButton(purchaseButton)
         ],
-        dimension: .horizontal(.center),
+        dimension: .horizontal(.center, .start),
         width: .init(type: .fill, value: nil),
         spacing: 0,
         backgroundColor: nil
@@ -207,7 +207,7 @@ private enum Template5Preview {
     static let data: PaywallComponentsData = .init(
         templateName: "components",
         assetBaseURL: URL(string: "https://assets.pawwalls.com")!,
-        componentsConfigs: .init(
+        componentsConfig: .init(
             base: .init(
                 stack: .init(
                     components: [
diff --git a/RevenueCatUI/Templates/Components/Text/TextComponentView.swift b/RevenueCatUI/Templates/Components/Text/TextComponentView.swift
index 7a83581934..0e7f86a557 100644
--- a/RevenueCatUI/Templates/Components/Text/TextComponentView.swift
+++ b/RevenueCatUI/Templates/Components/Text/TextComponentView.swift
@@ -88,7 +88,7 @@ struct TextComponentView_Previews: PreviewProvider {
                 component: .init(
                     text: "id_1",
                     fontFamily: nil,
-                    fontWeight: .heavy,
+                    fontWeight: .black,
                     color: .init(light: "#ff0000"),
                     backgroundColor: .init(light: "#dedede"),
                     padding: .init(top: 10,
diff --git a/Sources/Networking/Responses/OfferingsResponse.swift b/Sources/Networking/Responses/OfferingsResponse.swift
index 46423a2b46..368635577c 100644
--- a/Sources/Networking/Responses/OfferingsResponse.swift
+++ b/Sources/Networking/Responses/OfferingsResponse.swift
@@ -18,17 +18,17 @@ import Foundation
 
 public struct PaywallComponentsData: Codable, Equatable, Sendable {
 
-    public struct ComponentsConfigs: Codable, Equatable, Sendable {
+    public struct ComponentsConfig: Codable, Equatable, Sendable {
 
-        public var base: ComponentsConfig
+        public var base: PaywallComponentsConfig
 
-        public init(base: ComponentsConfig) {
+        public init(base: PaywallComponentsConfig) {
             self.base = base
         }
 
     }
 
-    public struct ComponentsConfig: Codable, Equatable, Sendable {
+    public struct PaywallComponentsConfig: Codable, Equatable, Sendable {
 
         public var stack: PaywallComponent.StackComponent
         public let stickyFooter: PaywallComponent.StickyFooterComponent?
@@ -83,7 +83,7 @@ public struct PaywallComponentsData: Codable, Equatable, Sendable {
         set { self._revision = newValue }
     }
 
-    public var componentsConfigs: ComponentsConfigs
+    public var componentsConfig: ComponentsConfig
     public var componentsLocalizations: [PaywallComponent.LocaleID: PaywallComponent.LocalizationDictionary]
     public var defaultLocale: String
 
@@ -92,7 +92,7 @@ public struct PaywallComponentsData: Codable, Equatable, Sendable {
 
     private enum CodingKeys: String, CodingKey {
         case templateName
-        case componentsConfigs
+        case componentsConfig
         case componentsLocalizations
         case defaultLocale
         case assetBaseURL = "assetBaseUrl"
@@ -101,13 +101,13 @@ public struct PaywallComponentsData: Codable, Equatable, Sendable {
 
     public init(templateName: String,
                 assetBaseURL: URL,
-                componentsConfigs: ComponentsConfigs,
+                componentsConfig: ComponentsConfig,
                 componentsLocalizations: [PaywallComponent.LocaleID: PaywallComponent.LocalizationDictionary],
                 revision: Int,
                 defaultLocaleIdentifier: String) {
         self.templateName = templateName
         self.assetBaseURL = assetBaseURL
-        self.componentsConfigs = componentsConfigs
+        self.componentsConfig = componentsConfig
         self.componentsLocalizations = componentsLocalizations
         self._revision = revision
         self.defaultLocale = defaultLocaleIdentifier
diff --git a/Sources/Paywalls/Components/Common/Dimension.swift b/Sources/Paywalls/Components/Common/Dimension.swift
index 9046713169..e5fd2e16d1 100644
--- a/Sources/Paywalls/Components/Common/Dimension.swift
+++ b/Sources/Paywalls/Components/Common/Dimension.swift
@@ -21,7 +21,7 @@ public extension PaywallComponent {
     enum Dimension: Codable, Sendable, Hashable {
 
         case vertical(HorizontalAlignment)
-        case horizontal(VerticalAlignment)
+        case horizontal(VerticalAlignment, FlexDistribution)
         case zlayer(TwoDimensionAlignment)
 
         public func encode(to encoder: any Encoder) throws {
@@ -31,9 +31,10 @@ public extension PaywallComponent {
             case .vertical(let alignment):
                 try container.encode(DimensionType.vertical.rawValue, forKey: .type)
                 try container.encode(alignment, forKey: .alignment)
-            case .horizontal(let alignment):
+            case .horizontal(let alignment, let distribution):
                 try container.encode(DimensionType.horizontal.rawValue, forKey: .type)
                 try container.encode(alignment, forKey: .alignment)
+                try container.encode(distribution, forKey: .distribution)
             case .zlayer(let alignment):
                 try container.encode(DimensionType.zlayer.rawValue, forKey: .type)
                 try container.encode(alignment.rawValue, forKey: .alignment)
@@ -50,7 +51,8 @@ public extension PaywallComponent {
                 self = .vertical(alignment)
             case .horizontal:
                 let alignment = try container.decode(VerticalAlignment.self, forKey: .alignment)
-                self = .horizontal(alignment)
+                let distribution = try container.decode(FlexDistribution.self, forKey: .distribution)
+                self = .horizontal(alignment, distribution)
             case .zlayer:
                 let alignment = try container.decode(TwoDimensionAlignment.self, forKey: .alignment)
                 self = .zlayer(alignment)
@@ -58,7 +60,7 @@ public extension PaywallComponent {
         }
 
         public static func horizontal() -> Dimension {
-            return .horizontal(.center)
+            return .horizontal(.center, .start)
         }
 
         public static func vertical() -> Dimension {
@@ -70,6 +72,7 @@ public extension PaywallComponent {
 
             case type
             case alignment
+            case distribution
 
         }
 
diff --git a/Sources/Paywalls/Components/Common/PaywallComponentBase.swift b/Sources/Paywalls/Components/Common/PaywallComponentBase.swift
index fa6f3eb752..d3161c2d3d 100644
--- a/Sources/Paywalls/Components/Common/PaywallComponentBase.swift
+++ b/Sources/Paywalls/Components/Common/PaywallComponentBase.swift
@@ -32,8 +32,8 @@ public enum PaywallComponent: PaywallComponentBase {
         case linkButton = "link_button"
         case button
         case package
-        case purchaseButton
-        case stickyFooter
+        case purchaseButton = "purchase_button"
+        case stickyFooter = "sticky_footer"
 
     }
 
diff --git a/Sources/Paywalls/Components/Common/PaywallComponentPropertyTypes.swift b/Sources/Paywalls/Components/Common/PaywallComponentPropertyTypes.swift
index 3d0364172d..57f04f7d21 100644
--- a/Sources/Paywalls/Components/Common/PaywallComponentPropertyTypes.swift
+++ b/Sources/Paywalls/Components/Common/PaywallComponentPropertyTypes.swift
@@ -125,6 +125,17 @@ public extension PaywallComponent {
 
     }
 
+    enum FlexDistribution: String, Codable, Sendable, Hashable, Equatable {
+
+        case start
+        case center
+        case end
+        case spaceBetween = "space_between"
+        case spaceAround = "space_around"
+        case spaceEvenly = "space_evenly"
+
+    }
+
     enum HorizontalAlignment: String, Codable, Sendable, Hashable, Equatable {
 
         case leading
@@ -148,23 +159,23 @@ public extension PaywallComponent {
         case trailing
         case top
         case bottom
-        case topLeading
-        case topTrailing
-        case bottomLeading
-        case bottomTrailing
+        case topLeading = "top_leading"
+        case topTrailing = "top_trailing"
+        case bottomLeading = "bottom_leading"
+        case bottomTrailing = "bottom_trailing"
 
     }
 
     enum FontWeight: String, Codable, Sendable, Hashable, Equatable {
 
-        case ultraLight
+        case extraLight = "extra_light"
         case thin
         case light
         case regular
         case medium
         case semibold
         case bold
-        case heavy
+        case extraBold = "extra_bold"
         case black
 
     }
diff --git a/Sources/Paywalls/Components/PaywallPackageComponent.swift b/Sources/Paywalls/Components/PaywallPackageComponent.swift
index 821b8595e2..ed7c52eb60 100644
--- a/Sources/Paywalls/Components/PaywallPackageComponent.swift
+++ b/Sources/Paywalls/Components/PaywallPackageComponent.swift
@@ -35,6 +35,18 @@ public extension PaywallComponent {
             self.isSelectedByDefault = isSelectedByDefault
             self.stack = stack
         }
+
+    }
+
+}
+
+extension PaywallComponent.PackageComponent {
+
+    enum CodingKeys: String, CodingKey {
+        case type
+        case packageID = "packageId"
+        case isSelectedByDefault
+        case stack
     }
 
 }
diff --git a/Sources/Paywalls/Components/PaywallTextComponent.swift b/Sources/Paywalls/Components/PaywallTextComponent.swift
index 1c6cfad283..d3f2e1f787 100644
--- a/Sources/Paywalls/Components/PaywallTextComponent.swift
+++ b/Sources/Paywalls/Components/PaywallTextComponent.swift
@@ -97,7 +97,7 @@ extension PaywallComponent.TextComponent {
 
     enum CodingKeys: String, CodingKey {
         case type
-        case text = "text_lid"
+        case text = "textLid"
         case fontFamily
         case fontWeight
         case color
@@ -116,7 +116,7 @@ extension PaywallComponent.PartialTextComponent {
 
     enum CodingKeys: String, CodingKey {
         case visible
-        case text = "text_lid"
+        case text = "textLid"
         case fontFamily
         case fontWeight
         case color
diff --git a/Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift b/Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift
index daf920511e..eb79b900b6 100644
--- a/Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift
+++ b/Tests/TestingApps/PaywallsTester/PaywallsTester/Config/SamplePaywalls.swift
@@ -650,7 +650,7 @@ private extension SamplePaywallLoader {
     ) -> PaywallComponentsData {
         PaywallComponentsData(templateName: "Component Sample",
                               assetBaseURL: URL(string:"https://assets.pawwalls.com/")!,
-                              componentsConfigs: .init(
+                              componentsConfig: .init(
                                 base: .init(
                                     stack: .init(components: components),
                                     stickyFooter: stickyFooter
@@ -928,7 +928,7 @@ private extension SamplePaywallLoader {
 
     static func simpleFeatureStack(text: PaywallComponent) -> PaywallComponent {
         .stack(.init(components: [checkmarkImage, text],
-                     dimension: .horizontal(.center),
+                     dimension: .horizontal(.center, .start),
                      spacing: nil,
                      backgroundColor: nil,
                      padding: PaywallComponent.Padding(top: 0, bottom: 0, leading: 40, trailing: 40)))
@@ -1109,7 +1109,7 @@ private extension SamplePaywallLoader {
 
     static var featureImageStack1: PaywallComponent = {
         .stack(.init(components: [treadmillText, spacer, treadmill, spacer],
-                     dimension: .horizontal(.center),
+                     dimension: .horizontal(.center, .start),
                      spacing: nil,
                      backgroundColor: nil,
                      padding: PaywallComponent.Padding(top: 0, bottom: 0, leading: 40, trailing: 40)))
@@ -1117,7 +1117,7 @@ private extension SamplePaywallLoader {
 
     static var featureImageStack2: PaywallComponent = {
         .stack(.init(components: [spacer, cycle, spacer, cycleText],
-                     dimension: .horizontal(.center),
+                     dimension: .horizontal(.center, .start),
                      spacing: nil,
                      backgroundColor: nil,
                      padding: PaywallComponent.Padding(top: 0, bottom: 0, leading: 40, trailing: 40)))
@@ -1125,7 +1125,7 @@ private extension SamplePaywallLoader {
 
     static var featureImageStack3: PaywallComponent = {
         .stack(.init(components: [weightsText, spacer, weights, spacer],
-                     dimension: .horizontal(.center),
+                     dimension: .horizontal(.center, .start),
                      spacing: nil,
                      backgroundColor: nil,
                      padding: PaywallComponent.Padding(top: 0, bottom: 0, leading: 40, trailing: 40)))
diff --git a/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/OfferingList/APIKeyDashboardList.swift b/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/OfferingList/APIKeyDashboardList.swift
index cdc39ea97c..f0ba534a45 100644
--- a/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/OfferingList/APIKeyDashboardList.swift
+++ b/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/OfferingList/APIKeyDashboardList.swift
@@ -140,26 +140,10 @@ struct APIKeyDashboardList: View {
             }
         }
         .sheet(item: self.$presentedPaywall) { paywall in
-            #if PAYWALL_COMPONENTS
-            if let componentData = paywall.offering.paywallComponentsData {
-                // TODO: Get locale
-                TemplateComponentsView(
-                    paywallComponentsData: componentData,
-                    offering: paywall.offering,
-                    onDismiss: { self.presentedPaywall = nil }
-                )
-            } else {
-                PaywallPresenter(offering: paywall.offering, mode: paywall.mode, introEligility: .eligible)
-                    .onRestoreCompleted { _ in
-                        self.presentedPaywall = nil
-                    }
-            }
-            #else
             PaywallPresenter(offering: paywall.offering, mode: paywall.mode, introEligility: .eligible)
                 .onRestoreCompleted { _ in
                     self.presentedPaywall = nil
                 }
-            #endif
         }
     }
 
@@ -208,7 +192,9 @@ extension APIKeyDashboardList.Template: CustomStringConvertible {
     var description: String {
         if let name = self.name {
             #if DEBUG
-            if let template = PaywallTemplate(rawValue: name) {
+            if name == "components" {
+                return "V2"
+            } else if let template = PaywallTemplate(rawValue: name) {
                 return template.name
             } else {
                 return "Unrecognized template"
diff --git a/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/SamplePaywallsList.swift b/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/SamplePaywallsList.swift
index 2df080faa4..9d8a549a5d 100644
--- a/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/SamplePaywallsList.swift
+++ b/Tests/TestingApps/PaywallsTester/PaywallsTester/UI/Views/SamplePaywallsList.swift
@@ -109,7 +109,7 @@ struct SamplePaywallsList: View {
             Section("Components") {
                 Button {
                     let data = SamplePaywallLoader.template1Components
-                    data.componentsConfigs.base.stack.components.printAsJSON()
+                    data.componentsConfig.base.stack.components.printAsJSON()
                     data.componentsLocalizations.printAsJSON()
                     self.display = .componentPaywall(data)
                 } label: {
@@ -117,7 +117,7 @@ struct SamplePaywallsList: View {
                 }
                 Button {
                     let data = SamplePaywallLoader.fitnessComponents
-                    data.componentsConfigs.base.stack.components.printAsJSON()
+                    data.componentsConfig.base.stack.components.printAsJSON()
                     data.componentsLocalizations.printAsJSON()
                     self.display = .componentPaywall(data)
                 } label: {
@@ -125,7 +125,7 @@ struct SamplePaywallsList: View {
                 }
                 Button {
                     let data = SamplePaywallLoader.simpleSampleComponents
-                    data.componentsConfigs.base.stack.components.printAsJSON()
+                    data.componentsConfig.base.stack.components.printAsJSON()
                     data.componentsLocalizations.printAsJSON()
                     self.display = .componentPaywall(data)
                 } label: {
@@ -133,7 +133,7 @@ struct SamplePaywallsList: View {
                 }
                 Button {
                     let data = SamplePaywallLoader.longWithStickyFooter
-                    data.componentsConfigs.base.stack.components.printAsJSON()
+                    data.componentsConfig.base.stack.components.printAsJSON()
                     data.componentsLocalizations.printAsJSON()
                     self.display = .componentPaywall(data)
                 } label: {