diff --git a/README.md b/README.md
index c8a3d19..de77b54 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,9 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
@@ -91,6 +93,11 @@ xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 <mi:MauiIcon Icon="{mi:Material ABC}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ### Nuget Package Changes
 
 - **`AathifMahir.Maui.MauiIcons.Material`** doesn't contain all the Variants anymore, Now only contains **Regular version** of Material Icons. Other Variants Decoupled into Seperate Packages Like Below
@@ -243,29 +250,6 @@ new MauiIcon().Icon(FluentIcons.Accounts).OnIdioms(new List<string>{"Desktop", "
 new MauiIcon().Icon(MaterialIcons.ABC).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:Cupertino Icon=Airplane, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # Properties
 
 | Parameters | Type | Description |
diff --git a/samples/MauiIcons.Sample/MainPage.xaml b/samples/MauiIcons.Sample/MainPage.xaml
index e352b38..3fbea29 100644
--- a/samples/MauiIcons.Sample/MainPage.xaml
+++ b/samples/MauiIcons.Sample/MainPage.xaml
@@ -59,19 +59,8 @@
             </HorizontalStackLayout>
 
             <HorizontalStackLayout HorizontalOptions="Center" Spacing="20">
-                <Image BackgroundColor="Red">
-                    <Image.Source>
-                        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}">
-                            <On Platform="MacCatalyst, WinUI" Value="{mi:Cupertino Icon=Airplane, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}" />
-                        </OnPlatform>
-                    </Image.Source>
-                </Image>
-
-                <Image BackgroundColor="Red">
-                    <Image.Source>
-                        <OnIdiom Default="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}" Desktop="{mi:FluentFilled Icon=Airplane20Filled, TypeArgument={x:Type ImageSource}}" />
-                    </Image.Source>
-                </Image>
+                <Image BackgroundColor="Red" Source="{mi:FluentFilled Icon=ZoomIn24Filled, OnPlatforms='MacCatalyst, Android, WinUI'}" />
+                <Image BackgroundColor="Red" Source="{mi:FluentFilled Icon=Airplane20Filled, OnIdioms='Desktop, Mobile'}" />
             </HorizontalStackLayout>
 
             <HorizontalStackLayout HorizontalOptions="Center" Spacing="10">
diff --git a/samples/MauiIcons.Sample/MauiIcons.Sample.csproj b/samples/MauiIcons.Sample/MauiIcons.Sample.csproj
index 892df5a..14a1f60 100644
--- a/samples/MauiIcons.Sample/MauiIcons.Sample.csproj
+++ b/samples/MauiIcons.Sample/MauiIcons.Sample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
+		<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);net6.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -14,15 +14,15 @@
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
 		<!-- Display name -->
-		<ApplicationTitle>MauiIcons.Sample</ApplicationTitle>
+		<ApplicationTitle>MauiIcons Gallery</ApplicationTitle>
 
 		<!-- App Identifier -->
 		<ApplicationId>com.companyname.mauiicons.sample</ApplicationId>
 		<ApplicationIdGuid>32B5B7F1-9EC0-44BE-ACAE-9AC11F0EEC47</ApplicationIdGuid>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>1</ApplicationVersion>
+		<ApplicationDisplayVersion>1.2</ApplicationDisplayVersion>
+		<ApplicationVersion>3</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
@@ -32,6 +32,10 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
+	  <AndroidPackageFormat>apk</AndroidPackageFormat>
+	</PropertyGroup>
+
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0fed1c2..70e25ae 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -8,8 +8,8 @@
 	</PropertyGroup>
 	
 	<PropertyGroup Condition="'$(MSBuildProjectName)' != 'MauiIcons.Sample' and $(MSBuildProjectName) != 'MauiIcons.Modules.UnitTest'">
-		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;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);net6.0-tizen</TargetFrameworks> -->
 
@@ -29,9 +29,9 @@
 	<PropertyGroup Condition="'$(MSBuildProjectName)' != 'MauiIcons.Sample' and $(MSBuildProjectName) != 'MauiIcons.Modules.UnitTest'">
 		<Title>MauiIcons</Title>
 		<PackageIcon>icon.png</PackageIcon>
-		<AssemblyVersion>2.2.5.0</AssemblyVersion>
-		<AssemblyFileVersion>2.2.5.0</AssemblyFileVersion>
-		<Version>2.2.5</Version>
+		<AssemblyVersion>3.0.0.0</AssemblyVersion>
+		<AssemblyFileVersion>3.0.0.0</AssemblyFileVersion>
+		<Version>3.0.0</Version>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
 		<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
diff --git a/src/MauiIcons.Core/Extensions/BaseIconExtension.cs b/src/MauiIcons.Core/Extensions/BaseIconExtension.cs
index ea0efc4..1b55063 100644
--- a/src/MauiIcons.Core/Extensions/BaseIconExtension.cs
+++ b/src/MauiIcons.Core/Extensions/BaseIconExtension.cs
@@ -5,7 +5,7 @@
 namespace MauiIcons.Core;
 
 [ContentProperty(nameof(Icon))]
-public abstract class BaseIconExtension<TEnum> : BindableObject, IMarkupExtension where TEnum : Enum
+public abstract class BaseIconExtension<TEnum> : BindableObject, IMarkupExtension<BindingBase> where TEnum : Enum
 {
     public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(TEnum?), typeof(BaseIconExtension<TEnum>), null);
     public static readonly BindableProperty IconSizeProperty = BindableProperty.Create(nameof(IconSize), typeof(double), typeof(BaseIconExtension<TEnum>), 30.0);
@@ -52,9 +52,7 @@ public bool IconAutoScaling
     [System.ComponentModel.TypeConverter(typeof(ListStringTypeConverter))]
     public IList<string> OnIdioms { get; set; } = new List<string>();
 
-    public Type? TypeArgument { get; set; }
-
-    public object ProvideValue(IServiceProvider serviceProvider)
+    public BindingBase ProvideValue(IServiceProvider serviceProvider)
     {
         var valueProvider = serviceProvider.GetService<IProvideValueTarget>() ?? throw new ArgumentException();
         Type? returnType = (valueProvider.TargetProperty as BindableProperty)?.ReturnType;
@@ -65,7 +63,10 @@ public object ProvideValue(IServiceProvider serviceProvider)
         return new Binding();
     }
 
-    object SetMauiIconBasedOnType(object targetObject, Type? returnType)
+    object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider) =>
+        (this as IMarkupExtension<BindingBase>).ProvideValue(serviceProvider);
+
+    Binding SetMauiIconBasedOnType(object targetObject, Type? returnType)
     {
         if(returnType == typeof(Enum))
             return SetFontProperties(targetObject, disableConverter: true);
@@ -79,17 +80,14 @@ object SetMauiIconBasedOnType(object targetObject, Type? returnType)
         if (returnType is null && (targetObject is On or OnPlatform<ImageSource>
             or OnPlatform<FontImageSource> or OnPlatformExtension
             or OnIdiom<ImageSource> or OnIdiom<FontImageSource>
-            or OnIdiomExtension) && (TypeArgument == typeof(ImageSource) || TypeArgument == typeof(FontImageSource)))
-            return SetImageSourceProperties();
-
-        else if (returnType is null && targetObject is On && (TypeArgument is null || TypeArgument != typeof(ImageSource) || TypeArgument != typeof(FontImageSource)))
-            throw new MauiIconsExpection("MauiIcons only supports ImageSource or FontImageSource in conjunction with OnPlatform and OnIdiom After Assigning TypeArgument." +
-                "it is recommended to utilize MauiIcon's integrated OnPlatform or OnIdiom functionalities for optimal compatibility.");
+            or OnIdiomExtension))
+            throw new MauiIconsExpection("MauiIcons doesn't support Maui OnPlatform or OnIdiom," +
+                "Therefore it is recommended to utilize MauiIcon's integrated Custom OnPlatform or OnIdiom functionalities.");
 
         else if (returnType is null && targetObject is Setter)
-            throw new MauiIconsExpection("MauiIcons doesn't support style setter to be used in conjunction with xaml extension.");
+            throw new MauiIconsExpection("MauiIcons doesn't support Style Setter to be used in conjunction with Xaml Extension.");
 
-        throw new MauiIconsExpection($"MauiIcons extension does not provide {returnType} support");
+        throw new MauiIconsExpection($"MauiIcons Extension does not provide {returnType} support");
     }
 
     Binding SetFontProperties(object targetObject, bool disableConverter = false)
@@ -170,18 +168,28 @@ Binding SetFontProperties(object targetObject, bool disableConverter = false)
         }
         return new Binding(nameof(Icon), mode: BindingMode.OneWay, converter: !disableConverter ? new EnumToStringConverter() : null, source: this);
     }
-    FontImageSource SetImageSourceProperties()
+
+    Binding SetImageSourceProperties()
     {
-        var fontImageSource = new FontImageSource();
-        fontImageSource.SetBinding(FontImageSource.GlyphProperty, new Binding(nameof(Icon), mode: BindingMode.OneWay, converter: new EnumToStringConverter(), source: this));
-        fontImageSource.FontFamily = Icon.GetFontFamily();
-        fontImageSource.SetBinding(FontImageSource.SizeProperty, new Binding(nameof(IconSize), source: this, mode: BindingMode.OneWay));
-        fontImageSource.SetBinding(FontImageSource.ColorProperty, new Binding(nameof(IconColor), source: this, mode: BindingMode.OneWay,
-            converter: new DefaultColorConverter(), converterParameter: fontImageSource.Color));
-        fontImageSource.SetBinding(FontImageSource.FontAutoScalingEnabledProperty, new Binding(nameof(IconAutoScaling), source: this, mode: BindingMode.OneWay));
-        return fontImageSource;
+        InternalSource = new FontImageSource();
+        ((FontImageSource)InternalSource).SetBinding(FontImageSource.GlyphProperty, new Binding(nameof(Icon), mode: BindingMode.OneWay, converter: new EnumToStringConverter(), source: this));
+        ((FontImageSource)InternalSource).FontFamily = Icon.GetFontFamily();
+        ((FontImageSource)InternalSource).SetBinding(FontImageSource.SizeProperty, new Binding(nameof(IconSize), source: this));
+        ((FontImageSource)InternalSource).SetBinding(FontImageSource.ColorProperty, new Binding(nameof(IconColor), source: this,
+                           converter: new DefaultColorConverter(), converterParameter: ((FontImageSource)InternalSource).Color));
+        ((FontImageSource)InternalSource).SetBinding(FontImageSource.FontAutoScalingEnabledProperty, new Binding(nameof(IconAutoScaling), source: this));
+        return new Binding(nameof(InternalSource), mode: BindingMode.OneWay, source: this);
     }
 
+    public static readonly BindableProperty InternalSourceProperty = BindableProperty.Create(nameof(InternalSource), typeof(ImageSource), typeof(BaseIconExtension<TEnum>), null);
 
+    /// <summary>
+    /// This is Used Internally, Don't Use it in XAML or CodeBehind
+    /// </summary>
+    public ImageSource InternalSource
+    {
+        get => (ImageSource)GetValue(InternalSourceProperty);
+        set => SetValue(InternalSourceProperty, value);
+    }
     
 }
diff --git a/src/MauiIcons.Core/ReleaseNotes.txt b/src/MauiIcons.Core/ReleaseNotes.txt
index e0ffca0..d6c8c6e 100644
--- a/src/MauiIcons.Core/ReleaseNotes.txt
+++ b/src/MauiIcons.Core/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Cupertino/ReleaseNotes.txt b/src/MauiIcons.Cupertino/ReleaseNotes.txt
index 786e4d6..cfece77 100644
--- a/src/MauiIcons.Cupertino/ReleaseNotes.txt
+++ b/src/MauiIcons.Cupertino/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Cupertino/readme.md b/src/MauiIcons.Cupertino/readme.md
index 6531db3..8d39105 100644
--- a/src/MauiIcons.Cupertino/readme.md
+++ b/src/MauiIcons.Cupertino/readme.md
@@ -52,7 +52,9 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
@@ -70,6 +72,11 @@ xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 <mi:MauiIcon Icon="{mi:Cupertino Airplane}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -161,29 +168,6 @@ new MauiIcon().Icon(CupertinoIcons.Airplane).OnIdioms(new List<string>{"Desktop"
 new MauiIcon().Icon(CupertinoIcons.AntFill).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:Cupertino Icon=Airplane, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:Cupertino Icon=AntFill, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:Cupertino Icon=AntFill, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:Cupertino Icon=Airplane, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.Cupertino**  
diff --git a/src/MauiIcons.Fluent.Filled/ReleaseNotes.txt b/src/MauiIcons.Fluent.Filled/ReleaseNotes.txt
index 4421e35..38f30c4 100644
--- a/src/MauiIcons.Fluent.Filled/ReleaseNotes.txt
+++ b/src/MauiIcons.Fluent.Filled/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Fluent.Filled/readme.md b/src/MauiIcons.Fluent.Filled/readme.md
index 94de34f..3f8cfcf 100644
--- a/src/MauiIcons.Fluent.Filled/readme.md
+++ b/src/MauiIcons.Fluent.Filled/readme.md
@@ -52,12 +52,14 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
 ```xml
-xmlns:fluentFilled="clr-namespace:MauiIcons.FluentFilled;assembly=MauiIcons.FluentFilled"
+xmlns:fluentFilled="clr-namespace:MauiIcons.Fluent.Filled;assembly=MauiIcons.Fluent.Filled"
 
 <fluentFilled:MauiIcon Icon="AppFolder48Filled"/>
 ```
@@ -70,6 +72,11 @@ xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 <mi:MauiIcon Icon="{mi:FluentFilled AppFolder48Filled}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ### Nuget Package Changes
 
 - **`AathifMahir.Maui.MauiIcons.FluentFilled`** is Depcrecated and Replaced by [`AathifMahir.Maui.MauiIcons.Fluent.Filled`](https://www.nuget.org/packages/AathifMahir.Maui.MauiIcons.Fluent.Filled/)
@@ -165,29 +172,6 @@ new MauiIcon().Icon(FluentFilledIcons.Accessibility48Filled).OnIdioms(new List<s
 new MauiIcon().Icon(FluentFilledIcons.AppFolder48Filled).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FluentFilled Icon=Accessibility48Filled, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:FluentFilled Icon=AppFolder48Filled, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:FluentFilled Icon=AppFolder48Filled, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:FluentFilled Icon=Accessibility48Filled, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.Fluent.Filled**  
diff --git a/src/MauiIcons.Fluent/ReleaseNotes.txt b/src/MauiIcons.Fluent/ReleaseNotes.txt
index a5a152e..379f04e 100644
--- a/src/MauiIcons.Fluent/ReleaseNotes.txt
+++ b/src/MauiIcons.Fluent/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Fluent/readme.md b/src/MauiIcons.Fluent/readme.md
index ef705f6..3288a76 100644
--- a/src/MauiIcons.Fluent/readme.md
+++ b/src/MauiIcons.Fluent/readme.md
@@ -52,7 +52,9 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
@@ -70,6 +72,12 @@ xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 <mi:MauiIcon Icon="{mi:Fluent AppFolder48}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
+
 ## Built in Control Usage
 
 `Xaml`
@@ -161,29 +169,6 @@ new MauiIcon().Icon(FluentIcons.Accessibility48).OnIdioms(new List<string>{"Desk
 new MauiIcon().Icon(FluentIcons.AppFolder48).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:Fluent Icon=Accessibility48, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:Fluent Icon=AppFolder48, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:Fluent Icon=AppFolder48, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:Fluent Icon=Accessibility48, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.Fluent**  
diff --git a/src/MauiIcons.FontAwesome.Brand/ReleaseNotes.txt b/src/MauiIcons.FontAwesome.Brand/ReleaseNotes.txt
index 4a0b0b0..2ea8a7c 100644
--- a/src/MauiIcons.FontAwesome.Brand/ReleaseNotes.txt
+++ b/src/MauiIcons.FontAwesome.Brand/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.FontAwesome.Brand/readme.md b/src/MauiIcons.FontAwesome.Brand/readme.md
index 5dbb46d..d1843bd 100644
--- a/src/MauiIcons.FontAwesome.Brand/readme.md
+++ b/src/MauiIcons.FontAwesome.Brand/readme.md
@@ -52,6 +52,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -143,29 +150,6 @@ new MauiIcon().Icon(FontAwesomeBrandIcons.Github).OnIdioms(new List<string>{"Des
 new MauiIcon().Icon(FontAwesomeBrandIcons.PenToSquare).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FontAwesomeBrand Icon=Pinterest, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:FontAwesomeBrand Icon=GooglePay, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:FontAwesomeBrand Icon=GooglePay, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:FontAwesomeBrand Icon=Github, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.FontAwesome.Brand**  
diff --git a/src/MauiIcons.FontAwesome.Solid/ReleaseNotes.txt b/src/MauiIcons.FontAwesome.Solid/ReleaseNotes.txt
index 4a0b0b0..2ea8a7c 100644
--- a/src/MauiIcons.FontAwesome.Solid/ReleaseNotes.txt
+++ b/src/MauiIcons.FontAwesome.Solid/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.FontAwesome.Solid/readme.md b/src/MauiIcons.FontAwesome.Solid/readme.md
index 3b1ac9e..dcba378 100644
--- a/src/MauiIcons.FontAwesome.Solid/readme.md
+++ b/src/MauiIcons.FontAwesome.Solid/readme.md
@@ -52,6 +52,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -143,29 +150,6 @@ new MauiIcon().Icon(FontAwesomeSolidIcons.Asterisk).OnIdioms(new List<string>{"D
 new MauiIcon().Icon(FontAwesomeSolidIcons.PenToSquare).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FontAwesomeSolid Icon=GreaterThanEqual, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:FontAwesomeSolid Icon=RankingStar, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:FontAwesomeSolid Icon=RankingStar, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:FontAwesomeSolid Icon=Asterisk, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.FontAwesome.Solid**  
diff --git a/src/MauiIcons.FontAwesome/ReleaseNotes.txt b/src/MauiIcons.FontAwesome/ReleaseNotes.txt
index 4a0b0b0..2ea8a7c 100644
--- a/src/MauiIcons.FontAwesome/ReleaseNotes.txt
+++ b/src/MauiIcons.FontAwesome/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.FontAwesome/readme.md b/src/MauiIcons.FontAwesome/readme.md
index b37c520..b97121e 100644
--- a/src/MauiIcons.FontAwesome/readme.md
+++ b/src/MauiIcons.FontAwesome/readme.md
@@ -52,6 +52,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -143,29 +150,6 @@ new MauiIcon().Icon(FontAwesomeIcons.Asterisk).OnIdioms(new List<string>{"Deskto
 new MauiIcon().Icon(FontAwesomeIcons.PenToSquare).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:FontAwesome Icon=GreaterThan, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:FontAwesome Icon=Star, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:FontAwesome Icon=Star, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:FontAwesome Icon=Asterisk, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.FontAwesome**  
diff --git a/src/MauiIcons.Material.Outlined/ReleaseNotes.txt b/src/MauiIcons.Material.Outlined/ReleaseNotes.txt
index d11e741..9c30a8b 100644
--- a/src/MauiIcons.Material.Outlined/ReleaseNotes.txt
+++ b/src/MauiIcons.Material.Outlined/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Material.Outlined/readme.md b/src/MauiIcons.Material.Outlined/readme.md
index e3aa69d..5caf1d2 100644
--- a/src/MauiIcons.Material.Outlined/readme.md
+++ b/src/MauiIcons.Material.Outlined/readme.md
@@ -52,6 +52,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -143,29 +150,6 @@ new MauiIcon().Icon(MaterialOutlinedIcons.ABC).OnIdioms(new List<string>{"Deskto
 new MauiIcon().Icon(MaterialOutlinedIcons.AddRoad).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:MaterialOutlined Icon=ABC, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:MaterialOutlined Icon=AddRoad, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:MaterialOutlined Icon=AddRoad, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:MaterialOutlined Icon=ABC, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.Material.Outlined**  
diff --git a/src/MauiIcons.Material.Rounded/ReleaseNotes.txt b/src/MauiIcons.Material.Rounded/ReleaseNotes.txt
index d11e741..9c30a8b 100644
--- a/src/MauiIcons.Material.Rounded/ReleaseNotes.txt
+++ b/src/MauiIcons.Material.Rounded/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Material.Rounded/readme.md b/src/MauiIcons.Material.Rounded/readme.md
index 88b6eef..b691e32 100644
--- a/src/MauiIcons.Material.Rounded/readme.md
+++ b/src/MauiIcons.Material.Rounded/readme.md
@@ -51,6 +51,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 
 ## Built in Control Usage
 
@@ -143,30 +150,6 @@ new MauiIcon().Icon(MaterialRoundedIcons.ABC).OnIdioms(new List<string>{"Desktop
 new MauiIcon().Icon(MaterialRoundedIcons.AddRoad).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:MaterialRounded Icon=ABC, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:MaterialRounded Icon=AddRoad, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:MaterialRounded Icon=AddRoad, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:MaterialRounded Icon=ABC, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
-
 # License
 
 **MauiIcons.Material.Rounded**  
diff --git a/src/MauiIcons.Material.Sharp/ReleaseNotes.txt b/src/MauiIcons.Material.Sharp/ReleaseNotes.txt
index d11e741..9c30a8b 100644
--- a/src/MauiIcons.Material.Sharp/ReleaseNotes.txt
+++ b/src/MauiIcons.Material.Sharp/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Material.Sharp/readme.md b/src/MauiIcons.Material.Sharp/readme.md
index 43cddf2..2e01933 100644
--- a/src/MauiIcons.Material.Sharp/readme.md
+++ b/src/MauiIcons.Material.Sharp/readme.md
@@ -52,6 +52,13 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
+## Breaking Changes
+
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -143,30 +150,6 @@ new MauiIcon().Icon(MaterialSharpIcons.ABC).OnIdioms(new List<string>{"Desktop",
 new MauiIcon().Icon(MaterialSharpIcons.AddRoad).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:MaterialSharp Icon=ABC, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:MaterialSharp Icon=AddRoad, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:MaterialSharp Icon=AddRoad, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:MaterialSharp Icon=ABC, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
-
 # License
 
 **MauiIcons.Material.Sharp**  
diff --git a/src/MauiIcons.Material/ReleaseNotes.txt b/src/MauiIcons.Material/ReleaseNotes.txt
index 80cc2f0..7579889 100644
--- a/src/MauiIcons.Material/ReleaseNotes.txt
+++ b/src/MauiIcons.Material/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.Material/readme.md b/src/MauiIcons.Material/readme.md
index 89cfeea..556b470 100644
--- a/src/MauiIcons.Material/readme.md
+++ b/src/MauiIcons.Material/readme.md
@@ -52,14 +52,16 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
 ```xml
 xmlns:material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
 
-<material:MauiIcon Icon="AddRoad"/>
+<material:MauiIcon Icon="ABC"/>
 ```
 
 `New (v2)`
@@ -67,9 +69,14 @@ xmlns:material="clr-namespace:MauiIcons.Material;assembly=MauiIcons.Material"
 ```xml
 xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 
-<mi:MauiIcon Icon="{mi:Material AddRoad}"/>
+<mi:MauiIcon Icon="{mi:Material ABC}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ### Nuget Package Changes
 
 - **`AathifMahir.Maui.MauiIcons.Material`** doesn't contain all the Variants anymore, Now only contains **Regular version** of Material Icons. Other Variants Decoupled into Seperate Packages Like Below
@@ -169,29 +176,6 @@ new MauiIcon().Icon(MaterialIcons.ABC).OnIdioms(new List<string>{"Desktop", "Pho
 new MauiIcon().Icon(MaterialIcons.AddRoad).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:Material Icon=ABC, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:Material Icon=AddRoad, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:Material Icon=AddRoad, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:Material Icon=ABC, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.Material**
diff --git a/src/MauiIcons.Modules.UnitTest/MauiIcons.Modules.UnitTest.csproj b/src/MauiIcons.Modules.UnitTest/MauiIcons.Modules.UnitTest.csproj
index fdde9d3..88acb47 100644
--- a/src/MauiIcons.Modules.UnitTest/MauiIcons.Modules.UnitTest.csproj
+++ b/src/MauiIcons.Modules.UnitTest/MauiIcons.Modules.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<UseMaui>true</UseMaui>
diff --git a/src/MauiIcons.SegoeFluent/ReleaseNotes.txt b/src/MauiIcons.SegoeFluent/ReleaseNotes.txt
index a244c0c..84ab66f 100644
--- a/src/MauiIcons.SegoeFluent/ReleaseNotes.txt
+++ b/src/MauiIcons.SegoeFluent/ReleaseNotes.txt
@@ -1,4 +1,9 @@
-v2.2.5
+v3.0.0
+• Critical Fixes for Xaml Markup Binding Support
+• Breaking Changes: Removal of Dotnet 7 Support
+• Breaking Changes: Removal of Maui OnPlatform and OnIdioms Support Instead Use MauiIcons Integrated Custom OnPlatforms and OnIdioms Feature
+
+v2.2.5
 • New and Improved Xaml Markup Extension with Binding Support
 
 v2.1.5
diff --git a/src/MauiIcons.SegoeFluent/readme.md b/src/MauiIcons.SegoeFluent/readme.md
index aaf3d0d..7452599 100644
--- a/src/MauiIcons.SegoeFluent/readme.md
+++ b/src/MauiIcons.SegoeFluent/readme.md
@@ -52,14 +52,16 @@ if you came across this issue dotnet/maui#7503 when using new namespace, Make su
 
 ```
 
-## Breaking Changes from v2
+## Breaking Changes
+
+### Version 1 to 2
 
 `Old (v1)`
 
 ```xml
 xmlns:segoeFluent="clr-namespace:MauiIcons.SegoeFluent;assembly=MauiIcons.SegoeFluent"
 
-<segoeFluent:MauiIcon Icon="ActionCenterQuiet"/>
+<segoeFluent:MauiIcon Icon="AdjustHologram"/>
 ```
 
 `New (v2)`
@@ -67,9 +69,14 @@ xmlns:segoeFluent="clr-namespace:MauiIcons.SegoeFluent;assembly=MauiIcons.SegoeF
 ```xml
 xmlns:mi="http://www.aathifmahir.com/dotnet/2022/maui/icons"
 
-<mi:MauiIcon Icon="{mi:SegoeFluent ActionCenterQuiet}"/>
+<mi:MauiIcon Icon="{mi:SegoeFluent AdjustHologram}"/>
 ```
 
+### Version 2 to 3
+
+  - Removal of **TypeArgument** and Built in OnPlatform and OnIdiom Support, Use MauiIcons Integrated [Custom OnPlatform and OnIdioms Feature](#custom-onplatform-and-onidiom-usage)
+  - Removal of **Dotnet 7** Support
+
 ## Built in Control Usage
 
 `Xaml`
@@ -161,29 +168,6 @@ new MauiIcon().Icon(SegoeFluentIcons.AdjustHologram).OnIdioms(new List<string>{"
 new MauiIcon().Icon(SegoeFluentIcons.ActionCenterQuiet).OnPlatforms(new List<string>{"WinUI", "Android"}).OnIdioms(new List<string>{"Desktop", "Phone"});
 ```
 
-## Maui Built in OnPlatform and OnIdiom Usage
-
-```xml
-<Image>
-    <Image.Source>
-        <OnPlatform x:TypeArguments="ImageSource" Default="{mi:SegoeFluent Icon=AdjustHologram, TypeArgument={x:Type ImageSource}}">
-            <On Platform="MacCatalyst, WinUI" 
-			Value="{mi:SegoeFluent Icon=ActionCenterQuiet, IconBackgroundColor=Cyan, TypeArgument={x:Type ImageSource}}"/>
-        </OnPlatform>
-    </Image.Source>
-</Image>
-
-<Image>
-    <Image.Source>
-        <OnIdiom Default="{mi:SegoeFluent Icon=ActionCenterQuiet, TypeArgument={x:Type ImageSource}}" 
-		Desktop="{mi:SegoeFluent Icon=AdjustHologram, TypeArgument={x:Type ImageSource}}">
-        </OnIdiom>
-    </Image.Source>
-</Image>
-
-```
-**Disclaimer:**  Only **ImageSource** or **FontImageSource** Supports Maui's Built in OnPlatform or OnIdiom and **TypeArgument** Should be Assigned to Work Optimally, Therefore It's Recommended to use MauiIcons Custom OnPlatform and OnIdioms
-
 # License
 
 **MauiIcons.SegoeFluent**