diff --git a/demo/lib/components/avatar.dart b/demo/lib/components/avatar.dart
index 94c432f..ecca996 100644
--- a/demo/lib/components/avatar.dart
+++ b/demo/lib/components/avatar.dart
@@ -15,7 +15,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
         RemixAvatar(
-          style: RemixAvatarStyles(
+          style: RemixAvatarStyle(
             container: Style(
               box.height(60),
               box.width(60),
@@ -31,7 +31,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
         ),
         const SizedBox(width: 10),
         RemixAvatar(
-          style: RemixAvatarStyles.base().copyWith(
+          style: RemixAvatarStyle.base().copyWith(
             container: Style(
               box.height(50),
               box.width(50),
@@ -45,7 +45,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
           image: NetworkImage(
             'https://avatars.githubusercontent.com/u/14010287?v=4',
           ),
-          style: RemixAvatarStyles.base().copyWith(
+          style: RemixAvatarStyle.base().copyWith(
             container: Style(
               box.height(40),
               box.width(40),
diff --git a/demo/lib/components/list_tile.dart b/demo/lib/components/list_tile.dart
index d858dfb..b4389a2 100644
--- a/demo/lib/components/list_tile.dart
+++ b/demo/lib/components/list_tile.dart
@@ -12,7 +12,7 @@ Widget buildCheckboxUseCase(BuildContext context) {
   return Center(
     child: RemixListTile(
       leading: RemixAvatar(
-        style: RemixAvatarStyles.base().copyWith(
+        style: RemixAvatarStyle.base().copyWith(
           container: Style(
             height(60),
             width(60),
diff --git a/lib/components/avatar/avatar.dart b/lib/components/avatar/avatar.dart
index bf9a9b2..e2ed630 100644
--- a/lib/components/avatar/avatar.dart
+++ b/lib/components/avatar/avatar.dart
@@ -6,7 +6,7 @@ import 'avatar.style.dart';
 import '../../utils/component_recipe.dart';
 
 class RemixAvatar extends StatelessWidget
-    implements RemixComponentRecipe<RemixAvatarStyles> {
+    implements RemixComponentRecipe<RemixAvatarStyle> {
   const RemixAvatar({
     super.key,
     this.image,
@@ -19,17 +19,17 @@ class RemixAvatar extends StatelessWidget
 
   final ImageProvider<Object>? image;
   final String? fallbackLabel;
-  final RemixWidgetBuilder<RemixAvatarStyles>? fallbackLabelBuilder;
-  final RemixWidgetBuilder<RemixAvatarStyles>? imageBuilder;
+  final RemixWidgetBuilder<RemixAvatarStyle>? fallbackLabelBuilder;
+  final RemixWidgetBuilder<RemixAvatarStyle>? imageBuilder;
 
   @override
-  final RemixAvatarStyles? style;
+  final RemixAvatarStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixAvatarStyles buildStyle(List<Variant> variants) {
-    var styles = style == null ? RemixAvatarStyles.base() : style!;
+  RemixAvatarStyle buildStyle(List<Variant> variants) {
+    var styles = style == null ? RemixAvatarStyle.base() : style!;
 
     return styles.applyVariants(variants);
   }
diff --git a/lib/components/avatar/avatar.style.dart b/lib/components/avatar/avatar.style.dart
index 2e90052..37200c5 100644
--- a/lib/components/avatar/avatar.style.dart
+++ b/lib/components/avatar/avatar.style.dart
@@ -1,7 +1,7 @@
 import 'package:mix/mix.dart';
 
-class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
-  const RemixAvatarStyles({
+class RemixAvatarStyle extends StyleRecipe<RemixAvatarStyle> {
+  const RemixAvatarStyle({
     this.container = const Style.empty(),
     this.fallbackLabel = const Style.empty(),
     this.image = const Style.empty(),
@@ -11,8 +11,8 @@ class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
   final Style fallbackLabel;
   final Style image;
 
-  factory RemixAvatarStyles.base() {
-    return RemixAvatarStyles(
+  factory RemixAvatarStyle.base() {
+    return RemixAvatarStyle(
       container: _container(),
       fallbackLabel: _label(),
       image: _image(),
@@ -20,8 +20,8 @@ class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
   }
 
   @override
-  RemixAvatarStyles applyVariants(List<Variant> variants) {
-    return RemixAvatarStyles(
+  RemixAvatarStyle applyVariants(List<Variant> variants) {
+    return RemixAvatarStyle(
       container: container.applyVariants(variants),
       fallbackLabel: fallbackLabel.applyVariants(variants),
       image: image.applyVariants(variants),
@@ -29,12 +29,12 @@ class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
   }
 
   @override
-  RemixAvatarStyles copyWith({
+  RemixAvatarStyle copyWith({
     Style? container,
     Style? fallbackLabel,
     Style? image,
   }) {
-    return RemixAvatarStyles(
+    return RemixAvatarStyle(
       container: this.container.merge(container),
       fallbackLabel: this.fallbackLabel.merge(fallbackLabel),
       image: this.image.merge(image),
@@ -42,7 +42,7 @@ class RemixAvatarStyles extends StyleRecipe<RemixAvatarStyles> {
   }
 
   @override
-  RemixAvatarStyles merge(RemixAvatarStyles? other) {
+  RemixAvatarStyle merge(RemixAvatarStyle? other) {
     return copyWith(
       container: other?.container,
       fallbackLabel: other?.fallbackLabel,
diff --git a/lib/components/badge/badge.dart b/lib/components/badge/badge.dart
index baff4ae..5cf5b73 100644
--- a/lib/components/badge/badge.dart
+++ b/lib/components/badge/badge.dart
@@ -5,7 +5,7 @@ import 'badge.style.dart';
 import '../../utils/component_recipe.dart';
 
 class RemixBadge extends StatelessWidget
-    implements RemixComponentRecipe<RemixBadgeStyles> {
+    implements RemixComponentRecipe<RemixBadgeStyle> {
   const RemixBadge({
     super.key,
     required this.label,
@@ -16,13 +16,13 @@ class RemixBadge extends StatelessWidget
   final String label;
 
   @override
-  final RemixBadgeStyles? style;
+  final RemixBadgeStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixBadgeStyles buildStyle(List<Variant> variants) {
-    var styles = style == null ? RemixBadgeStyles.base() : style!;
+  RemixBadgeStyle buildStyle(List<Variant> variants) {
+    var styles = style == null ? RemixBadgeStyle.base() : style!;
     return styles.applyVariants(variants);
   }
 
diff --git a/lib/components/badge/badge.style.dart b/lib/components/badge/badge.style.dart
index 3510565..113ccef 100644
--- a/lib/components/badge/badge.style.dart
+++ b/lib/components/badge/badge.style.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:mix/mix.dart';
 
-class RemixBadgeStyles extends StyleRecipe<RemixBadgeStyles> {
-  const RemixBadgeStyles({
+class RemixBadgeStyle extends StyleRecipe<RemixBadgeStyle> {
+  const RemixBadgeStyle({
     this.container = const Style.empty(),
     this.label = const Style.empty(),
   });
@@ -10,34 +10,34 @@ class RemixBadgeStyles extends StyleRecipe<RemixBadgeStyles> {
   final Style container;
   final Style label;
 
-  factory RemixBadgeStyles.base() {
-    return RemixBadgeStyles(
+  factory RemixBadgeStyle.base() {
+    return RemixBadgeStyle(
       container: _container(),
       label: _label(),
     );
   }
 
   @override
-  RemixBadgeStyles applyVariants(List<Variant> variants) {
-    return RemixBadgeStyles(
+  RemixBadgeStyle applyVariants(List<Variant> variants) {
+    return RemixBadgeStyle(
       container: container.applyVariants(variants),
       label: label.applyVariants(variants),
     );
   }
 
   @override
-  RemixBadgeStyles copyWith({
+  RemixBadgeStyle copyWith({
     Style? container,
     Style? label,
   }) {
-    return RemixBadgeStyles(
+    return RemixBadgeStyle(
       container: this.container.merge(container),
       label: this.label.merge(label),
     );
   }
 
   @override
-  RemixBadgeStyles merge(RemixBadgeStyles? other) {
+  RemixBadgeStyle merge(RemixBadgeStyle? other) {
     return copyWith(
       container: other?.container,
       label: other?.label,
diff --git a/lib/components/button/button.dart b/lib/components/button/button.dart
index e33da64..9db9a25 100644
--- a/lib/components/button/button.dart
+++ b/lib/components/button/button.dart
@@ -6,7 +6,7 @@ import 'package:remix_ui/components/button/button.variants.dart';
 import '../../utils/component_recipe.dart';
 
 class RemixButton extends StatelessWidget
-    implements RemixComponentRecipe<RemixButtonStyles> {
+    implements RemixComponentRecipe<RemixButtonStyle> {
   const RemixButton({
     super.key,
     this.label,
@@ -33,27 +33,25 @@ class RemixButton extends StatelessWidget
   final VoidCallback? onPressed;
 
   @override
-  final RemixButtonStyles? style;
+  final RemixButtonStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixButtonStyles buildStyle(List<Variant> variants) {
-    final result = style == null ? RemixButtonStyles.baseForm() : style!;
+  RemixButtonStyle buildStyle(List<Variant> variants) {
+    final result = style == null ? RemixButtonStyle.baseForm() : style!;
     return result.applyVariants(variants);
   }
 
-
-  List<Widget> _buildChildren(BuildContext context, RemixButtonStyles style) {
-    if (isLoading) {
-      return _buildLoadingChildren(context, style);
-    }
-    return _buildDefaultChildren(style);
+  List<Widget> _buildChildren(BuildContext context, RemixButtonStyle style) {
+    return loading
+        ? _buildLoadingChildren(context, style)
+        : _buildDefaultChildren(style);
   }
 
   List<Widget> _buildLoadingChildren(
     BuildContext context,
-    RemixButtonStyles buttonStyle,
+    RemixButtonStyle buttonStyle,
   ) =>
       [
         _buildLoadingIndicator(MixData.create(context, buttonStyle.icon)),
@@ -78,7 +76,7 @@ class RemixButton extends StatelessWidget
     );
   }
 
-  List<Widget> _buildDefaultChildren(RemixButtonStyles style) => [
+  List<Widget> _buildDefaultChildren(RemixButtonStyle style) => [
         if (iconLeft != null) StyledIcon(iconLeft, style: style.icon),
         if (label != null) StyledText(label!, style: style.label),
         if (iconRight != null) StyledIcon(iconRight, style: style.icon),
diff --git a/lib/components/button/button.style.dart b/lib/components/button/button.style.dart
index e349e34..f37e7f2 100644
--- a/lib/components/button/button.style.dart
+++ b/lib/components/button/button.style.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:mix/mix.dart';
 import 'package:remix_ui/components/button/button.variants.dart';
 
-class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
-  const RemixButtonStyles({
+class RemixButtonStyle extends StyleRecipe<RemixButtonStyle> {
+  const RemixButtonStyle({
     this.container = const Style.empty(),
     this.icon = const Style.empty(),
     this.label = const Style.empty(),
@@ -13,19 +13,19 @@ class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
   final Style icon;
   final Style label;
 
-  factory RemixButtonStyles.baseForm() {
-    return RemixButtonStyles(
+  factory RemixButtonStyle.baseForm() {
+    return RemixButtonStyle(
       container: _container(),
       icon: _icon(),
       label: _label(),
     );
   }
 
-  factory RemixButtonStyles.build([
-    RemixButtonStyles? other,
+  factory RemixButtonStyle.build([
+    RemixButtonStyle? other,
     List<Variant> variants = const [],
   ]) {
-    return RemixButtonStyles(
+    return RemixButtonStyle(
       container: _container(),
       icon: _icon(),
       label: _label(),
@@ -33,8 +33,8 @@ class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
   }
 
   @override
-  RemixButtonStyles applyVariants(List<Variant> variants) {
-    return RemixButtonStyles(
+  RemixButtonStyle applyVariants(List<Variant> variants) {
+    return RemixButtonStyle(
       container: container.applyVariants(variants),
       icon: icon.applyVariants(variants),
       label: label.applyVariants(variants),
@@ -42,12 +42,12 @@ class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
   }
 
   @override
-  RemixButtonStyles copyWith({
+  RemixButtonStyle copyWith({
     Style? container,
     Style? icon,
     Style? label,
   }) {
-    return RemixButtonStyles(
+    return RemixButtonStyle(
       container: this.container.merge(container),
       icon: this.icon.merge(icon),
       label: this.label.merge(label),
@@ -55,7 +55,7 @@ class RemixButtonStyles extends StyleRecipe<RemixButtonStyles> {
   }
 
   @override
-  RemixButtonStyles merge(RemixButtonStyles? other) {
+  RemixButtonStyle merge(RemixButtonStyle? other) {
     return copyWith(
       container: other?.container,
       icon: other?.icon,
diff --git a/lib/components/card/card.dart b/lib/components/card/card.dart
index 615b362..3d397eb 100644
--- a/lib/components/card/card.dart
+++ b/lib/components/card/card.dart
@@ -24,7 +24,7 @@ class PresableRemixCard extends RemixCard {
 }
 
 class RemixCard extends StatelessWidget
-    implements RemixComponentRecipe<RemixCardStyles> {
+    implements RemixComponentRecipe<RemixCardStyle> {
   const RemixCard({
     super.key,
     required this.child,
@@ -35,7 +35,7 @@ class RemixCard extends StatelessWidget
   factory RemixCard.pressable(
     Widget child, {
     void Function()? onTap,
-    RemixCardStyles? style,
+    RemixCardStyle? style,
   }) {
     return PresableRemixCard(
       style: style,
@@ -47,13 +47,13 @@ class RemixCard extends StatelessWidget
   final Widget child;
 
   @override
-  final RemixCardStyles? style;
+  final RemixCardStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixCardStyles buildStyle(List<Variant> variants) {
-    final result = style == null ? RemixCardStyles.base() : style!;
+  RemixCardStyle buildStyle(List<Variant> variants) {
+    final result = style == null ? RemixCardStyle.base() : style!;
 
     return result.applyVariants(variants);
   }
diff --git a/lib/components/card/card.style.dart b/lib/components/card/card.style.dart
index 998e664..4d3ee05 100644
--- a/lib/components/card/card.style.dart
+++ b/lib/components/card/card.style.dart
@@ -1,27 +1,27 @@
 import 'package:mix/mix.dart';
 
-class RemixCardStyles extends StyleRecipe<RemixCardStyles> {
-  const RemixCardStyles({
+class RemixCardStyle extends StyleRecipe<RemixCardStyle> {
+  const RemixCardStyle({
     this.container = const Style.empty(),
   });
 
   final Style container;
 
-  factory RemixCardStyles.base() {
-    return RemixCardStyles(
+  factory RemixCardStyle.base() {
+    return RemixCardStyle(
       container: _container(),
     );
   }
 
   @override
-  RemixCardStyles applyVariants(List<Variant> variants) {
-    return RemixCardStyles(
+  RemixCardStyle applyVariants(List<Variant> variants) {
+    return RemixCardStyle(
       container: container.applyVariants(variants),
     );
   }
 
   @override
-  RemixCardStyles merge(RemixCardStyles? other) {
+  RemixCardStyle merge(RemixCardStyle? other) {
     if (other == null) return this;
     return copyWith(
       container: container.merge(other.container),
@@ -29,10 +29,10 @@ class RemixCardStyles extends StyleRecipe<RemixCardStyles> {
   }
 
   @override
-  RemixCardStyles copyWith({
+  RemixCardStyle copyWith({
     Style? container,
   }) {
-    return RemixCardStyles(
+    return RemixCardStyle(
       container: container ?? this.container,
     );
   }
diff --git a/lib/components/checkbox/checkbox.dart b/lib/components/checkbox/checkbox.dart
index 77b605e..02065de 100644
--- a/lib/components/checkbox/checkbox.dart
+++ b/lib/components/checkbox/checkbox.dart
@@ -6,7 +6,7 @@ import 'package:remix_ui/components/checkbox/checkbox.variants.dart';
 import '../../utils/component_recipe.dart';
 
 class RemixCheckbox extends StatelessWidget
-    implements RemixComponentRecipe<RemixCheckboxStyles> {
+    implements RemixComponentRecipe<RemixCheckboxStyle> {
   const RemixCheckbox({
     super.key,
     this.label,
@@ -27,13 +27,13 @@ class RemixCheckbox extends StatelessWidget
   final ValueChanged<bool>? onChanged;
 
   @override
-  final RemixCheckboxStyles? style;
+  final RemixCheckboxStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixCheckboxStyles buildStyle(List<Variant> variants) {
-    final result = style == null ? RemixCheckboxStyles.baseForm() : style!;
+  RemixCheckboxStyle buildStyle(List<Variant> variants) {
+    final result = style == null ? RemixCheckboxStyle.baseForm() : style!;
 
     return result.applyVariants(variants);
   }
diff --git a/lib/components/checkbox/checkbox.style.dart b/lib/components/checkbox/checkbox.style.dart
index e50ca3a..175813a 100644
--- a/lib/components/checkbox/checkbox.style.dart
+++ b/lib/components/checkbox/checkbox.style.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:mix/mix.dart';
 import 'package:remix_ui/components/checkbox/checkbox.variants.dart';
 
-class RemixCheckboxStyles extends StyleRecipe<RemixCheckboxStyles> {
-  const RemixCheckboxStyles({
+class RemixCheckboxStyle extends StyleRecipe<RemixCheckboxStyle> {
+  const RemixCheckboxStyle({
     required this.flexContainer,
     required this.innerContainer,
     required this.icon,
@@ -15,8 +15,8 @@ class RemixCheckboxStyles extends StyleRecipe<RemixCheckboxStyles> {
   final Style icon;
   final Style label;
 
-  factory RemixCheckboxStyles.baseForm() {
-    return RemixCheckboxStyles(
+  factory RemixCheckboxStyle.baseForm() {
+    return RemixCheckboxStyle(
       flexContainer: _flexContainerStyle(),
       innerContainer: _innerContainerStyle(),
       icon: _iconStyle(),
@@ -25,8 +25,8 @@ class RemixCheckboxStyles extends StyleRecipe<RemixCheckboxStyles> {
   }
 
   @override
-  RemixCheckboxStyles applyVariants(List<Variant> variants) {
-    return RemixCheckboxStyles(
+  RemixCheckboxStyle applyVariants(List<Variant> variants) {
+    return RemixCheckboxStyle(
       flexContainer: flexContainer.applyVariants(variants),
       innerContainer: innerContainer.applyVariants(variants),
       icon: icon.applyVariants(variants),
@@ -35,13 +35,13 @@ class RemixCheckboxStyles extends StyleRecipe<RemixCheckboxStyles> {
   }
 
   @override
-  RemixCheckboxStyles copyWith({
+  RemixCheckboxStyle copyWith({
     Style? flexContainer,
     Style? innerContainer,
     Style? icon,
     Style? label,
   }) {
-    return RemixCheckboxStyles(
+    return RemixCheckboxStyle(
       innerContainer: this.innerContainer.merge(innerContainer),
       icon: this.icon.merge(icon),
       label: this.label.merge(label),
@@ -50,7 +50,7 @@ class RemixCheckboxStyles extends StyleRecipe<RemixCheckboxStyles> {
   }
 
   @override
-  RemixCheckboxStyles merge(RemixCheckboxStyles? other) {
+  RemixCheckboxStyle merge(RemixCheckboxStyle? other) {
     return copyWith(
       flexContainer: other?.flexContainer,
       innerContainer: other?.innerContainer,
diff --git a/lib/components/divider/divider.dart b/lib/components/divider/divider.dart
index bff53bc..3f0bbf9 100644
--- a/lib/components/divider/divider.dart
+++ b/lib/components/divider/divider.dart
@@ -5,7 +5,7 @@ import 'divider.style.dart';
 import '../../utils/component_recipe.dart';
 
 class RemixDivider extends StatelessWidget
-    implements RemixComponentRecipe<RemixDividerStyles> {
+    implements RemixComponentRecipe<RemixDividerStyle> {
   const RemixDivider({
     super.key,
     this.style,
@@ -13,13 +13,13 @@ class RemixDivider extends StatelessWidget
   });
 
   @override
-  final RemixDividerStyles? style;
+  final RemixDividerStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixDividerStyles buildStyle(List<Variant> variants) {
-    var styles = style == null ? RemixDividerStyles.base() : style!;
+  RemixDividerStyle buildStyle(List<Variant> variants) {
+    var styles = style == null ? RemixDividerStyle.base() : style!;
     return styles.applyVariants(variants);
   }
 
diff --git a/lib/components/divider/divider.style.dart b/lib/components/divider/divider.style.dart
index 8baf3f2..33c04cb 100644
--- a/lib/components/divider/divider.style.dart
+++ b/lib/components/divider/divider.style.dart
@@ -1,36 +1,36 @@
 import 'package:mix/mix.dart';
 
-class RemixDividerStyles extends StyleRecipe<RemixDividerStyles> {
-  const RemixDividerStyles({
+class RemixDividerStyle extends StyleRecipe<RemixDividerStyle> {
+  const RemixDividerStyle({
     this.container = const Style.empty(),
   });
 
   final Style container;
 
-  factory RemixDividerStyles.base() {
-    return RemixDividerStyles(
+  factory RemixDividerStyle.base() {
+    return RemixDividerStyle(
       container: _container(),
     );
   }
 
   @override
-  RemixDividerStyles applyVariants(List<Variant> variants) {
-    return RemixDividerStyles(
+  RemixDividerStyle applyVariants(List<Variant> variants) {
+    return RemixDividerStyle(
       container: container.applyVariants(variants),
     );
   }
 
   @override
-  RemixDividerStyles copyWith({
+  RemixDividerStyle copyWith({
     Style? container,
   }) {
-    return RemixDividerStyles(
+    return RemixDividerStyle(
       container: this.container.merge(container),
     );
   }
 
   @override
-  RemixDividerStyles merge(RemixDividerStyles? other) {
+  RemixDividerStyle merge(RemixDividerStyle? other) {
     return copyWith(
       container: other?.container,
     );
diff --git a/lib/components/radio/radio.dart b/lib/components/radio/radio.dart
index 028cc0c..4d4f369 100644
--- a/lib/components/radio/radio.dart
+++ b/lib/components/radio/radio.dart
@@ -6,7 +6,7 @@ import 'radio.style.dart';
 import 'radio.variants.dart';
 
 class RemixRadio extends StatelessWidget
-    implements RemixComponentRecipe<RemixRadioStyles> {
+    implements RemixComponentRecipe<RemixRadioStyle> {
   const RemixRadio({
     super.key,
     this.label,
@@ -23,13 +23,13 @@ class RemixRadio extends StatelessWidget
   final ValueChanged<bool>? onChanged;
 
   @override
-  final RemixRadioStyles? style;
+  final RemixRadioStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixRadioStyles buildStyle(List<Variant> variants) {
-    final result = style == null ? RemixRadioStyles.baseForm() : style!;
+  RemixRadioStyle buildStyle(List<Variant> variants) {
+    final result = style == null ? RemixRadioStyle.baseForm() : style!;
     return result.applyVariants(variants);
   }
 
diff --git a/lib/components/radio/radio.style.dart b/lib/components/radio/radio.style.dart
index 89347fd..f5f09dc 100644
--- a/lib/components/radio/radio.style.dart
+++ b/lib/components/radio/radio.style.dart
@@ -3,8 +3,8 @@ import 'package:mix/mix.dart';
 
 import 'radio.variants.dart';
 
-class RemixRadioStyles extends StyleRecipe<RemixRadioStyles> {
-  const RemixRadioStyles({
+class RemixRadioStyle extends StyleRecipe<RemixRadioStyle> {
+  const RemixRadioStyle({
     this.outerContainer = const Style.empty(),
     this.innerContainer = const Style.empty(),
     this.label = const Style.empty(),
@@ -16,8 +16,8 @@ class RemixRadioStyles extends StyleRecipe<RemixRadioStyles> {
   final Style label;
   final Style row;
 
-  factory RemixRadioStyles.baseForm() {
-    return RemixRadioStyles(
+  factory RemixRadioStyle.baseForm() {
+    return RemixRadioStyle(
       outerContainer: _outerContainerStyle(),
       innerContainer: _innerContainerStyle(),
       label: _labelStyle(),
@@ -26,8 +26,8 @@ class RemixRadioStyles extends StyleRecipe<RemixRadioStyles> {
   }
 
   @override
-  RemixRadioStyles applyVariants(List<Variant> variants) {
-    return RemixRadioStyles(
+  RemixRadioStyle applyVariants(List<Variant> variants) {
+    return RemixRadioStyle(
       outerContainer: outerContainer.applyVariants(variants),
       innerContainer: innerContainer.applyVariants(variants),
       label: label.applyVariants(variants),
@@ -36,13 +36,13 @@ class RemixRadioStyles extends StyleRecipe<RemixRadioStyles> {
   }
 
   @override
-  RemixRadioStyles copyWith({
+  RemixRadioStyle copyWith({
     Style? outerContainer,
     Style? innerContainer,
     Style? label,
     Style? row,
   }) {
-    return RemixRadioStyles(
+    return RemixRadioStyle(
       innerContainer: this.innerContainer.merge(innerContainer),
       outerContainer: this.outerContainer.merge(outerContainer),
       label: this.label.merge(label),
@@ -51,7 +51,7 @@ class RemixRadioStyles extends StyleRecipe<RemixRadioStyles> {
   }
 
   @override
-  RemixRadioStyles merge(RemixRadioStyles? other) {
+  RemixRadioStyle merge(RemixRadioStyle? other) {
     return copyWith(
       outerContainer: other?.outerContainer,
       innerContainer: other?.innerContainer,
diff --git a/lib/components/switch/switch.dart b/lib/components/switch/switch.dart
index 97f60c8..65704d8 100644
--- a/lib/components/switch/switch.dart
+++ b/lib/components/switch/switch.dart
@@ -6,7 +6,7 @@ import 'switch.style.dart';
 import 'switch.variants.dart';
 
 class RemixSwitch extends StatelessWidget
-    implements RemixComponentRecipe<RemixSwitchStyles> {
+    implements RemixComponentRecipe<RemixSwitchStyle> {
   const RemixSwitch({
     super.key,
     this.disabled = false,
@@ -21,13 +21,13 @@ class RemixSwitch extends StatelessWidget
   final ValueChanged<bool>? onChanged;
 
   @override
-  final RemixSwitchStyles? style;
+  final RemixSwitchStyle? style;
 
   @override
   final List<Variant> variants;
 
-  RemixSwitchStyles buildStyle(List<Variant> variants) {
-    final result = style == null ? RemixSwitchStyles.baseForm() : style!;
+  RemixSwitchStyle buildStyle(List<Variant> variants) {
+    final result = style == null ? RemixSwitchStyle.baseForm() : style!;
     return result.applyVariants(variants);
   }
 
diff --git a/lib/components/switch/switch.style.dart b/lib/components/switch/switch.style.dart
index a84b45b..09b0cf6 100644
--- a/lib/components/switch/switch.style.dart
+++ b/lib/components/switch/switch.style.dart
@@ -3,8 +3,8 @@ import 'package:mix/mix.dart';
 
 import 'switch.variants.dart';
 
-class RemixSwitchStyles extends StyleRecipe<RemixSwitchStyles> {
-  const RemixSwitchStyles({
+class RemixSwitchStyle extends StyleRecipe<RemixSwitchStyle> {
+  const RemixSwitchStyle({
     this.outerFlexContainer = const Style.empty(),
     this.innerContainer = const Style.empty(),
   });
@@ -12,34 +12,34 @@ class RemixSwitchStyles extends StyleRecipe<RemixSwitchStyles> {
   final Style outerFlexContainer;
   final Style innerContainer;
 
-  factory RemixSwitchStyles.baseForm() {
-    return RemixSwitchStyles(
+  factory RemixSwitchStyle.baseForm() {
+    return RemixSwitchStyle(
       outerFlexContainer: _outerFlexContainerStyle(),
       innerContainer: _innerContainerStyle(),
     );
   }
 
   @override
-  RemixSwitchStyles applyVariants(List<Variant> variants) {
-    return RemixSwitchStyles(
+  RemixSwitchStyle applyVariants(List<Variant> variants) {
+    return RemixSwitchStyle(
       outerFlexContainer: outerFlexContainer.applyVariants(variants),
       innerContainer: innerContainer.applyVariants(variants),
     );
   }
 
   @override
-  RemixSwitchStyles copyWith({
+  RemixSwitchStyle copyWith({
     Style? outerFlexContainer,
     Style? innerContainer,
   }) {
-    return RemixSwitchStyles(
+    return RemixSwitchStyle(
       innerContainer: this.innerContainer.merge(innerContainer),
       outerFlexContainer: this.outerFlexContainer.merge(outerFlexContainer),
     );
   }
 
   @override
-  RemixSwitchStyles merge(RemixSwitchStyles? other) {
+  RemixSwitchStyle merge(RemixSwitchStyle? other) {
     return copyWith(
       outerFlexContainer: other?.outerFlexContainer,
       innerContainer: other?.innerContainer,