diff --git a/packages/wyatt_ui_kit/lib/src/core/helpers/theme_helper.dart b/packages/wyatt_ui_components/lib/src/core/utils/theme_helper.dart
similarity index 100%
rename from packages/wyatt_ui_kit/lib/src/core/helpers/theme_helper.dart
rename to packages/wyatt_ui_components/lib/src/core/utils/theme_helper.dart
diff --git a/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart b/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart
index 4626fb50..0995251d 100644
--- a/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart
+++ b/packages/wyatt_ui_components/lib/src/core/utils/theme_resolver.dart
@@ -15,6 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import 'package:flutter/material.dart';
+import 'package:wyatt_ui_components/src/core/utils/theme_helper.dart';
 import 'package:wyatt_ui_components/src/domain/entities/theme_style.dart';
 
 /// {@template theme_resolver}
@@ -38,52 +39,35 @@ abstract class ThemeResolver<S extends ThemeStyle<S>, T, E> {
   S? Function(BuildContext context, {E? extra}) get customStyleFn;
 
   /// Compute default value from Flutter Theme or with hardcoded values.
-  S computeDefaultValue(BuildContext context, {E? extra});
-
-  S? computeExtensionValueFn(
-    BuildContext context,
-    T themeExtension, {
+  S computeDefaultValue(
+    BuildContext context, {
     E? extra,
   });
 
-  /// Compute values from the extension if found
-  S? _computeExtensionValue(
-    BuildContext context, {
+  /// Compute extension value from custom component extension.
+  S? computeExtensionValueFn(
+    BuildContext context,
+    T? themeExtension, {
     E? extra,
-  }) {
-    final themeExtension = Theme.of(context).extension<T>();
-    if (themeExtension != null) {
-      return computeExtensionValueFn(
-        context,
-        themeExtension,
-        extra: extra,
-      );
-    }
-    return null;
-  }
-
-  /// Compute custom value
-  S? _computeCustomValue(
-    BuildContext context, {
-    E? extra,
-  }) {
-    final customStyle = customStyleFn(
-      context,
-      extra: extra,
-    );
-    if (customStyle != null) {
-      return customStyle;
-    }
-    return null;
-  }
+  });
 
   /// Choose most suitable style for a given context.
   S negotiate(BuildContext context, {E? extra}) {
-    S style = computeDefaultValue(context, extra: extra);
-    style =
-        style.mergeWith(_computeExtensionValue(context, extra: extra)) ?? style;
-    style =
-        style.mergeWith(_computeCustomValue(context, extra: extra)) ?? style;
-    return style;
+    final style = computeDefaultValue(context, extra: extra);
+    return ThemeHelper.getThemeElement<S, S>(
+          [
+            style,
+            computeExtensionValueFn(
+              context,
+              Theme.of(context).extension<T>(),
+              extra: extra,
+            ),
+            // _computeExtensionValue(context, extra: extra),
+            customStyleFn(context, extra: extra)
+          ],
+          transform: (value) => value,
+          combine: (value, element) => value?.mergeWith(element),
+        ) ??
+        style;
   }
 }
diff --git a/packages/wyatt_ui_components/lib/src/core/utils/utils.dart b/packages/wyatt_ui_components/lib/src/core/utils/utils.dart
index 17821996..ec38db81 100644
--- a/packages/wyatt_ui_components/lib/src/core/utils/utils.dart
+++ b/packages/wyatt_ui_components/lib/src/core/utils/utils.dart
@@ -16,4 +16,5 @@
 
 export 'multi_color.dart';
 export 'text_wrapper.dart';
+export 'theme_helper.dart';
 export 'theme_resolver.dart';
diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart
index 505e9e37..feb496b7 100644
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_theme_resolver.dart
@@ -80,33 +80,33 @@ class FileSelectionButtonThemeResolver extends ThemeResolver<
   @override
   FileSelectionButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    FileSelectionButtonThemeExtension themeExtension, {
+    FileSelectionButtonThemeExtension? themeExtension, {
     ButtonState? extra,
   }) {
     FileSelectionButtonStyle? style;
     switch (extra?.state) {
       case ControlState.disabled:
-        style = themeExtension.disabledStyle;
+        style = themeExtension?.disabledStyle;
         break;
       case ControlState.focused:
-        style = themeExtension.focusedStyle;
+        style = themeExtension?.focusedStyle;
         break;
       case ControlState.hovered:
-        style = themeExtension.hoveredStyle;
+        style = themeExtension?.hoveredStyle;
         break;
       case ControlState.tapped:
-        style = themeExtension.tappedStyle;
+        style = themeExtension?.tappedStyle;
         break;
       case ControlState.normal:
       case null:
-        style = themeExtension.normalStyle;
+        style = themeExtension?.normalStyle;
         break;
     }
     if (extra?.isSelected ?? false) {
-      style = themeExtension.selectedStyle;
+      style = themeExtension?.selectedStyle;
     }
     if (extra?.isInvalid ?? false) {
-      style = themeExtension.invalidStyle;
+      style = themeExtension?.invalidStyle;
     }
     return style;
   }
diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart
index dfbe1349..abb6b8c3 100644
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_theme_resolver.dart
@@ -76,21 +76,21 @@ class FlatButtonThemeResolver extends ThemeResolver<FlatButtonStyle,
   @override
   FlatButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    FlatButtonThemeExtension themeExtension, {
+    FlatButtonThemeExtension? themeExtension, {
     ControlState? extra,
   }) {
     switch (extra) {
       case ControlState.disabled:
-        return themeExtension.disabledStyle;
+        return themeExtension?.disabledStyle;
       case ControlState.focused:
-        return themeExtension.focusedStyle;
+        return themeExtension?.focusedStyle;
       case ControlState.hovered:
-        return themeExtension.hoveredStyle;
+        return themeExtension?.hoveredStyle;
       case ControlState.tapped:
-        return themeExtension.tappedStyle;
+        return themeExtension?.tappedStyle;
       case ControlState.normal:
       case null:
-        return themeExtension.normalStyle;
+        return themeExtension?.normalStyle;
     }
   }
 }
diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart
index 0115fb1f..b5d102d7 100644
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_button_theme_resolver.dart
@@ -74,21 +74,21 @@ class SimpleIconButtonThemeResolver extends ThemeResolver<SimpleIconButtonStyle,
   @override
   SimpleIconButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    SimpleIconButtonThemeExtension themeExtension, {
+    SimpleIconButtonThemeExtension? themeExtension, {
     ControlState? extra,
   }) {
     switch (extra) {
       case ControlState.disabled:
-        return themeExtension.disabledStyle;
+        return themeExtension?.disabledStyle;
       case ControlState.focused:
-        return themeExtension.focusedStyle;
+        return themeExtension?.focusedStyle;
       case ControlState.hovered:
-        return themeExtension.hoveredStyle;
+        return themeExtension?.hoveredStyle;
       case ControlState.tapped:
-        return themeExtension.tappedStyle;
+        return themeExtension?.tappedStyle;
       case ControlState.normal:
       case null:
-        return themeExtension.normalStyle;
+        return themeExtension?.normalStyle;
     }
   }
 }
diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart
index 4628bd87..6124ccc1 100644
--- a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_theme_resolver.dart
@@ -76,30 +76,30 @@ class SymbolButtonThemeResolver extends ThemeResolver<SymbolButtonStyle,
   @override
   SymbolButtonStyle? computeExtensionValueFn(
     BuildContext context,
-    SymbolButtonThemeExtension themeExtension, {
+    SymbolButtonThemeExtension? themeExtension, {
     ButtonState? extra,
   }) {
     SymbolButtonStyle? style;
     switch (extra?.state) {
       case ControlState.disabled:
-        style = themeExtension.disabledStyle;
+        style = themeExtension?.disabledStyle;
         break;
       case ControlState.focused:
-        style = themeExtension.focusedStyle;
+        style = themeExtension?.focusedStyle;
         break;
       case ControlState.hovered:
-        style = themeExtension.hoveredStyle;
+        style = themeExtension?.hoveredStyle;
         break;
       case ControlState.tapped:
-        style = themeExtension.tappedStyle;
+        style = themeExtension?.tappedStyle;
         break;
       case ControlState.normal:
       case null:
-        style = themeExtension.normalStyle;
+        style = themeExtension?.normalStyle;
         break;
     }
     if (extra?.isSelected ?? false) {
-      style = themeExtension.selectedStyle;
+      style = themeExtension?.selectedStyle;
     }
 
     return style;
diff --git a/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
index a5384e54..72e98477 100644
--- a/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/loader/loader_theme_resolver.dart
@@ -48,11 +48,11 @@ class LoaderThemeResolver
   @override
   LoaderStyle? computeExtensionValueFn(
     BuildContext context,
-    LoaderThemeExtension themeExtension, {
+    LoaderThemeExtension? themeExtension, {
     void extra,
   }) =>
       LoaderStyle(
-        colors: themeExtension.colors,
-        stroke: themeExtension.stroke,
+        colors: themeExtension?.colors,
+        stroke: themeExtension?.stroke,
       );
 }
diff --git a/packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder_theme_resolver.dart
index 4661a264..74202562 100644
--- a/packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/rich_text_builder/rich_text_builder_theme_resolver.dart
@@ -43,11 +43,11 @@ class RichTextBuilderThemeResolver extends ThemeResolver<RichTextBuilderStyle,
   @override
   RichTextBuilderStyle? computeExtensionValueFn(
     BuildContext context,
-    RichTextBuilderThemeExtension themeExtension, {
+    RichTextBuilderThemeExtension? themeExtension, {
     void extra,
   }) =>
       RichTextBuilderStyle(
-        defaultStyle: themeExtension.defaultStyle,
-        styles: themeExtension.styles,
+        defaultStyle: themeExtension?.defaultStyle,
+        styles: themeExtension?.styles,
       );
 }
diff --git a/packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart b/packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart
index 5a3fbd0c..0791ac25 100644
--- a/packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart
+++ b/packages/wyatt_ui_kit/lib/src/components/text_inputs/text_input_theme_resolver.dart
@@ -118,19 +118,19 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
   @override
   TextInputStyle? computeExtensionValueFn(
     BuildContext context,
-    TextInputThemeExtension themeExtension, {
+    TextInputThemeExtension? themeExtension, {
     TextInputState? extra,
   }) {
     TextInputStyle? textInputStyle;
     switch (extra?.controlState) {
       case ControlState.focused:
-        textInputStyle = themeExtension.focusedStyle;
+        textInputStyle = themeExtension?.focusedStyle;
         break;
       case ControlState.disabled:
-        textInputStyle = themeExtension.disableStyle;
+        textInputStyle = themeExtension?.disableStyle;
         break;
       case ControlState.normal:
-        textInputStyle = themeExtension.normalStyle;
+        textInputStyle = themeExtension?.normalStyle;
         break;
       case ControlState.hovered:
       case ControlState.tapped:
@@ -141,7 +141,7 @@ class TextInputThemeResolver extends ThemeResolver<TextInputStyle,
     TextInputStyle? style;
     switch (extra?.statusState) {
       case StatusState.error:
-        style = themeExtension.errorStyle;
+        style = themeExtension?.errorStyle;
         break;
       case StatusState.initial:
       case StatusState.success:
diff --git a/packages/wyatt_ui_kit/lib/src/core/helpers/helpers.dart b/packages/wyatt_ui_kit/lib/src/core/helpers/helpers.dart
index 0e95fe99..35d48e7f 100644
--- a/packages/wyatt_ui_kit/lib/src/core/helpers/helpers.dart
+++ b/packages/wyatt_ui_kit/lib/src/core/helpers/helpers.dart
@@ -15,4 +15,3 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 export './linear_gradient_helper.dart';
-export './theme_helper.dart';