diff --git a/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml b/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml
index 5b4705c..01c3291 100644
--- a/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml
+++ b/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml
@@ -5,19 +5,11 @@
              x:Name="this">
 
     <ContentView.Resources>
-        <Color x:Key="CtrlBackground">#f6f6f6</Color>
-        <!-- Implicit styles -->
-        <Style TargetType="{x:Type Entry}">
-            <Setter Property="BackgroundColor" Value="{x:DynamicResource CtrlBackground}" />
-        </Style>
 
         <Style TargetType="{x:Type Label}">
             <Setter Property="Margin"  Value="0,10,0,0" />
         </Style>
 
-        <Style TargetType="{x:Type DatePicker}">
-            <Setter Property="BackgroundColor" Value="{x:DynamicResource CtrlBackground}" />
-        </Style>
     </ContentView.Resources>
 
     <VerticalStackLayout>
diff --git a/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml.cs b/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml.cs
index cd3ee27..a0032be 100644
--- a/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml.cs
+++ b/src/Maui.BindableProperty.Generator.Demo/CustomControls/HeaderControl.xaml.cs
@@ -4,20 +4,24 @@ namespace Maui.BindableProperty.Generator.Demo.CustomControls
 {
     public partial class HeaderControl : ContentView
     {
+        #pragma warning disable CS0169
+
         [AutoBindable(OnChanged = nameof(UpdateDisplayName))]
-        private string _firstName;
+        private readonly string _firstName;
 
         [AutoBindable(PropertyName = "LastName", OnChanged = nameof(UpdateDisplayName))]
-        private string _l;
+        private readonly string _l;
 
         [AutoBindable(DefaultValue = "DateTime.Now", OnChanged = nameof(OnDateTimeChanged))]
-        private DateTime _birthDate;
+        private readonly DateTime _birthDate;
 
         [AutoBindable(DefaultValue = "USA")]
-        private string _country;
+        private readonly string _country;
 
         [AutoBindable]
-        private string _displayName;
+        private readonly string _displayName;
+
+        #pragma warning restore CS0169
 
         public HeaderControl()
         {
diff --git a/src/Maui.BindableProperty.Generator.Demo/MainPage.xaml b/src/Maui.BindableProperty.Generator.Demo/MainPage.xaml
index 73f4d2e..8b9dfce 100644
--- a/src/Maui.BindableProperty.Generator.Demo/MainPage.xaml
+++ b/src/Maui.BindableProperty.Generator.Demo/MainPage.xaml
@@ -5,14 +5,6 @@
              xmlns:controls="clr-namespace:Maui.BindableProperty.Generator.Demo.CustomControls"
              x:Name="this">
 
-    <ContentPage.Resources>
-        <Color x:Key="CtrlBackground">#f6f6f6</Color>
-        <!-- Implicit styles -->
-        <Style TargetType="{x:Type Editor}">
-            <Setter Property="BackgroundColor" Value="{x:DynamicResource CtrlBackground}" />
-        </Style>
-    </ContentPage.Resources>
-
     <ScrollView>
         <VerticalStackLayout Spacing="25" Padding="30">
 
diff --git a/src/Maui.BindableProperty.Generator.Demo/Resources/Styles.xaml b/src/Maui.BindableProperty.Generator.Demo/Resources/Styles.xaml
index 0eb4369..1db9e77 100644
--- a/src/Maui.BindableProperty.Generator.Demo/Resources/Styles.xaml
+++ b/src/Maui.BindableProperty.Generator.Demo/Resources/Styles.xaml
@@ -100,6 +100,7 @@
     </Style>
 
     <Style TargetType="DatePicker">
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
@@ -122,6 +123,7 @@
     </Style>
 
     <Style TargetType="Editor">
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14" />
@@ -146,6 +148,7 @@
 
     <Style TargetType="Entry">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
diff --git a/src/Maui.BindableProperty.Generator.Demo/ViewModels/MainViewModel.cs b/src/Maui.BindableProperty.Generator.Demo/ViewModels/MainViewModel.cs
index 3c3375c..917be6e 100644
--- a/src/Maui.BindableProperty.Generator.Demo/ViewModels/MainViewModel.cs
+++ b/src/Maui.BindableProperty.Generator.Demo/ViewModels/MainViewModel.cs
@@ -1,6 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using System.Text;
 
 namespace Maui.BindableProperty.Generator.Demo.ViewModels
 {