diff --git a/src/LumexUI/Components/Accordion/LumexAccordionItem.razor.cs b/src/LumexUI/Components/Accordion/LumexAccordionItem.razor.cs
index ecf4aaad..4ddb523e 100644
--- a/src/LumexUI/Components/Accordion/LumexAccordionItem.razor.cs
+++ b/src/LumexUI/Components/Accordion/LumexAccordionItem.razor.cs
@@ -79,28 +79,28 @@ public partial class LumexAccordionItem : LumexComponentBase, ISlotComponent<Acc
     private protected override string? RootClass =>
         TwMerge.Merge( AccordionItem.GetStyles( this ) );
 
-    private string HeadingClass =>
+    private string? HeadingClass =>
         TwMerge.Merge( AccordionItem.GetHeadingStyles( this ) );
 
-    private string TriggerClass =>
+    private string? TriggerClass =>
         TwMerge.Merge( AccordionItem.GetTriggerStyles( this ) );
 
-    private string StartContentClass =>
+    private string? StartContentClass =>
         TwMerge.Merge( AccordionItem.GetStartContentStyles( this ) );
 
-    private string TitleWrapperClass =>
+    private string? TitleWrapperClass =>
         TwMerge.Merge( AccordionItem.GetTitleWrapperStyles( this ) );
 
-    private string TitleClass =>
+    private string? TitleClass =>
         TwMerge.Merge( AccordionItem.GetTitleStyles( this ) );
 
-    private string SubtitleClass =>
+    private string? SubtitleClass =>
         TwMerge.Merge( AccordionItem.GetSubtitleStyles( this ) );
 
-    private string IndicatorClass =>
+    private string? IndicatorClass =>
         TwMerge.Merge( AccordionItem.GetIndicatorStyles( this ) );
 
-    private string ContentClass =>
+    private string? ContentClass =>
         TwMerge.Merge( AccordionItem.GetContentStyles( this ) );
 
     private bool _disposed;
diff --git a/src/LumexUI/Components/Checkbox/LumexCheckbox.razor.cs b/src/LumexUI/Components/Checkbox/LumexCheckbox.razor.cs
index 4ace4912..7f4bc9a0 100644
--- a/src/LumexUI/Components/Checkbox/LumexCheckbox.razor.cs
+++ b/src/LumexUI/Components/Checkbox/LumexCheckbox.razor.cs
@@ -31,13 +31,13 @@ public partial class LumexCheckbox : LumexInputBase<bool>, ISlotComponent<Checkb
     private protected override string? RootClass =>
         TwMerge.Merge( Checkbox.GetStyles( this ) );
 
-    private string WrapperClass =>
+    private string? WrapperClass =>
         TwMerge.Merge( Checkbox.GetWrapperStyles( this ) );
 
-    private string IconClass =>
+    private string? IconClass =>
         TwMerge.Merge( Checkbox.GetIconStyles( this ) );
 
-    private string LabelClass =>
+    private string? LabelClass =>
         TwMerge.Merge( Checkbox.GetLabelStyles( this ) );
 
     private readonly RenderFragment _renderCheckIcon;
diff --git a/src/LumexUI/Components/Checkbox/LumexCheckboxGroup.razor.cs b/src/LumexUI/Components/Checkbox/LumexCheckboxGroup.razor.cs
index 859840b5..c5c21835 100644
--- a/src/LumexUI/Components/Checkbox/LumexCheckboxGroup.razor.cs
+++ b/src/LumexUI/Components/Checkbox/LumexCheckboxGroup.razor.cs
@@ -70,16 +70,16 @@ public partial class LumexCheckboxGroup : LumexComponentBase, ISlotComponent<Che
     /// </summary>
     [Parameter] public CheckboxSlots? CheckboxClasses { get; set; }
 
-    private protected override string RootClass =>
+    private protected override string? RootClass =>
         TwMerge.Merge( CheckboxGroup.GetStyles( this ) );
 
-    private string LabelClass =>
+    private string? LabelClass =>
         TwMerge.Merge( CheckboxGroup.GetLabelStyles( this ) );
 
-    private string WrapperClass =>
+    private string? WrapperClass =>
         TwMerge.Merge( CheckboxGroup.GetWrapperStyles( this ) );
 
-    private string DescriptionClass =>
+    private string? DescriptionClass =>
         TwMerge.Merge( CheckboxGroup.GetDescriptionStyles( this ) );
 
     private readonly CheckboxGroupContext _context;
diff --git a/src/LumexUI/Components/Collapse/LumexCollapse.cs b/src/LumexUI/Components/Collapse/LumexCollapse.cs
index 6d4219d6..ecf34ca7 100644
--- a/src/LumexUI/Components/Collapse/LumexCollapse.cs
+++ b/src/LumexUI/Components/Collapse/LumexCollapse.cs
@@ -31,7 +31,7 @@ public class LumexCollapse : LumexComponentBase
 
     internal CollapseState State { get; set; }
 
-    private protected override string RootClass =>
+    private protected override string? RootClass =>
         TwMerge.Merge( Collapse.GetStyles( this ) );
 
     private protected override string RootStyle =>