diff --git a/Polar_chart_sample/PolarChartSample.slnx b/Polar_chart_sample/PolarChartSample.slnx
new file mode 100644
index 0000000..da42a19
--- /dev/null
+++ b/Polar_chart_sample/PolarChartSample.slnx
@@ -0,0 +1,3 @@
+<Solution>
+  <Project Path="PolarChartSample/PolarChartSample.csproj" />
+</Solution>
diff --git a/Polar_chart_sample/PolarChartSample/App.xaml.cs b/Polar_chart_sample/PolarChartSample/App.xaml.cs
index e8e71dd..b6566ee 100644
--- a/Polar_chart_sample/PolarChartSample/App.xaml.cs
+++ b/Polar_chart_sample/PolarChartSample/App.xaml.cs
@@ -1,12 +1,17 @@
-namespace PolarChartSample
+using Microsoft.Extensions.DependencyInjection;
+
+namespace PolarChartSample
 {
     public partial class App : Application
     {
         public App()
         {
             InitializeComponent();
+        }
 
-            MainPage = new AppShell();
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            return new Window(new AppShell());
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Polar_chart_sample/PolarChartSample/AppShell.xaml b/Polar_chart_sample/PolarChartSample/AppShell.xaml
index df9a2f1..d5a13f0 100644
--- a/Polar_chart_sample/PolarChartSample/AppShell.xaml
+++ b/Polar_chart_sample/PolarChartSample/AppShell.xaml
@@ -4,10 +4,10 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:PolarChartSample"
-    Shell.FlyoutBehavior="Disabled"
     Title="PolarChartSample">
 
     <ShellContent
+        Title="Home"
         ContentTemplate="{DataTemplate local:MainPage}"
         Route="MainPage" />
 
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/Android/MainActivity.cs b/Polar_chart_sample/PolarChartSample/Platforms/Android/MainActivity.cs
index a7a2be3..faccf7f 100644
--- a/Polar_chart_sample/PolarChartSample/Platforms/Android/MainActivity.cs
+++ b/Polar_chart_sample/PolarChartSample/Platforms/Android/MainActivity.cs
@@ -4,7 +4,7 @@
 
 namespace PolarChartSample
 {
-    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity
     {
     }
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/MacCatalyst/Info.plist b/Polar_chart_sample/PolarChartSample/Platforms/MacCatalyst/Info.plist
index 7268977..f2e0987 100644
--- a/Polar_chart_sample/PolarChartSample/Platforms/MacCatalyst/Info.plist
+++ b/Polar_chart_sample/PolarChartSample/Platforms/MacCatalyst/Info.plist
@@ -15,6 +15,8 @@
 	<array>
 		<integer>2</integer>
 	</array>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.lifestyle</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>arm64</string>
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/Tizen/Main.cs b/Polar_chart_sample/PolarChartSample/Platforms/Tizen/Main.cs
deleted file mode 100644
index 09936b0..0000000
--- a/Polar_chart_sample/PolarChartSample/Platforms/Tizen/Main.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Microsoft.Maui;
-using Microsoft.Maui.Hosting;
-using System;
-
-namespace PolarChartSample
-{
-    internal class Program : MauiApplication
-    {
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-
-        static void Main(string[] args)
-        {
-            var app = new Program();
-            app.Run(args);
-        }
-    }
-}
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/Tizen/tizen-manifest.xml b/Polar_chart_sample/PolarChartSample/Platforms/Tizen/tizen-manifest.xml
deleted file mode 100644
index 53e3533..0000000
--- a/Polar_chart_sample/PolarChartSample/Platforms/Tizen/tizen-manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
-  <profile name="common" />
-  <ui-application appid="maui-application-id-placeholder" exec="PolarChartSample.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-    <label>maui-application-title-placeholder</label>
-    <icon>maui-appicon-placeholder</icon>
-    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
-  </ui-application>
-  <shortcut-list />
-  <privileges>
-    <privilege>http://tizen.org/privilege/internet</privilege>
-  </privileges> 
-  <dependencies />
-  <provides-appdefined-privileges />
-</manifest>
\ No newline at end of file
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/Windows/Package.appxmanifest b/Polar_chart_sample/PolarChartSample/Platforms/Windows/Package.appxmanifest
index 24f9206..f965dc6 100644
--- a/Polar_chart_sample/PolarChartSample/Platforms/Windows/Package.appxmanifest
+++ b/Polar_chart_sample/PolarChartSample/Platforms/Windows/Package.appxmanifest
@@ -8,7 +8,7 @@
 
   <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="821BBF0B-7696-4A7E-B947-4C4953FDF74B" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="21BFE768-E449-469B-A0D9-B8AA868B9B5F" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/Windows/app.manifest b/Polar_chart_sample/PolarChartSample/Platforms/Windows/app.manifest
index 6232418..e5a3552 100644
--- a/Polar_chart_sample/PolarChartSample/Platforms/Windows/app.manifest
+++ b/Polar_chart_sample/PolarChartSample/Platforms/Windows/app.manifest
@@ -10,6 +10,8 @@
       -->
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
     </windowsSettings>
   </application>
 </assembly>
diff --git a/Polar_chart_sample/PolarChartSample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/Polar_chart_sample/PolarChartSample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000..24ab3b4
--- /dev/null
+++ b/Polar_chart_sample/PolarChartSample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is the minimum required version of the Apple Privacy Manifest for .NET MAUI apps.
+The contents below are needed because of APIs that are used in the .NET framework and .NET MAUI SDK.
+
+You are responsible for adding extra entries as needed for your application.
+
+More information: https://aka.ms/maui-privacy-manifest
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>C617.1</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>35F9.1</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>E174.1</string>
+            </array>
+        </dict>
+        <!--
+            The entry below is only needed when you're using the Preferences API in your app.
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>CA92.1</string>
+            </array>
+        </dict> -->
+    </array>
+</dict>
+</plist>
diff --git a/Polar_chart_sample/PolarChartSample/PolarChartSample.csproj b/Polar_chart_sample/PolarChartSample/PolarChartSample.csproj
index b2269ef..db3b756 100644
--- a/Polar_chart_sample/PolarChartSample/PolarChartSample.csproj
+++ b/Polar_chart_sample/PolarChartSample/PolarChartSample.csproj
@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+		<TargetFrameworks>net10.0-android</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
 
 		<!-- Note for MacCatalyst:
 		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -20,6 +19,14 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
+		<!-- Enable XAML source generation for faster build times and improved performance.
+		     This generates C# code from XAML at compile time instead of runtime inflation.
+		     To disable, remove this line.
+		     For individual files, you can override by setting Inflator metadata:
+		       <MauiXaml Update="MyPage.xaml" Inflator="Default" /> (reverts to defaults: Runtime for Debug, XamlC for Release)
+		       <MauiXaml Update="MyPage.xaml" Inflator="Runtime" /> (force runtime inflation) -->
+		<MauiXamlInflator>SourceGen</MauiXamlInflator>
+
 		<!-- Display name -->
 		<ApplicationTitle>PolarChartSample</ApplicationTitle>
 
@@ -30,12 +37,14 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -48,7 +57,7 @@
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
 		<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
-
+		
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
 
@@ -58,8 +67,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
 		<PackageReference Include="Syncfusion.Maui.Charts" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.Core" Version="*" />
 	</ItemGroup>
diff --git a/Polar_chart_sample/PolarChartSample/PolarChartSample.sln b/Polar_chart_sample/PolarChartSample/PolarChartSample.sln
deleted file mode 100644
index 35ae4d6..0000000
--- a/Polar_chart_sample/PolarChartSample/PolarChartSample.sln
+++ /dev/null
@@ -1,27 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolarChartSample", "PolarChartSample.csproj", "{B5AA8CBE-0874-4D62-8576-A060CEF770F4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5AA8CBE-0874-4D62-8576-A060CEF770F4}.Release|Any CPU.Deploy.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {24F14122-8899-488E-8970-8D3A68A84422}
-	EndGlobalSection
-EndGlobal
diff --git a/Polar_chart_sample/PolarChartSample/Properties/launchSettings.json b/Polar_chart_sample/PolarChartSample/Properties/launchSettings.json
index edf8aad..4f85793 100644
--- a/Polar_chart_sample/PolarChartSample/Properties/launchSettings.json
+++ b/Polar_chart_sample/PolarChartSample/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Regular.ttf b/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Regular.ttf
index 9ab655d..2cc82d2 100644
Binary files a/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Regular.ttf and b/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Regular.ttf differ
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Semibold.ttf b/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Semibold.ttf
index 2b7468e..fcb5284 100644
Binary files a/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Semibold.ttf and b/Polar_chart_sample/PolarChartSample/Resources/Fonts/OpenSans-Semibold.ttf differ
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Images/dotnet_bot.png b/Polar_chart_sample/PolarChartSample/Resources/Images/dotnet_bot.png
index f93ce02..054167e 100644
Binary files a/Polar_chart_sample/PolarChartSample/Resources/Images/dotnet_bot.png and b/Polar_chart_sample/PolarChartSample/Resources/Images/dotnet_bot.png differ
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Raw/AboutAssets.txt b/Polar_chart_sample/PolarChartSample/Resources/Raw/AboutAssets.txt
index 15d6244..89dc758 100644
--- a/Polar_chart_sample/PolarChartSample/Resources/Raw/AboutAssets.txt
+++ b/Polar_chart_sample/PolarChartSample/Resources/Raw/AboutAssets.txt
@@ -4,7 +4,7 @@ is automatically handled by the following `MauiAsset` Build Action within your `
 
 	<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 
-These files will be deployed with you package and will be accessible using Essentials:
+These files will be deployed with your package and will be accessible using Essentials:
 
 	async Task LoadMauiAsset()
 	{
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Styles/Colors.xaml b/Polar_chart_sample/PolarChartSample/Resources/Styles/Colors.xaml
index 30307a5..d57fcc6 100644
--- a/Polar_chart_sample/PolarChartSample/Resources/Styles/Colors.xaml
+++ b/Polar_chart_sample/PolarChartSample/Resources/Styles/Colors.xaml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<?xaml-comp compile="true" ?>
 <ResourceDictionary 
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
diff --git a/Polar_chart_sample/PolarChartSample/Resources/Styles/Styles.xaml b/Polar_chart_sample/PolarChartSample/Resources/Styles/Styles.xaml
index e0d36bb..5fef12a 100644
--- a/Polar_chart_sample/PolarChartSample/Resources/Styles/Styles.xaml
+++ b/Polar_chart_sample/PolarChartSample/Resources/Styles/Styles.xaml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<?xaml-comp compile="true" ?>
 <ResourceDictionary 
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
@@ -132,12 +131,6 @@
         </Setter>
     </Style>
 
-    <Style TargetType="Frame">
-        <Setter Property="HasShadow" Value="False" />
-        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="CornerRadius" Value="8" />
-    </Style>
-
     <Style TargetType="ImageButton">
         <Setter Property="Opacity" Value="1" />
         <Setter Property="BorderColor" Value="Transparent"/>
@@ -179,10 +172,6 @@
         </Setter>
     </Style>
 
-    <Style TargetType="Span">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-    </Style>
-
     <Style TargetType="Label" x:Key="Headline">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
         <Setter Property="FontSize" Value="32" />
@@ -197,17 +186,12 @@
         <Setter Property="HorizontalTextAlignment" Value="Center" />
     </Style>
 
-    <Style TargetType="ListView">
-        <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
     <Style TargetType="Picker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="MinimumHeightRequest" Value="44"/>
         <Setter Property="MinimumWidthRequest" Value="44"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -391,6 +375,30 @@
             </VisualStateGroupList>
         </Setter>
     </Style>
+  
+    <!--
+    <Style TargetType="TitleBar">
+        <Setter Property="MinimumHeightRequest" Value="32"/>
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="TitleActiveStates">
+                    <VisualState x:Name="TitleBarTitleActive">
+                        <VisualState.Setters>
+                            <Setter Property="BackgroundColor" Value="Transparent" />
+                            <Setter Property="ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="TitleBarTitleInactive">
+                        <VisualState.Setters>
+                            <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+                            <Setter Property="ForegroundColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray500}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
+    -->
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
         <Setter Property="Padding" Value="0"/>
@@ -399,7 +407,7 @@
 
     <Style TargetType="Shell" ApplyToDerivedTypes="True">
         <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
-        <Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" />
+        <Setter Property="Shell.ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
         <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
         <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
         <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />