diff --git a/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
index 0d247bf3..c083545a 100644
--- a/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
+++ b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart
@@ -17,15 +17,41 @@
 import 'package:wyatt_ui_components/src/domain/entities/entities.dart';
 
 class ComponentThemeData {
-
   const ComponentThemeData.raw({
     this.appBar,
     this.bottomNavigationBar,
     this.errorWidget,
     this.loadingWidget,
+    this.loaderComponent,
+    this.richTextBuilderComponent,
+    this.textInputComponent,
+    this.fileSelectionButtonComponent,
+    this.flatButtonComponent,
+    this.simpleIconButtonComponent,
+    this.symbolButtonComponent,
+    this.informationCardComponent,
+    this.portfolioCardComponent,
+    this.quoteCardComponent,
+    this.skillCardComponent,
   });
   final AppBarComponent? appBar;
   final BottomNavigationBarComponent? bottomNavigationBar;
   final ErrorWidgetComponent? errorWidget;
   final LoadingWidgetComponent? loadingWidget;
+  final LoaderComponent? loaderComponent;
+
+  final RichTextBuilderComponent? richTextBuilderComponent;
+  final TextInputComponent? textInputComponent;
+
+  // Buttons
+  final FileSelectionButtonComponent? fileSelectionButtonComponent;
+  final FlatButtonComponent? flatButtonComponent;
+  final SimpleIconButtonComponent? simpleIconButtonComponent;
+  final SymbolButtonComponent? symbolButtonComponent;
+
+  // Cards
+  final InformationCardComponent? informationCardComponent;
+  final PortfolioCardComponent? portfolioCardComponent;
+  final QuoteCardComponent? quoteCardComponent;
+  final SkillCardComponent? skillCardComponent;
 }