diff --git a/packages/wyatt_ui_kit/lib/src/core/extensions/theme_extensions.dart b/packages/wyatt_ui_kit/lib/src/core/extensions/theme_extensions.dart
index 22efeb80..021dca70 100644
--- a/packages/wyatt_ui_kit/lib/src/core/extensions/theme_extensions.dart
+++ b/packages/wyatt_ui_kit/lib/src/core/extensions/theme_extensions.dart
@@ -16,8 +16,6 @@
 
 import 'package:flutter/material.dart';
 
-extension ThemeExtension on BuildContext {
-  TextTheme get textTheme => Theme.of(this).textTheme;
-  ColorScheme get colorScheme => Theme.of(this).colorScheme;
-  ButtonThemeData get buttonTheme => Theme.of(this).buttonTheme;
+extension BuildContextThemeExtension on BuildContext {
+  T? themeExtension<T>() => Theme.of(this).extension<T>();
 }