diff --git a/Demos/Apps/TodoApp/TodoItem.razor b/Demos/Apps/TodoApp/TodoItem.razor
index c3d81df42d..f166809bca 100644
--- a/Demos/Apps/TodoApp/TodoItem.razor
+++ b/Demos/Apps/TodoApp/TodoItem.razor
@@ -1,7 +1,7 @@
 <ListGroupItem>
     <Field Horizontal Padding="Padding.IsAuto.OnAll">
         <FieldBody ColumnSize="ColumnSize.Is1">
-            <Check TValue="bool" Checked="@Todo.Completed" CheckedChanged="@OnCheckedChanged"></Check>
+            <Check TValue="bool" Value="@Todo.Completed" ValueChanged="@OnCheckedChanged"></Check>
         </FieldBody>
         <FieldBody ColumnSize="ColumnSize.Is11">
             @Todo.Description
diff --git a/Demos/Apps/TodoApp/TodoItems.razor b/Demos/Apps/TodoApp/TodoItems.razor
index e5540c2730..afc6ec1b65 100644
--- a/Demos/Apps/TodoApp/TodoItems.razor
+++ b/Demos/Apps/TodoApp/TodoItems.razor
@@ -10,7 +10,7 @@
                     <Fields>
                         <Column ColumnSize="ColumnSize.Is1">
                             <Field>
-                                <Check TValue="bool" Checked="@Todos.All(x=>x.Completed)" CheckedChanged="@OnCheckAll">All</Check>
+                                <Check TValue="bool" Value="@Todos.All(x=>x.Completed)" ValueChanged="@OnCheckAll">All</Check>
                             </Field>
                         </Column>
                         <Column ColumnSize="ColumnSize.Is11">
@@ -19,7 +19,7 @@
                                     <Addon AddonType="AddonType.Body">
                                         <Validations @ref="validations" Mode="ValidationMode.Manual">
                                             <Validation Validator="@ValidationRule.IsNotEmpty">
-                                                <TextEdit @bind-Text="@description" Placeholder="What needs to be done?"></TextEdit>
+                                                <TextEdit @bind-Value="@description" Placeholder="What needs to be done?"></TextEdit>
                                             </Validation>
                                         </Validations>
                                     </Addon>
diff --git a/Demos/Blazorise.Demo/Components/FormularyModal.razor b/Demos/Blazorise.Demo/Components/FormularyModal.razor
index 0faa4c958e..1751fb8442 100644
--- a/Demos/Blazorise.Demo/Components/FormularyModal.razor
+++ b/Demos/Blazorise.Demo/Components/FormularyModal.razor
@@ -9,14 +9,14 @@
     <Field Horizontal>
         <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">First Name</FieldLabel>
         <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-            <TextEdit @bind-Text="model.FirstName"></TextEdit>
+            <TextEdit @bind-Value="model.FirstName"></TextEdit>
         </FieldBody>
     </Field>
 
     <Field Horizontal>
         <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Email</FieldLabel>
         <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-            <TextEdit @bind-Text="model.Email"></TextEdit>
+            <TextEdit @bind-Value="model.Email"></TextEdit>
         </FieldBody>
     </Field>
 
diff --git a/Demos/Blazorise.Demo/Components/TopMenu.razor b/Demos/Blazorise.Demo/Components/TopMenu.razor
index 2fd271a1c5..17b214632c 100644
--- a/Demos/Blazorise.Demo/Components/TopMenu.razor
+++ b/Demos/Blazorise.Demo/Components/TopMenu.razor
@@ -121,17 +121,17 @@
                         <Row>
                             <Column Margin="Margin.Is2.FromBottom">
                                 <Field>
-                                    <Switch TValue="bool" Checked="@(Theme?.Enabled == true)" CheckedChanged="@ThemeEnabledChanged">Theme enabled</Switch>
+                                    <Switch TValue="bool" Value="@(Theme?.Enabled == true)" ValueChanged="@ThemeEnabledChanged">Theme enabled</Switch>
                                 </Field>
                             </Column>
                         </Row>
                         <Row>
                             <Column Margin="Margin.Is2.FromBottom">
                                 <Field>
-                                    <Check TValue="bool" Checked="@(Theme?.IsGradient == true)" CheckedChanged="@ThemeGradientChanged">Gradient colors</Check>
+                                    <Check TValue="bool" Value="@(Theme?.IsGradient == true)" ValueChanged="@ThemeGradientChanged">Gradient colors</Check>
                                 </Field>
                                 <Field>
-                                    <Check TValue="bool" Checked="@(Theme?.IsRounded == true)" CheckedChanged="@ThemeRoundedChanged">Rounded elements</Check>
+                                    <Check TValue="bool" Value="@(Theme?.IsRounded == true)" ValueChanged="@ThemeRoundedChanged">Rounded elements</Check>
                                 </Field>
                             </Column>
                         </Row>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/AutocompletesPage.razor b/Demos/Blazorise.Demo/Pages/Tests/AutocompletesPage.razor
index bba93239c5..ffd0da5601 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/AutocompletesPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/AutocompletesPage.razor
@@ -10,7 +10,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@autocompleteFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@autocompleteFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
                 <Field Horizontal JustifyContent="JustifyContent.End">
@@ -57,7 +57,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@multipleAutocompleteFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@multipleAutocompleteFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
                 <Field Horizontal JustifyContent="JustifyContent.End">
@@ -100,7 +100,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@autocompleteReadDataFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@autocompleteReadDataFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
 
@@ -147,7 +147,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@multipleAutocompleteReadDataFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@multipleAutocompleteReadDataFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
 
@@ -199,7 +199,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@autocompleteVirtualizeFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@autocompleteVirtualizeFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
                 <Field Horizontal JustifyContent="JustifyContent.End">
@@ -247,7 +247,7 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@autocompleteVirtualizeReadDataFreeTyping">FreeTyping</Check>
+                        <Check @bind-Value="@autocompleteVirtualizeReadDataFreeTyping">FreeTyping</Check>
                     </FieldBody>
                 </Field>
 
diff --git a/Demos/Blazorise.Demo/Pages/Tests/CarouselPage.razor b/Demos/Blazorise.Demo/Pages/Tests/CarouselPage.razor
index 07ffe40f87..3143e2023f 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/CarouselPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/CarouselPage.razor
@@ -5,10 +5,10 @@
             <CardBody>
                 <Fields>
                     <Field ColumnSize="ColumnSize.Is3">
-                        <Switch TValue="bool" @bind-Checked="@showIndicators">Indicators</Switch>
+                        <Switch TValue="bool" @bind-Value="@showIndicators">Indicators</Switch>
                     </Field>
                     <Field ColumnSize="ColumnSize.Is3">
-                        <Switch TValue="bool" @bind-Checked="@showControls">Controls</Switch>
+                        <Switch TValue="bool" @bind-Value="@showControls">Controls</Switch>
                     </Field>
                 </Fields>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/CropperPage.razor b/Demos/Blazorise.Demo/Pages/Tests/CropperPage.razor
index 5964fc9927..b7b7e122f5 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/CropperPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/CropperPage.razor
@@ -37,7 +37,7 @@
                             Aspect Ratio
                         </FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue="@ratio">
+                            <Select @bind-Value="@ratio">
                                 <SelectItem Value="@CropperAspectRatio.Is16x9.Value">16:9</SelectItem>
                                 <SelectItem Value="@CropperAspectRatio.Is4x3.Value">4:3</SelectItem>
                                 <SelectItem Value="@CropperAspectRatio.Is1x1.Value">1:1</SelectItem>
@@ -48,7 +48,7 @@
                     </Field>
                     <Field>
                         <FieldBody>
-                            <Check @bind-Checked="@enabled">Enabled</Check>
+                            <Check @bind-Value="@enabled">Enabled</Check>
                         </FieldBody>
                     </Field>
                     <Field>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/AggregatesPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/AggregatesPage.razor
index d4d82e6550..396ee8a269 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/AggregatesPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/AggregatesPage.razor
@@ -41,7 +41,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ColumnChooserPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ColumnChooserPage.razor
index 7f7312b192..e381948407 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ColumnChooserPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ColumnChooserPage.razor
@@ -40,7 +40,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataExternalSourcePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataExternalSourcePage.razor
index d5c1645824..54b3298967 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataExternalSourcePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataExternalSourcePage.razor
@@ -49,7 +49,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor
index b6096b0088..6feea6e1d9 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor
@@ -19,7 +19,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@editable">Editable</Check>
+                                    <Check @bind-Value="@editable">Editable</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -29,7 +29,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check TValue="bool" @bind-Checked="@fixedHeader">Fixed Header</Check>
+                                    <Check TValue="bool" @bind-Value="@fixedHeader">Fixed Header</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -39,7 +39,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check TValue="bool" Checked="@virtualize" CheckedChanged="@OnVirtualizeChanged">Virtualize</Check>
+                                    <Check TValue="bool" Value="@virtualize" ValueChanged="@OnVirtualizeChanged">Virtualize</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -49,7 +49,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@resizable">Resizable</Check>
+                                    <Check @bind-Value="@resizable">Resizable</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -59,7 +59,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@sortable">Sortable</Check>
+                                    <Check @bind-Value="@sortable">Sortable</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -69,7 +69,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@filterable">Filterable</Check>
+                                    <Check @bind-Value="@filterable">Filterable</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -79,7 +79,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@showPager">Show Pager</Check>
+                                    <Check @bind-Value="@showPager">Show Pager</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -89,7 +89,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@showPageSizes">Show Page sizes</Check>
+                                    <Check @bind-Value="@showPageSizes">Show Page sizes</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -99,7 +99,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check @bind-Checked="@showButtonRow">Show Button Row</Check>
+                                    <Check @bind-Value="@showButtonRow">Show Button Row</Check>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -109,7 +109,7 @@
                                     </Tooltip>
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Check TValue=bool Checked="@readDataMode" CheckedChanged="OnReadDataModeChanged">Large Data</Check>
+                                    <Check TValue=bool Value="@readDataMode" ValueChanged="OnReadDataModeChanged">Large Data</Check>
                                 </FieldBody>
                             </Field>
                         </Fields>
@@ -123,7 +123,7 @@
                                     Selection mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@selectionMode">
+                                    <Select @bind-Value="@selectionMode">
                                         <SelectItem Value="@DataGridSelectionMode.Single">Single</SelectItem>
                                         <SelectItem Value="@DataGridSelectionMode.Multiple">Multiple</SelectItem>
                                     </Select>
@@ -134,7 +134,7 @@
                                     Edit Mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@editMode">
+                                    <Select @bind-Value="@editMode">
                                         <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                                         <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                                         <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -146,7 +146,7 @@
                                     Resizable Mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@resizableMode">
+                                    <Select @bind-Value="@resizableMode">
                                         <SelectItem Value="TableResizeMode.Header">Header</SelectItem>
                                         <SelectItem Value="TableResizeMode.Columns">Columns</SelectItem>
                                     </Select>
@@ -157,7 +157,7 @@
                                     Command Mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@commandsMode">
+                                    <Select @bind-Value="@commandsMode">
                                         <SelectItem Value="DataGridCommandMode.Default">Default</SelectItem>
                                         <SelectItem Value="DataGridCommandMode.ButtonRow">Button Row</SelectItem>
                                         <SelectItem Value="DataGridCommandMode.Commands">Commands</SelectItem>
@@ -175,7 +175,7 @@
                                     Sort mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@sortMode">
+                                    <Select @bind-Value="@sortMode">
                                         <SelectItem Value="@DataGridSortMode.Single">Single</SelectItem>
                                         <SelectItem Value="@DataGridSortMode.Multiple">Multiple</SelectItem>
                                     </Select>
@@ -186,7 +186,7 @@
                                     Filter mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@filterMode">
+                                    <Select @bind-Value="@filterMode">
                                         <SelectItem Value="@DataGridFilterMode.Default">Default</SelectItem>
                                         <SelectItem Value="@DataGridFilterMode.Menu">Menu</SelectItem>
                                     </Select>
@@ -197,7 +197,7 @@
                                     Responsive mode
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@responsiveMode">
+                                    <Select @bind-Value="@responsiveMode">
                                         <SelectItem Value="@TableResponsiveMode.Default">Default</SelectItem>
                                         <SelectItem Value="@TableResponsiveMode.Mobile">Mobile</SelectItem>
                                     </Select>
@@ -208,7 +208,7 @@
                                     Custom Search
                                 </FieldLabel>
                                 <FieldBody>
-                                    <TextEdit Text="@customFilterValue" TextChanged="@OnCustomFilterValueChanged" />
+                                    <TextEdit Value="@customFilterValue" ValueChanged="@OnCustomFilterValueChanged" />
                                 </FieldBody>
                             </Field>
                         </Fields>
@@ -290,7 +290,7 @@
                                 </Button>
                             </FilterTemplate>
                             <MultiSelectTemplate>
-                                <Check TValue="bool" Checked="@context.IsSelected" CheckedExpression="() => context.IsSelected" Indeterminate="@context.IsIndeterminate" CheckedChanged="@context.SelectedChanged"></Check>
+                                <Check TValue="bool" Value="@context.IsSelected" ValueExpression="() => context.IsSelected" Indeterminate="@context.IsIndeterminate" ValueChanged="@context.SelectedChanged"></Check>
                             </MultiSelectTemplate>
                             <AggregateTemplate>
                                 <Span TextWeight="TextWeight.Bold">@(selectedEmployees?.Count ?? 0)</Span>
@@ -322,7 +322,7 @@
                         <DataGridColumn TextAlignment="TextAlignment.Center" Field="@nameof( Employee.Id )" Caption="#" Sortable="false" Width="60px" PreventRowClick />
                         <DataGridColumn Field="@nameof( Employee.FirstName )" Caption="First Name" Validator="@CheckFirstName" Editable>
                             <FilterTemplate>
-                                <TextEdit Placeholder="Search name" Text="@context.SearchValue?.ToString()" TextChanged="@(v=> context.TriggerFilterChange(v))" />
+                                <TextEdit Placeholder="Search name" Value="@context.SearchValue?.ToString()" ValueChanged="@(v=> context.TriggerFilterChange(v))" />
                             </FilterTemplate>
                         </DataGridColumn>
                         <DataGridColumn Field="@nameof( Employee.LastName )" Caption="Last Name" Editable ValidationPattern="[A-Za-z]{3}" />
@@ -338,7 +338,7 @@
                             <FilterTemplate>
                                 @{
                                     selectedCityFilter = @context.SearchValue?.ToString() ?? "";
-                                    <Select TValue="string" SelectedValue="@selectedCityFilter" SelectedValueChanged="@(e => { selectedCityFilter = e; context.TriggerFilterChange( selectedCityFilter ); })">
+                                    <Select TValue="string" Value="@selectedCityFilter" ValueChanged="@(e => { selectedCityFilter = e; context.TriggerFilterChange( selectedCityFilter ); })">
                                         <SelectItem Value="@("")">All</SelectItem>
                                         @foreach ( var item in dataModels )
                                         {
@@ -421,24 +421,24 @@
                     <Field>
                         <FieldLabel>First Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedEmployee?.FirstName"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedEmployee?.FirstName"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Last Name</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedEmployee?.LastName"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedEmployee?.LastName"></TextEdit>
                     </Field>
                 </Fields>
                 <Fields>
                     <Field>
                         <FieldLabel>Email</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedEmployee?.Email"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedEmployee?.Email"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>City</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedEmployee?.City"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedEmployee?.City"></TextEdit>
                     </Field>
                 </Fields>
             </CardBody>
@@ -464,24 +464,24 @@
                                 <Field>
                                     <FieldLabel>First Name</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit ReadOnly Text="@employee?.FirstName"></TextEdit>
+                                        <TextEdit ReadOnly Value="@employee?.FirstName"></TextEdit>
                                     </FieldBody>
                                 </Field>
                                 <Field>
                                     <FieldLabel>Last Name</FieldLabel>
-                                    <TextEdit ReadOnly Text="@employee?.LastName"></TextEdit>
+                                    <TextEdit ReadOnly Value="@employee?.LastName"></TextEdit>
                                 </Field>
                             </Fields>
                             <Fields>
                                 <Field>
                                     <FieldLabel>Email</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit ReadOnly Text="@employee?.Email"></TextEdit>
+                                        <TextEdit ReadOnly Value="@employee?.Email"></TextEdit>
                                     </FieldBody>
                                 </Field>
                                 <Field>
                                     <FieldLabel>City</FieldLabel>
-                                    <TextEdit ReadOnly Text="@employee?.City"></TextEdit>
+                                    <TextEdit ReadOnly Value="@employee?.City"></TextEdit>
                                 </Field>
                             </Fields>
                         </CardBody>
@@ -503,7 +503,7 @@
                             <Field>
                                 <FieldLabel>Quantity</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit ReadOnly Text="@selectedEmployees.Count.ToString()"></TextEdit>
+                                    <TextEdit ReadOnly Value="@selectedEmployees.Count.ToString()"></TextEdit>
                                 </FieldBody>
                             </Field>
                         </Fields>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataInMemoryPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataInMemoryPage.razor
index 82fee29b56..ccc48c3ee5 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataInMemoryPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataInMemoryPage.razor
@@ -40,7 +40,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DynamicDataPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DynamicDataPage.razor
index cf489dd378..3939a01432 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DynamicDataPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DynamicDataPage.razor
@@ -52,7 +52,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn Field="IsActive" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked='(context as dynamic).IsActive' Disabled ReadOnly />
+                                <Check TValue="bool" Value='(context as dynamic).IsActive' Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
index 425713ac0b..53d0d5c695 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingBatchEdit.razor
@@ -14,7 +14,7 @@
                         Edit Mode
                     </FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@editMode">
+                        <Select @bind-Value="@editMode">
                             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -70,7 +70,7 @@
                          </DataGridColumn>
                          <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                              <DisplayTemplate>
-                                 <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                              </DisplayTemplate>
                          </DataGridCheckColumn>
                      </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingButtonRowPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingButtonRowPage.razor
index b076cadf04..4a9f12cb34 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingButtonRowPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingButtonRowPage.razor
@@ -12,7 +12,7 @@
                     </FieldLabel>
                     <FieldBody>
                         
-                        <Select @bind-SelectedValue="@editMode">
+                        <Select @bind-Value="@editMode">
                             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -55,7 +55,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingCommandsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingCommandsPage.razor
index 3d87c16bc0..a36b6d937c 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingCommandsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingCommandsPage.razor
@@ -17,7 +17,7 @@
                         Edit Mode
                     </FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@editMode">
+                        <Select @bind-Value="@editMode">
                             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -52,7 +52,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingRapidPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingRapidPage.razor
index 708a51f707..133a12be4b 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingRapidPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingRapidPage.razor
@@ -11,7 +11,7 @@
                 </Paragraph>
                 <Field>
                     <FieldBody>
-                        <Switch @bind-Checked="@showCommandColumn" Size="Size.Medium">Show Command Column</Switch>
+                        <Switch @bind-Value="@showCommandColumn" Size="Size.Medium">Show Command Column</Switch>
                     </FieldBody>
                 </Field>
             </CardBody>
@@ -52,7 +52,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingUpdateCellPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingUpdateCellPage.razor
index 03f0f1e42b..3f28ec4303 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingUpdateCellPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/EditingUpdateCellPage.razor
@@ -11,7 +11,7 @@
                         Edit Mode
                     </FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@editMode">
+                        <Select @bind-Value="@editMode">
                             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -43,7 +43,7 @@
                         <DataGridSelectColumn TItem="Employee" Field="@nameof( Employee.Gender )" Caption="Gender" Editable Data="EmployeeData.Genders" ValueField="(x) => ((Gender)x).Code" TextField="(x) => ((Gender)x).Description">
 
                             <EditTemplate>
-                                <Select TValue="string" SelectedValue="@((string)( context.CellValue ))" SelectedValueChanged="@(( v ) => { context.CellValue = v; context.UpdateCell( nameof( Employee.FirstName ), TitleToName( TitleFromGender( v ), context.ReadCell( nameof( Employee.FirstName ) ) ) ); })">
+                                <Select TValue="string" Value="@((string)( context.CellValue ))" ValueChanged="@(( v ) => { context.CellValue = v; context.UpdateCell( nameof( Employee.FirstName ), TitleToName( TitleFromGender( v ), context.ReadCell( nameof( Employee.FirstName ) ) ) ); })">
                                     <SelectItem Value="(string)null"></SelectItem>
                                     <SelectItem Value="@("M")">Male</SelectItem>
                                     <SelectItem Value="@("F")">Female</SelectItem>
@@ -56,7 +56,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterColumn.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterColumn.razor
index e43c716b24..8d1b99093f 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterColumn.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterColumn.razor
@@ -34,7 +34,7 @@
                         </DataGridNumericColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable>
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomColumn.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomColumn.razor
index cbc0fea892..edd03eed3e 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomColumn.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomColumn.razor
@@ -33,7 +33,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomPage.razor
index 712fba5b07..45760ca88f 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterCustomPage.razor
@@ -7,7 +7,7 @@
             </CardHeader>
             <CardBody>
                 <Field>
-                    Custom Filter: <TextEdit @bind-Text="@customFilterValue"></TextEdit>
+                    Custom Filter: <TextEdit @bind-Value="@customFilterValue"></TextEdit>
                 </Field>
                 <DataGrid TItem="Employee"
                           Data="inMemoryData"
@@ -36,7 +36,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterStandardPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterStandardPage.razor
index df1c784375..4d8f7bf42f 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterStandardPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FilterStandardPage.razor
@@ -33,7 +33,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable>
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FixedHeaderPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FixedHeaderPage.razor
index 1c837d4544..28ad44bffd 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FixedHeaderPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/FixedHeaderPage.razor
@@ -35,7 +35,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupMultiplePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupMultiplePage.razor
index 291ead2cb4..5f4e0019bc 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupMultiplePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupMultiplePage.razor
@@ -79,7 +79,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false" Groupable Grouping>
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupPage.razor
index 5f886cf77e..e33ea16aa0 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupPage.razor
@@ -41,7 +41,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupSinglePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupSinglePage.razor
index 0df770a7ac..e30a007941 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupSinglePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/GroupSinglePage.razor
@@ -40,7 +40,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/PagerPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/PagerPage.razor
index a5813720bb..18b923499b 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/PagerPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/PagerPage.razor
@@ -33,7 +33,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
@@ -50,7 +50,7 @@
                     <TotalItemsShortTemplate><Badge Color="Color.Success">@context.TotalItems</Badge></TotalItemsShortTemplate>
                     <ItemsPerPageTemplate></ItemsPerPageTemplate>
                     <PageSelectorTemplate>
-                        <Select TextColor="TextColor.Success" @bind-SelectedValue="@context.CurrentPage" Size="Size.Small">
+                        <Select TextColor="TextColor.Success" @bind-Value="@context.CurrentPage" Size="Size.Small">
                             @for ( int i = context.FirstVisiblePage; i <= context.LastVisiblePage; ++i )
                             {
                                 var pageNumber = i;
@@ -59,7 +59,7 @@
                         </Select>
                     </PageSelectorTemplate>
                     <PageSizesTemplate>
-                        <Select TextColor="TextColor.Success" @bind-SelectedValue="@context.CurrentPageSize" Size="Size.Small">
+                        <Select TextColor="TextColor.Success" @bind-Value="@context.CurrentPageSize" Size="Size.Small">
                             @foreach ( var curPageSize in context.PageSizes )
                             {
                                 <SelectItem Value="@curPageSize">@curPageSize</SelectItem>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ResizePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ResizePage.razor
index 0794c8b080..369dd60253 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ResizePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ResizePage.razor
@@ -11,7 +11,7 @@
                         Resize Mode
                     </FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@resizeMode">
+                        <Select @bind-Value="@resizeMode">
                             <SelectItem Value="TableResizeMode.Header">Header</SelectItem>
                             <SelectItem Value="TableResizeMode.Columns">Columns</SelectItem>
                         </Select>
@@ -44,7 +44,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/RowOverlayPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/RowOverlayPage.razor
index aef324c5f3..f446d8ee71 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/RowOverlayPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/RowOverlayPage.razor
@@ -34,7 +34,7 @@
                          </DataGridColumn>
                          <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                              <DisplayTemplate>
-                                 <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                              </DisplayTemplate>
                          </DataGridCheckColumn>
                      </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionCellPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionCellPage.razor
index 693f81f998..e0071e00b8 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionCellPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionCellPage.razor
@@ -43,7 +43,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
@@ -64,18 +64,18 @@
                     <Field>
                         <FieldLabel>Row Index</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedCell?.RowIndex.ToString()"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedCell?.RowIndex.ToString()"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Field</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedCell?.ColumnInfo?.Field"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedCell?.ColumnInfo?.Field"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Value</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)"></TextEdit>
                     </Field>
                 </Fields>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionDetailRowPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionDetailRowPage.razor
index 38df5cbd7e..2c6ada7942 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionDetailRowPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionDetailRowPage.razor
@@ -14,7 +14,7 @@
                     You may also use the ToggleDetailRow API to programatically toggle a row.
                 </Paragraph>
                 <Paragraph>
-                    <Select TValue="int" @bind-SelectedValue="@selectedEmployeeIdForDetailRow">
+                    <Select TValue="int" @bind-Value="@selectedEmployeeIdForDetailRow">
                         <SelectItem Value="0"></SelectItem>
                         @foreach ( var item in inMemoryData )
                         {
@@ -54,7 +54,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionMultiplePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionMultiplePage.razor
index 998d02e899..c5c67f9b17 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionMultiplePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionMultiplePage.razor
@@ -48,7 +48,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
@@ -75,24 +75,24 @@
                                 <Field>
                                     <FieldLabel>First Name</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit ReadOnly Text="@employee?.FirstName"></TextEdit>
+                                        <TextEdit ReadOnly Value="@employee?.FirstName"></TextEdit>
                                     </FieldBody>
                                 </Field>
                                 <Field>
                                     <FieldLabel>Last Name</FieldLabel>
-                                    <TextEdit ReadOnly Text="@employee?.LastName"></TextEdit>
+                                    <TextEdit ReadOnly Value="@employee?.LastName"></TextEdit>
                                 </Field>
                             </Fields>
                             <Fields>
                                 <Field>
                                     <FieldLabel>Email</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit ReadOnly Text="@employee?.Email"></TextEdit>
+                                        <TextEdit ReadOnly Value="@employee?.Email"></TextEdit>
                                     </FieldBody>
                                 </Field>
                                 <Field>
                                     <FieldLabel>City</FieldLabel>
-                                    <TextEdit ReadOnly Text="@employee?.City"></TextEdit>
+                                    <TextEdit ReadOnly Value="@employee?.City"></TextEdit>
                                 </Field>
                             </Fields>
                         </CardBody>
@@ -114,7 +114,7 @@
                             <Field>
                                 <FieldLabel>Quantity</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit ReadOnly Text="@selectedEmployees.Count.ToString()"></TextEdit>
+                                    <TextEdit ReadOnly Value="@selectedEmployees.Count.ToString()"></TextEdit>
                                 </FieldBody>
                             </Field>
                         </Fields>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionSinglePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionSinglePage.razor
index 82d4e270bc..a664b5f1aa 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionSinglePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionSinglePage.razor
@@ -49,7 +49,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
@@ -70,24 +70,24 @@
                     <Field>
                         <FieldLabel>First Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedEmployee?.FirstName"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedEmployee?.FirstName"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Last Name</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedEmployee?.LastName"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedEmployee?.LastName"></TextEdit>
                     </Field>
                 </Fields>
                 <Fields>
                     <Field>
                         <FieldLabel>Email</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedEmployee?.Email"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedEmployee?.Email"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>City</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedEmployee?.City"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedEmployee?.City"></TextEdit>
                     </Field>
                 </Fields>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionStylingPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionStylingPage.razor
index 687ed44385..1677fcb595 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionStylingPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SelectionStylingPage.razor
@@ -34,7 +34,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortFieldPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortFieldPage.razor
index f99518ffe0..7ca1dd599e 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortFieldPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortFieldPage.razor
@@ -43,7 +43,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortMultiplePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortMultiplePage.razor
index cda72996bd..2d71c05e4a 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortMultiplePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortMultiplePage.razor
@@ -36,7 +36,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortSinglePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortSinglePage.razor
index 2b97d75721..dfc21c039e 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortSinglePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/SortSinglePage.razor
@@ -33,7 +33,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/StateManagementPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/StateManagementPage.razor
index 8332bbd1ce..c8672602dc 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/StateManagementPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/StateManagementPage.razor
@@ -56,7 +56,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ValidationsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ValidationsPage.razor
index c6a19bcccf..2ca1dff3ee 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ValidationsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/ValidationsPage.razor
@@ -45,7 +45,7 @@
                         Edit Mode
                     </FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@editMode">
+                        <Select @bind-Value="@editMode">
                             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
                             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
                             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
@@ -83,7 +83,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false" Validator="@ValidateCheck">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeExternalSourcePage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeExternalSourcePage.razor
index f2fa60ace7..93ea99afa5 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeExternalSourcePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeExternalSourcePage.razor
@@ -35,7 +35,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeInMemoryPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeInMemoryPage.razor
index 7aae417054..5c990bc2fd 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeInMemoryPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/VirtualizeInMemoryPage.razor
@@ -48,7 +48,7 @@
                         </DataGridColumn>
                         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
                             <DisplayTemplate>
-                                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
                             </DisplayTemplate>
                         </DataGridCheckColumn>
                     </DataGridColumns>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/FilePickerPage.razor b/Demos/Blazorise.Demo/Pages/Tests/FilePickerPage.razor
index ef7641d8c9..3eec2c4ecd 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/FilePickerPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/FilePickerPage.razor
@@ -12,13 +12,13 @@
             <CardBody>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@disableProgressReport">Disable Report Progress</Check>
+                        <Check @bind-Value="@disableProgressReport">Disable Report Progress</Check>
                         <Paragraph>By disabling progress report, file transfer can be significantly improved.</Paragraph>
                     </FieldBody>
                 </Field>
                 <Field>
                     <FieldBody>
-                        <Check @bind-Checked="@directory">Upload Directory?</Check>
+                        <Check @bind-Value="@directory">Upload Directory?</Check>
                     </FieldBody>
                 </Field>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/FocusTrapPage.razor b/Demos/Blazorise.Demo/Pages/Tests/FocusTrapPage.razor
index 6dc58c300e..2d8fff5a15 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/FocusTrapPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/FocusTrapPage.razor
@@ -11,7 +11,7 @@
                 </CardText>
             </CardBody>
             <CardBody>
-                <Switch TValue="bool" Checked="@focusTrapActive" CheckedChanged="@OnFocusTrapActiveChanged">Active</Switch>
+                <Switch TValue="bool" Value="@focusTrapActive" ValueChanged="@OnFocusTrapActiveChanged">Active</Switch>
             </CardBody>
             <CardBody>
                 <FocusTrap @ref="focusTrapRef" Active="@focusTrapActive">
diff --git a/Demos/Blazorise.Demo/Pages/Tests/FormsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/FormsPage.razor
index ef663c93e3..21fcce1381 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/FormsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/FormsPage.razor
@@ -24,7 +24,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Password</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <TextEdit Role="TextRole.Password" Text="password" />
+                        <TextEdit Role="TextRole.Password" Value="password" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
@@ -42,19 +42,19 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Readonly</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <TextEdit Text="Readonly value" ReadOnly />
+                        <TextEdit Value="Readonly value" ReadOnly />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Disabled</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <TextEdit Text="Disabled value" Disabled />
+                        <TextEdit Value="Disabled value" Disabled />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Static control</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <TextEdit Text="email@example.com" Plaintext />
+                        <TextEdit Value="email@example.com" Plaintext />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
@@ -68,7 +68,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Input Select</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <Select SelectedValue="3">
+                        <Select Value="3">
                             <SelectItem Value="1">One</SelectItem>
                             <SelectItem Value="2">Two</SelectItem>
                             <SelectItem Value="3">Three</SelectItem>
@@ -79,7 +79,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Multiple Select</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <Select TValue="int" Multiple>
+                        <Select TValue="int[]" Multiple>
                             <SelectItem Value="1">One</SelectItem>
                             <SelectItem Value="2">Two</SelectItem>
                             <SelectItem Value="3">Three</SelectItem>
@@ -90,7 +90,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Input Select With Group</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <Select SelectedValue="3">
+                        <Select Value="3">
                             <SelectGroup Label="first group">
                                 <SelectItem Value="1">One</SelectItem>
                                 <SelectItem Value="2">Two</SelectItem>
@@ -123,7 +123,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Time</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <TimeEdit TValue="TimeSpan?" TimeChanged="@((v)=>Console.WriteLine(v))" />
+                        <TimeEdit TValue="TimeSpan?" ValueChanged="@((v)=>Console.WriteLine(v))" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
@@ -147,7 +147,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Radios</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <RadioGroup TValue="string" Name="colors" CheckedValue="@("blue")">
+                        <RadioGroup TValue="string" Name="colors" Value="@("blue")">
                             <Radio Value="@("red")">Red</Radio>
                             <Radio Value="@("green")">Green</Radio>
                             <Radio Value="@("blue")">Blue</Radio>
@@ -157,7 +157,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Radio buttons</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <RadioGroup TValue="string" Name="colors2" Buttons CheckedValue="@("green")">
+                        <RadioGroup TValue="string" Name="colors2" Buttons Value="@("green")">
                             <Radio Value="@("red")">Red</Radio>
                             <Radio Value="@("green")">Green</Radio>
                             <Radio Value="@("blue")">Blue</Radio>
@@ -167,7 +167,7 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Color</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-                        <ColorEdit ColorChanged="@(c=>Console.WriteLine(c))" />
+                        <ColorEdit ValueChanged="@(c=>Console.WriteLine(c))" />
                     </FieldBody>
                 </Field>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/IconsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/IconsPage.razor
index b900b78e16..6ccb322f1f 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/IconsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/IconsPage.razor
@@ -10,7 +10,7 @@
             </CardHeader>
             <CardBody>
                 <Field>
-                    <TextEdit @bind-Text="@search" Placeholder="Search by name..." />
+                    <TextEdit @bind-Value="@search" Placeholder="Search by name..." />
                 </Field>
             </CardBody>
             <CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/ListGroupPage.razor b/Demos/Blazorise.Demo/Pages/Tests/ListGroupPage.razor
index d478df0316..a890b947c2 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/ListGroupPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/ListGroupPage.razor
@@ -11,7 +11,7 @@
             </CardBody>
             <CardBody>
                 <Row>
-                    <Column><Switch @bind-Checked="@flush">Flush</Switch></Column>
+                    <Column><Switch @bind-Value="@flush">Flush</Switch></Column>
                 </Row>
             </CardBody>
         </Card>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/LoadingIndicatorPage.razor b/Demos/Blazorise.Demo/Pages/Tests/LoadingIndicatorPage.razor
index b051453f7d..0c57667e5a 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/LoadingIndicatorPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/LoadingIndicatorPage.razor
@@ -17,25 +17,25 @@
             </CardBody>
             <CardBody>
                 <Button Clicked="() => lineChartIndicator.Show()" Color="Color.Primary" Margin="Margin.Is2.OnX">Set Visible</Button>
-                <Check TValue="bool" @bind-Checked="lineChartBusy" Inline>Visible</Check>
-                <Check TValue="bool" @bind-Checked="lineChartInitializing" Inline>Initializing</Check>
+                <Check TValue="bool" @bind-Value="lineChartBusy" Inline>Visible</Check>
+                <Check TValue="bool" @bind-Value="lineChartInitializing" Inline>Initializing</Check>
             </CardBody>
             <CardBody>
                 Width (null, 1% .. 100%) <Slider Min="0" Max="100" @bind-Value="spinnerWidth" />
                 Height (null, 1% .. 100%)<Slider Min="0" Max="100" @bind-Value="spinnerHeight" />
                 Horizontal Placement
-                <Select TValue="LoadingIndicatorPlacement" @bind-SelectedValue="spinnerHorizontal">
+                <Select TValue="LoadingIndicatorPlacement" @bind-Value="spinnerHorizontal">
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.Start">Start</SelectItem>
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.Middle">Middle</SelectItem>
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.End">End</SelectItem>
                 </Select>
                 Vertical Placement
-                <Select TValue="LoadingIndicatorPlacement" @bind-SelectedValue="spinnerVertical">
+                <Select TValue="LoadingIndicatorPlacement" @bind-Value="spinnerVertical">
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.Top">Top</SelectItem>
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.Middle">Middle</SelectItem>
                     <SelectItem TValue="LoadingIndicatorPlacement" Value="LoadingIndicatorPlacement.Bottom">Bottom</SelectItem>
                 </Select>
-                <Check TValue="bool" @bind-Checked="usePadding" Inline>Use IndicatorPadding</Check>
+                <Check TValue="bool" @bind-Value="usePadding" Inline>Use IndicatorPadding</Check>
                 @if ( usePadding )
                 {
                     <style>
@@ -45,7 +45,7 @@
                         }
                     </style>
                 }
-                <Check TValue="bool" @bind-Checked="showBorder" Inline>Show border</Check>
+                <Check TValue="bool" @bind-Value="showBorder" Inline>Show border</Check>
                 @if ( showBorder )
                 {
                     <style>
@@ -65,7 +65,7 @@
             <CardBody>
                 Message
                 <LoadingIndicator @ref="textEditIndicator" Inline SpinnerHeight="80%" IndicatorHorizontalPlacement="LoadingIndicatorPlacement.End" IndicatorPadding="@(Padding.Is2.FromEnd)">
-                    <TextEdit Disabled="textEditIndicator.Visible" Text="disabled when busy" />
+                    <TextEdit Disabled="textEditIndicator.Visible" Value="disabled when busy" />
                 </LoadingIndicator>
                 <Button Color="Color.Primary" Disabled="@(textEditIndicator?.Visible ?? false)" Clicked="ShowInlineBusy">Send</Button>
             </CardBody>
@@ -114,9 +114,9 @@
                         </LoadingIndicator>
                     </Column>
                     <Column ColumnSize="ColumnSize.IsHalf">
-                        Spinner color<ColorPicker @bind-Color="spinnerColor" />
-                        Spinner background color<ColorPicker @bind-Color="spinnerBackground" />
-                        Screen color<ColorPicker @bind-Color="screenColor" />
+                        Spinner color<ColorPicker @bind-Value="@spinnerColor" />
+                        Spinner background color<ColorPicker @bind-Value="spinnerBackground" />
+                        Screen color<ColorPicker @bind-Value="@screenColor" />
                     </Column>
                 </Row>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/LottieAnimationPage.razor b/Demos/Blazorise.Demo/Pages/Tests/LottieAnimationPage.razor
index 2cb6c8762a..b7bdfde6f8 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/LottieAnimationPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/LottieAnimationPage.razor
@@ -11,13 +11,13 @@
                     <Column>
                         <Field>
                             <FieldLabel>Animation Path</FieldLabel>
-                            <TextEdit Text="@path" TextChanged="@OnPathChanged" />
+                            <TextEdit Value="@path" ValueChanged="@OnPathChanged" />
                         </Field>
                     </Column>
                     <Column>
                         <Field>
                             <FieldLabel>Background Color</FieldLabel>
-                            <ColorPicker @bind-Color="@backgroundColor" />
+                            <ColorPicker @bind-Value="@backgroundColor" />
                         </Field>
                     </Column>
                 </Row>
@@ -31,7 +31,7 @@
                     <Column>
                         <Field>
                             <FieldLabel>Direction</FieldLabel>
-                            <Select @bind-SelectedValue="@animationDirection">
+                            <Select @bind-Value="@animationDirection">
                                 <SelectItem Value="LottieAnimationDirection.Forward">Forward</SelectItem>
                                 <SelectItem Value="LottieAnimationDirection.Backward">Backward</SelectItem>
                             </Select>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/ModalsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/ModalsPage.razor
index 5f75f1e2d2..bb7d3901e4 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/ModalsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/ModalsPage.razor
@@ -8,7 +8,7 @@
             <CardBody>
                 <Row>
                     <Column>
-                        <Switch @bind-Checked="@animation">Animation</Switch>
+                        <Switch @bind-Value="@animation">Animation</Switch>
                     </Column>
                     <Column>
                         <NumericEdit TValue="int" @bind-Value="animationDuration">Animation Duration (ms)</NumericEdit>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/OffcanvasPage.razor b/Demos/Blazorise.Demo/Pages/Tests/OffcanvasPage.razor
index ce7bf3eb9d..de6c77182e 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/OffcanvasPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/OffcanvasPage.razor
@@ -14,7 +14,7 @@
                                 Animation
                             </FieldLabel>
                             <FieldBody>
-                                <Switch @bind-Checked="@animation">Animation</Switch>
+                                <Switch @bind-Value="@animation">Animation</Switch>
                             </FieldBody>
                         </Field>
                     </Column>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/PickersPage.razor b/Demos/Blazorise.Demo/Pages/Tests/PickersPage.razor
index 421cf3f591..59bdb6f552 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/PickersPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/PickersPage.razor
@@ -7,39 +7,39 @@
             </CardHeader>
             <CardBody>
                 <Field Horizontal>
-                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date</FieldLabel>
+                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date Single</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateOnly?" @bind-Date="@d1" Placeholder="Select date..." />
+                        <DatePicker @bind-Value="@d1" Placeholder="Select date..." />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
-                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date & Time</FieldLabel>
+                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date & Time Single</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateTime?" @bind-Date="@dt1" Placeholder="Select date and time..." InputMode="DateInputMode.DateTime" />
+                        <DatePicker @bind-Value="@dt1" Placeholder="Select date and time..." InputMode="DateInputMode.DateTime" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date Range</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateOnly?" @bind-Dates="@d2" Placeholder="Select range..." SelectionMode="DateInputSelectionMode.Range" />
+                        <DatePicker @bind-Value="@d2" Placeholder="Select range..." SelectionMode="DateInputSelectionMode.Range" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date & Time Range</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateTime?" @bind-Dates="@dt2" Placeholder="Select date and time range..." InputMode="DateInputMode.DateTime" SelectionMode="DateInputSelectionMode.Range" />
+                        <DatePicker @bind-Value="@dt2" Placeholder="Select date and time range..." InputMode="DateInputMode.DateTime" SelectionMode="DateInputSelectionMode.Range" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
-                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date Range</FieldLabel>
+                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date Multi</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateOnly?" @bind-Dates="@d3" Placeholder="Select multiple date..." SelectionMode="DateInputSelectionMode.Multiple" />
+                        <DatePicker @bind-Value="@d3" Placeholder="Select multiple date..." SelectionMode="DateInputSelectionMode.Multiple" />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
-                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date & Time Range</FieldLabel>
+                    <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Date & Time Multi</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <DatePicker TValue="DateTime?" @bind-Dates="@dt3" Placeholder="Select multiple date and time..." InputMode="DateInputMode.DateTime" SelectionMode="DateInputSelectionMode.Multiple" />
+                        <DatePicker @bind-Value="@dt3" Placeholder="Select multiple date and time..." InputMode="DateInputMode.DateTime" SelectionMode="DateInputSelectionMode.Multiple" />
                     </FieldBody>
                 </Field>
             </CardBody>
@@ -82,25 +82,25 @@
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">TimeOnly</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <TimePicker TValue="TimeOnly?" @bind-Time="@t1" Placeholder="Select time..." />
+                        <TimePicker TValue="TimeOnly?" @bind-Value="@t1" Placeholder="Select time..." />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">24h Format</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <TimePicker TValue="TimeOnly?" @bind-Time="@t2" Placeholder="Select time in 24h format..." TimeAs24hr />
+                        <TimePicker TValue="TimeOnly?" @bind-Value="@t2" Placeholder="Select time in 24h format..." TimeAs24hr />
                     </FieldBody>
                 </Field>
                 <Field Horizontal>
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">TimeSpan</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <TimePicker TValue="TimeSpan?" @bind-Time="@ts1" Placeholder="Select time..." />
+                        <TimePicker TValue="TimeSpan?" @bind-Value="@ts1" Placeholder="Select time..." />
                     </FieldBody>
                 </Field>
                 <Field Horizontal="true">
                     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">24h Format</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                        <TimePicker TValue="TimeSpan?" @bind-Time="@ts2" Placeholder="Select time in 24h format..." TimeAs24hr />
+                        <TimePicker TValue="TimeSpan?" @bind-Value="@ts2" Placeholder="Select time in 24h format..." TimeAs24hr />
                     </FieldBody>
                 </Field>
                 <Div>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/QRCodePage.razor b/Demos/Blazorise.Demo/Pages/Tests/QRCodePage.razor
index 2be9350d0a..307fb9c4d4 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/QRCodePage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/QRCodePage.razor
@@ -14,7 +14,7 @@
                                     Value
                                 </FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="text" />
+                                    <TextEdit @bind-Value="text" />
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -22,7 +22,7 @@
                                     ECC Level
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Select @bind-SelectedValue="@eccLevel">
+                                    <Select @bind-Value="@eccLevel">
                                         <SelectItem Value="EccLevel.L">L</SelectItem>
                                         <SelectItem Value="EccLevel.M">M</SelectItem>
                                         <SelectItem Value="EccLevel.Q">Q</SelectItem>
@@ -35,7 +35,7 @@
                                     Dark Color
                                 </FieldLabel>
                                 <FieldBody>
-                                    <ColorPicker @bind-Color="darkColor" />
+                                    <ColorPicker @bind-Value="@darkColor" />
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -43,7 +43,7 @@
                                     Light Color
                                 </FieldLabel>
                                 <FieldBody>
-                                    <ColorPicker @bind-Color="lightColor" />
+                                    <ColorPicker @bind-Value="@lightColor" />
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -59,7 +59,7 @@
                                     As Anchor
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Switch @bind-Checked="asAnchor"></Switch>
+                                    <Switch @bind-Value="asAnchor"></Switch>
                                 </FieldBody>
                             </Field>
                             <Field>
@@ -67,7 +67,7 @@
                                     Draw Quiet Zones
                                 </FieldLabel>
                                 <FieldBody>
-                                    <Switch @bind-Checked="drawQuietZones"></Switch>
+                                    <Switch @bind-Value="drawQuietZones"></Switch>
                                 </FieldBody>
                             </Field>
                         </Fields>
@@ -81,7 +81,7 @@
                                     Base64 PNG Image
                                 </FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="base64PngIcon" />
+                                    <TextEdit @bind-Value="base64PngIcon" />
                                 </FieldBody>
                             </Field>
                             <Field>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/RichTextEditPage.razor b/Demos/Blazorise.Demo/Pages/Tests/RichTextEditPage.razor
index 8c9ebe5e29..e5dee7e97a 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/RichTextEditPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/RichTextEditPage.razor
@@ -14,7 +14,7 @@
                                 Options
                             </FieldLabel>
                             <FieldBody>
-                                <Switch @bind-Checked="@readOnly">Read only</Switch>
+                                <Switch @bind-Value="@readOnly">Read only</Switch>
                             </FieldBody>
                         </Field>
                         <Field>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor b/Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor
index 852af437cc..f33e15309c 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor
@@ -11,13 +11,13 @@
                     <Field>
                         <FieldLabel>Background Color</FieldLabel>
                         <FieldBody>
-                            <ColorPicker @bind-Color="@backgroundColor" />
+                            <ColorPicker @bind-Value="@backgroundColor" />
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Pen Color</FieldLabel>
                         <FieldBody>
-                            <ColorPicker @bind-Color="@penColor" />
+                            <ColorPicker @bind-Value="@penColor" />
                         </FieldBody>
                     </Field>
                     <Field>
@@ -59,7 +59,7 @@
                     <Field>
                         <FieldLabel>Read only</FieldLabel>
                         <FieldBody>
-                            <Check @bind-Checked="@readOnly" />
+                            <Check @bind-Value="@readOnly" />
                         </FieldBody>
                     </Field>
                 </Fields>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/SplitterPage.razor b/Demos/Blazorise.Demo/Pages/Tests/SplitterPage.razor
index f1851e071f..a9ddbc55a1 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/SplitterPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/SplitterPage.razor
@@ -26,7 +26,7 @@
                 <Field>
                     <FieldLabel>Direction</FieldLabel>
                     <FieldBody>
-                        <RadioGroup TValue="SplitterDirection" @bind-CheckedValue="@direction">
+                        <RadioGroup TValue="SplitterDirection" @bind-Value="@direction">
                             <Radio Value="SplitterDirection.Horizontal">Horizontal</Radio>
                             <Radio Value="SplitterDirection.Vertical">Vertical</Radio>
                         </RadioGroup>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/StepsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/StepsPage.razor
index 62117f311c..66f0d1ae9c 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/StepsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/StepsPage.razor
@@ -91,7 +91,7 @@
                         <StepPanel Name="2">
                             <Field>
                                 <FieldLabel>Email address</FieldLabel>
-                                <TextEdit @bind-Text="email" Placeholder="Enter email">
+                                <TextEdit @bind-Value="email" Placeholder="Enter email">
                                     <FieldHelp>This field is required in order to procceed to the next step.</FieldHelp>
                                 </TextEdit>
                             </Field>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/TablesPage.razor b/Demos/Blazorise.Demo/Pages/Tests/TablesPage.razor
index 472e288755..784fdcb158 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/TablesPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/TablesPage.razor
@@ -596,7 +596,7 @@
                         <Field>
                             <Row>
                                 <Column>
-                                    <Switch @bind-Checked="@fixedHeader">Fixed header</Switch>
+                                    <Switch @bind-Value="@fixedHeader">Fixed header</Switch>
                                 </Column>
                             </Row>
                             <Row>
@@ -618,29 +618,29 @@
                             </Row>
                         </Field>
                         <Field>
-                            <Switch @bind-Checked="@stripped">Stripped</Switch>
+                            <Switch @bind-Value="@stripped">Stripped</Switch>
                         </Field>
                         <Field>
-                            <Switch @bind-Checked="@bordered">Bordered</Switch>
+                            <Switch @bind-Value="@bordered">Bordered</Switch>
                         </Field>
                         <Field>
-                            <Switch @bind-Checked="@borderless">Borderless</Switch>
+                            <Switch @bind-Value="@borderless">Borderless</Switch>
                         </Field>
                         <Field>
-                            <Switch @bind-Checked="@hoverable">Hoverable</Switch>
+                            <Switch @bind-Value="@hoverable">Hoverable</Switch>
                         </Field>
                         <Field>
-                            <Switch @bind-Checked="@small">Narrow rows</Switch>
+                            <Switch @bind-Value="@small">Narrow rows</Switch>
                         </Field>
                         <Field>
                             <Row>
                                 <Column>
-                                    <Switch @bind-Checked="@resizable">Resizable</Switch>
+                                    <Switch @bind-Value="@resizable">Resizable</Switch>
                                 </Column>
                                 @if ( resizable )
                                 {
                                     <Column>
-                                        <Select @bind-SelectedValue="@resizeMode">
+                                        <Select @bind-Value="@resizeMode">
                                             <SelectItem Value="TableResizeMode.Header">Header</SelectItem>
                                             <SelectItem Value="TableResizeMode.Columns">Columns</SelectItem>
                                         </Select>
@@ -649,7 +649,7 @@
                             </Row>
                         </Field>
                         <Field>
-                            <Select @bind-SelectedValue="@responsiveMode">
+                            <Select @bind-Value="@responsiveMode">
                                 <SelectItem Value="TableResponsiveMode.Default">Default</SelectItem>
                                 <SelectItem Value="TableResponsiveMode.Mobile">Mobile</SelectItem>
                             </Select>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/ThemingPage.razor b/Demos/Blazorise.Demo/Pages/Tests/ThemingPage.razor
index afa78a02f8..04ab9f2146 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/ThemingPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/ThemingPage.razor
@@ -9,7 +9,7 @@
                 <CardText>Define the global size for button and input components.</CardText>
             </CardBody>
             <CardBody>
-                <Select TValue="Size?" SelectedValue="@selectedSize" SelectedValueChanged="@OnThemeInputSizeChanged">
+                <Select TValue="Size?" Value="@selectedSize" ValueChanged="@OnThemeInputSizeChanged">
                     <SelectItem TValue="Size?" Value="@(null)"></SelectItem>
                     <SelectItem TValue="Size?" Value="Size.Small">Small</SelectItem>
                     <SelectItem TValue="Size?" Value="Size.Default">Default</SelectItem>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/ToastPage.razor b/Demos/Blazorise.Demo/Pages/Tests/ToastPage.razor
index b365915bb8..0d3c7ef0e3 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/ToastPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/ToastPage.razor
@@ -14,7 +14,7 @@
                                 Placement
                             </FieldLabel>
                             <FieldBody>
-                                <Select @bind-SelectedValue="@toasterPlacement">
+                                <Select @bind-Value="@toasterPlacement">
                                     <SelectItem Value="ToasterPlacement.Top">Top</SelectItem>
                                     <SelectItem Value="ToasterPlacement.TopStart">TopStart</SelectItem>
                                     <SelectItem Value="ToasterPlacement.TopEnd">TopEnd</SelectItem>
@@ -31,7 +31,7 @@
                                 Animation
                             </FieldLabel>
                             <FieldBody>
-                                <Switch @bind-Checked="@animation">Animation</Switch>
+                                <Switch @bind-Value="@animation">Animation</Switch>
                             </FieldBody>
                         </Field>
                     </Column>
@@ -51,7 +51,7 @@
                                 Autohide
                             </FieldLabel>
                             <FieldBody>
-                                <Switch @bind-Checked="@autohide">Autohide</Switch>
+                                <Switch @bind-Value="@autohide">Autohide</Switch>
                             </FieldBody>
                         </Field>
                     </Column>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/TransferListPage.razor b/Demos/Blazorise.Demo/Pages/Tests/TransferListPage.razor
index 864d4c83b1..d388b9eb13 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/TransferListPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/TransferListPage.razor
@@ -10,17 +10,17 @@
             <CardBody>
                 <Fields>
                     <Field>
-                        <Switch @bind-Checked="@scrollable">
+                        <Switch @bind-Value="@scrollable">
                             Scroll Mode
                         </Switch>
                     </Field>
                     <Field>
-                        <Switch @bind-Checked="@multipleMode">
+                        <Switch @bind-Value="@multipleMode">
                             Multiple Mode
                         </Switch>
                     </Field>
                     <Field>
-                        <Switch @bind-Checked="@moveAll">
+                        <Switch @bind-Value="@moveAll">
                             Move All
                         </Switch>
                     </Field>
@@ -63,7 +63,7 @@
                     <Field>
                         <FieldLabel>Items</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@(listStart != null ? string.Join( ',', listStart ) : "")"></TextEdit>
+                            <TextEdit ReadOnly Value="@(listStart != null ? string.Join( ',', listStart ) : "")"></TextEdit>
                          </FieldBody>
                      </Field>
                  </Fields>
@@ -80,7 +80,7 @@
                      <Field>
                          <FieldLabel>Items</FieldLabel>
                          <FieldBody>
-                             <TextEdit ReadOnly Text="@(listEnd != null ? string.Join( ',', listEnd ) : "")"></TextEdit>
+                            <TextEdit ReadOnly Value="@(listEnd != null ? string.Join( ',', listEnd ) : "")"></TextEdit>
                          </FieldBody>
                      </Field>
                  </Fields>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/TreeViewPage.razor b/Demos/Blazorise.Demo/Pages/Tests/TreeViewPage.razor
index 2c9dd92f30..49dc8172be 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/TreeViewPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/TreeViewPage.razor
@@ -18,7 +18,7 @@
                         <Field Horizontal>
                             <FieldLabel Margin="Margin.Is3.FromEnd">Selection mode</FieldLabel>
                             <FieldBody>
-                                <Select @bind-SelectedValue="@selectionMode">
+                                <Select @bind-Value="@selectionMode">
                                     <SelectItem Value="TreeViewSelectionMode.Single">Single</SelectItem>
                                     <SelectItem Value="TreeViewSelectionMode.Multiple">Multiple</SelectItem>
                                 </Select>
@@ -43,7 +43,7 @@
                         }
                     </Column>
                     <Column ColumnSize="ColumnSize.IsAuto">
-                        <Switch @bind-Checked=virtualize>Virtualize</Switch>
+                        <Switch @bind-Value=virtualize>Virtualize</Switch>
                     </Column>
                 </Row>
             </CardBody>
diff --git a/Demos/Blazorise.Demo/Pages/Tests/ValidationsPage.razor b/Demos/Blazorise.Demo/Pages/Tests/ValidationsPage.razor
index 112fae653b..a9f3b30760 100644
--- a/Demos/Blazorise.Demo/Pages/Tests/ValidationsPage.razor
+++ b/Demos/Blazorise.Demo/Pages/Tests/ValidationsPage.razor
@@ -42,7 +42,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Text="@passwordAuto">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Value="@passwordAuto">
                                      <Feedback>
                                          <ValidationError>Password must be at least 6 characters long!</ValidationError>
                                      </Feedback>
@@ -168,7 +168,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Text="@passwordManual">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Value="@passwordManual">
                                      <Feedback>
                                          <ValidationError>Password must be at least 6 characters long!</ValidationError>
                                      </Feedback>
@@ -270,7 +270,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Full Name</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Placeholder="First and last name" @bind-Text="@user.Name">
+                                 <TextEdit Placeholder="First and last name" @bind-Value="@user.Name">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -282,7 +282,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Email</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Placeholder="Enter email" @bind-Text="@user.Email">
+                                 <TextEdit Placeholder="Enter email" @bind-Value="@user.Email">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -294,7 +294,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Text="@user.Password">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Value="@user.Password">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -306,7 +306,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Re Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Text="@user.ConfirmPassword">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Value="@user.ConfirmPassword">
                                      <Feedback>
                                          <ValidationError Multiline />
                                      </Feedback>
@@ -318,7 +318,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Title</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <Select TValue="string" @bind-SelectedValue="@user.Title">
+                                 <Select TValue="string" @bind-Value="@user.Title">
                                      <ChildContent>
                                          <SelectItem Value="@(string.Empty)"></SelectItem>
                                          <SelectItem Value="@("Mr")">Mr.</SelectItem>
@@ -334,7 +334,7 @@
                      <Validation>
                          <Field Horizontal JustifyContent="JustifyContent.End">
                              <FieldBody ColumnSize="ColumnSize.Is9.Is3.WithOffset">
-                                 <Check @bind-Checked="@user.TermsAndConditions">
+                                 <Check @bind-Value="@user.TermsAndConditions">
                                      <ChildContent>
                                          Terms and Conditions
                                      </ChildContent>
@@ -368,7 +368,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Full Name</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Placeholder="First and last name" @bind-Text="@manualUser.Name">
+                                 <TextEdit Placeholder="First and last name" @bind-Value="@manualUser.Name">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -380,7 +380,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Email</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Placeholder="Enter email" @bind-Text="@manualUser.Email">
+                                 <TextEdit Placeholder="Enter email" @bind-Value="@manualUser.Email">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -392,7 +392,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Text="@manualUser.Password">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Value="@manualUser.Password">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -404,7 +404,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Re Password</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Text="@manualUser.ConfirmPassword">
+                                 <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Value="@manualUser.ConfirmPassword">
                                      <Feedback>
                                          <ValidationError />
                                      </Feedback>
@@ -416,7 +416,7 @@
                          <Field Horizontal>
                             <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Title</FieldLabel>
                              <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                 <Select TValue="string" @bind-SelectedValue="@manualUser.Title">
+                                 <Select TValue="string" @bind-Value="@manualUser.Title">
                                      <ChildContent>
                                          <SelectItem Value="@(string.Empty)"></SelectItem>
                                          <SelectItem Value="@("Mr")">Mr.</SelectItem>
@@ -432,7 +432,7 @@
                      <Validation>
                          <Field Horizontal JustifyContent="JustifyContent.End">
                              <FieldBody ColumnSize="ColumnSize.Is9.Is3.WithOffset">
-                                 <Check @bind-Checked="@manualUser.TermsAndConditions">
+                                 <Check @bind-Value="@manualUser.TermsAndConditions">
                                      <ChildContent>
                                          Terms and Conditions
                                      </ChildContent>
@@ -481,7 +481,7 @@
                             <Field Horizontal>
                                 <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Full Name</FieldLabel>
                                  <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                     <TextEdit Placeholder="First and last name" @bind-Text="@modalUser.Name">
+                                     <TextEdit Placeholder="First and last name" @bind-Value="@modalUser.Name">
                                          <Feedback>
                                              <ValidationError />
                                          </Feedback>
@@ -493,7 +493,7 @@
                              <Field Horizontal>
                                 <FieldLabel RequiredIndicator ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Email</FieldLabel>
                                  <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-                                     <TextEdit Placeholder="Enter email" @bind-Text="@modalUser.Email">
+                                     <TextEdit Placeholder="Enter email" @bind-Value="@modalUser.Email">
                                          <Feedback>
                                              <ValidationError />
                                          </Feedback>
@@ -522,7 +522,7 @@
                      <Validation>
                          <Field>
                              <FieldLabel RequiredIndicator>First name</FieldLabel>
-                            <TextEdit Placeholder="Enter first name..." @bind-Text="@person.FirstName">
+                            <TextEdit Placeholder="Enter first name..." @bind-Value="@person.FirstName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -532,7 +532,7 @@
                     <Validation>
                         <Field>
                             <FieldLabel RequiredIndicator>Last name</FieldLabel>
-                            <TextEdit Placeholder="Enter last name..." @bind-Text="@person.LastName">
+                            <TextEdit Placeholder="Enter last name..." @bind-Value="@person.LastName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -566,7 +566,7 @@
                         <Field>
                             <FieldLabel>Name</FieldLabel>
                             <FieldBody>
-                                <TextEdit @bind-Text="@Company.Name">
+                                <TextEdit @bind-Value="@Company.Name">
                                     <Feedback>
                                         <ValidationError />
                                     </Feedback>
@@ -578,7 +578,7 @@
                         <Field>
                             <FieldLabel>Description</FieldLabel>
                             <FieldBody>
-                                <TextEdit @bind-Text="@Company.Description">
+                                <TextEdit @bind-Value="@Company.Description">
                                     <Feedback>
                                         <ValidationError />
                                     </Feedback>
@@ -587,14 +587,14 @@
                         </Field>
                     </Validation>
                     <Field>
-                        <Switch @bind-Checked="@Company.UseAlphaCode">Use AlphaCode</Switch>
+                        <Switch @bind-Value="@Company.UseAlphaCode">Use AlphaCode</Switch>
                     </Field>
                     <Fields>
                         <Validation>
                             <Field>
                                 <FieldLabel>AlphaCode</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="@Company.AlphaCode">
+                                    <TextEdit @bind-Value="@Company.AlphaCode">
                                         <Feedback>
                                             <ValidationError />
                                         </Feedback>
@@ -606,7 +606,7 @@
                             <Field>
                                 <FieldLabel>BetaCode</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="@Company.BetaCode">
+                                    <TextEdit @bind-Value="@Company.BetaCode">
                                         <Feedback>
                                             <ValidationError />
                                         </Feedback>
diff --git a/Documentation/Blazorise.Docs/Components/Commercial/ThemePage.razor b/Documentation/Blazorise.Docs/Components/Commercial/ThemePage.razor
index 994e0aee68..686cb033dd 100644
--- a/Documentation/Blazorise.Docs/Components/Commercial/ThemePage.razor
+++ b/Documentation/Blazorise.Docs/Components/Commercial/ThemePage.razor
@@ -25,7 +25,7 @@
                     </Row>
                     <Form>
                         <Field>
-                            <RadioGroup TValue="int" Class="license-options" @bind-CheckedValue="@checkedProductId">
+                            <RadioGroup TValue="int" Class="license-options" @bind-Value="@checkedProductId">
                                 @foreach ( var product in Products )
                                 {
                                     <Radio TValue="int" Value="@product.Id">
diff --git a/Documentation/Blazorise.Docs/Components/HomeNewsletterWidget.razor b/Documentation/Blazorise.Docs/Components/HomeNewsletterWidget.razor
index 0f18a1fee6..7c19416765 100644
--- a/Documentation/Blazorise.Docs/Components/HomeNewsletterWidget.razor
+++ b/Documentation/Blazorise.Docs/Components/HomeNewsletterWidget.razor
@@ -26,7 +26,7 @@
                     <Column ColumnSize="ColumnSize.Is8.Is9.OnDesktop" Padding="Padding.Is2.FromEnd">
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
-                                <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Text="@email" aria-label="Subscription email">
+                                <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Value="@email" aria-label="Subscription email">
                                     <Feedback>
                                         <ValidationError Style="font-size: .85rem;" TextColor="TextColor.Warning">Please complete this required field.</ValidationError>
                                     </Feedback>
@@ -43,7 +43,7 @@
                     <Column TextColor="TextColor.White">
                         <Validation Validator="ValidationRule.IsChecked">
                             <Field Margin="Margin.Is1.FromBottom">
-                                <Check @bind-Checked="@termsAgreed">
+                                <Check @bind-Value="@termsAgreed">
                                     <ChildContent>
                                         I agree to the <Anchor To="terms" TextColor="TextColor.Secondary">Terms &amp; Conditions</Anchor> and <Anchor To="privacy" TextColor="TextColor.Secondary">Privacy Policy</Anchor>.
                                     </ChildContent>
@@ -54,7 +54,7 @@
                             </Field>
                         </Validation>
                         <Field>
-                            <Check TValue="bool" @bind-Checked="@marketingAgreed">
+                            <Check TValue="bool" @bind-Value="@marketingAgreed">
                                 I would like to receive marketing materials like product deals &amp; special offers.
                             </Check>
                         </Field>
diff --git a/Documentation/Blazorise.Docs/Components/NewsletterWidget.razor b/Documentation/Blazorise.Docs/Components/NewsletterWidget.razor
index fe024d01fc..504936b3f8 100644
--- a/Documentation/Blazorise.Docs/Components/NewsletterWidget.razor
+++ b/Documentation/Blazorise.Docs/Components/NewsletterWidget.razor
@@ -19,7 +19,7 @@
                         <FieldBody>
                             <Addons>
                                 <Addon AddonType="AddonType.Body">
-                                    <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Text="@email">
+                                    <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Value="@email">
                                     </TextEdit>
                                 </Addon>
                                 <Addon AddonType="AddonType.End">
@@ -58,7 +58,7 @@ else
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
                                 <FieldBody>
-                                    <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Text="@email">
+                                    <TextEdit Role="TextRole.Email" Placeholder="Email Address" @bind-Value="@email">
                                         <Feedback>
                                             <ValidationError Style="font-size: .8rem;">Please complete this required field.</ValidationError>
                                         </Feedback>
diff --git a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
index fbe2cab561..9ea1c2a8e7 100644
--- a/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
+++ b/Documentation/Blazorise.Docs/Models/Snippets.generated.cs
@@ -97,7 +97,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>First Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text=""@EmployeeModel.FirstName"">
+                            <TextEdit @bind-Value=""@EmployeeModel.FirstName"">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -109,7 +109,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>Last Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text=""@EmployeeModel.LastName"">
+                            <TextEdit @bind-Value=""@EmployeeModel.LastName"">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -123,7 +123,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>Email Address</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text=""@EmployeeModel.Email"" Role=""TextRole.Email"">
+                            <TextEdit @bind-Value=""@EmployeeModel.Email"" Role=""TextRole.Email"">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -135,7 +135,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>Date of Birth</FieldLabel>
                         <FieldBody>
-                            <DatePicker @bind-Date=""@EmployeeModel.DateOfBirth"">
+                            <DatePicker @bind-Value=""@EmployeeModel.DateOfBirth"">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -161,7 +161,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>Gender</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue=""@EmployeeModel.Gender"">
+                            <Select @bind-Value=""@EmployeeModel.Gender"">
                                 <ChildContent>
                                     <SelectItem TValue=""string""></SelectItem>
                                     @foreach ( var g in Gender.GetGenders() )
@@ -181,7 +181,7 @@ An unhandled error has occurred.
                 <Field>
                     <FieldLabel>Address</FieldLabel>
                     <FieldBody>
-                        <TextEdit @bind-Text=""@EmployeeModel.Address.Street"">
+                        <TextEdit @bind-Value=""@EmployeeModel.Address.Street"">
                             <Feedback>
                                 <ValidationError />
                             </Feedback>
@@ -194,7 +194,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>City</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue=""@EmployeeModel.Address.City"">
+                            <Select @bind-Value=""@EmployeeModel.Address.City"">
                                 <ChildContent>
                                     <SelectItem TValue=""string""></SelectItem>
                                     @foreach ( var c in City.GetCities() )
@@ -213,7 +213,7 @@ An unhandled error has occurred.
                     <Field ColumnSize=""ColumnSize.IsHalf"">
                         <FieldLabel>Zip</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text=""@EmployeeModel.Address.Zip"">
+                            <TextEdit @bind-Value=""@EmployeeModel.Address.Zip"">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -226,7 +226,7 @@ An unhandled error has occurred.
                 <Field>
                     <FieldLabel>Country</FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue=""@EmployeeModel.Address.Country"">
+                        <Select @bind-Value=""@EmployeeModel.Address.Country"">
                             <ChildContent>
                                 <SelectItem TValue=""string""></SelectItem>
                                 @foreach ( var c in Country.GetCountries() )
@@ -385,7 +385,7 @@ public static IEnumerable<Gender> GetGenders()
         public const string UsingTheSelectComponent_SelectComponentWithComplexTypeExample = @"<Row>
     <Column>
         <Field>
-            <Select TValue=""int"" SelectedValueChanged=""@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))"">
+            <Select TValue=""int"" ValueChanged=""@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))"">
                 @foreach ( var employee in employeeData )
                 {
                     <SelectItem @key=""employee.Id"" Value=""@employee.Id"">@employee.Name</SelectItem>
@@ -429,7 +429,7 @@ protected override void OnInitialized()
 <Row>
     <Column>
         <Field>
-            <Select TValue=""Day"" @bind-SelectedValue=""@selectedDay"">
+            <Select TValue=""Day"" @bind-Value=""@selectedDay"">
                 @foreach ( var enumValue in Enum.GetValues<Day>() )
                 {
                     <SelectItem @key=""enumValue"" Value=""@enumValue"">@enumValue</SelectItem>
@@ -465,7 +465,7 @@ public enum Day
         public const string UsingTheSelectComponent_SelectComponentWithNullableTypeExample = @"<Row>
     <Column>
         <Field>
-            <Select TValue=""int?"" @bind-SelectedValue=""@selectedEmployeeId"">
+            <Select TValue=""int?"" @bind-Value=""@selectedEmployeeId"">
                 <SelectItem Value=""(int?)null""></SelectItem>
                 <SelectItem Value=""11500"">John</SelectItem>
                 <SelectItem Value=""11566"">Julia</SelectItem>
@@ -566,7 +566,7 @@ private bool CompareFilterValues( string searchValue, string compareTo, MyFilter
         public const string HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExample = @"<FilterMenuTemplate>
     <Row>
         <Column ColumnSize=""ColumnSize.Is4"">
-            <Select TValue=""MyFilter"" SelectedValue=""@_filterTracker.GetColumnFilterValue(context.Column.Field)"" SelectedValueChanged=""e => { _filterTracker.SetColumnFilter(context.Column, e); }"">
+            <Select TValue=""MyFilter"" Value=""@_filterTracker.GetColumnFilterValue(context.Column.Field)"" ValueChanged=""e => { _filterTracker.SetColumnFilter(context.Column, e); }"">
                 <SelectItem TValue=""MyFilter"" Value=""@MyFilter.Contains"">Contains</SelectItem>
                 <SelectItem TValue=""MyFilter"" Value=""@MyFilter.StartsWith"">Starts With</SelectItem>
                 <SelectItem TValue=""MyFilter"" Value=""@MyFilter.EndsWith"">Ends With</SelectItem>
@@ -580,7 +580,7 @@ private bool CompareFilterValues( string searchValue, string compareTo, MyFilter
             </Select>
         </Column>
         <Column ColumnSize=""ColumnSize.Is4"">
-            <TextEdit Text=""@_filterTracker.GetColumnSearchValue(context.Column.Field)"" TextChanged=""@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))"" />
+            <TextEdit Value=""@_filterTracker.GetColumnSearchValue(context.Column.Field)"" ValueChanged=""@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))"" />
         </Column>
 
         <Column ColumnSize=""ColumnSize.Is4"">
@@ -715,7 +715,7 @@ private IEnumerable<string> LocalizeMessageArguments( IEnumerable<string> argume
     <Validation>
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text=""@_model.PhoneCountryCode"">
+            <TextEdit @bind-Value=""@_model.PhoneCountryCode"">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -747,7 +747,7 @@ private async Task Submit()
     <Validation MessageLocalizer=""MessageLocalizer.Localize"">
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text=""@_model.PhoneCountryCode"">
+            <TextEdit @bind-Value=""@_model.PhoneCountryCode"">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -990,7 +990,7 @@ public static void ValidateRobot( ValidatorEventArgs eventArgs )
     <Validation>
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text=""@_model.PhoneCountryCode"">
+            <TextEdit @bind-Value=""@_model.PhoneCountryCode"">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -1476,19 +1476,19 @@ Blazorise Demo
     <Field ColumnSize=""ColumnSize.IsHalf"">
         <FieldLabel>First name</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""John"" />
+            <TextEdit Value=""John"" />
         </FieldBody>
     </Field>
     <Field ColumnSize=""ColumnSize.IsHalf"">
         <FieldLabel>Last name</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""Smith"" />
+            <TextEdit Value=""Smith"" />
         </FieldBody>
     </Field>
     <Field ColumnSize=""ColumnSize.IsFull"">
         <FieldLabel>Email address</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""john.smith@example.com"" />
+            <TextEdit Value=""john.smith@example.com"" />
         </FieldBody>
     </Field>
     <Field Flex=""Flex.JustifyContent.Between"">
@@ -1504,19 +1504,19 @@ Blazorise Demo
     <Field ColumnSize=""ColumnSize.IsHalf"">
         <FieldLabel>First name</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""John"" />
+            <TextEdit Value=""John"" />
         </FieldBody>
     </Field>
     <Field ColumnSize=""ColumnSize.IsHalf"">
         <FieldLabel>Last name</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""Smith"" />
+            <TextEdit Value=""Smith"" />
         </FieldBody>
     </Field>
     <Field ColumnSize=""ColumnSize.IsFull"">
         <FieldLabel>Email address</FieldLabel>
         <FieldBody>
-            <TextEdit Text=""john.smith@example.com"" />
+            <TextEdit Value=""john.smith@example.com"" />
         </FieldBody>
     </Field>
     <Field>
@@ -1738,13 +1738,13 @@ This is some text within a card body. Jelly lemon drops tiramisu chocolate cake
 
         public const string CheckExample = @"<Check TValue=""bool"">Check me out</Check>";
 
-        public const string CheckWithBindExample = @"<Check TValue=""bool"" @bind-Checked=""@rememberMe"">Remember Me</Check>
+        public const string CheckWithBindExample = @"<Check TValue=""bool"" @bind-Value=""@rememberMe"">Remember Me</Check>
 
 @code{
     bool rememberMe;
 }";
 
-        public const string CheckWithEventExample = @"<Check TValue=""bool"" Checked=""@rememberMe"" CheckedChanged=""@OnRememberMeChanged"">Remember Me</Check>
+        public const string CheckWithEventExample = @"<Check TValue=""bool"" Value=""@rememberMe"" ValueChanged=""@OnRememberMeChanged"">Remember Me</Check>
 
 @code{
     bool rememberMe;
@@ -1803,28 +1803,28 @@ Task OnClicked()
     }
 }";
 
-        public const string ColorEditDisabledExample = @"<ColorEdit Color=""#888888"" Disabled />";
+        public const string ColorEditDisabledExample = @"<ColorEdit Value=""#888888"" Disabled />";
 
-        public const string ColorEditExample = @"<ColorEdit @bind-Color=""@colorValue"" />
+        public const string ColorEditExample = @"<ColorEdit @bind-Value=""@colorValue"" />
 
 @code {
     string colorValue = ""#ff0000"";
 }";
 
         public const string ColorEditSizeExample = @"<Field>
-    <ColorEdit Color=""#888888"" Size=""Size.Small"" />
+    <ColorEdit Value=""#888888"" Size=""Size.Small"" />
 </Field>
 <Field>
-    <ColorEdit Color=""#444444"" Size=""Size.Large"" />
+    <ColorEdit Value=""#444444"" Size=""Size.Large"" />
 </Field>";
 
-        public const string ColorPickerExample = @"<ColorPicker @bind-Color=""@colorValue"" />
+        public const string ColorPickerExample = @"<ColorPicker @bind-Value=""@colorValue"" />
 
 @code {
     string colorValue = ""#ff0000"";
 }";
 
-        public const string ColorPickerShowHueExample = @"<ColorPicker @bind-Color=""@colorValue"" ShowHueSlider />
+        public const string ColorPickerShowHueExample = @"<ColorPicker @bind-Value=""@colorValue"" ShowHueSlider />
 
 @code {
     string colorValue = ""#ff00ff"";
@@ -1832,7 +1832,7 @@ Task OnClicked()
 
         public const string BasicDateEditExample = @"<DateEdit TValue=""DateTime?"" />";
 
-        public const string BasicDatePickerExample = @"<DatePicker TValue=""DateTime?"" @bind-Date=""@value"" />
+        public const string BasicDatePickerExample = @"<DatePicker TValue=""DateTime?"" @bind-Value=""@value"" />
 
 @code {
     DateTime? value;
@@ -1853,13 +1853,13 @@ Show Picker
     DateEdit<DateTime> dateEditRef;
 }";
 
-        public const string DateEditWithBindExample = @"<DateEdit TValue=""DateTime?"" @bind-Date=""@selectedDate"" />
+        public const string DateEditWithBindExample = @"<DateEdit TValue=""DateTime?"" @bind-Value=""@selectedDate"" />
 
 @code{
     DateTime? selectedDate;
 }";
 
-        public const string DateEditWithEventExample = @"<DateEdit TValue=""DateTime?"" Date=""@selectedDate"" DateChanged=""@OnDateChanged"" />
+        public const string DateEditWithEventExample = @"<DateEdit TValue=""DateTime?"" Value=""@selectedDate"" ValueChanged=""@OnDateChanged"" />
 
 @code{
     DateTime? selectedDate;
@@ -1905,13 +1905,13 @@ void OnDateChanged( DateTime? date )
     <FieldHelp>Format: DD/MM/YYYY</FieldHelp>
 </Field>";
 
-        public const string DatePickerInputFormatExample = @"<DatePicker TValue=""DateTime?"" @bind-Date=""@value"" InputFormat=""dd.MM.yyyy"" DisplayFormat=""dd.MM.yyyy"" />
+        public const string DatePickerInputFormatExample = @"<DatePicker TValue=""DateTime?"" @bind-Value=""@value"" InputFormat=""dd.MM.yyyy"" DisplayFormat=""dd.MM.yyyy"" />
 
 @code {
     DateTime? value;
 }";
 
-        public const string DatePickerNonStaticExample = @"<DatePicker TValue=""DateTime?"" @bind-Date=""@value"" StaticPicker=""false"" />
+        public const string DatePickerNonStaticExample = @"<DatePicker TValue=""DateTime?"" @bind-Value=""@value"" StaticPicker=""false"" />
 
 @code {
     DateTime? value;
@@ -1919,7 +1919,7 @@ void OnDateChanged( DateTime? date )
 
         public const string DatePickerWithIconExample = @"<Addons>
     <Addon AddonType=""AddonType.Body"">
-        <DatePicker @ref=""@datePicker"" TValue=""DateTime?"" @bind-Date=""@value"" />
+        <DatePicker @ref=""@datePicker"" TValue=""DateTime?"" @bind-Value=""@value"" />
     </Addon>
     <Addon AddonType=""AddonType.End"">
         <Button Color=""Color.Light"" Clicked=""@(()=>datePicker.ToggleAsync())"">
@@ -1933,19 +1933,19 @@ void OnDateChanged( DateTime? date )
     DateTime? value;
 }";
 
-        public const string InlineDatePickerExample = @"<DatePicker TValue=""DateTime?"" @bind-Date=""@value"" Inline />
+        public const string InlineDatePickerExample = @"<DatePicker TValue=""DateTime?"" @bind-Value=""@value"" Inline />
 
 @code {
     DateTime? value;
 }";
 
-        public const string MultipleDatePickerExample = @"<DatePicker @bind-Dates=""selectedDates"" TValue=""DateTime?"" InputMode=""DateInputMode.Date"" SelectionMode=""DateInputSelectionMode.Multiple"" />
+        public const string MultipleDatePickerExample = @"<DatePicker @bind-Value=""selectedDates"" InputMode=""DateInputMode.Date"" SelectionMode=""DateInputSelectionMode.Multiple"" />
 
 @code{
     IReadOnlyList<DateTime?> selectedDates;
 }";
 
-        public const string RangeDatePickerExample = @"<DatePicker TValue=""DateTime?"" @bind-Dates=""selectedDates"" InputMode=""DateInputMode.Date"" SelectionMode=""DateInputSelectionMode.Range"" />
+        public const string RangeDatePickerExample = @"<DatePicker @bind-Value=""selectedDates"" InputMode=""DateInputMode.Date"" SelectionMode=""DateInputSelectionMode.Range"" />
 
 @code {
     IReadOnlyList<DateTime?> selectedDates;
@@ -2244,7 +2244,7 @@ Task ShowMenu()
 
         public const string FieldWithDisabledExample = @"<Field>
     <FieldLabel>Disabled</FieldLabel>
-    <TextEdit Text=""Value"" Disabled />
+    <TextEdit Value=""Value"" Disabled />
 </Field>";
 
         public const string FieldWithHelpExample = @"<Fields>
@@ -2269,7 +2269,7 @@ Task ShowMenu()
 
         public const string FieldWithReadOnlyExample = @"<Field>
     <FieldLabel>Read-Only</FieldLabel>
-    <TextEdit Text=""Value"" ReadOnly />
+    <TextEdit Value=""Value"" ReadOnly />
 </Field>";
 
         public const string HorizontalFieldExample = @"<Field Horizontal>
@@ -2663,7 +2663,7 @@ void OnProgressed( FileProgressedEventArgs e )
 
         public const string BasicFocusTrapExample = @"<Card>
     <CardBody>
-        <Switch TValue=""bool"" @bind-Checked=""@focusTrapActive"">Active</Switch>
+        <Switch TValue=""bool"" @bind-Value=""@focusTrapActive"">Active</Switch>
     </CardBody>
     <CardBody>
         <FocusTrap Active=""@focusTrapActive"">
@@ -2696,7 +2696,7 @@ void OnProgressed( FileProgressedEventArgs e )
         public const string BasicHighlighterExample = @"<Field>
     <FieldLabel>Search value</FieldLabel>
     <FieldBody>
-        <TextEdit @bind-Text=""@searchValue"" />
+        <TextEdit @bind-Value=""@searchValue"" />
     </FieldBody>
 </Field>
 
@@ -2723,19 +2723,19 @@ void OnProgressed( FileProgressedEventArgs e )
     <Field>
         <FieldLabel>Search value</FieldLabel>
         <FieldBody>
-            <TextEdit @bind-Text=""@searchValue"" />
+            <TextEdit @bind-Value=""@searchValue"" />
         </FieldBody>
     </Field>
     <Field>
         <FieldLabel>Until Next Boundary</FieldLabel>
         <FieldBody>
-            <Switch @bind-Checked=""@untilNextBoundary""></Switch>
+            <Switch @bind-Value=""@untilNextBoundary""></Switch>
         </FieldBody>
     </Field>
     <Field>
         <FieldLabel>Case Sensitive</FieldLabel>
         <FieldBody>
-            <Switch @bind-Checked=""@caseSensitive""></Switch>
+            <Switch @bind-Value=""@caseSensitive""></Switch>
         </FieldBody>
     </Field>
 </Fields>
@@ -3002,7 +3002,7 @@ A third list item
 
         public const string BasicMemoEditExample = @"<MemoEdit Rows=""5"" />";
 
-        public const string MemoEditAutoSizeExample = @"<MemoEdit Text=""@loremipsum"" AutoSize />
+        public const string MemoEditAutoSizeExample = @"<MemoEdit Value=""@loremipsum"" AutoSize />
 
 @code {
     string loremipsum = @""Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel semper libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae.
@@ -3031,13 +3031,13 @@ A third list item
     } );
 }";
 
-        public const string MemoEditWithBindExample = @"<MemoEdit @bind-Text=""@description"" />
+        public const string MemoEditWithBindExample = @"<MemoEdit @bind-Value=""@description"" />
 
 @code{
     string description;
 }";
 
-        public const string MemoEditWithEventExample = @"<MemoEdit Text=""@description"" TextChanged=""@OnDescriptionChanged"" />
+        public const string MemoEditWithEventExample = @"<MemoEdit Value=""@description"" ValueChanged=""@OnDescriptionChanged"" />
 
 @code{
     string description;
@@ -3657,7 +3657,7 @@ private void SetActive(string page)
     <Radio Value=""@(""blue"")"">Blue</Radio>
 </RadioGroup>";
 
-        public const string RadioGroupWithBindExample = @"<RadioGroup TValue=""string"" Name=""colors"" @bind-CheckedValue=""@checkedValue"">
+        public const string RadioGroupWithBindExample = @"<RadioGroup TValue=""string"" Name=""colors"" @bind-Value=""@checkedValue"">
     <Radio Value=""@(""red"")"">Red</Radio>
     <Radio Value=""@(""green"")"">Green</Radio>
     <Radio Value=""@(""blue"")"">Blue</Radio>
@@ -3667,10 +3667,7 @@ private void SetActive(string page)
     string checkedValue = ""green"";
 }";
 
-        public const string RadioGroupWithEventExample = @"<RadioGroup TValue=""string""
-            Name=""colors""
-            CheckedValue=""@checkedValue""
-            CheckedValueChanged=""@OnCheckedValueChanged"">
+        public const string RadioGroupWithEventExample = @"<RadioGroup TValue=""string"" Name=""colors"" Value=""@checkedValue"" ValueChanged=""@OnValueChanged"">
     <Radio Value=""@(""red"")"">Red</Radio>
     <Radio Value=""@(""green"")"">Green</Radio>
     <Radio Value=""@(""blue"")"">Blue</Radio>
@@ -3679,7 +3676,7 @@ private void SetActive(string page)
 @code{
     string checkedValue = ""green"";
 
-    Task OnCheckedValueChanged( string value )
+    Task OnValueChanged(string value)
     {
         checkedValue = value;
 
@@ -3777,7 +3774,7 @@ private static string GetColor( int number )
     <SelectItem Value=""4"">Four</SelectItem>
 </Select>";
 
-        public const string SelectWithBindExample = @"<Select @bind-SelectedValue=""@selectedValue"">
+        public const string SelectWithBindExample = @"<Select @bind-Value=""@selectedValue"">
     <SelectItem Value=""1"">One</SelectItem>
     <SelectItem Value=""2"">Two</SelectItem>
     <SelectItem Value=""3"">Three</SelectItem>
@@ -3788,7 +3785,7 @@ private static string GetColor( int number )
     int selectedValue;
 }";
 
-        public const string SelectWithEventExample = @"<Select TValue=""int"" SelectedValue=""@selectedValue"" SelectedValueChanged=""@OnSelectedValueChanged"">
+        public const string SelectWithEventExample = @"<Select TValue=""int"" Value=""@selectedValue"" ValueChanged=""@OnSelectedValueChanged"">
     <SelectItem Value=""1"">One</SelectItem>
     <SelectItem Value=""2"">Two</SelectItem>
     <SelectItem Value=""3"">Three</SelectItem>
@@ -3909,7 +3906,7 @@ Step 1
         <StepPanel Name=""2"">
             <Field>
                 <FieldLabel>Email address</FieldLabel>
-                <TextEdit @bind-Text=""email"" Placeholder=""Enter email"">
+                <TextEdit @bind-Value=""email"" Placeholder=""Enter email"">
                     <FieldHelp>This field is required in order to procceed to the next step.</FieldHelp>
                 </TextEdit>
             </Field>
@@ -3948,13 +3945,13 @@ private bool NavigationAllowed( StepNavigationContext context )
 
         public const string BasicSwitchExample = @"<Switch TValue=""bool"">Remember me</Switch>";
 
-        public const string SwitchWithBindExample = @"<Switch TValue=""bool"" @bind-Checked=""@rememberMe"">Remember Me</Switch>
+        public const string SwitchWithBindExample = @"<Switch TValue=""bool"" @bind-Value=""@rememberMe"">Remember Me</Switch>
 
 @code{
     bool rememberMe;
 }";
 
-        public const string SwitchWithEventExample = @"<Switch TValue=""bool"" Checked=""@rememberMe"" CheckedChanged=""@OnRememberMeChanged"">Remember Me</Switch>
+        public const string SwitchWithEventExample = @"<Switch TValue=""bool"" Value=""@rememberMe"" ValueChanged=""@OnRememberMeChanged"">Remember Me</Switch>
 
 @code{
     bool rememberMe;
@@ -4550,13 +4547,13 @@ Numbers only
     } );
 }";
 
-        public const string TextEditWithBindExample = @"<TextEdit @bind-Text=""@name"" />
+        public const string TextEditWithBindExample = @"<TextEdit @bind-Value=""@name"" />
 
 @code{
     string name;
 }";
 
-        public const string TextEditWithEventExample = @"<TextEdit Text=""@name"" TextChanged=""@OnNameChanged"" />
+        public const string TextEditWithEventExample = @"<TextEdit Value=""@name"" ValueChanged=""@OnNameChanged"" />
 
 @code{
     string name;
@@ -4651,13 +4648,13 @@ Task OnThemeColorChanged( string value )
 
         public const string BasicTimeEditExample = @"<TimeEdit TValue=""TimeSpan?"" />";
 
-        public const string BasicTimePickerExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Time=""@value"" />
+        public const string BasicTimePickerExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Value=""@value"" />
 
 @code {
     TimeSpan? value;
 }";
 
-        public const string InlineTimePickerExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Time=""@value"" Inline />
+        public const string InlineTimePickerExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Value=""@value"" Inline />
 
 @code {
     TimeSpan? value;
@@ -4676,18 +4673,18 @@ Show Picker
     TimeEdit<DateTime> timeEditRef;
 }";
 
-        public const string TimeEditWithBindExample = @"<TimeEdit TValue=""TimeSpan?"" @bind-Time=""@selectedTime"" />
+        public const string TimeEditWithBindExample = @"<TimeEdit TValue=""TimeSpan?"" @bind-Value=""@selectedTime"" />
 
 @code{
     TimeSpan? selectedTime;
 }";
 
-        public const string TimeEditWithEventExample = @"<TimeEdit TValue=""TimeSpan?"" Time=""@selectedTime"" TimeChanged=""@OnTimeChanged"" />
+        public const string TimeEditWithEventExample = @"<TimeEdit TValue=""TimeSpan?"" Value=""@selectedTime"" ValueChanged=""@OnValueChanged"" />
 
 @code{
     TimeSpan? selectedTime;
 
-    Task OnTimeChanged( TimeSpan? Time )
+    Task OnValueChanged(TimeSpan? Time)
     {
         selectedTime = Time;
 
@@ -4695,13 +4692,13 @@ Task OnTimeChanged( TimeSpan? Time )
     }
 }";
 
-        public const string TimePickerNonStaticExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Time=""@value"" StaticPicker=""false"" />
+        public const string TimePickerNonStaticExample = @"<TimePicker TValue=""TimeSpan?"" @bind-Value=""@value"" StaticPicker=""false"" />
 
 @code {
     TimeSpan? value;
 }";
 
-        public const string TimePickerWithDateTimeExample = @"<TimePicker TValue=""DateTime?"" @bind-Time=""@value"" />
+        public const string TimePickerWithDateTimeExample = @"<TimePicker TValue=""DateTime?"" @bind-Value=""@value"" />
 
 @code {
     DateTime? value;
@@ -4709,7 +4706,7 @@ Task OnTimeChanged( TimeSpan? Time )
 
         public const string TimePickerWithIconExample = @"<Addons>
     <Addon AddonType=""AddonType.Body"">
-        <TimePicker @ref=""@timePicker"" TValue=""TimeSpan?"" @bind-Time=""@value"" />
+        <TimePicker @ref=""@timePicker"" TValue=""TimeSpan?"" @bind-Value=""@value"" />
     </Addon>
     <Addon AddonType=""AddonType.End"">
         <Button Color=""Color.Light"" Clicked=""@(()=>timePicker.ToggleAsync())"">
@@ -5049,7 +5046,7 @@ void ValidateEmail( ValidatorEventArgs e )
         <Field Horizontal>
             <FieldLabel ColumnSize=""ColumnSize.Is2"">Full Name</FieldLabel>
             <FieldBody ColumnSize=""ColumnSize.Is10"">
-                <TextEdit Placeholder=""First and last name"" @bind-Text=""@user.Name"">
+                <TextEdit Placeholder=""First and last name"" @bind-Value=""@user.Name"">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -5061,7 +5058,7 @@ void ValidateEmail( ValidatorEventArgs e )
         <Field Horizontal>
             <FieldLabel ColumnSize=""ColumnSize.Is2"">Email</FieldLabel>
             <FieldBody ColumnSize=""ColumnSize.Is10"">
-                <TextEdit Placeholder=""Enter email"" @bind-Text=""@user.Email"">
+                <TextEdit Placeholder=""Enter email"" @bind-Value=""@user.Email"">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -5073,7 +5070,7 @@ void ValidateEmail( ValidatorEventArgs e )
         <Field Horizontal>
             <FieldLabel ColumnSize=""ColumnSize.Is2"">Password</FieldLabel>
             <FieldBody ColumnSize=""ColumnSize.Is10"">
-                <TextEdit Role=""TextRole.Password"" Placeholder=""Password"" @bind-Text=""@user.Password"">
+                <TextEdit Role=""TextRole.Password"" Placeholder=""Password"" @bind-Value=""@user.Password"">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -5085,7 +5082,7 @@ void ValidateEmail( ValidatorEventArgs e )
         <Field Horizontal>
             <FieldLabel ColumnSize=""ColumnSize.Is2"">Re Password</FieldLabel>
             <FieldBody ColumnSize=""ColumnSize.Is10"">
-                <TextEdit Role=""TextRole.Password"" Placeholder=""Retype password"" @bind-Text=""@user.ConfirmPassword"">
+                <TextEdit Role=""TextRole.Password"" Placeholder=""Retype password"" @bind-Value=""@user.ConfirmPassword"">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -5218,7 +5215,7 @@ void ValidateCheck( ValidatorEventArgs e )
         </Field>
     </Validation>
     <Field>
-        <Switch @bind-Checked=""@Company.UseAlphaCode"">Use AlphaCode</Switch>
+        <Switch @bind-Value=""@Company.UseAlphaCode"">Use AlphaCode</Switch>
     </Field>
     <Fields>
         <Validation>
@@ -5378,7 +5375,7 @@ public IEnumerable<ValidationResult> Validate( ValidationContext validationConte
         public const string VideoScriptsExample = @"<script src=""_content/Blazorise.Video/video.js?v=1.7.0.0"" type=""module""></script>";
 
         public const string AnimateExample = @"<Field>
-    <Select TValue=""string"" SelectedValueChanged=""@OnSelectedAnimationChanged"">
+    <Select TValue=""string"" ValueChanged=""@OnSelectedAnimationChanged"">
         @foreach ( var availableAnimation in Animations.GetNames() )
         {
             <SelectItem Value=""@availableAnimation"">@availableAnimation</SelectItem>
@@ -7142,7 +7139,7 @@ public enum Status
         Edit Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue=""@editMode"">
+        <Select @bind-Value=""@editMode"">
             <SelectItem Value=""DataGridEditMode.Form"">Form</SelectItem>
             <SelectItem Value=""DataGridEditMode.Inline"">Inline</SelectItem>
             <SelectItem Value=""DataGridEditMode.Popup"">Popup</SelectItem>
@@ -7289,18 +7286,18 @@ protected override async Task OnInitializedAsync()
                     <Field>
                         <FieldLabel>Row Index</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text=""@selectedCell?.RowIndex.ToString()""></TextEdit>
+                            <TextEdit ReadOnly Value=""@selectedCell?.RowIndex.ToString()""></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Field</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text=""@selectedCell?.ColumnInfo?.Field""></TextEdit>
+                            <TextEdit ReadOnly Value=""@selectedCell?.ColumnInfo?.Field""></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Value</FieldLabel>
-                        <TextEdit ReadOnly Text=""@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)""></TextEdit>
+                        <TextEdit ReadOnly Value=""@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)""></TextEdit>
                     </Field>
                 </Fields>
             </CardBody>
@@ -7548,7 +7545,7 @@ private bool OnGenderCustomFilter( object itemValue, object searchValue )
 
 }";
 
-        public const string DataGridCustomFilteringExample = @"Custom Filter: <TextEdit Text=""@customFilterValue"" TextChanged=""@OnCustomFilterValueChanged""></TextEdit>
+        public const string DataGridCustomFilteringExample = @"Custom Filter: <TextEdit Value=""@customFilterValue"" ValueChanged=""@OnCustomFilterValueChanged""></TextEdit>
 
 <DataGrid @ref=""dataGrid""
           TItem=""Employee""
@@ -7819,7 +7816,7 @@ private ExpandoObject NewItemCreator()
         </DataGridColumn>
         <DataGridCheckColumn Field=""IsActive"" Caption=""Active"" Editable Filterable=""false"">
             <DisplayTemplate>
-                <Check TValue=""bool"" Checked='(context as dynamic).IsActive' Disabled ReadOnly />
+                <Check TValue=""bool"" Value='(context as dynamic).IsActive' Disabled ReadOnly />
             </DisplayTemplate>
         </DataGridCheckColumn>
     </DataGridColumns>
@@ -7870,7 +7867,7 @@ private ExpandoObject NewItemCreator()
         Edit Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue=""@editMode"">
+        <Select @bind-Value=""@editMode"">
             <SelectItem Value=""DataGridEditMode.Form"">Form</SelectItem>
             <SelectItem Value=""DataGridEditMode.Inline"">Inline</SelectItem>
             <SelectItem Value=""DataGridEditMode.Popup"">Popup</SelectItem>
@@ -8082,7 +8079,7 @@ protected override async Task OnInitializedAsync()
     <FilterMenuTemplate>
         <Row>
             <Column ColumnSize=""ColumnSize.Is4"">
-                <Select TValue=""DataGridColumnFilterMethod"" SelectedValue=""@context.GetFilterMethod()"" SelectedValueChanged=""e => { context.FilterMethodChanged.InvokeAsync(e); }"">
+                <Select TValue=""DataGridColumnFilterMethod"" Value=""@context.GetFilterMethod()"" ValueChanged=""e => { context.FilterMethodChanged.InvokeAsync(e); }"">
                     @{
                         var isNumericOrDate = context.Column.ColumnType == DataGridColumnType.Numeric || context.Column.ColumnType == DataGridColumnType.Date;
                     }
@@ -8110,12 +8107,12 @@ protected override async Task OnInitializedAsync()
                 <Field @key=context.GetFilterMethod()>
                     @if ( context.GetFilterMethod() == DataGridColumnFilterMethod.Between )
                     {
-                        <TextEdit Text=""@GetFilterValue1(context)"" TextChanged=""@((newValue) => SetFilterValue1(context.Column.Filter, newValue))"" />
-                        <TextEdit Text=""@GetFilterValue2(context)"" TextChanged=""@((newValue) => SetFilterValue2(context.Column.Filter, newValue))"" />
+                        <TextEdit Value=""@GetFilterValue1(context)"" ValueChanged=""@((newValue) => SetFilterValue1(context.Column.Filter, newValue))"" />
+                        <TextEdit Value=""@GetFilterValue2(context)"" ValueChanged=""@((newValue) => SetFilterValue2(context.Column.Filter, newValue))"" />
                     }
                     else
                     {
-                        <TextEdit Text=""@context.GetSearchValue()?.ToString()"" TextChanged=""@((newValue) => context.Column.Filter.SearchValue = newValue)"" />
+                        <TextEdit Value=""@context.GetSearchValue()?.ToString()"" ValueChanged=""@((newValue) => context.Column.Filter.SearchValue = newValue)"" />
                     }
                 </Field>
             </Column>
@@ -8274,7 +8271,7 @@ protected override async Task OnInitializedAsync()
             <SelectList Data=""@dataGridRef?.DisplayGroupedData""
                         TItem=""GroupContext<Employee>"" TValue=""string""
                         TextField=""x=> x.Key"" ValueField=""x=> x.Key""
-            @bind-SelectedValue=""selectedGroupKey""></SelectList>
+                        @bind-SelectedValue=""selectedGroupKey""></SelectList>
         </FieldLabel>
         <FieldBody>
             <Button Color=""Color.Primary"" Clicked=""@(() => dataGridRef.ExpandGroups(selectedGroupKey))"">Expand Selected Group</Button>
@@ -8758,7 +8755,7 @@ private Task OnRemoveItemClick()
     <TotalItemsShortTemplate><Badge Color=""Color.Success"">@context.TotalItems</Badge></TotalItemsShortTemplate>
     <ItemsPerPageTemplate></ItemsPerPageTemplate>
     <PageSelectorTemplate>
-        <Select TextColor=""TextColor.Success"" @bind-SelectedValue=""@context.CurrentPage"" Size=""Size.Small"">
+        <Select TextColor=""TextColor.Success"" @bind-Value=""@context.CurrentPage"" Size=""Size.Small"">
             @for ( int i = context.FirstVisiblePage; i <= context.LastVisiblePage; ++i )
             {
                 var pageNumber = i;
@@ -8767,7 +8764,7 @@ private Task OnRemoveItemClick()
         </Select>
     </PageSelectorTemplate>
     <PageSizesTemplate>
-        <Select TextColor=""TextColor.Success"" @bind-SelectedValue=""@context.CurrentPageSize"" Size=""Size.Small"">
+        <Select TextColor=""TextColor.Success"" @bind-Value=""@context.CurrentPageSize"" Size=""Size.Small"">
             @foreach ( var curPageSize in context.PageSizes )
             {
                 <SelectItem Value=""@curPageSize"">@curPageSize</SelectItem>
@@ -8791,7 +8788,7 @@ protected override async Task OnInitializedAsync()
 
         public const string DataGridRapidEditExample = @"<Field>
     <FieldBody>
-        <Switch @bind-Checked=""@showCommandColumn"" Size=""Size.Medium"">Show Command Column</Switch>
+        <Switch @bind-Value=""@showCommandColumn"" Size=""Size.Medium"">Show Command Column</Switch>
     </FieldBody>
 </Field>
 
@@ -8844,7 +8841,7 @@ protected override async Task OnInitializedAsync()
         Resize Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue=""@resizeMode"">
+        <Select @bind-Value=""@resizeMode"">
             <SelectItem Value=""TableResizeMode.Header"">Header</SelectItem>
             <SelectItem Value=""TableResizeMode.Columns"">Columns</SelectItem>
         </Select>
@@ -9223,7 +9220,7 @@ protected override async Task OnInitializedAsync()
         </DataGridColumn>
         <DataGridCheckColumn TItem=""Employee"" Field=""@nameof(Employee.IsActive)"" Caption=""Active"" Editable Filterable=""false"">
             <DisplayTemplate>
-                <Check TValue=""bool"" Checked=""context.IsActive"" Disabled ReadOnly />
+                <Check TValue=""bool"" Value=""context.IsActive"" Disabled ReadOnly />
             </DisplayTemplate>
         </DataGridCheckColumn>
     </DataGridColumns>
@@ -9340,7 +9337,7 @@ protected override async Task OnInitializedAsync()
     <DataGridColumn Field=""@nameof( Employee.FirstName )"" Caption=""Name"" Editable>
         <EditTemplate>
             <Validation Validator=""@CheckName"">
-                <TextEdit Text=""@((string)context.CellValue)"" TextChanged=""(value => context.CellValue = value)"">
+                <TextEdit Value=""@((string)context.CellValue)"" ValueChanged=""(value => context.CellValue = value)"">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -9497,7 +9494,7 @@ protected override async Task OnInitializedAsync()
     <Validation>
         <Field>
             <FieldLabel>First name</FieldLabel>
-            <TextEdit Placeholder=""Enter first name..."" @bind-Text=""@person.FirstName"">
+            <TextEdit Placeholder=""Enter first name..."" @bind-Value=""@person.FirstName"">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -9507,7 +9504,7 @@ protected override async Task OnInitializedAsync()
     <Validation>
         <Field>
             <FieldLabel>Last name</FieldLabel>
-            <TextEdit Placeholder=""Enter last name..."" @bind-Text=""@person.LastName"">
+            <TextEdit Placeholder=""Enter last name..."" @bind-Value=""@person.LastName"">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -12039,14 +12036,14 @@ Please fill in the formulary
     <Field Horizontal>
         <FieldLabel ColumnSize=""ColumnSize.IsFull.OnTablet.Is3.OnDesktop"">First Name</FieldLabel>
         <FieldBody ColumnSize=""ColumnSize.IsFull.OnTablet.Is9.OnDesktop"">
-            <TextEdit @bind-Text=""model.FirstName""></TextEdit>
+            <TextEdit @bind-Value=""model.FirstName""></TextEdit>
         </FieldBody>
     </Field>
 
     <Field Horizontal>
         <FieldLabel ColumnSize=""ColumnSize.IsFull.OnTablet.Is3.OnDesktop"">Email</FieldLabel>
         <FieldBody ColumnSize=""ColumnSize.IsFull.OnTablet.Is9.OnDesktop"">
-            <TextEdit @bind-Text=""model.Email""></TextEdit>
+            <TextEdit @bind-Value=""model.Email""></TextEdit>
         </FieldBody>
     </Field>
 
@@ -12102,7 +12099,7 @@ public Task ShowRenderFragment()
         public const string ModalProviderCustomStructureExample = @"<Field Horizontal>
     <FieldLabel ColumnSize=""ColumnSize.IsFull.OnTablet.Is2.OnDesktop"">User Name</FieldLabel>
     <FieldBody ColumnSize=""ColumnSize.IsFull.OnTablet.Is10.OnDesktop"">
-        <TextEdit @bind-Text=""userName""></TextEdit>
+        <TextEdit @bind-Value=""userName""></TextEdit>
     </FieldBody>
 </Field>
 
diff --git a/Documentation/Blazorise.Docs/NewFilesToBuild.txt b/Documentation/Blazorise.Docs/NewFilesToBuild.txt
index 4b1438bcb0..e69de29bb2 100644
--- a/Documentation/Blazorise.Docs/NewFilesToBuild.txt
+++ b/Documentation/Blazorise.Docs/NewFilesToBuild.txt
@@ -1 +0,0 @@
-D:\Projects\UI\Blazorise\Documentation\Blazorise.Docs\Pages\Docs\Extensions\DataGrid\Code\DataGridSortComparerExampleCode.html
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Code/ValidationWithDataAnnotations_FormExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Code/ValidationWithDataAnnotations_FormExampleCode.html
index 5d1131de2c..17fed8285b 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Code/ValidationWithDataAnnotations_FormExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Code/ValidationWithDataAnnotations_FormExampleCode.html
@@ -10,7 +10,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>First Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -22,7 +22,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Last Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.LastName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.LastName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -36,7 +36,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email Address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -48,7 +48,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Date of Birth<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.DateOfBirth</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.DateOfBirth</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -74,7 +74,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Gender<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Gender</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Gender</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ChildContent</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="atSign">&#64;</span>foreach ( var g in Gender.GetGenders() )
@@ -94,7 +94,7 @@
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Street</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Street</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -107,7 +107,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>City<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.City</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.City</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ChildContent</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="atSign">&#64;</span>foreach ( var c in City.GetCities() )
@@ -126,7 +126,7 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Zip<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Zip</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Zip</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -139,7 +139,7 @@
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Country<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Country</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>EmployeeModel.Address.Country</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ChildContent</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="atSign">&#64;</span>foreach ( var c in Country.GetCountries() )
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Examples/ValidationWithDataAnnotations_FormExample.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Examples/ValidationWithDataAnnotations_FormExample.snippet
index 3242126330..2895e63726 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Examples/ValidationWithDataAnnotations_FormExample.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Examples/ValidationWithDataAnnotations_FormExample.snippet
@@ -9,7 +9,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>First Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.FirstName">
+                            <TextEdit @bind-Value="@EmployeeModel.FirstName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -21,7 +21,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Last Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.LastName">
+                            <TextEdit @bind-Value="@EmployeeModel.LastName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -35,7 +35,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Email Address</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.Email" Role="TextRole.Email">
+                            <TextEdit @bind-Value="@EmployeeModel.Email" Role="TextRole.Email">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -47,7 +47,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Date of Birth</FieldLabel>
                         <FieldBody>
-                            <DatePicker @bind-Date="@EmployeeModel.DateOfBirth">
+                            <DatePicker @bind-Value="@EmployeeModel.DateOfBirth">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -73,7 +73,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Gender</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue="@EmployeeModel.Gender">
+                            <Select @bind-Value="@EmployeeModel.Gender">
                                 <ChildContent>
                                     <SelectItem TValue="string"></SelectItem>
                                     @foreach ( var g in Gender.GetGenders() )
@@ -93,7 +93,7 @@
                 <Field>
                     <FieldLabel>Address</FieldLabel>
                     <FieldBody>
-                        <TextEdit @bind-Text="@EmployeeModel.Address.Street">
+                        <TextEdit @bind-Value="@EmployeeModel.Address.Street">
                             <Feedback>
                                 <ValidationError />
                             </Feedback>
@@ -106,7 +106,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>City</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue="@EmployeeModel.Address.City">
+                            <Select @bind-Value="@EmployeeModel.Address.City">
                                 <ChildContent>
                                     <SelectItem TValue="string"></SelectItem>
                                     @foreach ( var c in City.GetCities() )
@@ -125,7 +125,7 @@
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Zip</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.Address.Zip">
+                            <TextEdit @bind-Value="@EmployeeModel.Address.Zip">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -138,7 +138,7 @@
                 <Field>
                     <FieldLabel>Country</FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@EmployeeModel.Address.Country">
+                        <Select @bind-Value="@EmployeeModel.Address.Country">
                             <ChildContent>
                                 <SelectItem TValue="string"></SelectItem>
                                 @foreach ( var c in Country.GetCountries() )
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Index.md
index 24b54fa007..fa72e8f80b 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-06-09_ValidationWithDataAnnotations/Index.md
@@ -176,7 +176,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>First Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.FirstName">
+                            <TextEdit @bind-Value="@EmployeeModel.FirstName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -188,7 +188,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Last Name</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.LastName">
+                            <TextEdit @bind-Value="@EmployeeModel.LastName">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -202,7 +202,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Email Address</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.Email" Role="TextRole.Email">
+                            <TextEdit @bind-Value="@EmployeeModel.Email" Role="TextRole.Email">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -214,7 +214,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Date of Birth</FieldLabel>
                         <FieldBody>
-                            <DatePicker @bind-Date="@EmployeeModel.DateOfBirth">
+                            <DatePicker @bind-Value="@EmployeeModel.DateOfBirth">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -240,7 +240,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Gender</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue="@EmployeeModel.Gender">
+                            <Select @bind-Value="@EmployeeModel.Gender">
                                 <ChildContent>
                                     <SelectItem TValue="string"></SelectItem>
                                     @foreach ( var g in Gender.GetGenders() )
@@ -260,7 +260,7 @@ Refer to the following code example.
                 <Field>
                     <FieldLabel>Address</FieldLabel>
                     <FieldBody>
-                        <TextEdit @bind-Text="@EmployeeModel.Address.Street">
+                        <TextEdit @bind-Value="@EmployeeModel.Address.Street">
                             <Feedback>
                                 <ValidationError />
                             </Feedback>
@@ -273,7 +273,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>City</FieldLabel>
                         <FieldBody>
-                            <Select @bind-SelectedValue="@EmployeeModel.Address.City">
+                            <Select @bind-Value="@EmployeeModel.Address.City">
                                 <ChildContent>
                                     <SelectItem TValue="string"></SelectItem>
                                     @foreach ( var c in City.GetCities() )
@@ -292,7 +292,7 @@ Refer to the following code example.
                     <Field ColumnSize="ColumnSize.IsHalf">
                         <FieldLabel>Zip</FieldLabel>
                         <FieldBody>
-                            <TextEdit @bind-Text="@EmployeeModel.Address.Zip">
+                            <TextEdit @bind-Value="@EmployeeModel.Address.Zip">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -305,7 +305,7 @@ Refer to the following code example.
                 <Field>
                     <FieldLabel>Country</FieldLabel>
                     <FieldBody>
-                        <Select @bind-SelectedValue="@EmployeeModel.Address.Country">
+                        <Select @bind-Value="@EmployeeModel.Address.Country">
                             <ChildContent>
                                 <SelectItem TValue="string"></SelectItem>
                                 @foreach ( var c in Country.GetCountries() )
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithComplexTypeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithComplexTypeExampleCode.html
index 333736ebd5..275a8991e1 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithComplexTypeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithComplexTypeExampleCode.html
@@ -3,7 +3,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Row</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(value =&gt; selectedEmployee = employeeData.First(emp =&gt; emp.Id == value))</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(value =&gt; selectedEmployee = employeeData.First(emp =&gt; emp.Id == value))</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="atSign">&#64;</span>foreach ( var employee in employeeData )
                 {
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>key</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">employee.Id</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>employee.Id</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="atSign">&#64;</span>employee.Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithEnumTypeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithEnumTypeExampleCode.html
index 93e502f061..e5838d841c 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithEnumTypeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithEnumTypeExampleCode.html
@@ -5,7 +5,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Row</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Day</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDay</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Day</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDay</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="atSign">&#64;</span>foreach ( var enumValue in Enum.GetValues<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Day</span><span class="htmlTagDelimiter">&gt;</span>() )
                 {
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>key</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">enumValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>enumValue</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="atSign">&#64;</span>enumValue<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithNullableTypeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithNullableTypeExampleCode.html
index 29a7305a0a..eb36a8faf4 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithNullableTypeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Code/UsingTheSelectComponent_SelectComponentWithNullableTypeExampleCode.html
@@ -3,7 +3,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Row</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedEmployeeId</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedEmployeeId</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">(int?)null</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">11500</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>John<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">11566</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Julia<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithComplexTypeExample.razor b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithComplexTypeExample.razor
index 608976c4ad..91dbb50b5d 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithComplexTypeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithComplexTypeExample.razor
@@ -3,7 +3,7 @@
 <Row>
     <Column>
         <Field>
-            <Select TValue="int" SelectedValueChanged="@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))">
+            <Select TValue="int" ValueChanged="@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))">
                 @foreach ( var employee in employeeData )
                 {
                     <SelectItem @key="employee.Id" Value="@employee.Id">@employee.Name</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithEnumTypeExample.razor b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithEnumTypeExample.razor
index 53ae76ab79..3c9e2a719b 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithEnumTypeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithEnumTypeExample.razor
@@ -4,7 +4,7 @@
 <Row>
     <Column>
         <Field>
-            <Select TValue="Day" @bind-SelectedValue="@selectedDay">
+            <Select TValue="Day" @bind-Value="@selectedDay">
                 @foreach ( var enumValue in Enum.GetValues<Day>() )
                 {
                     <SelectItem @key="enumValue" Value="@enumValue">@enumValue</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithNullableTypeExample.razor b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithNullableTypeExample.razor
index a8c3a60927..3a6607f2a1 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithNullableTypeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Examples/UsingTheSelectComponent_SelectComponentWithNullableTypeExample.razor
@@ -3,7 +3,7 @@
 <Row>
     <Column>
         <Field>
-            <Select TValue="int?" @bind-SelectedValue="@selectedEmployeeId">
+            <Select TValue="int?" @bind-Value="@selectedEmployeeId">
                 <SelectItem Value="(int?)null"></SelectItem>
                 <SelectItem Value="11500">John</SelectItem>
                 <SelectItem Value="11566">Julia</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Index.md
index d8744e7fc3..592161adc7 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-07-01_UsingTheSelectComponent/Index.md
@@ -65,7 +65,7 @@ Here's an example of how to properly handle an enumeration type, by configuring
 <Row>
     <Column>
         <Field>
-            <Select TValue="Day" @bind-SelectedValue="@selectedDay">
+            <Select TValue="Day" @bind-Value="@selectedDay">
                 @foreach ( var enumValue in Enum.GetValues<Day>() )
                 {
                     <SelectItem @key="enumValue" Value="@enumValue">@enumValue</SelectItem>
@@ -115,7 +115,7 @@ Let's look at how a dropdown list with four employees would look, now with actua
 <Row>
     <Column>
         <Field>
-            <Select TValue="int" SelectedValueChanged="@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))">
+            <Select TValue="int" ValueChanged="@(value => selectedEmployee = employeeData.First(emp => emp.Id == value))">
                 @foreach ( var employee in employeeData )
                 {
                     <SelectItem @key="employee.Id" Value="@employee.Id">@employee.Name</SelectItem>
@@ -169,7 +169,7 @@ So the option should be left empty, let's see this in action with a nullable typ
 <Row>
     <Column>
         <Field>
-            <Select TValue="int?" @bind-SelectedValue="@selectedEmployeeId">
+            <Select TValue="int?" @bind-Value="@selectedEmployeeId">
                 <SelectItem Value="(int?)null"></SelectItem>
                 <SelectItem Value="11500">John</SelectItem>
                 <SelectItem Value="11566">Julia</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo4Code.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo4Code.html
index e701453c18..2b0b561e16 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo4Code.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo4Code.html
@@ -2,14 +2,14 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 </div>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo6Code.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo6Code.html
index 476cd3c643..193cc0b45f 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo6Code.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo6Code.html
@@ -4,7 +4,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsEmail</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>Please Enter Your Email. <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>Email is good<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>
@@ -16,11 +16,11 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsNotEmpty</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validations</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo8Code.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo8Code.html
index 80dcb60072..a1e06ba0bb 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo8Code.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Code/CreateTabbedLoginDemo8Code.html
@@ -18,7 +18,7 @@
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsEmail</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email...</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>Please Enter Your Email. <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>
                                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>Email is good<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>
@@ -30,11 +30,11 @@
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsNotEmpty</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password..</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validations</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">CardBody</span><span class="htmlTagDelimiter">&gt;</span>
@@ -56,13 +56,13 @@
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsNotEmpty</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Your Name</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Your Name</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsEmail</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Your Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Your Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>Please Enter your email.<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationNone</span><span class="htmlTagDelimiter">&gt;</span>
                                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>Email is valid<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ValidationSuccess</span><span class="htmlTagDelimiter">&gt;</span>
@@ -74,7 +74,7 @@
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ValidationRule</span><span class="enumValue">.IsNotEmpty</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter Password</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldHelp</span><span class="htmlTagDelimiter">&gt;</span>Password Strength: <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Text</span> <span class="htmlAttributeName">TextColor</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextColor</span><span class="enumValue">.Danger</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Strong<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Text</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldHelp</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo4.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo4.snippet
index 28a9109c12..9381237559 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo4.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo4.snippet
@@ -1,11 +1,11 @@
 <Field>
     <FieldLabel>Email</FieldLabel>
-    <TextEdit @bind-Text="@email" Placeholder="Enter email..." />
+    <TextEdit @bind-Value="@email" Placeholder="Enter email..." />
 </Field>
 <Field>
     <FieldLabel>Password</FieldLabel>
-    <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+    <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
 </Field>
 <Field>
-    <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+    <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
 </Field>
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo6.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo6.snippet
index c1c0266db9..96d251ed66 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo6.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo6.snippet
@@ -2,7 +2,7 @@
     <Validation Validator="ValidationRule.IsEmail">
         <Field>
             <FieldLabel>Email</FieldLabel>
-            <TextEdit @bind-Text="@email" Placeholder="Enter email...">
+            <TextEdit @bind-Value="@email" Placeholder="Enter email...">
                 <Feedback>
                     <ValidationNone>Please Enter Your Email. </ValidationNone>
                     <ValidationSuccess>Email is good</ValidationSuccess>
@@ -14,10 +14,10 @@
     <Validation Validator="ValidationRule.IsNotEmpty">
         <Field>
             <FieldLabel>Password</FieldLabel>
-            <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+            <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
         </Field>
     </Validation>
     <Field>
-        <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+        <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
     </Field>
 </Validations>
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo8.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo8.snippet
index 23e44e08bd..2a3a9d2847 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo8.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Examples/CreateTabbedLoginDemo8.snippet
@@ -16,7 +16,7 @@
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
                                 <FieldLabel>Email</FieldLabel>
-                                <TextEdit @bind-Text="@email" Placeholder="Enter email...">
+                                <TextEdit @bind-Value="@email" Placeholder="Enter email...">
                                     <Feedback>
                                         <ValidationNone>Please Enter Your Email. </ValidationNone>
                                         <ValidationSuccess>Email is good</ValidationSuccess>
@@ -28,11 +28,11 @@
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Password</FieldLabel>
-                                <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+                                <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
                             </Field>
                         </Validation>
                         <Field>
-                            <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+                            <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
                         </Field>
                     </Validations>
                 </CardBody>
@@ -54,13 +54,13 @@
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Name</FieldLabel>
-                                <TextEdit @bind-Text="@name" Placeholder="Enter Your Name" />
+                                <TextEdit @bind-Value="@name" Placeholder="Enter Your Name" />
                             </Field>
                         </Validation>
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
                                 <FieldLabel>Email</FieldLabel>
-                                <TextEdit @bind-Text="@email" Placeholder="Enter Your Email">
+                                <TextEdit @bind-Value="@email" Placeholder="Enter Your Email">
                                     <Feedback>
                                         <ValidationNone>Please Enter your email.</ValidationNone>
                                         <ValidationSuccess>Email is valid</ValidationSuccess>
@@ -72,7 +72,7 @@
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Password</FieldLabel>
-                                <TextEdit @bind-Text="@password" Placeholder="Enter Password" />
+                                <TextEdit @bind-Value="@password" Placeholder="Enter Password" />
                                 <FieldHelp>Password Strength: <Text TextColor="TextColor.Danger">Strong</Text></FieldHelp>
                             </Field>
                         </Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Index.md
index b153a37586..1d9db18791 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-12_CreateTabbedLoginDemo/Index.md
@@ -108,14 +108,14 @@ After creating the tabs component, we have to fill it with content. Since we are
 ```html
 <Field>
     <FieldLabel>Email</FieldLabel>
-    <TextEdit @bind-Text="@email" Placeholder="Enter email..." />
+    <TextEdit @bind-Value="@email" Placeholder="Enter email..." />
 </Field>
 <Field>
     <FieldLabel>Password</FieldLabel>
-    <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+    <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
 </Field>
 <Field>
-    <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+    <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
 </Field>
 ```
 
@@ -142,7 +142,7 @@ The code snippet below illustrates how you can validate the email field using th
     <Validation Validator="ValidationRule.IsEmail">
         <Field>
             <FieldLabel>Email</FieldLabel>
-            <TextEdit @bind-Text="@email" Placeholder="Enter email...">
+            <TextEdit @bind-Value="@email" Placeholder="Enter email...">
                 <Feedback>
                     <ValidationNone>Please Enter Your Email. </ValidationNone>
                     <ValidationSuccess>Email is good</ValidationSuccess>
@@ -154,11 +154,11 @@ The code snippet below illustrates how you can validate the email field using th
     <Validation Validator="ValidationRule.IsNotEmpty">
         <Field>
             <FieldLabel>Password</FieldLabel>
-            <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+            <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
         </Field>
     </Validation>
     <Field>
-        <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+        <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
     </Field>
 </Validations>
 ```
@@ -201,7 +201,7 @@ And the full code that includes a register page.
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
                                 <FieldLabel>Email</FieldLabel>
-                                <TextEdit @bind-Text="@email" Placeholder="Enter email...">
+                                <TextEdit @bind-Value="@email" Placeholder="Enter email...">
                                     <Feedback>
                                         <ValidationNone>Please Enter Your Email. </ValidationNone>
                                         <ValidationSuccess>Email is good</ValidationSuccess>
@@ -213,11 +213,11 @@ And the full code that includes a register page.
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Password</FieldLabel>
-                                <TextEdit @bind-Text="@password" Placeholder="Enter Password.." />
+                                <TextEdit @bind-Value="@password" Placeholder="Enter Password.." />
                             </Field>
                         </Validation>
                         <Field>
-                            <Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+                            <Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
                         </Field>
                     </Validations>
                 </CardBody>
@@ -239,13 +239,13 @@ And the full code that includes a register page.
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Name</FieldLabel>
-                                <TextEdit @bind-Text="@name" Placeholder="Enter Your Name" />
+                                <TextEdit @bind-Value="@name" Placeholder="Enter Your Name" />
                             </Field>
                         </Validation>
                         <Validation Validator="ValidationRule.IsEmail">
                             <Field>
                                 <FieldLabel>Email</FieldLabel>
-                                <TextEdit @bind-Text="@email" Placeholder="Enter Your Email">
+                                <TextEdit @bind-Value="@email" Placeholder="Enter Your Email">
                                     <Feedback>
                                         <ValidationNone>Please Enter your email.</ValidationNone>
                                         <ValidationSuccess>Email is valid</ValidationSuccess>
@@ -257,7 +257,7 @@ And the full code that includes a register page.
                         <Validation Validator="ValidationRule.IsNotEmpty">
                             <Field>
                                 <FieldLabel>Password</FieldLabel>
-                                <TextEdit @bind-Text="@password" Placeholder="Enter Password" />
+                                <TextEdit @bind-Value="@password" Placeholder="Enter Password" />
                                 <FieldHelp>Password Strength: <Text TextColor="TextColor.Danger">Strong</Text></FieldHelp>
                             </Field>
                         </Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation12Code.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation12Code.html
index 425279b7df..ee33cc7a98 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation12Code.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation12Code.html
@@ -15,7 +15,7 @@
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is12</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is2.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Email Address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">ViewModel.EmailAddress</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">ViewModel.EmailAddress</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span><span class="htmlTagDelimiter">/&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -27,7 +27,7 @@
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is12</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is2.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">ViewModel.Password</span><span class="htmlTagDelimiter">&gt;</span>
+                    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">ViewModel.Password</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span><span class="htmlTagDelimiter">/&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation3Code.html b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation3Code.html
index 2036548b7e..fb7185d8f7 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation3Code.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Code/ReactiveUIFluentValidation3Code.html
@@ -15,7 +15,7 @@
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is12</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is2.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Email Address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Model</span><span class="enumValue">.EmailAddress</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Model</span><span class="enumValue">.EmailAddress</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span><span class="htmlTagDelimiter">/&gt;</span>
                             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -27,7 +27,7 @@
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is12</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is2.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Model</span><span class="enumValue">.Password</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Some text value...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Model</span><span class="enumValue">.Password</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span><span class="htmlTagDelimiter">/&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation12.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation12.snippet
index 53d5041785..0a71050139 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation12.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation12.snippet
@@ -14,7 +14,7 @@
                 <Field Horizontal ColumnSize="ColumnSize.Is12">
                     <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Email Address</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                        <TextEdit Placeholder="Some text value..." @bind-Text=ViewModel.EmailAddress>
+                        <TextEdit Placeholder="Some text value..." @bind-Value=ViewModel.EmailAddress>
                             <Feedback>
                                 <ValidationError/>
                             </Feedback>
@@ -26,7 +26,7 @@
             <Field Horizontal ColumnSize="ColumnSize.Is12">
                 <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Password</FieldLabel>
                 <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Text=ViewModel.Password>
+                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Value=ViewModel.Password>
                         <Feedback>
                             <ValidationError/>
                         </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation3.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation3.snippet
index f57e0c8316..49d257c0de 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation3.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Examples/ReactiveUIFluentValidation3.snippet
@@ -14,7 +14,7 @@
                 <Field Horizontal ColumnSize="ColumnSize.Is12">
                     <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Email Address</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                        <TextEdit Placeholder="Some text value..." @bind-Text="Model.EmailAddress">
+                        <TextEdit Placeholder="Some text value..." @bind-Value="Model.EmailAddress">
                             <Feedback>
                                 <ValidationError/>
                             </Feedback>
@@ -26,7 +26,7 @@
             <Field Horizontal ColumnSize="ColumnSize.Is12">
                 <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Password</FieldLabel>
                 <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Text="Model.Password">
+                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Value="Model.Password">
                         <Feedback>
                             <ValidationError/>
                         </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Index.md
index 465954b8dc..37f6d97a9a 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2022-08-19_ReactiveUIFluentValidation/Index.md
@@ -58,7 +58,7 @@ And then you're going to need a library.  [BlazoriseFluentValidation](https://gi
                 <Field Horizontal ColumnSize="ColumnSize.Is12">
                     <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Email Address</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                        <TextEdit Placeholder="Some text value..." @bind-Text="Model.EmailAddress">
+                        <TextEdit Placeholder="Some text value..." @bind-Value="Model.EmailAddress">
                             <Feedback>
                                 <ValidationError/>
                             </Feedback>
@@ -70,7 +70,7 @@ And then you're going to need a library.  [BlazoriseFluentValidation](https://gi
             <Field Horizontal ColumnSize="ColumnSize.Is12">
                 <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Password</FieldLabel>
                 <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Text="Model.Password">
+                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Value="Model.Password">
                         <Feedback>
                             <ValidationError/>
                         </Feedback>
@@ -206,7 +206,7 @@ Ah yes, bindings in the View.  Here's the completed markup of the View.
                 <Field Horizontal ColumnSize="ColumnSize.Is12">
                     <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Email Address</FieldLabel>
                     <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                        <TextEdit Placeholder="Some text value..." @bind-Text=ViewModel.EmailAddress>
+                        <TextEdit Placeholder="Some text value..." @bind-Value=ViewModel.EmailAddress>
                             <Feedback>
                                 <ValidationError/>
                             </Feedback>
@@ -218,7 +218,7 @@ Ah yes, bindings in the View.  Here's the completed markup of the View.
             <Field Horizontal ColumnSize="ColumnSize.Is12">
                 <FieldLabel ColumnSize="ColumnSize.Is2.OnDesktop">Password</FieldLabel>
                 <FieldBody ColumnSize="ColumnSize.Is6.OnDesktop">
-                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Text=ViewModel.Password>
+                    <TextEdit Role="TextRole.Password" Placeholder="Some text value..." @bind-Value=ViewModel.Password>
                         <Feedback>
                             <ValidationError/>
                         </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Code/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Code/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExampleCode.html
index 2419c1c657..28b432d4d7 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Code/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Code/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExampleCode.html
@@ -3,7 +3,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FilterMenuTemplate</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Row</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is4</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">MyFilter</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_filterTracker.GetColumnFilterValue(context.Column.Field)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">e =&gt; { _filterTracker.SetColumnFilter(context.Column, e); }</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">MyFilter</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_filterTracker.GetColumnFilterValue(context.Column.Field)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">e =&gt; { _filterTracker.SetColumnFilter(context.Column, e); }</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">MyFilter</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>MyFilter.Contains</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Contains<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">MyFilter</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>MyFilter.StartsWith</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Starts With<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">MyFilter</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>MyFilter.EndsWith</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Ends With<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
@@ -17,7 +17,7 @@
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Select</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is4</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_filterTracker.GetColumnSearchValue(context.Column.Field)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; _filterTracker.SetColumnSearchValue(context.Column, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_filterTracker.GetColumnSearchValue(context.Column.Field)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; _filterTracker.SetColumnSearchValue(context.Column, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
 
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is4</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Examples/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExample.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Examples/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExample.snippet
index 7062724a5f..f85c016b84 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Examples/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExample.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Examples/HowToEnhanceDataGridMenuFilter_FilterMenuTemplateExample.snippet
@@ -2,7 +2,7 @@
 <FilterMenuTemplate>
     <Row>
         <Column ColumnSize="ColumnSize.Is4">
-            <Select TValue="MyFilter" SelectedValue="@_filterTracker.GetColumnFilterValue(context.Column.Field)" SelectedValueChanged="e => { _filterTracker.SetColumnFilter(context.Column, e); }">
+            <Select TValue="MyFilter" Value="@_filterTracker.GetColumnFilterValue(context.Column.Field)" ValueChanged="e => { _filterTracker.SetColumnFilter(context.Column, e); }">
                 <SelectItem TValue="MyFilter" Value="@MyFilter.Contains">Contains</SelectItem>
                 <SelectItem TValue="MyFilter" Value="@MyFilter.StartsWith">Starts With</SelectItem>
                 <SelectItem TValue="MyFilter" Value="@MyFilter.EndsWith">Ends With</SelectItem>
@@ -16,7 +16,7 @@
             </Select>
         </Column>
         <Column ColumnSize="ColumnSize.Is4">
-            <TextEdit Text="@_filterTracker.GetColumnSearchValue(context.Column.Field)" TextChanged="@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))" />
+            <TextEdit Value="@_filterTracker.GetColumnSearchValue(context.Column.Field)" ValueChanged="@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))" />
         </Column>
 
         <Column ColumnSize="ColumnSize.Is4">
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Index.md
index 0e7579b7e9..ee0dd7749f 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-08_HowToEnhanceDataGridMenuFilter/Index.md
@@ -140,7 +140,7 @@ Now we need to update the UI so it uses our custom implementation, let's use the
 <FilterMenuTemplate>
     <Row>
         <Column ColumnSize="ColumnSize.Is4">
-            <Select TValue="MyFilter" SelectedValue="@_filterTracker.GetColumnFilterValue(context.Column.Field)" SelectedValueChanged="e => { _filterTracker.SetColumnFilter(context.Column, e); }">
+            <Select TValue="MyFilter" Value="@_filterTracker.GetColumnFilterValue(context.Column.Field)" ValueChanged="e => { _filterTracker.SetColumnFilter(context.Column, e); }">
                 <SelectItem TValue="MyFilter" Value="@MyFilter.Contains">Contains</SelectItem>
                 <SelectItem TValue="MyFilter" Value="@MyFilter.StartsWith">Starts With</SelectItem>
                 <SelectItem TValue="MyFilter" Value="@MyFilter.EndsWith">Ends With</SelectItem>
@@ -154,7 +154,7 @@ Now we need to update the UI so it uses our custom implementation, let's use the
             </Select>
         </Column>
         <Column ColumnSize="ColumnSize.Is4">
-            <TextEdit Text="@_filterTracker.GetColumnSearchValue(context.Column.Field)" TextChanged="@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))" />
+            <TextEdit Value="@_filterTracker.GetColumnSearchValue(context.Column.Field)" ValueChanged="@((newValue) => _filterTracker.SetColumnSearchValue(context.Column, newValue))" />
         </Column>
 
         <Column ColumnSize="ColumnSize.Is4">
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExampleCode.html
index 054d5983ce..474bcc1dad 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExampleCode.html
@@ -4,7 +4,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Phone Country Code<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_model.PhoneCountryCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_model.PhoneCountryCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExampleCode.html b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExampleCode.html
index 8b5a3e9c28..892e8c2e45 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Code/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExampleCode.html
@@ -4,7 +4,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">MessageLocalizer</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">MessageLocalizer</span><span class="enumValue">.Localize</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Phone Country Code<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_model.PhoneCountryCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>_model.PhoneCountryCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExample.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExample.snippet
index 0a166f9b0e..71c9fe8c22 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExample.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationExample.snippet
@@ -3,7 +3,7 @@
     <Validation>
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text="@_model.PhoneCountryCode">
+            <TextEdit @bind-Value="@_model.PhoneCountryCode">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExample.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExample.snippet
index f9dbfe5c53..7bcc9aa9ae 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExample.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Examples/HowToHandleLocalizationInBlazoriseValidation_ValidationLocalizationFullExample.snippet
@@ -2,7 +2,7 @@
     <Validation MessageLocalizer="MessageLocalizer.Localize">
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text="@_model.PhoneCountryCode">
+            <TextEdit @bind-Value="@_model.PhoneCountryCode">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Index.md
index 931db3b720..d6dfdc7c60 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Index.md
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2023-09-15_HowToHandleLocalizationInBlazoriseValidation/Index.md
@@ -27,7 +27,7 @@ We want to validate this property and display a localized error message if the v
     <Validation>
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text="@_model.PhoneCountryCode">
+            <TextEdit @bind-Value="@_model.PhoneCountryCode">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -136,7 +136,7 @@ The following shows a full example of how this would work:
     <Validation MessageLocalizer="MessageLocalizer.Localize">
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text="@_model.PhoneCountryCode">
+            <TextEdit @bind-Value="@_model.PhoneCountryCode">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2024-05-08_HowToImplementvalidationWithCaptcha/Examples/HowToImplementvalidationWithCaptcha_ValidationLocalizationExample.snippet b/Documentation/Blazorise.Docs/Pages/Blog/2024-05-08_HowToImplementvalidationWithCaptcha/Examples/HowToImplementvalidationWithCaptcha_ValidationLocalizationExample.snippet
index 0a166f9b0e..71c9fe8c22 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/2024-05-08_HowToImplementvalidationWithCaptcha/Examples/HowToImplementvalidationWithCaptcha_ValidationLocalizationExample.snippet
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2024-05-08_HowToImplementvalidationWithCaptcha/Examples/HowToImplementvalidationWithCaptcha_ValidationLocalizationExample.snippet
@@ -3,7 +3,7 @@
     <Validation>
         <Field>
             <FieldLabel>Phone Country Code</FieldLabel>
-            <TextEdit @bind-Text="@_model.PhoneCountryCode">
+            <TextEdit @bind-Value="@_model.PhoneCountryCode">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.md b/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.md
new file mode 100644
index 0000000000..a9c9296576
--- /dev/null
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.md
@@ -0,0 +1,72 @@
+---
+title: Blazorise Migration to v2.0
+description: Track and review changes to the Blazorise APIs, documentation, and components to help you migrate from v1.x to v2.0.
+permalink: /blog/migration-to-2.0
+canonical: /blog/migration-to-2.0
+image-url: /img/news/empty.png
+image-text: Blazorise Migration to v2.0
+author-name: Mladen Macanović
+author-image: mladen
+posted-on: January 15th, 2025
+read-time: 4 min
+---
+
+# Migrating to 2.0
+
+Blazorise 2.0 is a major release that brings a lot of changes to the Blazorise APIs, documentation, and components. This article will help you track and review these changes to help you migrate from v1.x to v2.0.
+
+## Breaking Changes
+
+The following is a list of breaking changes that you need to be aware of when migrating to Blazorise 2.0:
+
+## Input Components
+
+All input components have been updated to use a single `Value` parameter instead of multiple parameters. This change was made to simplify the API and make it more consistent across all components.
+
+### Check
+
+- Dropping the `Checked` parameter. Use the `Value` parameter instead.
+
+### ColorEdit
+
+- Dropping the `Color` parameter. Use the `Value` parameter instead.
+
+### ColorPicker
+
+- Dropping the `Color` parameter. Use the `Value` parameter instead.
+
+### DateEdit
+
+- Dropping the `Date` parameter. Use the `Value` parameter instead.
+
+### DatePicker
+
+- Dropping the `Date` and `Dates` parameters. Use the `Value` parameter instead.
+
+### MemoEdit
+
+- Dropping the `Text` parameter. Use the `Value` parameter instead.
+
+### Select
+
+- Dropping the `SelectedValue` and `SelectedValues` parameters. Use the `Value` parameter instead.
+
+### Switch
+
+- Dropping the `Checked` parameter. Use the `Value` parameter instead.
+
+### TextEdit
+
+- Dropping the `Text` parameter. Use the `Value` parameter instead.
+
+### TimeEdit
+
+- Dropping the `Time` parameter. Use the `Value` parameter instead.
+
+### TimePicker
+
+- Dropping the `Time` parameter. Use the `Value` parameter instead.
+
+### Link
+
+Removed `Match.Custom` enum value from the `Match` parameter. This change was made to simplify the API and make it more consistent across all components.
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.razor b/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.razor
new file mode 100644
index 0000000000..298fedff03
--- /dev/null
+++ b/Documentation/Blazorise.Docs/Pages/Blog/2025-01-15_MigrationTo2/Index.razor
@@ -0,0 +1,149 @@
+@page "/blog/migration-to-2.0"
+
+<Seo Canonical="/blog/migration-to-2.0" Title="Blazorise Migration to v2.0" Description="Track and review changes to the Blazorise APIs, documentation, and components to help you migrate from v1.x to v2.0." ImageUrl="/img/news/empty.png" />
+
+<BlogPageImage Source="/img/news/empty.png" Text="" />
+
+<BlogPageTitle>
+    Migrating to 2.0
+</BlogPageTitle>
+
+<BlogPageParagraph>
+    Blazorise 2.0 is a major release that brings a lot of changes to the Blazorise APIs, documentation, and components. This article will help you track and review these changes to help you migrate from v1.x to v2.0.
+</BlogPageParagraph>
+
+<BlogPageSubtitle>
+    Breaking Changes
+</BlogPageSubtitle>
+
+<BlogPageParagraph>
+    The following is a list of breaking changes that you need to be aware of when migrating to Blazorise 2.0:
+</BlogPageParagraph>
+
+<BlogPageSubtitle>
+    Input Components
+</BlogPageSubtitle>
+
+<BlogPageParagraph>
+    All input components have been updated to use a single <Code>Value</Code> parameter instead of multiple parameters. This change was made to simplify the API and make it more consistent across all components.
+</BlogPageParagraph>
+
+<Heading Size="HeadingSize.Is3">
+    Check
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Checked</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    ColorEdit
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Color</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    ColorPicker
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Color</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    DateEdit
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Date</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    DatePicker
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Date</Code> and <Code>Dates</Code> parameters. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    MemoEdit
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Text</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    Select
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>SelectedValue</Code> and <Code>SelectedValues</Code> parameters. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    Switch
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Checked</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    TextEdit
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Text</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    TimeEdit
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Time</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    TimePicker
+</Heading>
+
+<BlogPageList>
+    <BlogPageListItem>
+        Dropping the <Code>Time</Code> parameter. Use the <Code>Value</Code> parameter instead.
+    </BlogPageListItem>
+</BlogPageList>
+
+<Heading Size="HeadingSize.Is3">
+    Link
+</Heading>
+
+<BlogPageParagraph>
+    Removed <Code>Match.Custom</Code> enum value from the <Code>Match</Code> parameter. This change was made to simplify the API and make it more consistent across all components.
+</BlogPageParagraph>
+
+<BlogPagePostInto UserName="Mladen Macanović" ImageName="mladen" PostedOn="January 15th, 2025" Read="4 min" />
diff --git a/Documentation/Blazorise.Docs/Pages/Blog/Index.razor b/Documentation/Blazorise.Docs/Pages/Blog/Index.razor
index d90ddc56e5..eb59250deb 100644
--- a/Documentation/Blazorise.Docs/Pages/Blog/Index.razor
+++ b/Documentation/Blazorise.Docs/Pages/Blog/Index.razor
@@ -11,7 +11,7 @@
         <BlogCategorySelect Categories="@BlogEntries.Select( x => x.Category ).Distinct()" @bind-SelectedCategory="@selectedCategory" />
     </Column>
     <Column ColumnSize="ColumnSize.Is4.OnDesktop" Margin="Margin.Is3.FromBottom">
-        <TextEdit Placeholder="Search..." @bind-Text="@search" />
+        <TextEdit Placeholder="Search..." @bind-Value="@search" />
     </Column>
 </Row>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Commercial/PurchaseOrderPage.razor b/Documentation/Blazorise.Docs/Pages/Commercial/PurchaseOrderPage.razor
index adff90d8f1..efffe82493 100644
--- a/Documentation/Blazorise.Docs/Pages/Commercial/PurchaseOrderPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Commercial/PurchaseOrderPage.razor
@@ -25,7 +25,7 @@
                                 <Field ColumnSize="ColumnSize.Is8.OnDesktop">
                                     <FieldLabel>Product</FieldLabel>
                                     <FieldBody>
-                                        <Select TValue="string" @bind-SelectedValue="@InputModel.Product">
+                                        <Select TValue="string" @bind-Value="@InputModel.Product">
                                             <ChildContent>
                                                 <SelectItem TValue="string" Value="null"></SelectItem>
                                                 @foreach ( var productName in SupportedProductNames )
@@ -65,7 +65,7 @@
                                 <Field ColumnSize="ColumnSize.Is12">
                                     <FieldLabel>Full Name</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.FullName">
+                                        <TextEdit @bind-Value="@InputModel.FullName">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -79,7 +79,7 @@
                                 <Field ColumnSize="ColumnSize.Is6.OnDesktop">
                                     <FieldLabel>Work Email</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit Role="TextRole.Email" @bind-Text="@InputModel.Email">
+                                        <TextEdit Role="TextRole.Email" @bind-Value="@InputModel.Email">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -90,7 +90,7 @@
                             <Field ColumnSize="ColumnSize.Is6.OnDesktop">
                                 <FieldLabel>Phone</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="@InputModel.PhoneNumber" Placeholder="(xx) xxx xxx xxx">
+                                    <TextEdit @bind-Value="@InputModel.PhoneNumber" Placeholder="(xx) xxx xxx xxx">
                                         <Feedback>
                                             <ValidationError />
                                         </Feedback>
@@ -103,7 +103,7 @@
                                 <Field ColumnSize="ColumnSize.Is8.OnDesktop">
                                     <FieldLabel>Company Name</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.Company">
+                                        <TextEdit @bind-Value="@InputModel.Company">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -115,7 +115,7 @@
                                 <Field ColumnSize="ColumnSize.Is4.OnDesktop">
                                     <FieldLabel>VAT / TAX Number</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.VAT">
+                                        <TextEdit @bind-Value="@InputModel.VAT">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -129,7 +129,7 @@
                                 <Field ColumnSize="ColumnSize.Is12">
                                     <FieldLabel>Address</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.Address">
+                                        <TextEdit @bind-Value="@InputModel.Address">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -142,7 +142,7 @@
                             <Field ColumnSize="ColumnSize.Is12">
                                 <FieldLabel>Address 2</FieldLabel>
                                 <FieldBody>
-                                    <TextEdit @bind-Text="@InputModel.Address2" />
+                                    <TextEdit @bind-Value="@InputModel.Address2" />
                                 </FieldBody>
                             </Field>
                         </Fields>
@@ -151,7 +151,7 @@
                                 <Field ColumnSize="ColumnSize.Is12">
                                     <FieldLabel>Country</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.Country">
+                                        <TextEdit @bind-Value="@InputModel.Country">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -165,7 +165,7 @@
                                 <Field ColumnSize="ColumnSize.Is4.OnDesktop">
                                     <FieldLabel>Town / City</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.City">
+                                        <TextEdit @bind-Value="@InputModel.City">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -177,7 +177,7 @@
                                 <Field ColumnSize="ColumnSize.Is4.OnDesktop">
                                     <FieldLabel>State / Region</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.State">
+                                        <TextEdit @bind-Value="@InputModel.State">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -189,7 +189,7 @@
                                 <Field ColumnSize="ColumnSize.Is4.OnDesktop">
                                     <FieldLabel>Zip / Postal Code</FieldLabel>
                                     <FieldBody>
-                                        <TextEdit @bind-Text="@InputModel.Zip">
+                                        <TextEdit @bind-Value="@InputModel.Zip">
                                             <Feedback>
                                                 <ValidationError />
                                             </Feedback>
@@ -203,7 +203,7 @@
                             <Field ColumnSize="ColumnSize.Is12">
                                 <FieldLabel>Preferred Payment Type</FieldLabel>
                                 <FieldBody>
-                                    <Select TValue="string" @bind-SelectedValue="@InputModel.PaymentType">
+                                    <Select TValue="string" @bind-Value="@InputModel.PaymentType">
                                         <SelectItem TValue="string" Value="null"></SelectItem>
                                         @foreach ( var paymantType in SupportedPaymentTypes )
                                         {
@@ -218,7 +218,7 @@
                             <Field ColumnSize="ColumnSize.Is12">
                                 <FieldLabel>Additional Notes</FieldLabel>
                                 <FieldBody>
-                                    <MemoEdit @bind-Text="@InputModel.Note" Rows="3" />
+                                    <MemoEdit @bind-Value="@InputModel.Note" Rows="3" />
                                 </FieldBody>
                             </Field>
                         </Fields>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInDialogsBestPracticeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInDialogsBestPracticeExampleCode.html
index 71b0cc551e..47ec53a6db 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInDialogsBestPracticeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInDialogsBestPracticeExampleCode.html
@@ -4,19 +4,19 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>First name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">John</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">John</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Last name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Smith</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Smith</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsFull</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">john.smith<span class="atSign">&#64;</span>example.com</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">john.smith<span class="atSign">&#64;</span>example.com</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Flex</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Flex.JustifyContent.Between</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInFormBestPracticeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInFormBestPracticeExampleCode.html
index 72da81182d..a807a19382 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInFormBestPracticeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Code/ButtonInFormBestPracticeExampleCode.html
@@ -4,19 +4,19 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>First name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">John</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">John</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsHalf</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Last name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Smith</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Smith</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.IsFull</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">john.smith<span class="atSign">&#64;</span>example.com</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">john.smith<span class="atSign">&#64;</span>example.com</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInDialogsBestPracticeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInDialogsBestPracticeExample.razor
index b64c450863..021b55beb1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInDialogsBestPracticeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInDialogsBestPracticeExample.razor
@@ -4,19 +4,19 @@
     <Field ColumnSize="ColumnSize.IsHalf">
         <FieldLabel>First name</FieldLabel>
         <FieldBody>
-            <TextEdit Text="John" />
+            <TextEdit Value="John" />
         </FieldBody>
     </Field>
     <Field ColumnSize="ColumnSize.IsHalf">
         <FieldLabel>Last name</FieldLabel>
         <FieldBody>
-            <TextEdit Text="Smith" />
+            <TextEdit Value="Smith" />
         </FieldBody>
     </Field>
     <Field ColumnSize="ColumnSize.IsFull">
         <FieldLabel>Email address</FieldLabel>
         <FieldBody>
-            <TextEdit Text="john.smith@example.com" />
+            <TextEdit Value="john.smith@example.com" />
         </FieldBody>
     </Field>
     <Field Flex="Flex.JustifyContent.Between">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInFormBestPracticeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInFormBestPracticeExample.razor
index 011c1d7091..239cb5162a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInFormBestPracticeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Buttons/Examples/ButtonInFormBestPracticeExample.razor
@@ -4,19 +4,19 @@
     <Field ColumnSize="ColumnSize.IsHalf">
         <FieldLabel>First name</FieldLabel>
         <FieldBody>
-            <TextEdit Text="John" />
+            <TextEdit Value="John" />
         </FieldBody>
     </Field>
     <Field ColumnSize="ColumnSize.IsHalf">
         <FieldLabel>Last name</FieldLabel>
         <FieldBody>
-            <TextEdit Text="Smith" />
+            <TextEdit Value="Smith" />
         </FieldBody>
     </Field>
     <Field ColumnSize="ColumnSize.IsFull">
         <FieldLabel>Email address</FieldLabel>
         <FieldBody>
-            <TextEdit Text="john.smith@example.com" />
+            <TextEdit Value="john.smith@example.com" />
         </FieldBody>
     </Field>
     <Field>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/CheckPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/CheckPage.razor
index 05bcc24e47..3b9ab7f415 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/CheckPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/CheckPage.razor
@@ -66,12 +66,12 @@
 
 <DocsAttributes>
     <DocsAttributesItem Name="TValue" Type="generic">
-        Data type of <Code>Checked</Code> value. Support types are <Code>bool</Code> and <Code>bool?</Code>.
+        Data type of <Code>Value</Code> value. Support types are <Code>bool</Code> and <Code>bool?</Code>.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="Checked" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the checked flag.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="CheckedChanged" Type="EventCallback<TValue>">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the check state is changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Indeterminate" Type="bool?" Default="null">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithBindExampleCode.html
index 6dd085a94a..a0da06863a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithEventExampleCode.html
index 8f842a48ac..68cf102201 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Code/CheckWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span> <span class="htmlAttributeName">CheckedChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnRememberMeChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnRememberMeChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Check</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithBindExample.razor
index 460bb9e5c2..c790a85dfc 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Check TValue="bool" @bind-Checked="@rememberMe">Remember Me</Check>
+<Check TValue="bool" @bind-Value="@rememberMe">Remember Me</Check>
 
 @code{
     bool rememberMe;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithEventExample.razor
index d05e69337b..887a93a96e 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Checks/Examples/CheckWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Check TValue="bool" Checked="@rememberMe" CheckedChanged="@OnRememberMeChanged">Remember Me</Check>
+<Check TValue="bool" Value="@rememberMe" ValueChanged="@OnRememberMeChanged">Remember Me</Check>
 
 @code{
     bool rememberMe;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditDisabledExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditDisabledExampleCode.html
index 4a401d034b..e4f68622c6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditDisabledExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditDisabledExampleCode.html
@@ -1,5 +1,5 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#888888</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#888888</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 </div>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditExampleCode.html
index dd2fec5cd2..ec5abc8a70 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditSizeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditSizeExampleCode.html
index 3ee0da66b4..cf76d541a6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditSizeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorEditSizeExampleCode.html
@@ -1,10 +1,10 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#888888</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#888888</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#444444</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Large</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">#444444</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Large</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 </div>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerExampleCode.html
index f5b1f7e0c2..d39ad33872 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorPicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorPicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerShowHueExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerShowHueExampleCode.html
index d2b3b0490a..ac7d28e1c9 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerShowHueExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Code/ColorPickerShowHueExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorPicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ShowHueSlider</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ColorPicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>colorValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ShowHueSlider</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorEditPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorEditPage.razor
index 59b516123f..3e77ddc593 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorEditPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorEditPage.razor
@@ -20,7 +20,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Basic">
-        In this example for Blazorise, the <Code>ColorEdit</Code> component is utilized to provide a color selection interface. It's bound to a <Code>colorValue</Code> variable via the <Code>@@bind-Color</Code> directive. Initially set to red (<Strong>#ff0000</Strong>, this <Code>colorValue</Code> automatically updates to reflect the user's color selection made through the <Code>ColorEdit</Code> component, showcasing a straightforward way to integrate color picking functionality into a Blazor application.
+        In this example for Blazorise, the <Code>ColorEdit</Code> component is utilized to provide a color selection interface. It's bound to a <Code>colorValue</Code> variable via the <Code>@@bind-Value</Code> directive. Initially set to red (<Strong>#ff0000</Strong>, this <Code>colorValue</Code> automatically updates to reflect the user's color selection made through the <Code>ColorEdit</Code> component, showcasing a straightforward way to integrate color picking functionality into a Blazor application.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <ColorEditExample />
@@ -57,10 +57,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Color" Type="string" Default="null">
+    <DocsAttributesItem Name="Value" Type="string" Default="null">
         Gets or sets the input color value in hex format.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="ColorChanged" Type="EventCallback<string>">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<string>">
         Occurs when the color has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Disabled" Type="bool" Default="false">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorPickerPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorPickerPage.razor
index 5159fb1df6..19cd9377e1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorPickerPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/ColorPickerPage.razor
@@ -22,7 +22,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Basic">
-        In this Blazorise example, a <Code>ColorPicker</Code> component is bound to a colorValue variable using the <Code>@@bind-Color</Code> directive. Initially set to red (<Strong>#ff0000</Strong>), the <Code>colorValue</Code> updates automatically when a user selects a new color through the <Code>ColorPicker</Code>, demonstrating an interactive color selection tool in a Blazor application.
+        In this Blazorise example, a <Code>ColorPicker</Code> component is bound to a colorValue variable using the <Code>@@bind-Value</Code> directive. Initially set to red (<Strong>#ff0000</Strong>), the <Code>colorValue</Code> updates automatically when a user selects a new color through the <Code>ColorPicker</Code>, demonstrating an interactive color selection tool in a Blazor application.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <ColorPickerExample />
@@ -49,10 +49,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Color" Type="string" Default="null">
+    <DocsAttributesItem Name="Value" Type="string" Default="null">
         Gets or sets the input color value in hex format.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="ColorChanged" Type="EventCallback<string>">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<string>">
         Occurs when the color has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Palette" Type="string[]">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditDisabledExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditDisabledExample.razor
index 73b466eca1..00896d98dd 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditDisabledExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditDisabledExample.razor
@@ -1,3 +1,3 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<ColorEdit Color="#888888" Disabled />
\ No newline at end of file
+<ColorEdit Value="#888888" Disabled />
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditExample.razor
index f233346763..5e70bdeeb2 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<ColorEdit @bind-Color="@colorValue" />
+<ColorEdit @bind-Value="@colorValue" />
 
 @code {
     string colorValue = "#ff0000";
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditSizeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditSizeExample.razor
index 9ffa13e165..595061bf60 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditSizeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorEditSizeExample.razor
@@ -1,8 +1,8 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 <Field>
-    <ColorEdit Color="#888888" Size="Size.Small" />
+    <ColorEdit Value="#888888" Size="Size.Small" />
 </Field>
 <Field>
-    <ColorEdit Color="#444444" Size="Size.Large" />
+    <ColorEdit Value="#444444" Size="Size.Large" />
 </Field>
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerExample.razor
index cb685c385f..72d3b297da 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<ColorPicker @bind-Color="@colorValue" />
+<ColorPicker @bind-Value="@colorValue" />
 
 @code {
     string colorValue = "#ff0000";
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerShowHueExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerShowHueExample.razor
index 8aa62d95c9..22972ebfe3 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerShowHueExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Colors/Examples/ColorPickerShowHueExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<ColorPicker @bind-Color="@colorValue" ShowHueSlider />
+<ColorPicker @bind-Value="@colorValue" ShowHueSlider />
 
 @code {
     string colorValue = "#ff00ff";
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/BasicDatePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/BasicDatePickerExampleCode.html
index 43db2e0cc8..39fe698c6a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/BasicDatePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/BasicDatePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithBindExampleCode.html
index 566c8900bf..0b3b53f9df 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DateEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDate</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DateEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDate</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithEventExampleCode.html
index 1df3501d5e..7dce7da5ac 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DateEditWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DateEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDate</span><span class="quot">&quot;</span> <span class="htmlAttributeName">DateChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnDateChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DateEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedDate</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnDateChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerInputFormatExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerInputFormatExampleCode.html
index 4756ec5507..ac56d09db4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerInputFormatExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerInputFormatExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputFormat</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dd.MM.yyyy</span><span class="quot">&quot;</span> <span class="htmlAttributeName">DisplayFormat</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dd.MM.yyyy</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputFormat</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dd.MM.yyyy</span><span class="quot">&quot;</span> <span class="htmlAttributeName">DisplayFormat</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dd.MM.yyyy</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerNonStaticExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerNonStaticExampleCode.html
index 1f2acc3259..9ecadf47b0 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerNonStaticExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerNonStaticExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">StaticPicker</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">StaticPicker</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerWithIconExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerWithIconExampleCode.html
index e208631df1..e251eca917 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerWithIconExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/DatePickerWithIconExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addons</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addon</span> <span class="htmlAttributeName">AddonType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">AddonType</span><span class="enumValue">.Body</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>datePicker</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>datePicker</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Addon</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addon</span> <span class="htmlAttributeName">AddonType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">AddonType</span><span class="enumValue">.End</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Button</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Color</span><span class="enumValue">.Light</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Clicked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(()=&gt;datePicker.ToggleAsync())</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/InlineDatePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/InlineDatePickerExampleCode.html
index 572fadbee6..5b5d74705b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/InlineDatePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/InlineDatePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Date</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Inline</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Inline</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/MultipleDatePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/MultipleDatePickerExampleCode.html
index 537e029bf4..1529bb515c 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/MultipleDatePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/MultipleDatePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Dates</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedDates</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputMode</span><span class="enumValue">.Date</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectionMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputSelectionMode</span><span class="enumValue">.Multiple</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedDates</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputMode</span><span class="enumValue">.Date</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectionMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputSelectionMode</span><span class="enumValue">.Multiple</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/RangeDatePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/RangeDatePickerExampleCode.html
index 7bd84daf7a..f7f4042b1b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/RangeDatePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Code/RangeDatePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Dates</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedDates</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputMode</span><span class="enumValue">.Date</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectionMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputSelectionMode</span><span class="enumValue">.Range</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DatePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedDates</span><span class="quot">&quot;</span> <span class="htmlAttributeName">InputMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputMode</span><span class="enumValue">.Date</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectionMode</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DateInputSelectionMode</span><span class="enumValue">.Range</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DateEditPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DateEditPage.razor
index 009ef0783d..2b4fa19954 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DateEditPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DateEditPage.razor
@@ -46,7 +46,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Manual event binding">
-        When using the event <Code>DateChanged</Code>, you also must define the <Code>Date</Code> value attribute.
+        When using the event <Code>ValueChanged</Code>, you also must define the <Code>Value</Code> value attribute.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <DateEditWithEventExample />
@@ -107,10 +107,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Date" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the input date value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="DateChanged" Type="@("EventCallback<TValue>")">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the date has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="InputMode" Type="DateInputMode" Default="Date">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DatePickerPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DatePickerPage.razor
index 9a19fd5aa2..e5778522f7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DatePickerPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/DatePickerPage.razor
@@ -425,13 +425,13 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Date" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the input date value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="DateChanged" Type="@("EventCallback<TValue>")">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the date has changed.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="DateExpression" Type="@("Expression<Func<TValue>>")">
+    <DocsAttributesItem Name="ValueExpression" Type="Expression<Func<TValue>>">
         Gets or sets an expression that identifies the date value.
     </DocsAttributesItem>
     <DocsAttributesItem Name="InputMode" Type="DateInputMode" Default="Date">
@@ -482,15 +482,6 @@
     <DocsAttributesItem Name="DisableMobile" Type="bool" Default="true">
         If enabled, it disables the native input on mobile devices.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="Dates" Type="IReadOnlyList<TValue>">
-        Gets or sets the input date value.
-    </DocsAttributesItem>
-    <DocsAttributesItem Name="DatesChanged" Type="EventCallback<IReadOnlyList<TValue>>">
-        Occurs when the date has changed.
-    </DocsAttributesItem>
-    <DocsAttributesItem Name="DatesExpression" Type="Expression<Func<IReadOnlyList<TValue>>>">
-        Gets or sets an expression that identifies the date value.
-    </DocsAttributesItem>
     <DocsAttributesItem Name="RangeSeparator" Type="string">
         Overrides the range separator that is used to separate date values when <Code>SelectionMode</Code> is set to <Code>DateInputSelectionMode.Range</Code>.
     </DocsAttributesItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/BasicDatePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/BasicDatePickerExample.razor
index 33a627586b..93385d10e4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/BasicDatePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/BasicDatePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker TValue="DateTime?" @bind-Date="@value" />
+<DatePicker TValue="DateTime?" @bind-Value="@value" />
 
 @code {
     DateTime? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithBindExample.razor
index 7eb0f19399..339d2daeb6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DateEdit TValue="DateTime?" @bind-Date="@selectedDate" />
+<DateEdit TValue="DateTime?" @bind-Value="@selectedDate" />
 
 @code{
     DateTime? selectedDate;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithEventExample.razor
index 2c725e80ff..2b1e871799 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DateEditWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DateEdit TValue="DateTime?" Date="@selectedDate" DateChanged="@OnDateChanged" />
+<DateEdit TValue="DateTime?" Value="@selectedDate" ValueChanged="@OnDateChanged" />
 
 @code{
     DateTime? selectedDate;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerInputFormatExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerInputFormatExample.razor
index 86397ee60f..80ce0b0291 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerInputFormatExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerInputFormatExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker TValue="DateTime?" @bind-Date="@value" InputFormat="dd.MM.yyyy" DisplayFormat="dd.MM.yyyy" />
+<DatePicker TValue="DateTime?" @bind-Value="@value" InputFormat="dd.MM.yyyy" DisplayFormat="dd.MM.yyyy" />
 
 @code {
     DateTime? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerNonStaticExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerNonStaticExample.razor
index 67201f0120..0a7c33d840 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerNonStaticExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerNonStaticExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker TValue="DateTime?" @bind-Date="@value" StaticPicker="false" />
+<DatePicker TValue="DateTime?" @bind-Value="@value" StaticPicker="false" />
 
 @code {
     DateTime? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerWithIconExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerWithIconExample.razor
index bd0ec8ebd0..ef4679dc77 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerWithIconExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/DatePickerWithIconExample.razor
@@ -2,7 +2,7 @@
 
 <Addons>
     <Addon AddonType="AddonType.Body">
-        <DatePicker @ref="@datePicker" TValue="DateTime?" @bind-Date="@value" />
+        <DatePicker @ref="@datePicker" TValue="DateTime?" @bind-Value="@value" />
     </Addon>
     <Addon AddonType="AddonType.End">
         <Button Color="Color.Light" Clicked="@(()=>datePicker.ToggleAsync())">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/InlineDatePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/InlineDatePickerExample.razor
index b860742c73..4028f02f23 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/InlineDatePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/InlineDatePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker TValue="DateTime?" @bind-Date="@value" Inline />
+<DatePicker TValue="DateTime?" @bind-Value="@value" Inline />
 
 @code {
     DateTime? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/MultipleDatePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/MultipleDatePickerExample.razor
index ab4eb771e5..1bcc2ac957 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/MultipleDatePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/MultipleDatePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker @bind-Dates="selectedDates" TValue="DateTime?" InputMode="DateInputMode.Date" SelectionMode="DateInputSelectionMode.Multiple" />
+<DatePicker @bind-Value="selectedDates" InputMode="DateInputMode.Date" SelectionMode="DateInputSelectionMode.Multiple" />
 
 @code{
     IReadOnlyList<DateTime?> selectedDates;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/RangeDatePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/RangeDatePickerExample.razor
index d36d1ab980..f1e9b8bae1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/RangeDatePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Dates/Examples/RangeDatePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<DatePicker TValue="DateTime?" @bind-Dates="selectedDates" InputMode="DateInputMode.Date" SelectionMode="DateInputSelectionMode.Range" />
+<DatePicker @bind-Value="selectedDates" InputMode="DateInputMode.Date" SelectionMode="DateInputSelectionMode.Range" />
 
 @code {
     IReadOnlyList<DateTime?> selectedDates;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithDisabledExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithDisabledExampleCode.html
index ff1339fd4c..bac31aa9ca 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithDisabledExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithDisabledExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Disabled<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 </div>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithReadOnlyExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithReadOnlyExampleCode.html
index 38c52fc88e..9b0eca35bd 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithReadOnlyExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Code/FieldWithReadOnlyExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Read-Only<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 </div>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithDisabledExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithDisabledExample.razor
index 1fafcccccd..e4c6a16ec7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithDisabledExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithDisabledExample.razor
@@ -2,5 +2,5 @@
 
 <Field>
     <FieldLabel>Disabled</FieldLabel>
-    <TextEdit Text="Value" Disabled />
+    <TextEdit Value="Value" Disabled />
 </Field>
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithReadOnlyExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithReadOnlyExample.razor
index 4a4be8a972..be0da7043b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithReadOnlyExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Fields/Examples/FieldWithReadOnlyExample.razor
@@ -2,5 +2,5 @@
 
 <Field>
     <FieldLabel>Read-Only</FieldLabel>
-    <TextEdit Text="Value" ReadOnly />
+    <TextEdit Value="Value" ReadOnly />
 </Field>
\ No newline at end of file
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Code/BasicFocusTrapExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Code/BasicFocusTrapExampleCode.html
index 8cee7ae13b..ef076c468d 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Code/BasicFocusTrapExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Code/BasicFocusTrapExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Card</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">CardBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>focusTrapActive</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Active<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>focusTrapActive</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Active<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">CardBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">CardBody</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FocusTrap</span> <span class="htmlAttributeName">Active</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>focusTrapActive</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Examples/BasicFocusTrapExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Examples/BasicFocusTrapExample.razor
index 38c3cab6b4..c729f9735f 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Examples/BasicFocusTrapExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/FocusTraps/Examples/BasicFocusTrapExample.razor
@@ -2,7 +2,7 @@
 
 <Card>
     <CardBody>
-        <Switch TValue="bool" @bind-Checked="@focusTrapActive">Active</Switch>
+        <Switch TValue="bool" @bind-Value="@focusTrapActive">Active</Switch>
     </CardBody>
     <CardBody>
         <FocusTrap Active="@focusTrapActive">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/BasicHighlighterExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/BasicHighlighterExampleCode.html
index 8991a60ffa..cac40ecd9d 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/BasicHighlighterExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/BasicHighlighterExampleCode.html
@@ -3,7 +3,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Search value<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>searchValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>searchValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/DynamicHighlighterExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/DynamicHighlighterExampleCode.html
index 53545b1c42..5ac1e88215 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/DynamicHighlighterExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Code/DynamicHighlighterExampleCode.html
@@ -4,19 +4,19 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Search value<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>searchValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>searchValue</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Until Next Boundary<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>untilNextBoundary</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>untilNextBoundary</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Case Sensitive<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>caseSensitive</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>caseSensitive</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/BasicHighlighterExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/BasicHighlighterExample.razor
index dbe9eb5d23..c463970db5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/BasicHighlighterExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/BasicHighlighterExample.razor
@@ -3,7 +3,7 @@
 <Field>
     <FieldLabel>Search value</FieldLabel>
     <FieldBody>
-        <TextEdit @bind-Text="@searchValue" />
+        <TextEdit @bind-Value="@searchValue" />
     </FieldBody>
 </Field>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/DynamicHighlighterExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/DynamicHighlighterExample.razor
index c547c60efb..5a098241c2 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/DynamicHighlighterExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Highlighters/Examples/DynamicHighlighterExample.razor
@@ -4,19 +4,19 @@
     <Field>
         <FieldLabel>Search value</FieldLabel>
         <FieldBody>
-            <TextEdit @bind-Text="@searchValue" />
+            <TextEdit @bind-Value="@searchValue" />
         </FieldBody>
     </Field>
     <Field>
         <FieldLabel>Until Next Boundary</FieldLabel>
         <FieldBody>
-            <Switch @bind-Checked="@untilNextBoundary"></Switch>
+            <Switch @bind-Value="@untilNextBoundary"></Switch>
         </FieldBody>
     </Field>
     <Field>
         <FieldLabel>Case Sensitive</FieldLabel>
         <FieldBody>
-            <Switch @bind-Checked="@caseSensitive"></Switch>
+            <Switch @bind-Value="@caseSensitive"></Switch>
         </FieldBody>
     </Field>
 </Fields>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditAutoSizeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditAutoSizeExampleCode.html
index 90a4454ff2..b631eb7b85 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditAutoSizeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditAutoSizeExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>loremipsum</span><span class="quot">&quot;</span> <span class="htmlAttributeName">AutoSize</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>loremipsum</span><span class="quot">&quot;</span> <span class="htmlAttributeName">AutoSize</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithBindExampleCode.html
index 231a02e8c5..06f1b5fab7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>description</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>description</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithEventExampleCode.html
index a8d91bf796..ebd66eb3bf 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Code/MemoEditWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>description</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnDescriptionChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">MemoEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>description</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnDescriptionChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditAutoSizeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditAutoSizeExample.razor
index d455634de3..8e5f558756 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditAutoSizeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditAutoSizeExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<MemoEdit Text="@loremipsum" AutoSize />
+<MemoEdit Value="@loremipsum" AutoSize />
 
 @code {
     string loremipsum = @"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel semper libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae.
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithBindExample.razor
index 3b27e63564..1b446cb963 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<MemoEdit @bind-Text="@description" />
+<MemoEdit @bind-Value="@description" />
 
 @code{
     string description;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithEventExample.razor
index 59b7452b8d..0faa0ccf64 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/Examples/MemoEditWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<MemoEdit Text="@description" TextChanged="@OnDescriptionChanged" />
+<MemoEdit Value="@description" ValueChanged="@OnDescriptionChanged" />
 
 @code{
     string description;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/MemoEditPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/MemoEditPage.razor
index 930d9533be..49b22891f9 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/MemoEditPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Memos/MemoEditPage.razor
@@ -60,7 +60,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Mannual event binding">
-        When using the event <Code>TextChanged</Code>, you also must define the <Code>Text</Code> value attribute.
+        When using the event <Code>ValueChanged</Code>, you also must define the <Code>Value</Code> value attribute.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <MemoEditWithEventExample />
@@ -74,8 +74,8 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Text Changed mode">
-        By default the <Code>TextChanged</Code> event will be raised on every keypress.
-        To override default behavior of <Code>TextChanged</Code> event and to disable the change on every
+        By default the <Code>ValueChanged</Code> event will be raised on every keypress.
+        To override default behavior of <Code>ValueChanged</Code> event and to disable the change on every
         keypress you must set the <Code>Immediate</Code> to <Code>false</Code> on application start.
         After setting it to <Code>false</Code> the event will be raised only after the input loses focus.
     </DocsPageSectionHeader>
@@ -109,10 +109,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Text" Type="string" Default="null">
+    <DocsAttributesItem Name="Value" Type="string" Default="null">
         Input value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="TextChanged" Type="@("EventCallback<string>")">
+    <DocsAttributesItem Name="ValueChanged" Type="@("EventCallback<string>")">
         Occurs after text has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Plaintext" Type="bool" Default="false">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithBindExampleCode.html
index 5a0e863c74..9f4552dee8 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">RadioGroup</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Name</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">colors</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-CheckedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>checkedValue</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">RadioGroup</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Name</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">colors</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>checkedValue</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;red&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Red<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;green&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Green<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;blue&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Blue<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithEventExampleCode.html
index ce77d1eb5c..da96b3a38c 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Code/RadioGroupWithEventExampleCode.html
@@ -1,9 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">RadioGroup</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span>
-            <span class="htmlAttributeName">Name</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">colors</span><span class="quot">&quot;</span>
-            <span class="htmlAttributeName">CheckedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>checkedValue</span><span class="quot">&quot;</span>
-            <span class="htmlAttributeName">CheckedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnCheckedValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">RadioGroup</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Name</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">colors</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>checkedValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;red&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Red<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;green&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Green<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Radio</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(&quot;blue&quot;)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Blue<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Radio</span><span class="htmlTagDelimiter">&gt;</span>
@@ -13,7 +10,7 @@
 <span class="atSign">&#64;</span>code{
     <span class="keyword">string</span> checkedValue = <span class="string">&quot;green&quot;</span>;
 
-    Task OnCheckedValueChanged( <span class="keyword">string</span> value )
+    Task OnValueChanged(<span class="keyword">string</span> value)
     {
         checkedValue = value;
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithBindExample.razor
index 498b53e3f3..7180006b95 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<RadioGroup TValue="string" Name="colors" @bind-CheckedValue="@checkedValue">
+<RadioGroup TValue="string" Name="colors" @bind-Value="@checkedValue">
     <Radio Value="@("red")">Red</Radio>
     <Radio Value="@("green")">Green</Radio>
     <Radio Value="@("blue")">Blue</Radio>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithEventExample.razor
index 1fc7e883f3..d74916bece 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/Examples/RadioGroupWithEventExample.razor
@@ -1,9 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<RadioGroup TValue="string"
-            Name="colors"
-            CheckedValue="@checkedValue"
-            CheckedValueChanged="@OnCheckedValueChanged">
+<RadioGroup TValue="string" Name="colors" Value="@checkedValue" ValueChanged="@OnValueChanged">
     <Radio Value="@("red")">Red</Radio>
     <Radio Value="@("green")">Green</Radio>
     <Radio Value="@("blue")">Blue</Radio>
@@ -12,7 +9,7 @@
 @code{
     string checkedValue = "green";
 
-    Task OnCheckedValueChanged( string value )
+    Task OnValueChanged(string value)
     {
         checkedValue = value;
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/RadioPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/RadioPage.razor
index 364474459a..b560dd2af5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/RadioPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Radios/RadioPage.razor
@@ -121,12 +121,12 @@
 
 <DocsAttributes Title="RadioGroup">
     <DocsAttributesItem Name="TValue" Type="generic">
-        <Code>CheckedValue</Code> data type.
+        <Code>Value</Code> data type.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="CheckedValue" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the checked value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="CheckedValueChanged" Type="@("EventCallback<TValue>")">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the checked value is changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Name" Type="string" Default="null">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithBindExampleCode.html
index 9afe6e4239..8033ab4ff5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedValue</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedValue</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">1</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>One<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Two<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">3</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Three<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithEventExampleCode.html
index fe7afafa18..184cfeadc8 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Code/SelectWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnSelectedValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">int</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnSelectedValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">1</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>One<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Two<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">3</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Three<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithBindExample.razor
index 116966a0bf..217e628db0 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Select @bind-SelectedValue="@selectedValue">
+<Select @bind-Value="@selectedValue">
     <SelectItem Value="1">One</SelectItem>
     <SelectItem Value="2">Two</SelectItem>
     <SelectItem Value="3">Three</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithEventExample.razor
index 49fc9320e6..8c9ff8fc9a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/Examples/SelectWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Select TValue="int" SelectedValue="@selectedValue" SelectedValueChanged="@OnSelectedValueChanged">
+<Select TValue="int" Value="@selectedValue" ValueChanged="@OnSelectedValueChanged">
     <SelectItem Value="1">One</SelectItem>
     <SelectItem Value="2">Two</SelectItem>
     <SelectItem Value="3">Three</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/SelectPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/SelectPage.razor
index ca0377607e..d3da625bb5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/SelectPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Selects/SelectPage.razor
@@ -46,7 +46,7 @@
 
 <UnorderedList>
     <UnorderedListItem>
-        Value type must be known. When using member variable on <Code>bind-*</Code> or <Code>SelectedValue</Code> attributes, the value type
+        Value type must be known. When using member variable on <Code>bind-*</Code> or <Code>Value</Code> attributes, the value type
         will be recognized automatically. Otherwise you must use TValue to define it eg (TValue=”int”).
     </UnorderedListItem>
     <UnorderedListItem>
@@ -102,9 +102,7 @@
 </DocsPageSubtitle>
 
 <DocsPageParagraph>
-    The process is basically the same for the single and for multiple select. The only difference is that
-    <Code>SelectedValue</Code> attribute is used for single select mode, and <Code>SelectedValues</Code> attribute
-    is used for multi-selection. Keep in mind that <Code>Multiple</Code> must be set to true for multi-selection to work properly.
+    The process is basically the same for the single and for multiple select.
 </DocsPageParagraph>
 
 <Alert Color="Color.Info" Visible>
@@ -125,7 +123,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Manual event binding">
-        When using the event <Code>SelectedValueChanged</Code>, you also must define the <Code>SelectedValue</Code> attribute.
+        When using the event <Code>ValueChanged</Code>, you also must define the <Code>Value</Code> attribute.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <SelectWithEventExample />
@@ -163,20 +161,14 @@
 
 <DocsAttributes Title="Select">
     <DocsAttributesItem Name="TValue" Type="generic">
-        <Code>SelectedValue</Code> or <Code>SelectedValues</Code> data type.
+        <Code>Value</Code> data type.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="SelectedValue" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Selected item value when in single edit mode.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="SelectedValues" Type="IReadOnlyList<TValue>" Default="default">
-        Selected item value when in multi edit mode.
-    </DocsAttributesItem>
-    <DocsAttributesItem Name="SelectedValueChanged" Type="EventCallback<TValue>">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the selected item value has changed.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="SelectedValuesChanged" Type="EventCallback<IReadOnlyList<TValue>>">
-        Occurs when the selected items value has changed (only when <Code>Multiple</Code>).
-    </DocsAttributesItem>
     <DocsAttributesItem Name="MaxVisibleItems" Type="int?" Default="null">
         Specifies how many options should be shown at once.
     </DocsAttributesItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Code/StepNavigationAllowedExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Code/StepNavigationAllowedExampleCode.html
index a23a9220e0..c436d6a668 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Code/StepNavigationAllowedExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Code/StepNavigationAllowedExampleCode.html
@@ -14,7 +14,7 @@
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">StepPanel</span> <span class="htmlAttributeName">Name</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Email address<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">email</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldHelp</span><span class="htmlTagDelimiter">&gt;</span>This field is required in order to procceed to the next step.<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldHelp</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Examples/StepNavigationAllowedExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Examples/StepNavigationAllowedExample.razor
index e477e8fee9..83ad335776 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Examples/StepNavigationAllowedExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Steps/Examples/StepNavigationAllowedExample.razor
@@ -14,7 +14,7 @@
         <StepPanel Name="2">
             <Field>
                 <FieldLabel>Email address</FieldLabel>
-                <TextEdit @bind-Text="email" Placeholder="Enter email">
+                <TextEdit @bind-Value="email" Placeholder="Enter email">
                     <FieldHelp>This field is required in order to procceed to the next step.</FieldHelp>
                 </TextEdit>
             </Field>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithBindExampleCode.html
index 569273e9fb..d7320e31da 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithEventExampleCode.html
index 0175eea076..54a331f101 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Code/SwitchWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span> <span class="htmlAttributeName">CheckedChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnRememberMeChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>rememberMe</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnRememberMeChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Remember Me<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithBindExample.razor
index 29e94ab5dd..721d6e38f9 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Switch TValue="bool" @bind-Checked="@rememberMe">Remember Me</Switch>
+<Switch TValue="bool" @bind-Value="@rememberMe">Remember Me</Switch>
 
 @code{
     bool rememberMe;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithEventExample.razor
index c7102f161a..54e210a686 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/Examples/SwitchWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<Switch TValue="bool" Checked="@rememberMe" CheckedChanged="@OnRememberMeChanged">Remember Me</Switch>
+<Switch TValue="bool" Value="@rememberMe" ValueChanged="@OnRememberMeChanged">Remember Me</Switch>
 
 @code{
     bool rememberMe;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/SwitchPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/SwitchPage.razor
index f6f8a58540..f372661f64 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/SwitchPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Switches/SwitchPage.razor
@@ -62,12 +62,12 @@
 
 <DocsAttributes>
     <DocsAttributesItem Name="TValue" Type="generic">
-        Data type of <Code>Checked</Code> value. Support types are <Code>bool</Code> and <Code>bool?</Code>.
+        Data type of <Code>Value</Code> value. Support types are <Code>bool</Code> and <Code>bool?</Code>.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="Checked" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the checked flag.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="CheckedChanged" Type="EventCallback<TValue>">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the check state is changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Color" Type="Color" Default="Default">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithBindExampleCode.html
index 0726cbaa4f..4fce42205b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithEventExampleCode.html
index c919ac2de8..573f3ca64a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Code/TextEditWithEventExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnNameChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnNameChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithBindExample.razor
index 3e997f6c9a..2d522cd21f 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TextEdit @bind-Text="@name" />
+<TextEdit @bind-Value="@name" />
 
 @code{
     string name;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithEventExample.razor
index 0f2937c2e1..9eb08273a3 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/Examples/TextEditWithEventExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TextEdit Text="@name" TextChanged="@OnNameChanged" />
+<TextEdit Value="@name" ValueChanged="@OnNameChanged" />
 
 @code{
     string name;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/TextEditPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/TextEditPage.razor
index 38ae3715b1..7c5d4941a2 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/TextEditPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Texts/TextEditPage.razor
@@ -123,7 +123,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Manual event binding">
-        When using the event <Code>TextChanged</Code>, you also must define the <Code>Text</Code> value attribute.
+        When using the event <Code>ValueChanged</Code>, you also must define the <Code>Value</Code> value attribute.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <TextEditWithEventExample />
@@ -137,8 +137,8 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Text Changed mode">
-        By default the <Code>TextChanged</Code> event will be raised on every keypress.
-        To override default behavior of <Code>TextChanged</Code> event and to disable the change on every
+        By default the <Code>ValueChanged</Code> event will be raised on every keypress.
+        To override default behavior of <Code>ValueChanged</Code> event and to disable the change on every
         keypress you must set the <Code>Immediate</Code> to <Code>false</Code> on application start.
         After setting it to <Code>false</Code> the event will be raised only after the input loses focus.
     </DocsPageSectionHeader>
@@ -187,10 +187,10 @@
     <DocsAttributesItem Name="Role" Type="TextRole" Default="Text">
         The role of the input text.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="Text" Type="string" Default="null">
+    <DocsAttributesItem Name="Value" Type="string" Default="null">
         Input value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="TextChanged" Type="@("EventCallback<string>")">
+    <DocsAttributesItem Name="ValueChanged" Type="@("EventCallback<string>")">
         Occurs after text has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Plaintext" Type="bool" Default="false">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/BasicTimePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/BasicTimePickerExampleCode.html
index cc64773fea..6dd39fc8c1 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/BasicTimePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/BasicTimePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/InlineTimePickerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/InlineTimePickerExampleCode.html
index a92ca6d986..65962cc4d7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/InlineTimePickerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/InlineTimePickerExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Inline</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Inline</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithBindExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithBindExampleCode.html
index 4d0b9d251d..23938f2102 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithBindExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithBindExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimeEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedTime</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimeEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedTime</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithEventExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithEventExampleCode.html
index 5972afd067..14d24fcde3 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithEventExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimeEditWithEventExampleCode.html
@@ -1,12 +1,12 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimeEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedTime</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TimeChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnTimeChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimeEdit</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>selectedTime</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnValueChanged</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code{
     TimeSpan? selectedTime;
 
-    Task OnTimeChanged( TimeSpan? Time )
+    Task OnValueChanged(TimeSpan? Time)
     {
         selectedTime = Time;
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerNonStaticExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerNonStaticExampleCode.html
index d9804caa35..7368ce45d4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerNonStaticExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerNonStaticExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">StaticPicker</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlAttributeName">StaticPicker</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithDateTimeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithDateTimeExampleCode.html
index 487e270a16..6b7e71f248 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithDateTimeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithDateTimeExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DateTime?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
 </pre></div>
 <div class="csharp"><pre>
 <span class="atSign">&#64;</span>code {
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithIconExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithIconExampleCode.html
index df07a404f1..31bb89a274 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithIconExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Code/TimePickerWithIconExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addons</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addon</span> <span class="htmlAttributeName">AddonType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">AddonType</span><span class="enumValue">.Body</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>timePicker</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Time</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TimePicker</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>timePicker</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">TimeSpan?</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>value</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Addon</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Addon</span> <span class="htmlAttributeName">AddonType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">AddonType</span><span class="enumValue">.End</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Button</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Color</span><span class="enumValue">.Light</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Clicked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(()=&gt;timePicker.ToggleAsync())</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/BasicTimePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/BasicTimePickerExample.razor
index 68b1a526e4..e3e7831b0b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/BasicTimePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/BasicTimePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimePicker TValue="TimeSpan?" @bind-Time="@value" />
+<TimePicker TValue="TimeSpan?" @bind-Value="@value" />
 
 @code {
     TimeSpan? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/InlineTimePickerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/InlineTimePickerExample.razor
index 8d17294406..df11029da6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/InlineTimePickerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/InlineTimePickerExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimePicker TValue="TimeSpan?" @bind-Time="@value" Inline />
+<TimePicker TValue="TimeSpan?" @bind-Value="@value" Inline />
 
 @code {
     TimeSpan? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithBindExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithBindExample.razor
index b592d3f8d0..5187d41776 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithBindExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithBindExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimeEdit TValue="TimeSpan?" @bind-Time="@selectedTime" />
+<TimeEdit TValue="TimeSpan?" @bind-Value="@selectedTime" />
 
 @code{
     TimeSpan? selectedTime;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithEventExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithEventExample.razor
index b9b84640cf..06938a7ae6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithEventExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimeEditWithEventExample.razor
@@ -1,11 +1,11 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimeEdit TValue="TimeSpan?" Time="@selectedTime" TimeChanged="@OnTimeChanged" />
+<TimeEdit TValue="TimeSpan?" Value="@selectedTime" ValueChanged="@OnValueChanged" />
 
 @code{
     TimeSpan? selectedTime;
 
-    Task OnTimeChanged( TimeSpan? Time )
+    Task OnValueChanged(TimeSpan? Time)
     {
         selectedTime = Time;
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerNonStaticExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerNonStaticExample.razor
index 65baf78c02..c390d2300a 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerNonStaticExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerNonStaticExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimePicker TValue="TimeSpan?" @bind-Time="@value" StaticPicker="false" />
+<TimePicker TValue="TimeSpan?" @bind-Value="@value" StaticPicker="false" />
 
 @code {
     TimeSpan? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithDateTimeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithDateTimeExample.razor
index cb478129e0..a0b56363c0 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithDateTimeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithDateTimeExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
-<TimePicker TValue="DateTime?" @bind-Time="@value" />
+<TimePicker TValue="DateTime?" @bind-Value="@value" />
 
 @code {
     DateTime? value;
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithIconExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithIconExample.razor
index 80fea6f083..1f25d8ebc5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithIconExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/Examples/TimePickerWithIconExample.razor
@@ -2,7 +2,7 @@
 
 <Addons>
     <Addon AddonType="AddonType.Body">
-        <TimePicker @ref="@timePicker" TValue="TimeSpan?" @bind-Time="@value" />
+        <TimePicker @ref="@timePicker" TValue="TimeSpan?" @bind-Value="@value" />
     </Addon>
     <Addon AddonType="AddonType.End">
         <Button Color="Color.Light" Clicked="@(()=>timePicker.ToggleAsync())">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimeEditPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimeEditPage.razor
index 5a13342e0a..53d413c075 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimeEditPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimeEditPage.razor
@@ -40,7 +40,7 @@
 
 <DocsPageSection>
     <DocsPageSectionHeader Title="Manual event binding">
-        When using the event <Code>TimeChanged</Code>, you also must define the <Code>Time</Code> value attribute.
+        When using the event <Code>ValueChanged</Code>, you also must define the <Code>Value</Code> value attribute.
     </DocsPageSectionHeader>
     <DocsPageSectionContent Outlined FullWidth>
         <TimeEditWithEventExample />
@@ -91,10 +91,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Time" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the input time value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="TimeChanged" Type="@("EventCallback<TValue>")">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the time has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Pattern" Type="string" Default="null">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimePickerPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimePickerPage.razor
index 32c42ef5e4..5b5fef4e65 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimePickerPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Times/TimePickerPage.razor
@@ -88,10 +88,10 @@
 </Heading>
 
 <DocsAttributes>
-    <DocsAttributesItem Name="Time" Type="TValue" Default="default">
+    <DocsAttributesItem Name="Value" Type="TValue" Default="default">
         Gets or sets the input time value.
     </DocsAttributesItem>
-    <DocsAttributesItem Name="TimeChanged" Type="@("EventCallback<TValue>")">
+    <DocsAttributesItem Name="ValueChanged" Type="EventCallback<TValue>">
         Occurs when the time has changed.
     </DocsAttributesItem>
     <DocsAttributesItem Name="Min" Type="TimeSpan?" Default="null">
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/DataAnnotationValidationExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/DataAnnotationValidationExampleCode.html
index 1e1a980f1c..cdd9c321cb 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/DataAnnotationValidationExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/DataAnnotationValidationExampleCode.html
@@ -7,7 +7,7 @@
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Full Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is10</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">First and last name</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Name</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">First and last name</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Name</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -19,7 +19,7 @@
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is10</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter email</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -31,7 +31,7 @@
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is10</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Password</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.Password</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -43,7 +43,7 @@
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is2</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Re Password<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is10</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Retype password</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.ConfirmPassword</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Retype password</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>user.ConfirmPassword</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/ValidationIValidatableObjectExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/ValidationIValidatableObjectExampleCode.html
index b38681b981..76922a16f3 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/ValidationIValidatableObjectExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Code/ValidationIValidatableObjectExampleCode.html
@@ -28,7 +28,7 @@
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>Company.UseAlphaCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Use AlphaCode<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>Company.UseAlphaCode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Use AlphaCode<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/DataAnnotationValidationExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/DataAnnotationValidationExample.razor
index ff49f1ac96..e8b32b4f9e 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/DataAnnotationValidationExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/DataAnnotationValidationExample.razor
@@ -6,7 +6,7 @@
         <Field Horizontal>
             <FieldLabel ColumnSize="ColumnSize.Is2">Full Name</FieldLabel>
             <FieldBody ColumnSize="ColumnSize.Is10">
-                <TextEdit Placeholder="First and last name" @bind-Text="@user.Name">
+                <TextEdit Placeholder="First and last name" @bind-Value="@user.Name">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -18,7 +18,7 @@
         <Field Horizontal>
             <FieldLabel ColumnSize="ColumnSize.Is2">Email</FieldLabel>
             <FieldBody ColumnSize="ColumnSize.Is10">
-                <TextEdit Placeholder="Enter email" @bind-Text="@user.Email">
+                <TextEdit Placeholder="Enter email" @bind-Value="@user.Email">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -30,7 +30,7 @@
         <Field Horizontal>
             <FieldLabel ColumnSize="ColumnSize.Is2">Password</FieldLabel>
             <FieldBody ColumnSize="ColumnSize.Is10">
-                <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Text="@user.Password">
+                <TextEdit Role="TextRole.Password" Placeholder="Password" @bind-Value="@user.Password">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
@@ -42,7 +42,7 @@
         <Field Horizontal>
             <FieldLabel ColumnSize="ColumnSize.Is2">Re Password</FieldLabel>
             <FieldBody ColumnSize="ColumnSize.Is10">
-                <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Text="@user.ConfirmPassword">
+                <TextEdit Role="TextRole.Password" Placeholder="Retype password" @bind-Value="@user.ConfirmPassword">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/ValidationIValidatableObjectExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/ValidationIValidatableObjectExample.razor
index 496aa5e69d..d559b5e0e4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/ValidationIValidatableObjectExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/Examples/ValidationIValidatableObjectExample.razor
@@ -27,7 +27,7 @@
         </Field>
     </Validation>
     <Field>
-        <Switch @bind-Checked="@Company.UseAlphaCode">Use AlphaCode</Switch>
+        <Switch @bind-Value="@Company.UseAlphaCode">Use AlphaCode</Switch>
     </Field>
     <Fields>
         <Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/ValidationPage.razor b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/ValidationPage.razor
index ae25837c6f..31ef85f835 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/ValidationPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Components/Validations/ValidationPage.razor
@@ -108,7 +108,7 @@
                 <Code>Validations</Code> component must contain reference to the validated POCO through the <Code>Model</Code> parameter.
             </OrderedListItem>
             <OrderedListItem>
-                Input component must bind to the model field through the <Code>@@bind-{Value}</Code>(i.e. <Code>@@bind-Text</Code>)
+                Input component must bind to the model field through the <Code>@@bind-{Value}</Code>(i.e. <Code>@@bind-Value</Code>)
             </OrderedListItem>
         </OrderedList>
         After those two requirements are met the Blazorise will have enough information to know how to use data annotations.
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Code/AnimateExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Code/AnimateExampleCode.html
index ba1bf9b273..7ec3da5679 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Code/AnimateExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Code/AnimateExampleCode.html
@@ -1,7 +1,7 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnSelectedAnimationChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnSelectedAnimationChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="atSign">&#64;</span>foreach ( var availableAnimation in Animations.GetNames() )
         {
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>availableAnimation</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="atSign">&#64;</span>availableAnimation<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Examples/AnimateExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Examples/AnimateExample.razor
index 88aab6f0c8..9812633864 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Examples/AnimateExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/Animate/Examples/AnimateExample.razor
@@ -1,7 +1,7 @@
 @namespace Blazorise.Docs.Docs.Examples
 
 <Field>
-    <Select TValue="string" SelectedValueChanged="@OnSelectedAnimationChanged">
+    <Select TValue="string" ValueChanged="@OnSelectedAnimationChanged">
         @foreach ( var availableAnimation in Animations.GetNames() )
         {
             <SelectItem Value="@availableAnimation">@availableAnimation</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridBatchEditExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridBatchEditExampleCode.html
index cea55f8595..e083c4c898 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridBatchEditExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridBatchEditExampleCode.html
@@ -5,7 +5,7 @@
         Edit Mode
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>editMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>editMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Form</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Form<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Inline</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Inline<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Popup</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Popup<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCellSelectionExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCellSelectionExampleCode.html
index 06e20b84fe..2418adf689 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCellSelectionExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCellSelectionExampleCode.html
@@ -29,18 +29,18 @@
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Row Index<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.RowIndex.ToString()</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.RowIndex.ToString()</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Field<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.ColumnInfo?.Field</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+                            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.ColumnInfo?.Field</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Value<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">CardBody</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExample - CopyCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExample - CopyCode.html
deleted file mode 100644
index 1ed045c19a..0000000000
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExample - CopyCode.html	
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="blazorise-codeblock">
-<div class="html"><pre>
-Custom Filter: <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>customFilterValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnCustomFilterValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
-
-<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGrid</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dataGrid</span><span class="quot">&quot;</span>
-          <span class="htmlAttributeName">TItem</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Employee</span><span class="quot">&quot;</span>
-          <span class="htmlAttributeName">Data</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>employeeList</span><span class="quot">&quot;</span>
-          <span class="htmlAttributeName">CustomFilter</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnCustomFilter</span><span class="quot">&quot;</span>
-          <span class="htmlAttributeName">Responsive</span><span class="htmlTagDelimiter">&gt;</span>
-    <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGridColumn</span> <span class="htmlAttributeName">Field</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>nameof( Employee.FirstName )</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Caption</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Editable</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridColumn</span><span class="htmlTagDelimiter">&gt;</span>
-<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGrid</span><span class="htmlTagDelimiter">&gt;</span>
-</pre></div>
-<div class="csharp"><pre>
-<span class="atSign">&#64;</span>code{
-    <span class="keyword">private</span> DataGrid&lt;Employee&gt; dataGrid;
-    <span class="keyword">private</span> List&lt;Employee&gt; employeeList = <span class="keyword">new</span>() { <span class="keyword">new</span>() { FirstName = <span class="string">&quot;David&quot;</span> }, <span class="keyword">new</span>() { FirstName = <span class="string">&quot;MLaden&quot;</span> }, <span class="keyword">new</span>() { FirstName = <span class="string">&quot;John&quot;</span> }, <span class="keyword">new</span>() { FirstName = <span class="string">&quot;Ana&quot;</span> }, <span class="keyword">new</span>() { FirstName = <span class="string">&quot;Jessica&quot;</span> } };
-
-    <span class="keyword">private</span> <span class="keyword">string</span> customFilterValue;
-
-    <span class="keyword">private</span> Task OnCustomFilterValueChanged( <span class="keyword">string</span> e )
-    {
-        customFilterValue = e;
-        <span class="keyword">return</span> dataGrid.Reload();
-    }
-
-    <span class="keyword">private</span> <span class="keyword">bool</span> OnCustomFilter( Employee model )
-    {
-        <span class="comment">// We want to accept empty value as valid or otherwise</span>
-        <span class="comment">// datagrid will not show anything.</span>
-        <span class="keyword">if</span> ( <span class="keyword">string</span>.IsNullOrEmpty( customFilterValue ) )
-            <span class="keyword">return</span> <span class="keyword">true</span>;
-
-        <span class="keyword">return</span> model.FirstName?.Contains( customFilterValue, StringComparison.OrdinalIgnoreCase ) == <span class="keyword">true</span>;
-    }
-
-}
-</pre></div>
-</div>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExampleCode.html
index 1ed045c19a..95ce95d111 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridCustomFilteringExampleCode.html
@@ -1,6 +1,6 @@
 <div class="blazorise-codeblock">
 <div class="html"><pre>
-Custom Filter: <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>customFilterValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnCustomFilterValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+Custom Filter: <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>customFilterValue</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>OnCustomFilterValueChanged</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
 
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGrid</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>ref</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">dataGrid</span><span class="quot">&quot;</span>
           <span class="htmlAttributeName">TItem</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Employee</span><span class="quot">&quot;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridDynamicExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridDynamicExampleCode.html
index 2ba8e46cef..608ffe87a8 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridDynamicExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridDynamicExampleCode.html
@@ -42,7 +42,7 @@
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridColumn</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGridCheckColumn</span> <span class="htmlAttributeName">Field</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">IsActive</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Caption</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Active</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Editable</span> <span class="htmlAttributeName">Filterable</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DisplayTemplate</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Checked</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">&#39;(context as dynamic).IsActive&#39;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">&#39;(context as dynamic).IsActive&#39;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DisplayTemplate</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridCheckColumn</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridColumns</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridEditModeExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridEditModeExampleCode.html
index 8a2ed49ecd..47b3e9e037 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridEditModeExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridEditModeExampleCode.html
@@ -5,7 +5,7 @@
         Edit Mode
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>editMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>editMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Form</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Form<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Inline</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Inline<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">DataGridEditMode</span><span class="enumValue">.Popup</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Popup<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridFilterModeColumnTemplateFilteringExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridFilterModeColumnTemplateFilteringExampleCode.html
index 0cfc4a3071..e64aee01d5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridFilterModeColumnTemplateFilteringExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridFilterModeColumnTemplateFilteringExampleCode.html
@@ -15,7 +15,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FilterMenuTemplate</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Row</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Column</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">ColumnSize</span><span class="enumValue">.Is4</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DataGridColumnFilterMethod</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.GetFilterMethod()</span><span class="quot">&quot;</span> <span class="htmlAttributeName">SelectedValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">e =&gt; { context.FilterMethodChanged.InvokeAsync(e); }</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">DataGridColumnFilterMethod</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.GetFilterMethod()</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">e =&gt; { context.FilterMethodChanged.InvokeAsync(e); }</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="atSign">&#64;</span>{
                         var isNumericOrDate = context.Column.ColumnType == DataGridColumnType.Numeric || context.Column.ColumnType == DataGridColumnType.Date;
                     }
@@ -43,12 +43,12 @@
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>key</span><span class="htmlOperator">=</span><span class="htmlAttributeValue">context.GetFilterMethod()</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="atSign">&#64;</span>if ( context.GetFilterMethod() == DataGridColumnFilterMethod.Between )
                     {
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>GetFilterValue1(context)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; SetFilterValue1(context.Column.Filter, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>GetFilterValue2(context)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; SetFilterValue2(context.Column.Filter, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>GetFilterValue1(context)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; SetFilterValue1(context.Column.Filter, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>GetFilterValue2(context)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; SetFilterValue2(context.Column.Filter, newValue))</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
                     }
                     else
                     {
-                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.GetSearchValue()?.ToString()</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; context.Column.Filter.SearchValue = newValue)</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
+                        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.GetSearchValue()?.ToString()</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((newValue) =&gt; context.Column.Filter.SearchValue = newValue)</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
                     }
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Column</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridGroupingMethodsExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridGroupingMethodsExampleCode.html
index d8cad3d9d8..e21f23ead3 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridGroupingMethodsExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridGroupingMethodsExampleCode.html
@@ -11,7 +11,7 @@
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectList</span> <span class="htmlAttributeName">Data</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>dataGridRef?.DisplayGroupedData</span><span class="quot">&quot;</span>
                         <span class="htmlAttributeName">TItem</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">GroupContext&lt;Employee&gt;</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">string</span><span class="quot">&quot;</span>
                         <span class="htmlAttributeName">TextField</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">x=&gt; x.Key</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueField</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">x=&gt; x.Key</span><span class="quot">&quot;</span>
-            <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedGroupKey</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectList</span><span class="htmlTagDelimiter">&gt;</span>
+                        <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">selectedGroupKey</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectList</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Button</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Color</span><span class="enumValue">.Primary</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Clicked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>(() =&gt; dataGridRef.ExpandGroups(selectedGroupKey))</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Expand Selected Group<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Button</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridPagerExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridPagerExampleCode.html
index 08e2158a5c..836198244b 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridPagerExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridPagerExampleCode.html
@@ -33,7 +33,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TotalItemsShortTemplate</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Badge</span> <span class="htmlAttributeName">Color</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Color</span><span class="enumValue">.Success</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="atSign">&#64;</span>context.TotalItems<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Badge</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TotalItemsShortTemplate</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ItemsPerPageTemplate</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">ItemsPerPageTemplate</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">PageSelectorTemplate</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TextColor</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextColor</span><span class="enumValue">.Success</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.CurrentPage</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TextColor</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextColor</span><span class="enumValue">.Success</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.CurrentPage</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="atSign">&#64;</span>for ( int i = context.FirstVisiblePage; i &lt;= context.LastVisiblePage; ++i )
             {
                 var pageNumber = i;
@@ -42,7 +42,7 @@
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Select</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">PageSelectorTemplate</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">PageSizesTemplate</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TextColor</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextColor</span><span class="enumValue">.Success</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.CurrentPageSize</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName">TextColor</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextColor</span><span class="enumValue">.Success</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>context.CurrentPageSize</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="atSign">&#64;</span>foreach ( var curPageSize in context.PageSizes )
             {
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>curPageSize</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="atSign">&#64;</span>curPageSize<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridRapidEditExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridRapidEditExampleCode.html
index aba4fd2b71..b211bb6234 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridRapidEditExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridRapidEditExampleCode.html
@@ -2,7 +2,7 @@
 <div class="html"><pre>
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>showCommandColumn</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Medium</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Show Command Column<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Switch</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>showCommandColumn</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Medium</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Show Command Column<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Switch</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridResizableExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridResizableExampleCode.html
index 97386d3dc5..29f7616513 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridResizableExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridResizableExampleCode.html
@@ -5,7 +5,7 @@
         Resize Mode
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-SelectedValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>resizeMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Select</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>resizeMode</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TableResizeMode</span><span class="enumValue">.Header</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Header<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">SelectItem</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TableResizeMode</span><span class="enumValue">.Columns</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Columns<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">SelectItem</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Select</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridStateManagementExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridStateManagementExampleCode.html
index bba30fd5d5..b82af28889 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridStateManagementExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridStateManagementExampleCode.html
@@ -36,7 +36,7 @@
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridColumn</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGridCheckColumn</span> <span class="htmlAttributeName">TItem</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Employee</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Field</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>nameof(Employee.IsActive)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Caption</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Active</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Editable</span> <span class="htmlAttributeName">Filterable</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="keyword">false</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DisplayTemplate</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Checked</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">context.IsActive</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Check</span> <span class="htmlAttributeName">TValue</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">bool</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">context.IsActive</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Disabled</span> <span class="htmlAttributeName">ReadOnly</span> <span class="htmlTagDelimiter">/&gt;</span>
             <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DisplayTemplate</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridCheckColumn</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">DataGridColumns</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridValidatorEditTemplateExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridValidatorEditTemplateExampleCode.html
index 77045ed6f1..2aefa105d9 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridValidatorEditTemplateExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Code/DataGridValidatorEditTemplateExampleCode.html
@@ -9,7 +9,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">DataGridColumn</span> <span class="htmlAttributeName">Field</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>nameof( Employee.FirstName )</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Caption</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Name</span><span class="quot">&quot;</span> <span class="htmlAttributeName">Editable</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">EditTemplate</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span> <span class="htmlAttributeName">Validator</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="sharpVariable"><span class="atSign">&#64;</span>CheckName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((string)context.CellValue)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">TextChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">(value =&gt; context.CellValue = value)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+                <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>((string)context.CellValue)</span><span class="quot">&quot;</span> <span class="htmlAttributeName">ValueChanged</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">(value =&gt; context.CellValue = value)</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridBatchEditExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridBatchEditExample.razor
index 609a692d99..1010eadb70 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridBatchEditExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridBatchEditExample.razor
@@ -5,7 +5,7 @@
         Edit Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue="@editMode">
+        <Select @bind-Value="@editMode">
             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCellSelectionExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCellSelectionExample.razor
index 94234d5f82..c00eaaae0d 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCellSelectionExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCellSelectionExample.razor
@@ -29,18 +29,18 @@
                     <Field>
                         <FieldLabel>Row Index</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedCell?.RowIndex.ToString()"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedCell?.RowIndex.ToString()"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Field</FieldLabel>
                         <FieldBody>
-                            <TextEdit ReadOnly Text="@selectedCell?.ColumnInfo?.Field"></TextEdit>
+                            <TextEdit ReadOnly Value="@selectedCell?.ColumnInfo?.Field"></TextEdit>
                         </FieldBody>
                     </Field>
                     <Field>
                         <FieldLabel>Value</FieldLabel>
-                        <TextEdit ReadOnly Text="@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)"></TextEdit>
+                        <TextEdit ReadOnly Value="@selectedCell?.Column?.FormatDisplayValue(selectedCell?.Item)"></TextEdit>
                     </Field>
                 </Fields>
             </CardBody>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCustomFilteringExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCustomFilteringExample.razor
index 1b7f507ca4..f2df8180b7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCustomFilteringExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridCustomFilteringExample.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise.Docs.Docs.Examples
 
- Custom Filter: <TextEdit Text="@customFilterValue" TextChanged="@OnCustomFilterValueChanged"></TextEdit>
+ Custom Filter: <TextEdit Value="@customFilterValue" ValueChanged="@OnCustomFilterValueChanged"></TextEdit>
 
 <DataGrid @ref="dataGrid"
           TItem="Employee"
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridDynamicExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridDynamicExample.razor
index 2eafb29662..aea4546ee4 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridDynamicExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridDynamicExample.razor
@@ -41,7 +41,7 @@
         </DataGridColumn>
         <DataGridCheckColumn Field="IsActive" Caption="Active" Editable Filterable="false">
             <DisplayTemplate>
-                <Check TValue="bool" Checked='(context as dynamic).IsActive' Disabled ReadOnly />
+                <Check TValue="bool" Value='(context as dynamic).IsActive' Disabled ReadOnly />
             </DisplayTemplate>
         </DataGridCheckColumn>
     </DataGridColumns>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridEditModeExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridEditModeExample.razor
index 07daee56f6..c11cc08895 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridEditModeExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridEditModeExample.razor
@@ -5,7 +5,7 @@
         Edit Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue="@editMode">
+        <Select @bind-Value="@editMode">
             <SelectItem Value="DataGridEditMode.Form">Form</SelectItem>
             <SelectItem Value="DataGridEditMode.Inline">Inline</SelectItem>
             <SelectItem Value="DataGridEditMode.Popup">Popup</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridFilterModeColumnTemplateFilteringExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridFilterModeColumnTemplateFilteringExample.razor
index 96cc726e78..0c8e958eca 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridFilterModeColumnTemplateFilteringExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridFilterModeColumnTemplateFilteringExample.razor
@@ -15,7 +15,7 @@
     <FilterMenuTemplate>
         <Row>
             <Column ColumnSize="ColumnSize.Is4">
-                <Select TValue="DataGridColumnFilterMethod" SelectedValue="@context.GetFilterMethod()" SelectedValueChanged="e => { context.FilterMethodChanged.InvokeAsync(e); }">
+                <Select TValue="DataGridColumnFilterMethod" Value="@context.GetFilterMethod()" ValueChanged="e => { context.FilterMethodChanged.InvokeAsync(e); }">
                     @{
                         var isNumericOrDate = context.Column.ColumnType == DataGridColumnType.Numeric || context.Column.ColumnType == DataGridColumnType.Date;
                     }
@@ -43,12 +43,12 @@
                 <Field @key=context.GetFilterMethod()>
                     @if ( context.GetFilterMethod() == DataGridColumnFilterMethod.Between )
                     {
-                        <TextEdit Text="@GetFilterValue1(context)" TextChanged="@((newValue) => SetFilterValue1(context.Column.Filter, newValue))" />
-                        <TextEdit Text="@GetFilterValue2(context)" TextChanged="@((newValue) => SetFilterValue2(context.Column.Filter, newValue))" />
+                        <TextEdit Value="@GetFilterValue1(context)" ValueChanged="@((newValue) => SetFilterValue1(context.Column.Filter, newValue))" />
+                        <TextEdit Value="@GetFilterValue2(context)" ValueChanged="@((newValue) => SetFilterValue2(context.Column.Filter, newValue))" />
                     }
                     else
                     {
-                        <TextEdit Text="@context.GetSearchValue()?.ToString()" TextChanged="@((newValue) => context.Column.Filter.SearchValue = newValue)" />
+                        <TextEdit Value="@context.GetSearchValue()?.ToString()" ValueChanged="@((newValue) => context.Column.Filter.SearchValue = newValue)" />
                     }
                 </Field>
             </Column>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridGroupingMethodsExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridGroupingMethodsExample.razor
index 3e042b9059..daa1d6f291 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridGroupingMethodsExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridGroupingMethodsExample.razor
@@ -11,7 +11,7 @@
             <SelectList Data="@dataGridRef?.DisplayGroupedData"
                         TItem="GroupContext<Employee>" TValue="string"
                         TextField="x=> x.Key" ValueField="x=> x.Key"
-            @bind-SelectedValue="selectedGroupKey"></SelectList>
+                        @bind-SelectedValue="selectedGroupKey"></SelectList>
         </FieldLabel>
         <FieldBody>
             <Button Color="Color.Primary" Clicked="@(() => dataGridRef.ExpandGroups(selectedGroupKey))">Expand Selected Group</Button>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridPagerExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridPagerExample.razor
index 9aad7675d4..a3a707efa0 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridPagerExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridPagerExample.razor
@@ -33,7 +33,7 @@
     <TotalItemsShortTemplate><Badge Color="Color.Success">@context.TotalItems</Badge></TotalItemsShortTemplate>
     <ItemsPerPageTemplate></ItemsPerPageTemplate>
     <PageSelectorTemplate>
-        <Select TextColor="TextColor.Success" @bind-SelectedValue="@context.CurrentPage" Size="Size.Small">
+        <Select TextColor="TextColor.Success" @bind-Value="@context.CurrentPage" Size="Size.Small">
             @for ( int i = context.FirstVisiblePage; i <= context.LastVisiblePage; ++i )
             {
                 var pageNumber = i;
@@ -42,7 +42,7 @@
         </Select>
     </PageSelectorTemplate>
     <PageSizesTemplate>
-        <Select TextColor="TextColor.Success" @bind-SelectedValue="@context.CurrentPageSize" Size="Size.Small">
+        <Select TextColor="TextColor.Success" @bind-Value="@context.CurrentPageSize" Size="Size.Small">
             @foreach ( var curPageSize in context.PageSizes )
             {
                 <SelectItem Value="@curPageSize">@curPageSize</SelectItem>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridRapidEditExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridRapidEditExample.razor
index cdb88439b0..b0884300d5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridRapidEditExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridRapidEditExample.razor
@@ -2,7 +2,7 @@
 
 <Field>
     <FieldBody>
-        <Switch @bind-Checked="@showCommandColumn" Size="Size.Medium">Show Command Column</Switch>
+        <Switch @bind-Value="@showCommandColumn" Size="Size.Medium">Show Command Column</Switch>
     </FieldBody>
 </Field>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridResizableExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridResizableExample.razor
index e0b8c5e7fd..2c2a890886 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridResizableExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridResizableExample.razor
@@ -5,7 +5,7 @@
         Resize Mode
     </FieldLabel>
     <FieldBody>
-        <Select @bind-SelectedValue="@resizeMode">
+        <Select @bind-Value="@resizeMode">
             <SelectItem Value="TableResizeMode.Header">Header</SelectItem>
             <SelectItem Value="TableResizeMode.Columns">Columns</SelectItem>
         </Select>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridStateManagementExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridStateManagementExample.razor
index 3c13701c27..0ff0ad2433 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridStateManagementExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridStateManagementExample.razor
@@ -36,7 +36,7 @@
         </DataGridColumn>
         <DataGridCheckColumn TItem="Employee" Field="@nameof(Employee.IsActive)" Caption="Active" Editable Filterable="false">
             <DisplayTemplate>
-                <Check TValue="bool" Checked="context.IsActive" Disabled ReadOnly />
+                <Check TValue="bool" Value="context.IsActive" Disabled ReadOnly />
             </DisplayTemplate>
         </DataGridCheckColumn>
     </DataGridColumns>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridValidatorEditTemplateExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridValidatorEditTemplateExample.razor
index 4e79474524..aeafece433 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridValidatorEditTemplateExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/DataGrid/Examples/DataGridValidatorEditTemplateExample.razor
@@ -9,7 +9,7 @@
     <DataGridColumn Field="@nameof( Employee.FirstName )" Caption="Name" Editable>
         <EditTemplate>
             <Validation Validator="@CheckName">
-                <TextEdit Text="@((string)context.CellValue)" TextChanged="(value => context.CellValue = value)">
+                <TextEdit Value="@((string)context.CellValue)" ValueChanged="(value => context.CellValue = value)">
                     <Feedback>
                         <ValidationError />
                     </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Code/BasicFluentValidationExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Code/BasicFluentValidationExampleCode.html
index 9dc2d6c534..ba170db5e7 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Code/BasicFluentValidationExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Code/BasicFluentValidationExampleCode.html
@@ -6,7 +6,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>First name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter first name...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>person.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter first name...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>person.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
@@ -16,7 +16,7 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Validation</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
             <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>Last name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter last name...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>person.LastName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Placeholder</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">Enter last name...</span><span class="quot">&quot;</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue"><span class="atSign">&#64;</span>person.LastName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
                 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
                     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">ValidationError</span> <span class="htmlTagDelimiter">/&gt;</span>
                 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Feedback</span><span class="htmlTagDelimiter">&gt;</span>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Examples/BasicFluentValidationExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Examples/BasicFluentValidationExample.razor
index 448fd241d6..80dc82336e 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Examples/BasicFluentValidationExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Extensions/FluentValidation/Examples/BasicFluentValidationExample.razor
@@ -5,7 +5,7 @@
     <Validation>
         <Field>
             <FieldLabel>First name</FieldLabel>
-            <TextEdit Placeholder="Enter first name..." @bind-Text="@person.FirstName">
+            <TextEdit Placeholder="Enter first name..." @bind-Value="@person.FirstName">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
@@ -15,7 +15,7 @@
     <Validation>
         <Field>
             <FieldLabel>Last name</FieldLabel>
-            <TextEdit Placeholder="Enter last name..." @bind-Text="@person.LastName">
+            <TextEdit Placeholder="Enter last name..." @bind-Value="@person.LastName">
                 <Feedback>
                     <ValidationError />
                 </Feedback>
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/FormularyModalExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/FormularyModalExampleCode.html
index 1c2d2a7404..1485380c0c 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/FormularyModalExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/FormularyModalExampleCode.html
@@ -10,14 +10,14 @@
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is3.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>First Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is9.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">model.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">model.FirstName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is3.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>Email<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is9.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">model.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+            <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">model.Email</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
         <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/ModalProviderCustomStructureExampleCode.html b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/ModalProviderCustomStructureExampleCode.html
index e1dc612983..0dd5e557c6 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/ModalProviderCustomStructureExampleCode.html
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Code/ModalProviderCustomStructureExampleCode.html
@@ -3,7 +3,7 @@
 <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">Horizontal</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is2.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>User Name<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.IsFull.OnTablet.Is10.OnDesktop</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
-        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Text</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">userName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
+        <span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName"><span class="atSign">&#64;</span>bind-Value</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">userName</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span><span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">TextEdit</span><span class="htmlTagDelimiter">&gt;</span>
     <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
 <span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/FormularyModalExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/FormularyModalExample.razor
index 0dccc3dfd7..0e6b1e5ed5 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/FormularyModalExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/FormularyModalExample.razor
@@ -10,14 +10,14 @@
     <Field Horizontal>
         <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">First Name</FieldLabel>
         <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-            <TextEdit @bind-Text="model.FirstName"></TextEdit>
+            <TextEdit @bind-Value="model.FirstName"></TextEdit>
         </FieldBody>
     </Field>
 
     <Field Horizontal>
         <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Email</FieldLabel>
         <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
-            <TextEdit @bind-Text="model.Email"></TextEdit>
+            <TextEdit @bind-Value="model.Email"></TextEdit>
         </FieldBody>
     </Field>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/ModalProviderCustomStructureExample.razor b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/ModalProviderCustomStructureExample.razor
index c5c34803f5..4cee4ffc71 100644
--- a/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/ModalProviderCustomStructureExample.razor
+++ b/Documentation/Blazorise.Docs/Pages/Docs/Services/ModalProvider/Examples/ModalProviderCustomStructureExample.razor
@@ -3,7 +3,7 @@
 <Field Horizontal>
     <FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">User Name</FieldLabel>
     <FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
-        <TextEdit @bind-Text="userName"></TextEdit>
+        <TextEdit @bind-Value="userName"></TextEdit>
     </FieldBody>
 </Field>
 
diff --git a/Documentation/Blazorise.Docs/Pages/Home/BookDemoPage.razor b/Documentation/Blazorise.Docs/Pages/Home/BookDemoPage.razor
index 16ff058c89..51f8aae9f3 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/BookDemoPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Home/BookDemoPage.razor
@@ -35,7 +35,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <TextEdit @bind-Text="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
+                                                    <TextEdit @bind-Value="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
                                                 </Addon>
                                             </Addons>
                                         </FieldBody>
@@ -52,7 +52,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <TextEdit @bind-Text="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
+                                                    <TextEdit @bind-Value="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
                                                 </Addon>
                                             </Addons>
                                         </FieldBody>
@@ -71,7 +71,7 @@
                                                         <Icon Name="Blazorise.Icons.FontAwesome.FontAwesomeIcons.Envelope" />
                                                     </AddonLabel>
                                                 </Addon>
-                                                <TextEdit @bind-Text="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Last Name..." />
+                                                <TextEdit @bind-Value="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Last Name..." />
                                             </Addons>
                                         </FieldBody>
                                     </Field>
@@ -87,7 +87,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <TextEdit @bind-Text="@User.Company" name="companyName" Placeholder="Company name..." aria-label="Company Name..." />
+                                                    <TextEdit @bind-Value="@User.Company" name="companyName" Placeholder="Company name..." aria-label="Company Name..." />
                                                 </Addon>
                                             </Addons>
                                         </FieldBody>
@@ -107,7 +107,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <Select @bind-SelectedValue="@JobRole">
+                                                    <Select @bind-Value="@JobRole">
                                                         @foreach ( var jobRole in JobRoles )
                                                         {
                                                             <SelectItem TValue="string" Value="@jobRole">@jobRole</SelectItem>
@@ -129,7 +129,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <Select @bind-SelectedValue="@Product">
+                                                    <Select @bind-Value="@Product">
                                                         @foreach ( var product in Products )
                                                         {
                                                             <SelectItem TValue="string" Value="@product">@product</SelectItem>
@@ -147,7 +147,7 @@
                                     <Field>
                                         <FieldLabel RequiredIndicator>What would you like to see during the demo?</FieldLabel>
                                         <FieldBody>
-                                            <MemoEdit @bind-Text="@MessageBody" name="message" Rows="6" />
+                                            <MemoEdit @bind-Value="@MessageBody" name="message" Rows="6" />
                                         </FieldBody>
                                     </Field>
                                 </Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/Home/Components/CaptchaInput.razor.cs b/Documentation/Blazorise.Docs/Pages/Home/Components/CaptchaInput.razor.cs
index 5e07e0730c..17f9529b6a 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/Components/CaptchaInput.razor.cs
+++ b/Documentation/Blazorise.Docs/Pages/Home/Components/CaptchaInput.razor.cs
@@ -138,19 +138,9 @@ protected override string GetFormatedValueExpression()
 
     #region Properties
 
-    /// <inheritdoc/>
-    protected override bool InternalValue { get => Value; set => Value = value; }
-
     [Inject] IOptions<AppSettings> AppSettings { get; set; }
-    [Inject] IHttpClientFactory HttpClientFactory { get; set; }
 
-    [Parameter] public bool Value { get; set; }
-    [Parameter] public EventCallback<bool> ValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the captcha valid value.
-    /// </summary>
-    [Parameter] public Expression<Func<bool>> ValueExpression { get; set; }
+    [Inject] IHttpClientFactory HttpClientFactory { get; set; }
 
     #endregion
 }
diff --git a/Documentation/Blazorise.Docs/Pages/Home/ContactPage.razor b/Documentation/Blazorise.Docs/Pages/Home/ContactPage.razor
index ef5a61dc0d..2aebf3eca9 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/ContactPage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Home/ContactPage.razor
@@ -35,7 +35,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <TextEdit @bind-Text="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
+                                                    <TextEdit @bind-Value="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
                                                 </Addon>
                                             </Addons>
                                         </FieldBody>
@@ -52,7 +52,7 @@
                                                     </AddonLabel>
                                                 </Addon>
                                                 <Addon AddonType="AddonType.Body">
-                                                    <TextEdit @bind-Text="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
+                                                    <TextEdit @bind-Value="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
                                                 </Addon>
                                             </Addons>
                                         </FieldBody>
@@ -69,7 +69,7 @@
                                                     <Icon Name="Blazorise.Icons.FontAwesome.FontAwesomeIcons.Envelope" />
                                                 </AddonLabel>
                                             </Addon>
-                                            <TextEdit @bind-Text="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Last Name..." />
+                                            <TextEdit @bind-Value="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Last Name..." />
                                         </Addons>
                                     </FieldBody>
                                 </Field>
@@ -85,7 +85,7 @@
                                                 </AddonLabel>
                                             </Addon>
                                             <Addon AddonType="AddonType.Body">
-                                                <Select @bind-SelectedValue="@MessageSubject">
+                                                <Select @bind-Value="@MessageSubject">
                                                     @foreach ( var subject in Subjects )
                                                     {
                                                         <SelectItem TValue="string" Value="@subject">@subject</SelectItem>
@@ -100,7 +100,7 @@
                                 <Field>
                                     <FieldLabel RequiredIndicator>What would you like to discuss?</FieldLabel>
                                     <FieldBody>
-                                        <MemoEdit @bind-Text="@MessageBody" name="message" Rows="6" />
+                                        <MemoEdit @bind-Value="@MessageBody" name="message" Rows="6" />
                                     </FieldBody>
                                 </Field>
                             </Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/Home/HelpUsImprovePage.razor b/Documentation/Blazorise.Docs/Pages/Home/HelpUsImprovePage.razor
index 09db31b188..72f46ceb2c 100644
--- a/Documentation/Blazorise.Docs/Pages/Home/HelpUsImprovePage.razor
+++ b/Documentation/Blazorise.Docs/Pages/Home/HelpUsImprovePage.razor
@@ -34,7 +34,7 @@
                                                 </AddonLabel>
                                             </Addon>
                                             <Addon AddonType="AddonType.Body">
-                                                <TextEdit @bind-Text="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
+                                                <TextEdit @bind-Value="@User.FirstName" name="firstName" Placeholder="First Name..." aria-label="First Name..." />
                                             </Addon>
                                         </Addons>
                                     </FieldBody>
@@ -49,7 +49,7 @@
                                                 </AddonLabel>
                                             </Addon>
                                             <Addon AddonType="AddonType.Body">
-                                                <TextEdit @bind-Text="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
+                                                <TextEdit @bind-Value="@User.LastName" name="lastName" Placeholder="Last Name..." aria-label="Last Name..." />
                                             </Addon>
                                         </Addons>
                                     </FieldBody>
@@ -64,7 +64,7 @@
                                                 <Icon Name="Blazorise.Icons.FontAwesome.FontAwesomeIcons.Envelope" />
                                             </AddonLabel>
                                         </Addon>
-                                        <TextEdit @bind-Text="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Email Here..." />
+                                        <TextEdit @bind-Value="@User.Email" name="email" Role="TextRole.Email" Placeholder="Email Here..." aria-label="Email Here..." />
                                     </Addons>
                                 </FieldBody>
                             </Field>
@@ -72,7 +72,7 @@
                                 <Field>
                                     <FieldLabel RequiredIndicator>What would you like to let us know?</FieldLabel>
                                     <FieldBody>
-                                        <MemoEdit @bind-Text="@MessageBody" name="message" Rows="6" />
+                                        <MemoEdit @bind-Value="@MessageBody" name="message" Rows="6" />
                                     </FieldBody>
                                 </Field>
                             </Validation>
diff --git a/Documentation/Blazorise.Docs/Pages/News/Index.razor b/Documentation/Blazorise.Docs/Pages/News/Index.razor
index 8f3b35ecce..7253c833ff 100644
--- a/Documentation/Blazorise.Docs/Pages/News/Index.razor
+++ b/Documentation/Blazorise.Docs/Pages/News/Index.razor
@@ -11,7 +11,7 @@
         <BlogCategorySelect Categories="@NewsEntries.Select( x => x.Category ).Distinct()" @bind-SelectedCategory="@selectedCategory" />
     </Column>
     <Column ColumnSize="ColumnSize.Is4.OnDesktop" Margin="Margin.Is3.FromBottom">
-        <TextEdit Placeholder="Search..." @bind-Text="@search" />
+        <TextEdit Placeholder="Search..." @bind-Value="@search" />
     </Column>
 </Row>
 
diff --git a/Source/Blazorise.AntDesign/Components/Check.razor b/Source/Blazorise.AntDesign/Components/Check.razor
index 277986a1ea..350417e12a 100644
--- a/Source/Blazorise.AntDesign/Components/Check.razor
+++ b/Source/Blazorise.AntDesign/Components/Check.razor
@@ -17,7 +17,7 @@
         {
             var sb = new System.Text.StringBuilder( "ant-checkbox-wrapper" );
 
-            if ( Checked?.ToString() == bool.TrueString )
+            if ( Value?.ToString() == bool.TrueString )
             {
                 sb.Append( " ant-checkbox-wrapper-pointer" );
             }
@@ -32,7 +32,7 @@
         {
             var sb = new System.Text.StringBuilder( "ant-checkbox" );
 
-            if ( Checked?.ToString() == bool.TrueString )
+            if ( Value?.ToString() == bool.TrueString )
             {
                 sb.Append( " ant-checkbox-checked" );
             }
diff --git a/Source/Blazorise.AntDesign/Components/DropdownItem.razor b/Source/Blazorise.AntDesign/Components/DropdownItem.razor
index 8141331c15..ceeb0dd013 100644
--- a/Source/Blazorise.AntDesign/Components/DropdownItem.razor
+++ b/Source/Blazorise.AntDesign/Components/DropdownItem.razor
@@ -3,7 +3,7 @@
     @if ( ShowCheckbox )
     {
         <Div Display="Blazorise.Display.InlineBlock" @onclick:stopPropagation @onmouseup:stopPropagation>
-            <Blazorise.Check TValue="bool" Checked="@(@checked)" CheckedExpression="@checkedExpression" CheckedChanged="CheckedChangedHandler" Disabled="@Disabled" @onclick:stopPropagation>
+            <Blazorise.Check TValue="bool" Value="@(@checked)" ValueChanged="CheckedChangedHandler" ValueExpression="@checkedExpression" Disabled="@Disabled" @onclick:stopPropagation>
                 @ChildContent
             </Blazorise.Check>
         </Div>
diff --git a/Source/Blazorise.AntDesign/Components/Select.razor b/Source/Blazorise.AntDesign/Components/Select.razor
index c2d9f02112..c68c5cc99b 100644
--- a/Source/Blazorise.AntDesign/Components/Select.razor
+++ b/Source/Blazorise.AntDesign/Components/Select.razor
@@ -4,14 +4,14 @@
 <CascadingValue Value="@this" IsFixed>
     <div @ref="@ElementRef" id="@ElementId" class="@ContainerClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" @attributes="@Attributes">
         <div @ref="@ElementRef" id="@SelectorElementId" class="ant-select-selector" @onclick="@OnSelectorClickHandler">
-            @if ( Multiple )
+            @if ( Multiple && Value is IEnumerable<TValue> values )
             {
-                @foreach ( var selectedValue in SelectedValues ?? Enumerable.Empty<TValue>() )
+                @foreach ( var selectedValue in values )
                 {
                     <span class="ant-select-selection-item">
                         <span class="ant-select-selection-item-content">
                             @{
-                                var selectItem = SelectItems.FirstOrDefault( i => i.Value.IsEqual( selectedValue ) );
+                                var selectItem = SelectItems.FirstOrDefault( i => i.CompareTo( selectedValue ) );
 
                                 @selectItem?.ChildContent;
                             }
diff --git a/Source/Blazorise.AntDesign/Components/Select.razor.cs b/Source/Blazorise.AntDesign/Components/Select.razor.cs
index 98340c74f6..f9da2f6ea4 100644
--- a/Source/Blazorise.AntDesign/Components/Select.razor.cs
+++ b/Source/Blazorise.AntDesign/Components/Select.razor.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Blazorise.Extensions;
 using Blazorise.Modules;
 using Blazorise.Utilities;
 using Microsoft.AspNetCore.Components;
@@ -13,12 +14,17 @@
 
 namespace Blazorise.AntDesign.Components;
 
-public partial class Select<TValue> : Blazorise.Select<TValue>, ICloseActivator, IAsyncDisposable
+public interface IAntSelect
+{
+    Task NotifySelectValueChanged( object selectValue );
+}
+
+public partial class Select<TValue> : Blazorise.Select<TValue>, ICloseActivator, IAsyncDisposable, IAntSelect
 {
     #region Members
 
     private string selectorElementId;
-    
+
     private string inputElementId;
 
     /// <summary>
@@ -32,12 +38,6 @@ public partial class Select<TValue> : Blazorise.Select<TValue>, ICloseActivator,
     /// </summary>
     private DotNetObjectReference<CloseActivatorAdapter> dotNetObjectRef;
 
-
-    /// <summary>
-    /// Internal string separator for selected values when Multiple mode is used.
-    /// </summary>
-    private const string MultipleValuesSeparator = ";"; // Let's hope ";" will be enough to distinguish the values!
-
     #endregion
 
     #region Methods
@@ -112,35 +112,24 @@ private async Task Collapse()
 
     private void ClearSelectedItems()
     {
-        SelectedValue = default;
-        SelectedValues = default;
+        Value = default;
     }
 
-    protected Task OnMultipleValueClickHandler( TValue selectValue )
+    public async Task NotifySelectValueChanged( object selectValue )
     {
-        var list = new List<TValue>( SelectedValues ?? Enumerable.Empty<TValue>() );
-
-        if ( list.Contains( selectValue ) )
-            list.Remove( selectValue );
-
-        return CurrentValueHandler( string.Join( MultipleValuesSeparator, list ) );
-    }
-
-    internal async Task NotifySelectValueChanged( TValue selectValue )
-    {
-        // We cuold just set SelectedValue(s) directly but that would skip validation process
+        // We could just set SelectedValue(s) directly but that would skip validation process
         // and we would also need to handle event handlers.
         // Thats why we need to call CurrentValueHandler that will trigger all that is required.
-        if ( Multiple )
+        if ( Multiple && Value is IEnumerable<TValue> values )
         {
-            var list = new List<TValue>( SelectedValues ?? Enumerable.Empty<TValue>() );
+            var list = new List<object>( values?.Select( x => (object)x ) ?? Enumerable.Empty<object>() );
 
-            if ( list.Contains( selectValue ) )
+            if ( list.Any( x => x.IsEqual( selectValue ) ) )
                 list.Remove( selectValue );
             else
                 list.Add( selectValue );
 
-            await CurrentValueHandler( string.Join( MultipleValuesSeparator, list ) );
+            await CurrentValueHandler( string.Join( MULTIPLE_DELIMITER, list ) );
         }
         else
         {
@@ -152,36 +141,36 @@ internal async Task NotifySelectValueChanged( TValue selectValue )
         await InvokeAsync( StateHasChanged );
     }
 
-    protected override Task<ParseValue<IReadOnlyList<TValue>>> ParseValueFromStringAsync( string value )
-    {
-        if ( string.IsNullOrEmpty( value ) )
-            return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
-
-        if ( Multiple )
-        {
-            // AntDesign does not use regular select element so there is no reason to call javascript like for
-            // other css frameworks. That's why we only need to parse the string that we have used previously.
-            return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, ParseMultipleValues( value ).ToList(), null ) );
-        }
-        else
-        {
-            if ( Converters.TryChangeType<TValue>( value, out var result ) )
-            {
-                return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, new TValue[] { result }, null ) );
-            }
-            else
-            {
-                return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
-            }
-        }
-    }
+    //protected override Task<ParseValue<IReadOnlyList<TValue>>> ParseValueFromStringAsync( string value )
+    //{
+    //    if ( string.IsNullOrEmpty( value ) )
+    //        return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
+
+    //    if ( Multiple )
+    //    {
+    //        // AntDesign does not use regular select element so there is no reason to call javascript like for
+    //        // other css frameworks. That's why we only need to parse the string that we have used previously.
+    //        return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, ParseMultipleValues( value ).ToList(), null ) );
+    //    }
+    //    else
+    //    {
+    //        if ( Converters.TryChangeType<TValue>( value, out var result ) )
+    //        {
+    //            return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, new TValue[] { result }, null ) );
+    //        }
+    //        else
+    //        {
+    //            return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
+    //        }
+    //    }
+    //}
 
     static IEnumerable<TValue> ParseMultipleValues( string csv )
     {
         if ( string.IsNullOrEmpty( csv ) )
             yield break;
 
-        foreach ( var value in csv.Split( MultipleValuesSeparator ) )
+        foreach ( var value in csv.Split( MULTIPLE_DELIMITER ) )
         {
             if ( Converters.TryChangeType<TValue>( value, out var result ) )
             {
@@ -242,13 +231,16 @@ protected IEnumerable<RenderFragment> SelectedItems
     {
         get
         {
-            foreach ( var selectedValue in SelectedValues )
+            if ( Value is IEnumerable<TValue> values )
             {
-                var item = SelectItems.FirstOrDefault( i => Convert.ToString( i.Value ) == Convert.ToString( selectedValue ) );
-
-                if ( item != null )
+                foreach ( var selectedValue in values )
                 {
-                    yield return item.ChildContent;
+                    var item = SelectItems.FirstOrDefault( i => i.CompareTo( selectedValue ) );
+
+                    if ( item != null )
+                    {
+                        yield return item.ChildContent;
+                    }
                 }
             }
         }
@@ -261,9 +253,9 @@ protected RenderFragment SelectedItem
     {
         get
         {
-            if ( SelectedValue != null )
+            if ( Value is not null )
             {
-                var item = SelectItems.FirstOrDefault( i => Convert.ToString( i.Value ) == Convert.ToString( SelectedValue ) );
+                var item = SelectItems.FirstOrDefault( i => i.CompareTo( Value ) );
 
                 return item?.ChildContent;
             }
diff --git a/Source/Blazorise.AntDesign/Components/SelectItem.razor.cs b/Source/Blazorise.AntDesign/Components/SelectItem.razor.cs
index bbf8677c5a..870721b8d9 100644
--- a/Source/Blazorise.AntDesign/Components/SelectItem.razor.cs
+++ b/Source/Blazorise.AntDesign/Components/SelectItem.razor.cs
@@ -12,7 +12,7 @@ public partial class SelectItem<TValue> : Blazorise.SelectItem<TValue>
 
     protected Task OnClickHandler()
     {
-        if ( ParentSelect != null && ParentSelect is AntDesign.Components.Select<TValue> select )
+        if ( ParentSelect != null && ParentSelect is IAntSelect select )
         {
             return select.NotifySelectValueChanged( Value );
         }
diff --git a/Source/Blazorise.AntDesign/Components/TextEdit.razor b/Source/Blazorise.AntDesign/Components/TextEdit.razor
index aeceba777b..26f3542519 100644
--- a/Source/Blazorise.AntDesign/Components/TextEdit.razor
+++ b/Source/Blazorise.AntDesign/Components/TextEdit.razor
@@ -2,7 +2,7 @@
 @if ( Plaintext )
 {
     <span @ref="@ElementRef" id="@ElementId" class="@ClassNames" style="@StyleNames" @attributes="@Attributes">
-        @Text
+        @Value
     </span>
     @ChildContent
     @Feedback
diff --git a/Source/Blazorise.Bootstrap/Components/Check.razor b/Source/Blazorise.Bootstrap/Components/Check.razor
index 342b97173c..f3359b84ce 100644
--- a/Source/Blazorise.Bootstrap/Components/Check.razor
+++ b/Source/Blazorise.Bootstrap/Components/Check.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Check<TValue>
 <Control Role="ControlRole.Check" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <Label Type="LabelType.Check" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
 </Control>
diff --git a/Source/Blazorise.Bootstrap/Components/Switch.razor b/Source/Blazorise.Bootstrap/Components/Switch.razor
index e6506836e4..ac75a97572 100644
--- a/Source/Blazorise.Bootstrap/Components/Switch.razor
+++ b/Source/Blazorise.Bootstrap/Components/Switch.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Switch<TValue>
 <Control Role="@ControlRole.Switch" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <Label Type="LabelType.Switch" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
 </Control>
diff --git a/Source/Blazorise.Bootstrap5/Components/Check.razor b/Source/Blazorise.Bootstrap5/Components/Check.razor
index 342b97173c..f3359b84ce 100644
--- a/Source/Blazorise.Bootstrap5/Components/Check.razor
+++ b/Source/Blazorise.Bootstrap5/Components/Check.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Check<TValue>
 <Control Role="ControlRole.Check" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <Label Type="LabelType.Check" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
 </Control>
diff --git a/Source/Blazorise.Bootstrap5/Components/Switch.razor b/Source/Blazorise.Bootstrap5/Components/Switch.razor
index e6506836e4..ac75a97572 100644
--- a/Source/Blazorise.Bootstrap5/Components/Switch.razor
+++ b/Source/Blazorise.Bootstrap5/Components/Switch.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Switch<TValue>
 <Control Role="@ControlRole.Switch" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <Label Type="LabelType.Switch" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
 </Control>
diff --git a/Source/Blazorise.Bulma/Components/Check.razor b/Source/Blazorise.Bulma/Components/Check.razor
index dc48c467f5..7f4caf58e7 100644
--- a/Source/Blazorise.Bulma/Components/Check.razor
+++ b/Source/Blazorise.Bulma/Components/Check.razor
@@ -3,14 +3,14 @@
 @if ( ParentIsFieldBody )
 {
     <div class="field">
-        <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+        <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
         <Label Type="LabelType.Check" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
         @Feedback
     </div>
 }
 else
 {
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <Label Type="LabelType.Check" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
 }
\ No newline at end of file
diff --git a/Source/Blazorise.Bulma/Components/TextEdit.razor b/Source/Blazorise.Bulma/Components/TextEdit.razor
index 5d194f07eb..8f69b524e7 100644
--- a/Source/Blazorise.Bulma/Components/TextEdit.razor
+++ b/Source/Blazorise.Bulma/Components/TextEdit.razor
@@ -5,7 +5,7 @@
         <div class="control">
             @if ( IsImmediate && IsDebounce )
             {
-                <input @ref="@ElementRef" id="@ElementId" type="@Type" name="@NameAttributeValue" inputmode="@Mode" class="@ClassNames" style="@StyleNames" placeholder="@Placeholder" disabled="@IsDisabled" readonly="@ReadOnly" maxlength="@MaxLength" size="@VisibleCharacters" pattern="@Pattern" tabindex="@TabIndex" value="@Text" @onchange="@OnChangeHandler" @oninput="@OnInputHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+                <input @ref="@ElementRef" id="@ElementId" type="@Type" name="@NameAttributeValue" inputmode="@Mode" class="@ClassNames" style="@StyleNames" placeholder="@Placeholder" disabled="@IsDisabled" readonly="@ReadOnly" maxlength="@MaxLength" size="@VisibleCharacters" pattern="@Pattern" tabindex="@TabIndex" value="@CurrentValue" @onchange="@OnChangeHandler" @oninput="@OnInputHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
             }
             else
             {
@@ -21,7 +21,7 @@ else
     <div class="control">
         @if ( IsImmediate && IsDebounce )
         {
-            <input @ref="@ElementRef" id="@ElementId" type="@Type" name="@NameAttributeValue" inputmode="@Mode" class="@ClassNames" style="@StyleNames" placeholder="@Placeholder" disabled="@IsDisabled" readonly="@ReadOnly" maxlength="@MaxLength" size="@VisibleCharacters" pattern="@Pattern" tabindex="@TabIndex" value="@Text" @onchange="@OnChangeHandler" @oninput="@OnInputHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+            <input @ref="@ElementRef" id="@ElementId" type="@Type" name="@NameAttributeValue" inputmode="@Mode" class="@ClassNames" style="@StyleNames" placeholder="@Placeholder" disabled="@IsDisabled" readonly="@ReadOnly" maxlength="@MaxLength" size="@VisibleCharacters" pattern="@Pattern" tabindex="@TabIndex" value="@CurrentValue" @onchange="@OnChangeHandler" @oninput="@OnInputHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
         }
         else
         {
diff --git a/Source/Blazorise.Material/Components/Switch.razor b/Source/Blazorise.Material/Components/Switch.razor
index d0c9af0504..68ee55cf64 100644
--- a/Source/Blazorise.Material/Components/Switch.razor
+++ b/Source/Blazorise.Material/Components/Switch.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Switch<TValue>
 <Control Role="@ControlRole.Switch" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     <span class="custom-control-track"></span>
     <Label Type="LabelType.Switch" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
     @Feedback
diff --git a/Source/Blazorise.Tailwind/Components/Check.razor b/Source/Blazorise.Tailwind/Components/Check.razor
index 6dac827fc0..c19275aae3 100644
--- a/Source/Blazorise.Tailwind/Components/Check.razor
+++ b/Source/Blazorise.Tailwind/Components/Check.razor
@@ -1,7 +1,7 @@
 @typeparam TValue
 @inherits Blazorise.Check<TValue>
 <Control Role="ControlRole.Check" Inline="@Inline">
-    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+    <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@Name" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
     @if ( ChildContent is not null )
     {
         <Label Type="LabelType.Check" For="@ElementId" Style="@Style" Cursor="@Cursor">@ChildContent</Label>
diff --git a/Source/Blazorise.Tailwind/Components/DropdownItem.razor b/Source/Blazorise.Tailwind/Components/DropdownItem.razor
index a354f14cf1..1aeb876dd2 100644
--- a/Source/Blazorise.Tailwind/Components/DropdownItem.razor
+++ b/Source/Blazorise.Tailwind/Components/DropdownItem.razor
@@ -4,7 +4,7 @@
         @if ( ShowCheckbox )
         {
             <Div Display="Blazorise.Display.InlineBlock" @onclick:stopPropagation @onmouseup:stopPropagation>
-                <Blazorise.Check TValue="bool" Checked="@(@checked)" CheckedExpression="@checkedExpression" CheckedChanged="CheckedChangedHandler" Disabled="@Disabled" @onclick:stopPropagation>
+                <Blazorise.Check TValue="bool" Value="@(@checked)" ValueChanged="CheckedChangedHandler" ValueExpression="@checkedExpression" Disabled="@Disabled" @onclick:stopPropagation>
                     @ChildContent
                 </Blazorise.Check>
             </Div>
diff --git a/Source/Blazorise.Tailwind/Components/Switch.razor b/Source/Blazorise.Tailwind/Components/Switch.razor
index e24f754d10..0a8c9a4929 100644
--- a/Source/Blazorise.Tailwind/Components/Switch.razor
+++ b/Source/Blazorise.Tailwind/Components/Switch.razor
@@ -2,7 +2,7 @@
 @inherits Blazorise.Switch<TValue>
 <Control Role="@ControlRole.Switch" Inline="@Inline">
     <Label Type="LabelType.Switch" For="@ElementId" Style="@Style" Cursor="@Cursor">
-        <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
+        <input @ref="@ElementRef" id="@ElementId" type="checkbox" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Value" tabindex="@TabIndex" @onclick:preventDefault="@ReadOnly" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes" />
         <div class="@BackgroundClassNames"></div>
         <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">@ChildContent</span>
     </Label>
diff --git a/Source/Blazorise/Base/BaseCheckComponent.cs b/Source/Blazorise/Base/BaseCheckComponent.cs
index 078b310f4c..54440e37ee 100644
--- a/Source/Blazorise/Base/BaseCheckComponent.cs
+++ b/Source/Blazorise/Base/BaseCheckComponent.cs
@@ -50,50 +50,15 @@ protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string va
         }
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return CheckedChanged.InvokeAsync( Checked );
-    }
-
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( CheckedExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( CheckedExpression )
-            : ExpressionFormatter.FormatLambda( CheckedExpression );
-    }
-
     #endregion
 
     #region Properties
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Checked; set => Checked = value; }
-
     /// <summary>
     /// Gets the string value that represents the checked state.
     /// </summary>
     protected abstract string TrueValueName { get; }
 
-    /// <summary>
-    /// Gets or sets the checked flag.
-    /// </summary>
-    [Parameter] public TValue Checked { get; set; }
-
-    /// <summary>
-    /// Occurs when the check state is changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> CheckedChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the checked value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> CheckedExpression { get; set; }
-
     /// <summary>
     /// Group checkboxes or radios on the same horizontal row.
     /// </summary>
diff --git a/Source/Blazorise/Base/BaseInputComponent.razor.cs b/Source/Blazorise/Base/BaseInputComponent.razor.cs
index 6ebc1c20ee..bd90fbb481 100644
--- a/Source/Blazorise/Base/BaseInputComponent.razor.cs
+++ b/Source/Blazorise/Base/BaseInputComponent.razor.cs
@@ -1,5 +1,6 @@
 #region Using directives
 using System;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Blazorise.Extensions;
 using Blazorise.Modules;
@@ -57,16 +58,49 @@ public abstract class BaseInputComponent<TValue> : BaseComponent, IValidationInp
     /// </summary>
     protected string formattedValueExpression;
 
+    /// <summary>
+    /// Holds the value of the input field.
+    /// </summary>
+    protected ComponentParameterInfo<TValue> paramValue;
+
     #endregion
 
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    /// <summary>
+    /// Method called before setting the parameters.
+    /// </summary>
+    /// <param name="parameters">The parameters that will be passed to the component.</param>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    protected virtual Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
         InitializeParameters();
 
-        await base.SetParametersAsync( parameters );
+        if ( Rendered )
+        {
+            if ( parameters.TryGetParameter( nameof( Value ), Value, IsSameAsInternalValue, out paramValue ) && paramValue.Changed )
+            {
+                ExecuteAfterRender( Revalidate );
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Method called after the parameters are set.
+    /// </summary>
+    /// <param name="parameters">The parameters that have been set on the component.</param>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    protected virtual async Task OnAfterSetParametersAsync( ParameterView parameters )
+    {
+        if ( ParentValidation is not null )
+        {
+            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( ValueExpression ), out var expression ) )
+                await ParentValidation.InitializeInputExpression( expression );
+
+            await InitializeValidation();
+        }
 
         // For modals we need to make sure that autofocus is applied every time the modal is opened.
         if ( parameters.TryGetValue<bool>( nameof( Autofocus ), out var paramAutofocus ) && autofocus != paramAutofocus )
@@ -91,6 +125,16 @@ public override async Task SetParametersAsync( ParameterView parameters )
         }
     }
 
+    /// <inheritdoc/>
+    public override async Task SetParametersAsync( ParameterView parameters )
+    {
+        await OnBeforeSetParametersAsync( parameters );
+
+        await base.SetParametersAsync( parameters );
+
+        await OnAfterSetParametersAsync( parameters );
+    }
+
     /// <inheritdoc/>
     protected override void OnInitialized()
     {
@@ -237,13 +281,16 @@ protected virtual object PrepareValueForValidation( TValue value )
     /// </summary>
     /// <param name="value">Value to check against the internal value.</param>
     /// <returns>True if the internal value matched the supplied value.</returns>
-    protected virtual bool IsSameAsInternalValue( TValue value ) => value.IsEqual( InternalValue );
+    protected virtual bool IsSameAsInternalValue( TValue value ) => value.IsEqual( Value );
 
     /// <summary>
     /// Raises and event that handles the edit value of Text, Date, Numeric etc.
     /// </summary>
     /// <param name="value">New edit value.</param>
-    protected abstract Task OnInternalValueChanged( TValue value );
+    protected virtual Task OnInternalValueChanged( TValue value )
+    {
+        return ValueChanged.InvokeAsync( value );
+    }
 
     /// <inheritdoc/>
     public virtual Task Focus( bool scrollToElement = true )
@@ -362,7 +409,15 @@ private void OnThemeChanged( object sender, EventArgs eventArgs )
     /// Gets the formatted value expression for the input component.
     /// </summary>
     /// <returns>Returns the formatted value expression for the input component</returns>
-    protected abstract string GetFormatedValueExpression();
+    protected virtual string GetFormatedValueExpression()
+    {
+        if ( ValueExpression is null )
+            return null;
+
+        return HtmlFieldPrefix is not null
+            ? HtmlFieldPrefix.GetFieldName( ValueExpression )
+            : ExpressionFormatter.FormatLambda( ValueExpression );
+    }
 
     #endregion
 
@@ -374,7 +429,7 @@ private void OnThemeChanged( object sender, EventArgs eventArgs )
     /// <inheritdoc/>
     public virtual object ValidationValue => CustomValidationValue is not null
         ? CustomValidationValue.Invoke()
-        : InternalValue;
+        : Value;
 
     /// <summary>
     /// Returns true if input belong to a <see cref="FieldBody"/>.
@@ -391,15 +446,6 @@ private void OnThemeChanged( object sender, EventArgs eventArgs )
     /// </summary>
     protected virtual TValue DefaultValue => default;
 
-    /// <summary>
-    /// Gets or sets the internal edit value.
-    /// </summary>
-    /// <remarks>
-    /// The reason for this to be abstract is so that input components can have
-    /// their own specialized parameters that can be binded(Text, Date, Value etc.)
-    /// </remarks>
-    protected abstract TValue InternalValue { get; set; }
-
     /// <summary>
     /// Gets the value to be used for the input's "name" attribute.
     /// </summary>
@@ -421,12 +467,12 @@ protected string NameAttributeValue
     /// </summary>
     protected TValue CurrentValue
     {
-        get => InternalValue;
+        get => Value;
         set
         {
             if ( !IsSameAsInternalValue( value ) )
             {
-                InternalValue = value;
+                Value = value;
                 InvokeAsync( () => OnInternalValueChanged( value ) );
             }
         }
@@ -474,6 +520,21 @@ protected string CurrentValueAsString
     /// </summary>
     [Inject] protected BlazoriseOptions Options { get; set; }
 
+    /// <summary>
+    /// Gets or sets the value inside the input field.
+    /// </summary>
+    [Parameter] public virtual TValue Value { get; set; }
+
+    /// <summary>
+    /// Occurs after value has changed.
+    /// </summary>
+    [Parameter] public virtual EventCallback<TValue> ValueChanged { get; set; }
+
+    /// <summary>
+    /// Gets or sets an expression that identifies the input value.
+    /// </summary>
+    [Parameter] public virtual Expression<Func<TValue>> ValueExpression { get; set; }
+
     /// <summary>
     /// Sets the size of the input control.
     /// </summary>
diff --git a/Source/Blazorise/Base/BaseRadioComponent.cs b/Source/Blazorise/Base/BaseRadioComponent.cs
new file mode 100644
index 0000000000..4f5f2ddc81
--- /dev/null
+++ b/Source/Blazorise/Base/BaseRadioComponent.cs
@@ -0,0 +1,137 @@
+#region Using directives
+using System;
+using System.Globalization;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Blazorise.Utilities;
+using Microsoft.AspNetCore.Components;
+#endregion
+
+namespace Blazorise;
+
+/// <summary>
+/// Base class for all radio based components.
+/// </summary>
+/// <typeparam name="TValue">Radio value type.</typeparam>
+public abstract class BaseRadioComponent<TValue> : BaseInputComponent<TValue>
+{
+    #region Members
+
+    private bool inline;
+
+    private Cursor cursor;
+
+    #endregion
+
+    #region Methods
+
+    /// <summary>
+    /// Handles the check input onchange event.
+    /// </summary>
+    /// <param name="eventArgs">Supplies information about an change event that is being raised.</param>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    protected virtual Task OnChangeHandler( ChangeEventArgs eventArgs )
+    {
+        return CurrentValueHandler( eventArgs?.Value?.ToString() );
+    }
+
+    /// <inheritdoc/>
+    protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
+    {
+        var parsedValue = ( value?.ToLowerInvariant() == TrueValueName?.ToLowerInvariant() ).ToString();
+
+        if ( Converters.TryChangeType<TValue>( parsedValue, out var result, CultureInfo.InvariantCulture ) )
+        {
+            return Task.FromResult( new ParseValue<TValue>( true, result, null ) );
+        }
+        else
+        {
+            return Task.FromResult( ParseValue<TValue>.Empty );
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override async Task OnInternalValueChanged( TValue value )
+    {
+        Checked = value?.ToString() == bool.TrueString;
+        await CheckedChanged.InvokeAsync( Checked );
+
+        await ValueChanged.InvokeAsync( value );
+    }
+
+    /// <inheritdoc/>
+    protected override string GetFormatedValueExpression()
+    {
+        if ( CheckedExpression is null )
+            return null;
+
+        return HtmlFieldPrefix is not null
+            ? HtmlFieldPrefix.GetFieldName( CheckedExpression )
+            : ExpressionFormatter.FormatLambda( CheckedExpression );
+    }
+
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// Gets the string value that represents the checked state.
+    /// </summary>
+    protected virtual string TrueValueName => Value.ToString();
+
+    /// <summary>
+    /// Gets or sets the checked flag.
+    /// </summary>
+    [Obsolete( "The 'Checked' property is obsolete and will be removed in future versions. Use 'Value' instead." )]
+    [Parameter] public bool Checked { get; set; }
+
+    /// <summary>
+    /// Occurs when the check state is changed.
+    /// </summary>
+    [Obsolete( "The 'CheckedChanged' property is obsolete and will be removed in future versions. Use 'ValueChanged' instead." )]
+    [Parameter] public EventCallback<bool> CheckedChanged { get; set; }
+
+    /// <summary>
+    /// Gets or sets an expression that identifies the checked value.
+    /// </summary>
+    [Obsolete( "The 'CheckedExpression' property is obsolete and will be removed in future versions. Use 'ValueExpression' instead." )]
+    [Parameter] public Expression<Func<bool>> CheckedExpression { get; set; }
+
+    /// <summary>
+    /// Group checkboxes or radios on the same horizontal row.
+    /// </summary>
+    [Parameter]
+    public bool Inline
+    {
+        get => inline;
+        set
+        {
+            if ( inline == value )
+                return;
+
+            inline = value;
+
+            DirtyClasses();
+        }
+    }
+
+    /// <summary>
+    /// Defines the mouse cursor based on the behaviour by the current css framework.
+    /// </summary>
+    [Parameter]
+    public Cursor Cursor
+    {
+        get => cursor;
+        set
+        {
+            if ( cursor == value )
+                return;
+
+            cursor = value;
+
+            DirtyClasses();
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/Source/Blazorise/Base/BaseTextInput.razor.cs b/Source/Blazorise/Base/BaseTextInput.razor.cs
index 36f2296b81..b239d006e8 100644
--- a/Source/Blazorise/Base/BaseTextInput.razor.cs
+++ b/Source/Blazorise/Base/BaseTextInput.razor.cs
@@ -1,5 +1,6 @@
 #region Using directives
 using System;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Blazorise.Utilities;
 using Microsoft.AspNetCore.Components;
@@ -24,6 +25,25 @@ public abstract class BaseTextInput<TValue> : BaseInputComponent<TValue>, ISelec
 
     #region Methods
 
+    /// <inheritdoc/>
+    protected override async Task OnAfterSetParametersAsync( ParameterView parameters )
+    {
+        if ( ParentValidation is not null )
+        {
+            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var paramPattern ) )
+            {
+                // make sure we get the newest value
+                var newValue = paramValue.Defined
+                    ? paramValue.Value
+                    : Value;
+
+                await ParentValidation.InitializeInputPattern( paramPattern, newValue );
+            }
+        }
+
+        await base.OnAfterSetParametersAsync( parameters );
+    }
+
     /// <inheritdoc/>
     protected override void OnInitialized()
     {
diff --git a/Source/Blazorise/Components/Check/Check.razor.cs b/Source/Blazorise/Components/Check/Check.razor.cs
index f777d0ddb0..185f19366c 100644
--- a/Source/Blazorise/Components/Check/Check.razor.cs
+++ b/Source/Blazorise/Components/Check/Check.razor.cs
@@ -26,24 +26,8 @@ public partial class Check<TValue> : BaseCheckComponent<TValue>
     /// <inheritdoc/>
     public override async Task SetParametersAsync( ParameterView parameters )
     {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<TValue>( nameof( Checked ), out var paramChecked ) && !paramChecked.IsEqual( Checked ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
         await base.SetParametersAsync( parameters );
 
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( CheckedExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
-
         if ( parameters.TryGetValue<bool?>( nameof( Indeterminate ), out var indeterminate ) && this.indeterminate != indeterminate )
         {
             this.indeterminate = indeterminate;
diff --git a/Source/Blazorise/Components/ColorEdit/ColorEdit.razor.cs b/Source/Blazorise/Components/ColorEdit/ColorEdit.razor.cs
index e689923e5b..a6d613dc34 100644
--- a/Source/Blazorise/Components/ColorEdit/ColorEdit.razor.cs
+++ b/Source/Blazorise/Components/ColorEdit/ColorEdit.razor.cs
@@ -14,34 +14,8 @@ namespace Blazorise;
 /// </summary>
 public partial class ColorEdit : BaseInputComponent<string>, ISelectableComponent
 {
-    #region Members
-
-    #endregion
-
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<string>( nameof( Color ), out var paramColor ) && !paramColor.IsEqual( Color ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<string>>>( nameof( ColorExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override void BuildClasses( ClassBuilder builder )
     {
@@ -60,12 +34,6 @@ protected Task OnChangeHandler( ChangeEventArgs eventArgs )
         return CurrentValueHandler( eventArgs?.Value?.ToString() );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( string value )
-    {
-        return ColorChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override string FormatValueAsString( string value )
     {
@@ -84,38 +52,5 @@ public virtual Task Select( bool focus = true )
         return JSUtilitiesModule.Select( ElementRef, ElementId, focus ).AsTask();
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ColorExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ColorExpression )
-            : ExpressionFormatter.FormatLambda( ColorExpression );
-    }
-
-    #endregion
-
-    #region Properties
-
-    /// <inheritdoc/>
-    protected override string InternalValue { get => Color; set => Color = value; }
-
-    /// <summary>
-    /// Gets or sets the input color value.
-    /// </summary>
-    [Parameter] public string Color { get; set; }
-
-    /// <summary>
-    /// Occurs when the color has changed.
-    /// </summary>
-    [Parameter] public EventCallback<string> ColorChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the color value.
-    /// </summary>
-    [Parameter] public Expression<Func<string>> ColorExpression { get; set; }
-
     #endregion
 }
\ No newline at end of file
diff --git a/Source/Blazorise/Components/ColorPicker/ColorPicker.razor.cs b/Source/Blazorise/Components/ColorPicker/ColorPicker.razor.cs
index b037a6c7ed..f28903a4fe 100644
--- a/Source/Blazorise/Components/ColorPicker/ColorPicker.razor.cs
+++ b/Source/Blazorise/Components/ColorPicker/ColorPicker.razor.cs
@@ -29,22 +29,23 @@ public partial class ColorPicker : BaseInputComponent<string>, ISelectableCompon
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
-        var colorChanged = parameters.TryGetValue<string>( nameof( Color ), out var color ) && !Color.IsEqual( color );
-        var paletteChanged = parameters.TryGetValue( nameof( Palette ), out string[] palette ) && !Palette.AreEqual( palette );
-        var showPaletteChanged = parameters.TryGetValue( nameof( ShowPalette ), out bool showPalette ) && ShowPalette != showPalette;
-        var hideAfterPaletteSelectChanged = parameters.TryGetValue( nameof( HideAfterPaletteSelect ), out bool hideAfterPaletteSelect ) && HideAfterPaletteSelect != hideAfterPaletteSelect;
-        var disabledChanged = parameters.TryGetValue( nameof( Disabled ), out bool disabled ) && Disabled != disabled;
-        var readOnlyChanged = parameters.TryGetValue( nameof( ReadOnly ), out bool readOnly ) && ReadOnly != readOnly;
-
-        if ( colorChanged )
+        await base.OnBeforeSetParametersAsync( parameters );
+
+        var paletteChanged = parameters.TryGetValue( nameof( Palette ), out string[] paramPalette ) && !Palette.AreEqual( paramPalette );
+        var showPaletteChanged = parameters.TryGetValue( nameof( ShowPalette ), out bool paramShowPalette ) && ShowPalette != paramShowPalette;
+        var hideAfterPaletteSelectChanged = parameters.TryGetValue( nameof( HideAfterPaletteSelect ), out bool paramHideAfterPaletteSelect ) && HideAfterPaletteSelect != paramHideAfterPaletteSelect;
+        var disabledChanged = parameters.TryGetValue( nameof( Disabled ), out bool paramDisabled ) && Disabled != paramDisabled;
+        var readOnlyChanged = parameters.TryGetValue( nameof( ReadOnly ), out bool paramReadOnly ) && ReadOnly != paramReadOnly;
+
+        if ( paramValue.Changed )
         {
-            await CurrentValueHandler( color );
+            await CurrentValueHandler( paramValue.Value );
 
             if ( Rendered )
             {
-                ExecuteAfterRender( async () => await JSModule.UpdateValue( ElementRef, ElementId, color ) );
+                ExecuteAfterRender( async () => await JSModule.UpdateValue( ElementRef, ElementId, paramValue ) );
             }
         }
 
@@ -57,25 +58,15 @@ public override async Task SetParametersAsync( ParameterView parameters )
             ExecuteAfterRender( async () => await JSModule.UpdateOptions( ElementRef, ElementId,
             new ColorPickerUpdateJsOptions
             {
-                Palette = new JSOptionChange<string[]>( paletteChanged, palette ),
-                ShowPalette = new JSOptionChange<bool>( showPaletteChanged, showPalette ),
-                HideAfterPaletteSelect = new JSOptionChange<bool>( hideAfterPaletteSelectChanged, hideAfterPaletteSelect ),
-                Disabled = new JSOptionChange<bool>( disabledChanged, disabled ),
-                ReadOnly = new JSOptionChange<bool>( readOnlyChanged, readOnly )
+                Palette = new JSOptionChange<string[]>( paletteChanged, paramPalette ),
+                ShowPalette = new JSOptionChange<bool>( showPaletteChanged, paramShowPalette ),
+                HideAfterPaletteSelect = new JSOptionChange<bool>( hideAfterPaletteSelectChanged, paramHideAfterPaletteSelect ),
+                Disabled = new JSOptionChange<bool>( disabledChanged, paramDisabled ),
+                ReadOnly = new JSOptionChange<bool>( readOnlyChanged, paramReadOnly )
             } ) );
 
 
         }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<string>>>( nameof( ColorExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -110,7 +101,7 @@ protected override async Task OnFirstAfterRenderAsync()
         await JSModule.Initialize( dotNetObjectRef: dotNetObjectRef, elementRef: ElementRef, elementId: ElementId,
         options: new()
         {
-            Default = Color,
+            Default = Value,
             Palette = Palette,
             ShowPalette = ShowPalette,
             HideAfterPaletteSelect = HideAfterPaletteSelect,
@@ -164,12 +155,6 @@ protected Task OnChangeHandler( ChangeEventArgs eventArgs )
         return CurrentValueHandler( eventArgs?.Value?.ToString() );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( string value )
-    {
-        return ColorChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override string FormatValueAsString( string value )
     {
@@ -196,23 +181,12 @@ public virtual Task Select( bool focus = true )
     [JSInvokable]
     public Task SetValue( string value )
     {
-        if ( Color.IsEqual( value ) )
+        if ( Value.IsEqual( value ) )
             return Task.CompletedTask;
 
         return CurrentValueHandler( value );
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ColorExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ColorExpression )
-            : ExpressionFormatter.FormatLambda( ColorExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -227,9 +201,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     protected virtual string ColorValueElementSelector => ":scope > .b-input-color-picker-preview > .b-input-color-picker-curent-value";
 
-    /// <inheritdoc/>
-    protected override string InternalValue { get => Color; set => Color = value; }
-
     /// <summary>
     /// Gets or sets the <see cref="IJSColorPickerModule"/> instance.
     /// </summary>
@@ -245,21 +216,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     [Inject] protected ITextLocalizer<ColorPicker> Localizer { get; set; }
 
-    /// <summary>
-    /// Gets or sets the input color value.
-    /// </summary>
-    [Parameter] public string Color { get; set; } = "#000000";
-
-    /// <summary>
-    /// Occurs when the color has changed.
-    /// </summary>
-    [Parameter] public EventCallback<string> ColorChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the color value.
-    /// </summary>
-    [Parameter] public Expression<Func<string>> ColorExpression { get; set; }
-
     /// <summary>
     /// List a colors below the colorpicker to make it convenient for users to choose from
     /// frequently or recently used colors.
diff --git a/Source/Blazorise/Components/DateEdit/DateEdit.razor.cs b/Source/Blazorise/Components/DateEdit/DateEdit.razor.cs
index 299e6ac9d7..923f698aa1 100644
--- a/Source/Blazorise/Components/DateEdit/DateEdit.razor.cs
+++ b/Source/Blazorise/Components/DateEdit/DateEdit.razor.cs
@@ -18,38 +18,6 @@ public partial class DateEdit<TValue> : BaseTextInput<TValue>
 {
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<TValue>( nameof( Date ), out var paramDate ) && !paramDate.IsEqual( Date ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( DateExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<TValue>( nameof( Date ), out var inDate )
-                    ? inDate
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override void BuildClasses( ClassBuilder builder )
     {
@@ -67,12 +35,6 @@ protected override Task OnChangeHandler( ChangeEventArgs e )
         return CurrentValueHandler( e?.Value?.ToString() );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return DateChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override string FormatValueAsString( TValue value )
         => Formaters.FormatDateValueAsString( value, DateFormat );
@@ -113,17 +75,6 @@ public Task ShowPicker()
         return JSUtilitiesModule.ShowPicker( ElementRef, ElementId ).AsTask();
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( DateExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( DateExpression )
-            : ExpressionFormatter.FormatLambda( DateExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -131,9 +82,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Date; set => Date = value; }
-
     /// <summary>
     /// Gets the string representation of the input mode.
     /// </summary>
@@ -149,21 +97,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     [Parameter] public DateInputMode InputMode { get; set; } = DateInputMode.Date;
 
-    /// <summary>
-    /// Gets or sets the input date value.
-    /// </summary>
-    [Parameter] public TValue Date { get; set; }
-
-    /// <summary>
-    /// Occurs when the date has changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> DateChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the date value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> DateExpression { get; set; }
-
     /// <summary>
     /// The earliest date to accept.
     /// </summary>
diff --git a/Source/Blazorise/Components/DatePicker/DatePicker.razor b/Source/Blazorise/Components/DatePicker/DatePicker.razor
index 8429158277..796524205c 100644
--- a/Source/Blazorise/Components/DatePicker/DatePicker.razor
+++ b/Source/Blazorise/Components/DatePicker/DatePicker.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise
 @typeparam TValue
-@inherits BaseTextInput<IReadOnlyList<TValue>>
+@inherits BaseTextInput<TValue>
 <input @ref="@ElementRef" id="@ElementId" type="text" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" pattern="@Pattern" value="@CurrentValueAsString" @onchange="@OnChangeHandler" @onclick="@OnClickHandler" placeholder="@Placeholder" min="@Min?.ToString(Utilities.Parsers.InternalDateFormat)" max="@Max?.ToString(Utilities.Parsers.InternalDateFormat)" tabindex="@TabIndex" @attributes="@Attributes" />
 @ChildContent
 @Feedback
\ No newline at end of file
diff --git a/Source/Blazorise/Components/DatePicker/DatePicker.razor.cs b/Source/Blazorise/Components/DatePicker/DatePicker.razor.cs
index 3186986d92..4c0cd81191 100644
--- a/Source/Blazorise/Components/DatePicker/DatePicker.razor.cs
+++ b/Source/Blazorise/Components/DatePicker/DatePicker.razor.cs
@@ -1,5 +1,6 @@
 #region Using directives
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -20,27 +21,28 @@ namespace Blazorise;
 /// An editor that displays a date value and allows a user to edit the value.
 /// </summary>
 /// <typeparam name="TValue">Data-type to be binded by the <see cref="DatePicker{TValue}"/> property.</typeparam>
-public partial class DatePicker<TValue> : BaseTextInput<IReadOnlyList<TValue>>, IAsyncDisposable, IDatePicker
+public partial class DatePicker<TValue> : BaseTextInput<TValue>, IAsyncDisposable, IDatePicker
 {
     #region Members
 
     private DotNetObjectReference<DatePickerAdapter> dotNetObjectRef;
 
+    /// <summary>
+    /// The internal value used to separate dates.
+    /// </summary>
+    protected const string MULTIPLE_DELIMITER = ", ";
+
     #endregion
 
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
-        var datesUsed = parameters.TryGetValue( nameof( Dates ), out IReadOnlyList<TValue> paramDates );
+        await base.OnBeforeSetParametersAsync( parameters );
 
         if ( Rendered )
         {
-            var dateUsed = parameters.TryGetValue<TValue>( nameof( Date ), out var paramDate );
-
-            var dateChanged = dateUsed && !Date.Equals( paramDate );
-            var datesChanged = datesUsed && !Dates.AreEqual( paramDates );
             var minChanged = parameters.TryGetValue( nameof( Min ), out DateTimeOffset? paramMin ) && !Min.IsEqual( paramMin );
             var maxChanged = parameters.TryGetValue( nameof( Max ), out DateTimeOffset? paramMax ) && !Max.IsEqual( paramMax );
             var firstDayOfWeekChanged = parameters.TryGetValue( nameof( FirstDayOfWeek ), out DayOfWeek paramFirstDayOfWeek ) && !FirstDayOfWeek.IsEqual( paramFirstDayOfWeek );
@@ -58,11 +60,9 @@ public override async Task SetParametersAsync( ParameterView parameters )
             var placeholderChanged = parameters.TryGetValue( nameof( Placeholder ), out string paramPlaceholder ) && Placeholder != paramPlaceholder;
             var staticPickerChanged = parameters.TryGetValue( nameof( StaticPicker ), out bool paramSaticPicker ) && StaticPicker != paramSaticPicker;
 
-            if ( dateChanged || datesChanged )
+            if ( paramValue.Changed )
             {
-                var formatedDateString = SelectionMode != DateInputSelectionMode.Single
-                    ? FormatValueAsString( paramDates?.ToArray() )
-                    : FormatValueAsString( new TValue[] { paramDate } );
+                var formatedDateString = FormatValueAsString( paramValue.Value );
 
                 await CurrentValueHandler( formatedDateString );
 
@@ -89,7 +89,7 @@ public override async Task SetParametersAsync( ParameterView parameters )
                  || placeholderChanged
                  || staticPickerChanged )
             {
-                ExecuteAfterRender( async () => await JSModule.UpdateOptions( ElementRef, ElementId, new DatePickerUpdateJSOptions()
+                ExecuteAfterRender( async () => await JSModule.UpdateOptions( ElementRef, ElementId, new()
                 {
                     FirstDayOfWeek = new JSOptionChange<int>( firstDayOfWeekChanged, (int)paramFirstDayOfWeek ),
                     DisplayFormat = new JSOptionChange<string>( displayFormatChanged, DisplayFormatConverter.Convert( paramDisplayFormat ) ),
@@ -99,8 +99,8 @@ public override async Task SetParametersAsync( ParameterView parameters )
                     Max = new JSOptionChange<string>( maxChanged, paramMax?.ToString( DateFormat ) ),
                     Disabled = new JSOptionChange<bool>( disabledChanged, paramDisabled ),
                     ReadOnly = new JSOptionChange<bool>( readOnlyChanged, paramReadOnly ),
-                    DisabledDates = new JSOptionChange<IEnumerable<string>>( disabledDatesChanged, paramDisabledDates?.Select( x => FormatValueAsString( new TValue[] { x } ) ) ),
-                    EnabledDates = new JSOptionChange<IEnumerable<string>>( enabledDatesChanged, paramEnabledDates?.Select( x => FormatValueAsString( new TValue[] { x } ) ) ),
+                    DisabledDates = new JSOptionChange<IEnumerable<string>>( disabledDatesChanged, paramDisabledDates?.Select( x => FormatValueAsString( x ) ) ),
+                    EnabledDates = new JSOptionChange<IEnumerable<string>>( enabledDatesChanged, paramEnabledDates?.Select( x => FormatValueAsString( x ) ) ),
                     DisabledDays = new JSOptionChange<IEnumerable<int>>( disabledDaysChanged, paramDisabledDays?.Select( x => (int)x ) ),
                     SelectionMode = new JSOptionChange<DateInputSelectionMode>( selectionModeChanged, paramSelectionMode ),
                     Inline = new JSOptionChange<bool>( inlineChanged, paramInline ),
@@ -110,39 +110,6 @@ public override async Task SetParametersAsync( ParameterView parameters )
                 } ) );
             }
         }
-
-        // Let blazor do its thing!
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( datesUsed )
-            {
-                if ( parameters.TryGetValue<Expression<Func<IReadOnlyList<TValue>>>>( nameof( DatesExpression ), out var datesExpression ) )
-                    await ParentValidation.InitializeInputExpression( datesExpression );
-
-                if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-                {
-                    await ParentValidation.InitializeInputPattern( pattern, paramDates );
-                }
-            }
-            else // fallback to default behavior
-            {
-                if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( DateExpression ), out var dateExpression ) )
-                    await ParentValidation.InitializeInputExpression( dateExpression );
-
-                if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-                {
-                    var value = parameters.TryGetValue<TValue>( nameof( Date ), out var inDate )
-                        ? new TValue[] { inDate }
-                        : InternalValue;
-
-                    await ParentValidation.InitializeInputPattern( pattern, value );
-                }
-            }
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -157,13 +124,7 @@ protected override void OnInitialized()
     protected override async Task OnFirstAfterRenderAsync()
     {
         dotNetObjectRef ??= CreateDotNetObjectRef( new DatePickerAdapter( this ) );
-        object defaultDate = null;
-
-        // for multiple mode default dates must be set as array
-        if ( SelectionMode != DateInputSelectionMode.Single )
-            defaultDate = Dates?.Select( x => FormatValueAsString( new TValue[] { x } ) )?.ToArray();
-        else
-            defaultDate = FormatValueAsString( new TValue[] { Date } );
+        object defaultDate = FormatValueAsString( Value );
 
         await JSModule.Initialize( dotNetObjectRef, ElementRef, ElementId, new()
         {
@@ -178,8 +139,8 @@ protected override async Task OnFirstAfterRenderAsync()
             Max = Max?.ToString( DateFormat ),
             Disabled = Disabled,
             ReadOnly = ReadOnly,
-            DisabledDates = DisabledDates?.Select( x => FormatValueAsString( new TValue[] { x } ) ),
-            EnabledDates = EnabledDates?.Select( x => FormatValueAsString( new TValue[] { x } ) ),
+            DisabledDates = DisabledDates?.Select( x => FormatValueAsString( x ) ),
+            EnabledDates = EnabledDates?.Select( x => FormatValueAsString( x ) ),
             DisabledDays = DisabledDays?.Select( x => (int)x ),
             Localization = GetLocalizationObject(),
             Inline = Inline,
@@ -241,73 +202,58 @@ protected async Task OnClickHandler( MouseEventArgs e )
     }
 
     /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( IReadOnlyList<TValue> value )
-    {
-        if ( SelectionMode != DateInputSelectionMode.Single )
-            return DatesChanged.InvokeAsync( value );
-        else
-            return DateChanged.InvokeAsync( value is null ? default : value.FirstOrDefault() );
-    }
-
-    /// <inheritdoc/>
-    protected override string FormatValueAsString( IReadOnlyList<TValue> values )
+    protected override string FormatValueAsString( TValue value )
     {
-        if ( values is null || values.Count == 0 )
+        if ( value is null )
             return null;
 
         if ( SelectionMode != DateInputSelectionMode.Single )
         {
             var results = new List<string>();
 
-            foreach ( var value in values )
+            if ( value is IEnumerable<TValue> values )
+            {
+                foreach ( var val in values )
+                {
+                    results.Add( Formaters.FormatDateValueAsString( val, DateFormat ) );
+                }
+            }
+            else if ( value is IEnumerable objects )
             {
-                results.Add( Formaters.FormatDateValueAsString( value, DateFormat ) );
+                foreach ( var val in objects )
+                {
+                    results.Add( Formaters.FormatDateValueAsString( val, DateFormat ) );
+                }
             }
 
-            return string.Join( SelectionMode == DateInputSelectionMode.Multiple ? ", " : CurrentRangeSeparator, results );
-        }
-        else
-        {
-            if ( values[0] is null )
-                return null;
+            var delimiter = SelectionMode == DateInputSelectionMode.Multiple ? MULTIPLE_DELIMITER : CurrentRangeSeparator;
 
-            return Formaters.FormatDateValueAsString( values[0], DateFormat );
+            return string.Join( delimiter, results );
         }
+
+        return Formaters.FormatDateValueAsString( value, DateFormat );
     }
 
     /// <inheritdoc/>
-    protected override Task<ParseValue<IReadOnlyList<TValue>>> ParseValueFromStringAsync( string value )
+    protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
     {
         if ( SelectionMode != DateInputSelectionMode.Single )
         {
-            var values = value?.Split( SelectionMode == DateInputSelectionMode.Multiple ? ", " : CurrentRangeSeparator );
+            var delimiter = SelectionMode == DateInputSelectionMode.Multiple ? MULTIPLE_DELIMITER : CurrentRangeSeparator;
 
-            if ( values?.Length > 0 )
-            {
-                var result = new List<TValue>();
+            var readOnlyList = Parsers.ParseCsvDatesToReadOnlyList<TValue>( value, delimiter, InputMode );
 
-                foreach ( var part in values )
-                {
-                    if ( Parsers.TryParseDate<TValue>( part, InputMode, out var resultValue ) )
-                    {
-                        result.Add( resultValue );
-                    }
-                }
-
-                return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, result.ToArray(), null ) );
-            }
-
-            return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( false, new TValue[] { default, default }, null ) );
+            return Task.FromResult( new ParseValue<TValue>( true, readOnlyList, null ) );
         }
         else
         {
             if ( Parsers.TryParseDate<TValue>( value, InputMode, out var result ) )
             {
-                return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, new TValue[] { result }, null ) );
+                return Task.FromResult( new ParseValue<TValue>( true, result, null ) );
             }
             else
             {
-                return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( false, new TValue[] { default }, null ) );
+                return Task.FromResult( new ParseValue<TValue>( false, default, null ) );
             }
         }
     }
@@ -480,17 +426,18 @@ private object GetLocalizationObject()
     }
 
     /// <inheritdoc/>
-    protected override bool IsSameAsInternalValue( IReadOnlyList<TValue> value ) => value.AreEqual( InternalValue );
-
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
+    protected override bool IsSameAsInternalValue( TValue value )
     {
-        if ( DateExpression is null )
-            return null;
+        if ( value is IEnumerable<TValue> values1 && Value is IEnumerable<TValue> values2 )
+        {
+            return values1.AreEqual( values2 );
+        }
+        else if ( value is IEnumerable objects1 && Value is IEnumerable objects2 )
+        {
+            return objects1.AreEqual( objects2 );
+        }
 
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( DateExpression )
-            : ExpressionFormatter.FormatLambda( DateExpression );
+        return value.IsEqual( Value );
     }
 
     #endregion
@@ -500,23 +447,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override IReadOnlyList<TValue> InternalValue
-    {
-        get => SelectionMode != DateInputSelectionMode.Single ? Dates : new TValue[] { Date };
-        set
-        {
-            if ( SelectionMode != DateInputSelectionMode.Single )
-            {
-                Dates = value;
-            }
-            else
-            {
-                Date = value is null ? default : value.FirstOrDefault();
-            }
-        }
-    }
-
     /// <summary>
     /// Gets the range separator based on the current locale settings.
     /// </summary>
@@ -572,36 +502,6 @@ protected override IReadOnlyList<TValue> InternalValue
     /// </summary>
     [Parameter] public string RangeSeparator { get; set; }
 
-    /// <summary>
-    /// Gets or sets the input date value.
-    /// </summary>
-    [Parameter] public TValue Date { get; set; }
-
-    /// <summary>
-    /// Occurs when the date has changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> DateChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the date value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> DateExpression { get; set; }
-
-    /// <summary>
-    /// Gets or sets the input date value.
-    /// </summary>
-    [Parameter] public IReadOnlyList<TValue> Dates { get; set; }
-
-    /// <summary>
-    /// Occurs when the date has changed.
-    /// </summary>
-    [Parameter] public EventCallback<IReadOnlyList<TValue>> DatesChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the date value.
-    /// </summary>
-    [Parameter] public Expression<Func<IReadOnlyList<TValue>>> DatesExpression { get; set; }
-
     /// <summary>
     /// The earliest date to accept.
     /// </summary>
diff --git a/Source/Blazorise/Components/Dropdown/DropdownItem.razor b/Source/Blazorise/Components/Dropdown/DropdownItem.razor
index d2a8c09c93..4b45bcf036 100644
--- a/Source/Blazorise/Components/Dropdown/DropdownItem.razor
+++ b/Source/Blazorise/Components/Dropdown/DropdownItem.razor
@@ -4,7 +4,7 @@
     @if ( ShowCheckbox )
     {
         <Div Display="Blazorise.Display.InlineBlock" @onclick:stopPropagation @onmouseup:stopPropagation>
-            <Check TValue="bool" Checked="@(@checked)" CheckedExpression="@checkedExpression" CheckedChanged="@CheckedChangedHandler" Disabled="@Disabled" @onclick:stopPropagation>
+            <Check TValue="bool" Value="@(@checked)" ValueChanged="@CheckedChangedHandler" ValueExpression="@checkedExpression" Disabled="@Disabled" @onclick:stopPropagation>
                 @ChildContent
             </Check>
         </Div>
diff --git a/Source/Blazorise/Components/FileEdit/FileEdit.razor.cs b/Source/Blazorise/Components/FileEdit/FileEdit.razor.cs
index bde1bb7223..771036334c 100644
--- a/Source/Blazorise/Components/FileEdit/FileEdit.razor.cs
+++ b/Source/Blazorise/Components/FileEdit/FileEdit.razor.cs
@@ -125,7 +125,7 @@ public async Task NotifyChange( FileEntry[] files )
         // Because of that we're going to skip CurrentValueHandler and implement all the
         // update logic here.
 
-        var updatedFiles = InternalValue?.Where( x => files.Any( file => file.Id == x.Id ) ).ToList() ?? new();
+        var updatedFiles = Value?.Where( x => files.Any( file => file.Id == x.Id ) ).ToList() ?? new();
         foreach ( var file in files )
         {
             if ( !updatedFiles.Any( x => x.Id == file.Id ) )
@@ -140,7 +140,7 @@ public async Task NotifyChange( FileEntry[] files )
             }
         }
 
-        InternalValue = updatedFiles.ToArray();
+        Value = updatedFiles.ToArray();
 
         // send the value to the validation for processing
         if ( ParentValidation is not null )
@@ -262,12 +262,6 @@ public Task ShowPicker()
         return JSUtilitiesModule.ShowPicker( ElementRef, ElementId ).AsTask();
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        return null;
-    }
-
     #endregion
 
     #region Properties
@@ -275,14 +269,11 @@ protected override string GetFormatedValueExpression()
     /// <summary>
     /// Gets the currently added files.
     /// </summary>
-    public IFileEntry[] Files => InternalValue;
+    public IFileEntry[] Files => Value;
 
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override IFileEntry[] InternalValue { get => files; set => files = value; }
-
     /// <summary>
     /// Number of processed bytes in current file.
     /// </summary>
@@ -341,7 +332,7 @@ protected string BrowseButtonString
     /// <summary>
     /// Gets the list is selected filename
     /// </summary>
-    protected IEnumerable<string> SelectedFileNames => InternalValue?.Select( x => x.Name ) ?? Enumerable.Empty<string>();
+    protected IEnumerable<string> SelectedFileNames => Value?.Select( x => x.Name ) ?? Enumerable.Empty<string>();
 
     /// <summary>
     /// Enables the multiple file selection.
diff --git a/Source/Blazorise/Components/InputMask/InputMask.razor.cs b/Source/Blazorise/Components/InputMask/InputMask.razor.cs
index 7ed2268bf5..e44db49712 100644
--- a/Source/Blazorise/Components/InputMask/InputMask.razor.cs
+++ b/Source/Blazorise/Components/InputMask/InputMask.razor.cs
@@ -27,38 +27,6 @@ public partial class InputMask : BaseTextInput<string>, IAsyncDisposable
 
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<string>( nameof( Value ), out var paramValue ) && !paramValue.IsEqual( Value ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<string>>>( nameof( ValueExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<string>( nameof( Value ), out var paramValue )
-                    ? paramValue
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override async Task OnFirstAfterRenderAsync()
     {
@@ -122,12 +90,6 @@ protected override Task OnChangeHandler( ChangeEventArgs e )
         return CurrentValueHandler( e?.Value?.ToString() );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( string value )
-    {
-        return ValueChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<string>> ParseValueFromStringAsync( string value )
     {
@@ -183,17 +145,6 @@ public Task NotifyCleared()
         return Cleared.InvokeAsync();
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ValueExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ValueExpression )
-            : ExpressionFormatter.FormatLambda( ValueExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -201,29 +152,11 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override string InternalValue { get => Value; set => Value = value; }
-
     /// <summary>
     /// Gets or sets the <see cref="IJSInputMaskModule"/> instance.
     /// </summary>
     [Inject] public IJSInputMaskModule JSModule { get; set; }
 
-    /// <summary>
-    /// Gets or sets the input time value.
-    /// </summary>
-    [Parameter] public string Value { get; set; }
-
-    /// <summary>
-    /// Occurs when the time has changed.
-    /// </summary>
-    [Parameter] public EventCallback<string> ValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the time field.
-    /// </summary>
-    [Parameter] public Expression<Func<string>> ValueExpression { get; set; }
-
     /// <summary>
     /// The mask to use for the input.
     /// </summary>
diff --git a/Source/Blazorise/Components/MemoEdit/MemoEdit.razor.cs b/Source/Blazorise/Components/MemoEdit/MemoEdit.razor.cs
index a69c742002..d37c628ddd 100644
--- a/Source/Blazorise/Components/MemoEdit/MemoEdit.razor.cs
+++ b/Source/Blazorise/Components/MemoEdit/MemoEdit.razor.cs
@@ -25,8 +25,10 @@ public partial class MemoEdit : BaseInputComponent<string>, ISelectableComponent
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
+        await base.OnBeforeSetParametersAsync( parameters );
+
         var replaceTabChanged = parameters.TryGetValue( nameof( ReplaceTab ), out bool paramReplaceTab ) && ReplaceTab != paramReplaceTab;
         var tabSizeChanged = parameters.TryGetValue( nameof( TabSize ), out int paramTabSize ) && TabSize != paramTabSize;
         var softTabsChanged = parameters.TryGetValue( nameof( SoftTabs ), out bool paramSoftTabs ) && SoftTabs != paramSoftTabs;
@@ -49,7 +51,7 @@ public override async Task SetParametersAsync( ParameterView parameters )
 
         if ( Rendered )
         {
-            if ( parameters.TryGetValue<string>( nameof( Text ), out var paramText ) && !paramText.IsEqual( Text ) )
+            if ( parameters.TryGetValue<string>( nameof( Value ), out var paramValue ) && !paramValue.IsEqual( Value ) )
             {
                 ExecuteAfterRender( async () =>
                 {
@@ -62,26 +64,6 @@ public override async Task SetParametersAsync( ParameterView parameters )
                 } );
             }
         }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<string>>>( nameof( TextExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<string>( nameof( Text ), out var paramText )
-                    ? paramText
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -137,12 +119,6 @@ protected override void BuildClasses( ClassBuilder builder )
         base.BuildClasses( builder );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( string value )
-    {
-        return TextChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<string>> ParseValueFromStringAsync( string value )
     {
@@ -221,24 +197,10 @@ public virtual async Task Select( bool focus = true )
         await JSUtilitiesModule.Select( ElementRef, ElementId, focus );
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( TextExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( TextExpression )
-            : ExpressionFormatter.FormatLambda( TextExpression );
-    }
-
     #endregion
 
     #region Properties
 
-    /// <inheritdoc/>
-    protected override string InternalValue { get => Text; set => Text = value; }
-
     /// <inheritdoc/>
     protected override string DefaultValue => string.Empty;
 
@@ -281,21 +243,6 @@ protected string BindValueEventName
     /// </summary>
     [Parameter] public bool Plaintext { get; set; }
 
-    /// <summary>
-    /// Gets or sets the text inside the input field.
-    /// </summary>
-    [Parameter] public string Text { get; set; }
-
-    /// <summary>
-    /// Occurs after text has changed.
-    /// </summary>
-    [Parameter] public EventCallback<string> TextChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the text value.
-    /// </summary>
-    [Parameter] public Expression<Func<string>> TextExpression { get; set; }
-
     /// <summary>
     /// Specifies the maximum number of characters allowed in the input element.
     /// </summary>
diff --git a/Source/Blazorise/Components/NumericEdit/NumericEdit.razor.cs b/Source/Blazorise/Components/NumericEdit/NumericEdit.razor.cs
index 8c6b9c5833..8afb35cda4 100644
--- a/Source/Blazorise/Components/NumericEdit/NumericEdit.razor.cs
+++ b/Source/Blazorise/Components/NumericEdit/NumericEdit.razor.cs
@@ -57,40 +57,14 @@ public NumericEdit() : base()
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<TValue>( nameof( Value ), out var paramValue ) && !paramValue.IsEqual( Value ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
+        await base.OnBeforeSetParametersAsync( parameters );
 
         // This make sure we know that Min or Max parameters are defined and can be checked against the current value.
         // Without we cannot determine if Min or Max has a default value when TValue is non-nullable type.
         minDefined = parameters.TryGetValue<TValue>( nameof( Min ), out var min );
         maxDefined = parameters.TryGetValue<TValue>( nameof( Max ), out var max );
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( ValueExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<TValue>( nameof( Value ), out var inValue )
-                    ? inValue
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -104,12 +78,6 @@ protected override void BuildClasses( ClassBuilder builder )
         base.BuildClasses( builder );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return ValueChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
     {
@@ -185,17 +153,6 @@ protected virtual Task ProcessNumber( TValue number )
         return Task.CompletedTask;
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ValueExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ValueExpression )
-            : ExpressionFormatter.FormatLambda( ValueExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -203,9 +160,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Value; set => Value = value; }
-
     /// <summary>
     /// Gets the string representation of the <see cref="Step"/> value.
     /// </summary>
@@ -252,24 +206,6 @@ protected CultureInfo CurrentCultureInfo
     /// </summary>
     protected string InputMode => inputMode;
 
-    /// <summary>
-    /// Gets or sets the value inside the input field.
-    /// </summary>
-    [Parameter] public TValue Value { get; set; }
-
-    /// <summary>
-    /// Occurs after the value has changed.
-    /// </summary>
-    /// <remarks>
-    /// This will be converted to EventCallback once the Blazor team fix the error for generic components. see https://github.com/aspnet/AspNetCore/issues/8385
-    /// </remarks>
-    [Parameter] public EventCallback<TValue> ValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> ValueExpression { get; set; }
-
     /// <summary>
     /// Specifies the interval between valid values.
     /// </summary>
diff --git a/Source/Blazorise/Components/NumericPicker/NumericPicker.razor.cs b/Source/Blazorise/Components/NumericPicker/NumericPicker.razor.cs
index 88b2d2c6c4..1188624147 100644
--- a/Source/Blazorise/Components/NumericPicker/NumericPicker.razor.cs
+++ b/Source/Blazorise/Components/NumericPicker/NumericPicker.razor.cs
@@ -75,8 +75,10 @@ public NumericPicker()
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
+        await base.OnBeforeSetParametersAsync( parameters );
+
         if ( Rendered )
         {
             var decimalsChanged = isIntegerType ? false : parameters.TryGetValue<int>( nameof( Decimals ), out var paramDecimals ) && !Decimals.IsEqual( paramDecimals );
@@ -135,9 +137,7 @@ public override async Task SetParametersAsync( ParameterView parameters )
             }
         }
 
-        var valueChanged = parameters.TryGetValue<TValue>( nameof( Value ), out var paramValue ) && !Value.IsEqual( paramValue );
-
-        if ( valueChanged )
+        if ( paramValue.Changed )
         {
             ExecuteAfterRender( async () => await JSModule.UpdateValue( ElementRef, ElementId, paramValue ) );
         }
@@ -145,27 +145,7 @@ public override async Task SetParametersAsync( ParameterView parameters )
         // This make sure we know that Min or Max parameters are defined and can be checked against the current value.
         // Without we cannot determine if Min or Max has a default value when TValue is non-nullable type.
         MinDefined = parameters.TryGetValue<TValue>( nameof( Min ), out var min );
-        MaxDefined = parameters.TryGetValue<TValue>( nameof( Max ), out var max );
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( ValueExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<TValue>( nameof( Value ), out var inValue )
-                    ? inValue
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
+        MaxDefined = parameters.TryGetValue<TValue>( nameof( Max ), out var max );       
     }
 
     /// <inheritdoc/>
@@ -280,12 +260,6 @@ public async Task SetValue( string value )
         }
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return ValueChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
     {
@@ -446,17 +420,6 @@ protected virtual Task ProcessNumber( TValue number )
     /// <returns>Number of decimals.</returns>
     protected int GetDecimals() => isIntegerType ? 0 : Decimals;
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ValueExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ValueExpression )
-            : ExpressionFormatter.FormatLambda( ValueExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -464,9 +427,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Value; set => Value = value; }
-
     /// <summary>
     /// True if spin buttons can be shown.
     /// </summary>
@@ -511,24 +471,6 @@ protected CultureInfo CurrentCultureInfo
     /// </summary>
     [Inject] public IJSNumericPickerModule JSModule { get; set; }
 
-    /// <summary>
-    /// Gets or sets the value inside the input field.
-    /// </summary>
-    [Parameter] public TValue Value { get; set; }
-
-    /// <summary>
-    /// Occurs after the value has changed.
-    /// </summary>
-    /// <remarks>
-    /// This will be converted to EventCallback once the Blazor team fix the error for generic components. see https://github.com/aspnet/AspNetCore/issues/8385
-    /// </remarks>
-    [Parameter] public EventCallback<TValue> ValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> ValueExpression { get; set; }
-
     /// <summary>
     /// Specifies the interval between valid values.
     /// </summary>
diff --git a/Source/Blazorise/Components/Radio/Radio.razor b/Source/Blazorise/Components/Radio/Radio.razor
index db4fd78c7a..9a3427a64b 100644
--- a/Source/Blazorise/Components/Radio/Radio.razor
+++ b/Source/Blazorise/Components/Radio/Radio.razor
@@ -1,6 +1,6 @@
 @namespace Blazorise
 @typeparam TValue
-@inherits BaseCheckComponent<bool>
-<input @ref="@ElementRef" id="@ElementId" type="radio" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@CurrentValue" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" name="@Group" @attributes="@Attributes" />
+@inherits BaseRadioComponent<TValue>
+<input @ref="@ElementRef" id="@ElementId" type="radio" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" checked="@Checked" value="@Value" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" name="@Group" @attributes="@Attributes" />
 @ChildContent
 @Feedback
\ No newline at end of file
diff --git a/Source/Blazorise/Components/Radio/Radio.razor.cs b/Source/Blazorise/Components/Radio/Radio.razor.cs
index 9bf508f1f5..5825453166 100644
--- a/Source/Blazorise/Components/Radio/Radio.razor.cs
+++ b/Source/Blazorise/Components/Radio/Radio.razor.cs
@@ -14,7 +14,7 @@ namespace Blazorise;
 /// Radio buttons allow the user to select one option from a set.
 /// </summary>
 /// <typeparam name="TValue">Checked value type.</typeparam>
-public partial class Radio<TValue> : BaseCheckComponent<bool>, IDisposable
+public partial class Radio<TValue> : BaseRadioComponent<TValue>, IDisposable
 {
     #region Members
 
@@ -45,8 +45,7 @@ public override async Task SetParametersAsync( ParameterView parameters )
 
         await base.SetParametersAsync( parameters );
 
-        // Individual Radio can have validation ONLY of it's not placed inside
-        // of a RadioGroup
+        // Individual Radio can have validation ONLY if it's not placed inside of a RadioGroup
         if ( ParentValidation is not null && ParentRadioGroup is null )
         {
             if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( CheckedExpression ), out var expression ) )
@@ -61,7 +60,7 @@ protected override void OnInitialized()
     {
         if ( ParentRadioGroup is not null )
         {
-            Checked = ParentRadioGroup.CheckedValue.IsEqual( Value );
+            Checked = ParentRadioGroup.Value.IsEqual( Value );
 
             // TODO: possibly memory leak in Blazor server-side with prerendering mode!
             ParentRadioGroup.RadioCheckedChanged += OnRadioChanged;
@@ -131,9 +130,6 @@ private async void OnRadioChanged( object sender, RadioCheckedChangedEventArgs<T
 
     #region Properties
 
-    /// <inheritdoc/>
-    protected override string TrueValueName => Value?.ToString();
-
     /// <inheritdoc/>
     protected override bool IsDisabled => ParentRadioGroup?.Disabled == true || base.IsDisabled;
 
@@ -182,11 +178,6 @@ public Color Color
         }
     }
 
-    /// <summary>
-    /// Gets or sets the radio value.
-    /// </summary>
-    [Parameter] public TValue Value { get; set; }
-
     /// <summary>
     /// Radio group in which this radio is placed.
     /// </summary>
diff --git a/Source/Blazorise/Components/Radio/RadioGroup.razor.cs b/Source/Blazorise/Components/Radio/RadioGroup.razor.cs
index 59b178d1be..09fd73cf5b 100644
--- a/Source/Blazorise/Components/Radio/RadioGroup.razor.cs
+++ b/Source/Blazorise/Components/Radio/RadioGroup.razor.cs
@@ -40,25 +40,6 @@ public partial class RadioGroup<TValue> : BaseInputComponent<TValue>
 
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( parameters.TryGetValue<TValue>( nameof( CheckedValue ), out var result ) && !CheckedValue.IsEqual( result ) )
-        {
-            await CurrentValueHandler( result?.ToString() );
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( CheckedValueExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override void BuildClasses( ClassBuilder builder )
     {
@@ -91,7 +72,7 @@ protected override Task OnInternalValueChanged( TValue value )
         // notify child radios they need to update their states
         RadioCheckedChanged?.Invoke( this, new( value ) );
 
-        return CheckedValueChanged.InvokeAsync( value );
+        return ValueChanged.InvokeAsync( value );
     }
 
     /// <summary>
@@ -113,27 +94,13 @@ protected override void OnValidationStatusChanged( object sender, ValidationStat
 
         // Since radios validation works little different when placed in radio group we need
         // to notify them to re-render when validation changes.
-        RadioCheckedChanged?.Invoke( this, new( CheckedValue ) );
-    }
-
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( CheckedValueExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( CheckedValueExpression )
-            : ExpressionFormatter.FormatLambda( CheckedValueExpression );
+        RadioCheckedChanged?.Invoke( this, new( Value ) );
     }
 
     #endregion
 
     #region Properties
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => CheckedValue; set => CheckedValue = value; }
-
     /// <summary>
     /// True of radio elements should be inlined.
     /// </summary>
@@ -189,20 +156,5 @@ public Color Color
         }
     }
 
-    /// <summary>
-    /// Gets or sets the checked value.
-    /// </summary>
-    [Parameter] public TValue CheckedValue { get; set; }
-
-    /// <summary>
-    /// Occurs when the checked value is changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> CheckedValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the checked value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> CheckedValueExpression { get; set; }
-
     #endregion
 }
\ No newline at end of file
diff --git a/Source/Blazorise/Components/Select/ISelect.cs b/Source/Blazorise/Components/Select/ISelect.cs
new file mode 100644
index 0000000000..04e15d2030
--- /dev/null
+++ b/Source/Blazorise/Components/Select/ISelect.cs
@@ -0,0 +1,26 @@
+namespace Blazorise;
+
+/// <summary>
+/// Defines methods for managing selectable items and checking their values.
+/// </summary>
+public interface ISelect
+{
+    /// <summary>
+    /// Adds a selectable item to the collection.
+    /// </summary>
+    /// <param name="selectItem">The item to add to the selection.</param>
+    void AddSelectItem( ISelectItem selectItem );
+
+    /// <summary>
+    /// Removes a selectable item from the collection.
+    /// </summary>
+    /// <param name="selectItem">The item to remove from the selection.</param>
+    void RemoveSelectItem( ISelectItem selectItem );
+
+    /// <summary>
+    /// Checks if the collection contains a specified value.
+    /// </summary>
+    /// <param name="value">The value to check for in the selection.</param>
+    /// <returns><c>true</c> if the collection contains the value; otherwise, <c>false</c>.</returns>
+    bool ContainsValue( object value );
+}
diff --git a/Source/Blazorise/Components/Select/ISelectItem.cs b/Source/Blazorise/Components/Select/ISelectItem.cs
new file mode 100644
index 0000000000..9b357411c4
--- /dev/null
+++ b/Source/Blazorise/Components/Select/ISelectItem.cs
@@ -0,0 +1,35 @@
+#region Using directives
+using Microsoft.AspNetCore.Components;
+#endregion
+
+namespace Blazorise;
+
+/// <summary>
+/// Interface for all <see cref="SelectItem{TValue}"/> components.
+/// </summary>
+public interface ISelectItem
+{
+    /// <summary>
+    /// Checks if the value is equal to the item value.
+    /// </summary>
+    /// <param name="value">The value to compare.</param>
+    /// <returns>A <see cref="bool"/> value indicating whether the value is equal to the item value.</returns>
+    bool CompareTo( object value );
+
+    /// <summary>
+    /// Gets or sets the item render fragment.
+    /// </summary>
+    RenderFragment ChildContent { get; set; }
+}
+
+/// <summary>
+/// Basic type for all <see cref="SelectItem{TValue}"/> components.
+/// </summary>
+/// <typeparam name="TValue"></typeparam>
+public interface ISelectItem<TValue> : ISelectItem
+{
+    /// <summary>
+    /// Gets or sets the item value.
+    /// </summary>
+    TValue Value { get; set; }
+}
\ No newline at end of file
diff --git a/Source/Blazorise/Components/Select/Select.razor b/Source/Blazorise/Components/Select/Select.razor
index 62d7a2a272..a4cb83131b 100644
--- a/Source/Blazorise/Components/Select/Select.razor
+++ b/Source/Blazorise/Components/Select/Select.razor
@@ -1,7 +1,6 @@
 @namespace Blazorise
 @typeparam TValue
-@inherits BaseInputComponent<IReadOnlyList<TValue>>
-@attribute [CascadingTypeParameter( nameof( TValue ) )]
+@inherits BaseInputComponent<TValue>
 <CascadingValue Value="@this" IsFixed>
     <select @ref="@ElementRef" id="@ElementId" name="@NameAttributeValue" class="@ClassNames" style="@StyleNames" disabled="@IsDisabled" readonly="@ReadOnly" multiple="@Multiple" size="@MaxVisibleItems" value="@CurrentValueAsString" tabindex="@TabIndex" @onchange="@OnChangeHandler" @onkeydown="@OnKeyDownHandler" @onkeypress="@OnKeyPressHandler" @onkeyup="@OnKeyUpHandler" @onblur="@OnBlurHandler" @onfocus="@OnFocusHandler" @onfocusin="@OnFocusInHandler" @onfocusout="@OnFocusOutHandler" @attributes="@Attributes">
         @ChildContent
diff --git a/Source/Blazorise/Components/Select/Select.razor.cs b/Source/Blazorise/Components/Select/Select.razor.cs
index 03abacf4f3..b4125e5ab0 100644
--- a/Source/Blazorise/Components/Select/Select.razor.cs
+++ b/Source/Blazorise/Components/Select/Select.razor.cs
@@ -1,11 +1,12 @@
 #region Using directives
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Blazorise.Extensions;
-using Blazorise.Modules;
 using Blazorise.Utilities;
 using Microsoft.AspNetCore.Components;
 #endregion
@@ -15,8 +16,8 @@ namespace Blazorise;
 /// <summary>
 /// The browser built-in select dropdown.
 /// </summary>
-/// <typeparam name="TValue">The type of the <see cref="SelectedValue"/>.</typeparam>
-public partial class Select<TValue> : BaseInputComponent<IReadOnlyList<TValue>>
+/// <typeparam name="TValue">The type of the <see cref="BaseInputComponent{TValue}.Value"/>.</typeparam>
+public partial class Select<TValue> : BaseInputComponent<TValue>, ISelect
 {
     #region Members
 
@@ -24,54 +25,17 @@ public partial class Select<TValue> : BaseInputComponent<IReadOnlyList<TValue>>
 
     private bool loading;
 
-    private readonly List<ISelectItem<TValue>> selectItems = new();
+    private readonly List<ISelectItem> selectItems = new();
 
-    private const string MULTIPLE_DELIMITER = "|~|";
+    /// <summary>
+    /// The internal value used by the select component.
+    /// </summary>
+    protected const string MULTIPLE_DELIMITER = "|~|";
 
     #endregion
 
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( Multiple )
-            {
-                if ( parameters.TryGetValue<IReadOnlyList<TValue>>( nameof( SelectedValues ), out var paramSelectedValues ) && !paramSelectedValues.AreEqual( SelectedValues ) )
-                {
-                    ExecuteAfterRender( Revalidate );
-                }
-            }
-            else
-            {
-                if ( parameters.TryGetValue<TValue>( nameof( SelectedValue ), out var paramSelectedValue ) && !paramSelectedValue.IsEqual( SelectedValue ) )
-                {
-                    ExecuteAfterRender( Revalidate );
-                }
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( Multiple )
-            {
-                if ( parameters.TryGetValue<Expression<Func<IReadOnlyList<TValue>>>>( nameof( SelectedValuesExpression ), out var expression ) )
-                    await ParentValidation.InitializeInputExpression( expression );
-            }
-            else
-            {
-                if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( SelectedValueExpression ), out var expression ) )
-                    await ParentValidation.InitializeInputExpression( expression );
-            }
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override void BuildClasses( ClassBuilder builder )
     {
@@ -98,72 +62,51 @@ protected virtual Task OnChangeHandler( ChangeEventArgs eventArgs )
     }
 
     /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( IReadOnlyList<TValue> value )
-    {
-        if ( Multiple )
-            return SelectedValuesChanged.InvokeAsync( value );
-        else
-            return SelectedValueChanged.InvokeAsync( value is null ? default : value.FirstOrDefault() );
-    }
-
-    /// <inheritdoc/>
-    protected override object PrepareValueForValidation( IReadOnlyList<TValue> value )
-    {
-        if ( Multiple )
-            return value;
-        else
-            return value is null ? default : value.FirstOrDefault();
-    }
-
-    /// <inheritdoc/>
-    protected override Task<ParseValue<IReadOnlyList<TValue>>> ParseValueFromStringAsync( string value )
+    protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
     {
         if ( string.IsNullOrEmpty( value ) )
-            return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
+            return Task.FromResult( ParseValue<TValue>.Empty );
 
         if ( Multiple )
         {
-            var multipleValues = value.Split( MULTIPLE_DELIMITER ).Select( value =>
-            {
-                if ( Converters.TryChangeType<TValue>( value, out var newValue ) )
-                    return newValue;
+            var readOnlyList = Converters.ConvertCsvToReadOnlyList<TValue>( value, MULTIPLE_DELIMITER );
 
-                return default;
-            } ).ToArray();
-
-            return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, multipleValues, null ) );
+            return Task.FromResult( new ParseValue<TValue>( true, readOnlyList, null ) );
         }
         else
         {
             if ( Converters.TryChangeType<TValue>( value, out var result ) )
             {
-                return Task.FromResult( new ParseValue<IReadOnlyList<TValue>>( true, new TValue[] { result }, null ) );
+                return Task.FromResult( new ParseValue<TValue>( true, result, null ) );
             }
             else
             {
-                return Task.FromResult( ParseValue<IReadOnlyList<TValue>>.Empty );
+                return Task.FromResult( ParseValue<TValue>.Empty );
             }
         }
     }
 
     /// <inheritdoc/>
-    protected override string FormatValueAsString( IReadOnlyList<TValue> value )
+    protected override string FormatValueAsString( TValue value )
     {
-        if ( value is null || value.Count == 0 )
+        if ( value is null )
             return string.Empty;
 
-        if ( Multiple )
+        // Blazor expects the arrays as JSON formatted string
+        if ( value is IEnumerable<TValue> values )
         {
-            // Make use of .NET BindConverter that will convert our array into valid JSON string.
-            return BindConverter.FormatValue( CurrentValue?.ToArray() ?? new TValue[] { } )?.ToString();
+            return Multiple
+                ? JsonSerializer.Serialize( values.Select( x => x?.ToString() ) )
+                : JsonSerializer.Serialize( values.FirstOrDefault()?.ToString() );
         }
-        else
+        else if ( value is IEnumerable objects && CurrentValue is not string )
         {
-            if ( value[0] is null )
-                return string.Empty;
-
-            return value[0].ToString();
+            return Multiple
+                ? JsonSerializer.Serialize( objects.Cast<object>().Select( x => x?.ToString() ) )
+                : JsonSerializer.Serialize( objects.Cast<object>().FirstOrDefault()?.ToString() );
         }
+
+        return value?.ToString();
     }
 
     /// <summary>
@@ -171,21 +114,28 @@ protected override string FormatValueAsString( IReadOnlyList<TValue> value )
     /// </summary>
     /// <param name="value">Item value.</param>
     /// <returns>True if value is found.</returns>
-    public bool ContainsValue( TValue value )
+    public bool ContainsValue( object value )
     {
-        var currentValue = CurrentValue;
+        if ( CurrentValue is null )
+            return false;
 
-        if ( currentValue is not null )
+        if ( CurrentValue is IEnumerable<TValue> values )
         {
-            var result = currentValue.Any( x => x.IsEqual( value ) );
-
-            return result;
+            return values.Any( x => x.IsEqual( value ) );
+        }
+        else if ( CurrentValue is IEnumerable objects && CurrentValue is not string )
+        {
+            return objects.Cast<object>().Any( x => x.IsEqual( value ) );
         }
 
-        return false;
+        return CurrentValue.IsEqual( value );
     }
 
-    internal void NotifySelectItemInitialized( ISelectItem<TValue> selectItem )
+    /// <summary>
+    /// Notifies the <see cref="ISelectItem"/> that it has been initialized.
+    /// </summary>
+    /// <param name="selectItem">The select item that has been initialized.</param>
+    public void AddSelectItem( ISelectItem selectItem )
     {
         if ( selectItem is null )
             return;
@@ -194,7 +144,11 @@ internal void NotifySelectItemInitialized( ISelectItem<TValue> selectItem )
             selectItems.Add( selectItem );
     }
 
-    internal void NotifySelectItemRemoved( ISelectItem<TValue> selectItem )
+    /// <summary>
+    /// Notifies the <see cref="ISelectItem"/> that it has been removed.
+    /// </summary>
+    /// <param name="selectItem">The select item that has been removed.</param>
+    public void RemoveSelectItem( ISelectItem selectItem )
     {
         if ( selectItem is null )
             return;
@@ -204,61 +158,28 @@ internal void NotifySelectItemRemoved( ISelectItem<TValue> selectItem )
     }
 
     /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
+    protected override bool IsSameAsInternalValue( TValue value )
     {
-        if ( Multiple && SelectedValuesExpression is not null )
+        if ( value is IEnumerable<TValue> values1 && Value is IEnumerable<TValue> values2 )
         {
-            return HtmlFieldPrefix is not null
-                ? HtmlFieldPrefix.GetFieldName( SelectedValuesExpression )
-                : ExpressionFormatter.FormatLambda( SelectedValuesExpression );
+            return values1.AreEqual( values2 );
         }
-        else if ( SelectedValueExpression is not null )
+        else if ( value is IEnumerable objects1 && Value is IEnumerable objects2 )
         {
-            return HtmlFieldPrefix is not null
-                ? HtmlFieldPrefix.GetFieldName( SelectedValueExpression )
-                : ExpressionFormatter.FormatLambda( SelectedValueExpression );
+            return objects1.AreEqual( objects2 );
         }
 
-        return null;
+        return value.IsEqual( Value );
     }
 
     #endregion
 
     #region Properties
 
-    /// <inheritdoc/>
-    public override object ValidationValue
-    {
-        get
-        {
-            if ( Multiple )
-                return InternalValue;
-            else
-                return InternalValue is null ? default : InternalValue.FirstOrDefault();
-        }
-    }
-
-    /// <inheritdoc/>
-    protected override IReadOnlyList<TValue> InternalValue
-    {
-        get => Multiple ? SelectedValues : new TValue[] { SelectedValue };
-        set
-        {
-            if ( Multiple )
-            {
-                SelectedValues = value;
-            }
-            else
-            {
-                SelectedValue = value is null ? default : value.FirstOrDefault();
-            }
-        }
-    }
-
     /// <summary>
     /// Gets the list of all select items inside of this select component.
     /// </summary>
-    protected IEnumerable<ISelectItem<TValue>> SelectItems => selectItems;
+    protected IEnumerable<ISelectItem> SelectItems => selectItems;
 
     /// <summary>
     /// Specifies that multiple items can be selected.
@@ -275,36 +196,6 @@ public bool Multiple
         }
     }
 
-    /// <summary>
-    /// Gets or sets the selected item value.
-    /// </summary>
-    [Parameter] public TValue SelectedValue { get; set; }
-
-    /// <summary>
-    /// Gets or sets the multiple selected item values.
-    /// </summary>
-    [Parameter] public IReadOnlyList<TValue> SelectedValues { get; set; }
-
-    /// <summary>
-    /// Occurs when the selected item value has changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> SelectedValueChanged { get; set; }
-
-    /// <summary>
-    /// Occurs when the selected items value has changed (only when <see cref="Multiple"/>==true).
-    /// </summary>
-    [Parameter] public EventCallback<IReadOnlyList<TValue>> SelectedValuesChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the selected value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> SelectedValueExpression { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the selected value.
-    /// </summary>
-    [Parameter] public Expression<Func<IReadOnlyList<TValue>>> SelectedValuesExpression { get; set; }
-
     /// <summary>
     /// Specifies how many options should be shown at once.
     /// </summary>
diff --git a/Source/Blazorise/Components/Select/SelectItem.razor.cs b/Source/Blazorise/Components/Select/SelectItem.razor.cs
index 4596df3a74..9e78c1010a 100644
--- a/Source/Blazorise/Components/Select/SelectItem.razor.cs
+++ b/Source/Blazorise/Components/Select/SelectItem.razor.cs
@@ -1,28 +1,12 @@
 #region Using directives
 using System;
 using System.Threading.Tasks;
+using Blazorise.Extensions;
 using Microsoft.AspNetCore.Components;
 #endregion
 
 namespace Blazorise;
 
-/// <summary>
-/// Basic type for all <see cref="SelectItem{TValue}"/> components.
-/// </summary>
-/// <typeparam name="TValue"></typeparam>
-public interface ISelectItem<TValue>
-{
-    /// <summary>
-    /// Gets or sets the item value.
-    /// </summary>
-    TValue Value { get; set; }
-
-    /// <summary>
-    /// Gets or sets the item render fragment.
-    /// </summary>
-    RenderFragment ChildContent { get; set; }
-}
-
 /// <summary>
 /// Option item in the <see cref="Select{TValue}"/> component.
 /// </summary>
@@ -34,7 +18,7 @@ public partial class SelectItem<TValue> : BaseComponent, ISelectItem<TValue>, ID
     /// <inheritdoc/>
     protected override Task OnInitializedAsync()
     {
-        ParentSelect?.NotifySelectItemInitialized( this );
+        ParentSelect?.AddSelectItem( this );
 
         return base.OnInitializedAsync();
     }
@@ -44,12 +28,18 @@ protected override void Dispose( bool disposing )
     {
         if ( disposing )
         {
-            ParentSelect?.NotifySelectItemRemoved( this );
+            ParentSelect?.RemoveSelectItem( this );
         }
 
         base.Dispose( disposing );
     }
 
+    /// <inheritdoc/>
+    public bool CompareTo( object value )
+    {
+        return Value?.IsEqual( value ) ?? false;
+    }
+
     #endregion
 
     #region Properties
diff --git a/Source/Blazorise/Components/Slider/Slider.razor.cs b/Source/Blazorise/Components/Slider/Slider.razor.cs
index 226b75dad2..00158b5115 100644
--- a/Source/Blazorise/Components/Slider/Slider.razor.cs
+++ b/Source/Blazorise/Components/Slider/Slider.razor.cs
@@ -33,30 +33,14 @@ public partial class Slider<TValue> : BaseInputComponent<TValue>
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<TValue>( nameof( Value ), out var paramValue ) && !paramValue.IsEqual( Value ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
+        await base.OnBeforeSetParametersAsync( parameters );
 
         // This make sure we know that Min or Max parameters are defined and can be checked against the current value.
         // Without we cannot determine if Min or Max has a default value when TValue is non-nullable type.
         minDefined = parameters.TryGetValue<TValue>( nameof( Min ), out var min );
         maxDefined = parameters.TryGetValue<TValue>( nameof( Max ), out var max );
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( ValueExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -68,12 +52,6 @@ protected override void BuildClasses( ClassBuilder builder )
         base.BuildClasses( builder );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return ValueChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<TValue>> ParseValueFromStringAsync( string value )
     {
@@ -108,17 +86,6 @@ protected override string FormatValueAsString( TValue value )
         };
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( ValueExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( ValueExpression )
-            : ExpressionFormatter.FormatLambda( ValueExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -126,9 +93,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Value; set => Value = value; }
-
     /// <summary>
     /// Gets the string representation of the <see cref="Step"/> value.
     /// </summary>
@@ -159,24 +123,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     [Parameter] public TValue Step { get; set; }
 
-    /// <summary>
-    /// Gets or sets the value inside the input field.
-    /// </summary>
-    [Parameter] public TValue Value { get; set; }
-
-    /// <summary>
-    /// Occurs after the value has changed.
-    /// </summary>
-    /// <remarks>
-    /// This will be converted to EventCallback once the Blazor team fix the error for generic components. see https://github.com/aspnet/AspNetCore/issues/8385
-    /// </remarks>
-    [Parameter] public EventCallback<TValue> ValueChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the checked value.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> ValueExpression { get; set; }
-
     /// <summary>
     /// The minimum value to accept for this input.
     /// </summary>
diff --git a/Source/Blazorise/Components/Switch/Switch.razor.cs b/Source/Blazorise/Components/Switch/Switch.razor.cs
index f355317745..e465d71684 100644
--- a/Source/Blazorise/Components/Switch/Switch.razor.cs
+++ b/Source/Blazorise/Components/Switch/Switch.razor.cs
@@ -24,32 +24,22 @@ public partial class Switch<TValue> : BaseCheckComponent<TValue>
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
+        await base.OnBeforeSetParametersAsync( parameters );
+
         if ( Rendered )
         {
-            if ( parameters.TryGetValue<TValue>( nameof( Checked ), out var paramChecked ) && !paramChecked.IsEqual( Checked ) )
+            if ( paramValue.Changed )
             {
                 ExecuteAfterRender( async () =>
                 {
-                    await Revalidate();
-
                     // Some providers may require that we define classname based on a switch state so we need to reset classes.
                     DirtyClasses();
                     await InvokeAsync( StateHasChanged );
                 } );
             }
         }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( CheckedExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -75,7 +65,7 @@ protected override void BuildClasses( ClassBuilder builder )
     /// <summary>
     /// Returns true id switch is in checked state.
     /// </summary>
-    protected bool IsChecked => string.Compare( Checked?.ToString(), TrueValueName, StringComparison.InvariantCultureIgnoreCase ) == 0;
+    protected bool IsChecked => string.Compare( Value?.ToString(), TrueValueName, StringComparison.InvariantCultureIgnoreCase ) == 0;
 
     /// <summary>
     /// Defines the switch named color.
diff --git a/Source/Blazorise/Components/TextEdit/TextEdit.razor.cs b/Source/Blazorise/Components/TextEdit/TextEdit.razor.cs
index ba69c819dc..891375560f 100644
--- a/Source/Blazorise/Components/TextEdit/TextEdit.razor.cs
+++ b/Source/Blazorise/Components/TextEdit/TextEdit.razor.cs
@@ -1,12 +1,10 @@
 #region Using directives
 using System;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Blazorise.Extensions;
 using Blazorise.Modules;
 using Blazorise.Utilities;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
 #endregion
 
 namespace Blazorise;
@@ -18,38 +16,6 @@ public partial class TextEdit : BaseTextInput<string>, IAsyncDisposable
 {
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<string>( nameof( Text ), out var paramText ) && !paramText.IsEqual( Text ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<string>>>( nameof( TextExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<string>( nameof( Text ), out var paramText )
-                    ? paramText
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected async override Task OnFirstAfterRenderAsync()
     {
@@ -80,29 +46,12 @@ protected override void BuildClasses( ClassBuilder builder )
         base.BuildClasses( builder );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( string value )
-    {
-        return TextChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override Task<ParseValue<string>> ParseValueFromStringAsync( string value )
     {
         return Task.FromResult( new ParseValue<string>( true, value, null ) );
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( TextExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( TextExpression )
-            : ExpressionFormatter.FormatLambda( TextExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -117,9 +66,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     protected string Mode => InputMode.ToTextInputMode();
 
-    /// <inheritdoc/>
-    protected override string InternalValue { get => Text; set => Text = value; }
-
     /// <inheritdoc/>
     protected override string DefaultValue => string.Empty;
 
@@ -138,21 +84,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     [Parameter] public TextInputMode InputMode { get; set; } = TextInputMode.None;
 
-    /// <summary>
-    /// Gets or sets the text inside the input field.
-    /// </summary>
-    [Parameter] public string Text { get; set; }
-
-    /// <summary>
-    /// Occurs after text has changed.
-    /// </summary>
-    [Parameter] public EventCallback<string> TextChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the text value.
-    /// </summary>
-    [Parameter] public Expression<Func<string>> TextExpression { get; set; }
-
     /// <summary>
     /// A string representing a edit mask expression.
     /// </summary>
diff --git a/Source/Blazorise/Components/TimeEdit/TimeEdit.razor.cs b/Source/Blazorise/Components/TimeEdit/TimeEdit.razor.cs
index 403d4d3f05..2c89276be0 100644
--- a/Source/Blazorise/Components/TimeEdit/TimeEdit.razor.cs
+++ b/Source/Blazorise/Components/TimeEdit/TimeEdit.razor.cs
@@ -18,38 +18,6 @@ public partial class TimeEdit<TValue> : BaseTextInput<TValue>
 {
     #region Methods
 
-    /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
-    {
-        if ( Rendered )
-        {
-            if ( parameters.TryGetValue<TValue>( nameof( Time ), out var paramTime ) && !paramTime.IsEqual( Time ) )
-            {
-                ExecuteAfterRender( Revalidate );
-            }
-        }
-
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( TimeExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<TValue>( nameof( Time ), out var inTime )
-                    ? inTime
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
-    }
-
     /// <inheritdoc/>
     protected override void BuildClasses( ClassBuilder builder )
     {
@@ -67,12 +35,6 @@ protected override Task OnChangeHandler( ChangeEventArgs e )
         return CurrentValueHandler( e?.Value?.ToString() );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return TimeChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override string FormatValueAsString( TValue value )
     {
@@ -122,17 +84,6 @@ public Task ShowPicker()
         return JSUtilitiesModule.ShowPicker( ElementRef, ElementId ).AsTask();
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( TimeExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( TimeExpression )
-            : ExpressionFormatter.FormatLambda( TimeExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -140,24 +91,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Time; set => Time = value; }
-
-    /// <summary>
-    /// Gets or sets the input time value.
-    /// </summary>
-    [Parameter] public TValue Time { get; set; }
-
-    /// <summary>
-    /// Occurs when the time has changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> TimeChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the time field.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> TimeExpression { get; set; }
-
     /// <summary>
     /// The earliest time to accept.
     /// </summary>
diff --git a/Source/Blazorise/Components/TimePicker/TimePicker.razor.cs b/Source/Blazorise/Components/TimePicker/TimePicker.razor.cs
index 891dee57ac..c26bbef6ac 100644
--- a/Source/Blazorise/Components/TimePicker/TimePicker.razor.cs
+++ b/Source/Blazorise/Components/TimePicker/TimePicker.razor.cs
@@ -22,9 +22,10 @@ public partial class TimePicker<TValue> : BaseTextInput<TValue>, IAsyncDisposabl
     #region Methods
 
     /// <inheritdoc/>
-    public override async Task SetParametersAsync( ParameterView parameters )
+    protected override async Task OnBeforeSetParametersAsync( ParameterView parameters )
     {
-        var timeChanged = parameters.TryGetValue( nameof( Time ), out TValue time ) && !Time.IsEqual( time );
+        await base.OnBeforeSetParametersAsync( parameters );
+
         var minChanged = parameters.TryGetValue( nameof( Min ), out TimeSpan? min ) && !Min.IsEqual( min );
         var maxChanged = parameters.TryGetValue( nameof( Max ), out TimeSpan? max ) && !Max.IsEqual( max );
         var displayFormatChanged = parameters.TryGetValue( nameof( DisplayFormat ), out string displayFormat ) && DisplayFormat != displayFormat;
@@ -35,9 +36,9 @@ public override async Task SetParametersAsync( ParameterView parameters )
         var placeholderChanged = parameters.TryGetValue( nameof( Placeholder ), out string paramPlaceholder ) && Placeholder != paramPlaceholder;
         var staticPickerChanged = parameters.TryGetValue( nameof( StaticPicker ), out bool paramSaticPicker ) && StaticPicker != paramSaticPicker;
 
-        if ( timeChanged )
+        if ( paramValue.Changed )
         {
-            var timeString = FormatValueAsString( time );
+            var timeString = FormatValueAsString( paramValue.Value );
 
             await CurrentValueHandler( timeString );
 
@@ -70,27 +71,6 @@ public override async Task SetParametersAsync( ParameterView parameters )
                 StaticPicker = new JSOptionChange<bool>( staticPickerChanged, paramSaticPicker ),
             } ) );
         }
-
-        // Let blazor do its thing!
-        await base.SetParametersAsync( parameters );
-
-        if ( ParentValidation is not null )
-        {
-            if ( parameters.TryGetValue<Expression<Func<TValue>>>( nameof( TimeExpression ), out var expression ) )
-                await ParentValidation.InitializeInputExpression( expression );
-
-            if ( parameters.TryGetValue<string>( nameof( Pattern ), out var pattern ) )
-            {
-                // make sure we get the newest value
-                var value = parameters.TryGetValue<TValue>( nameof( Time ), out var inTime )
-                    ? inTime
-                    : InternalValue;
-
-                await ParentValidation.InitializeInputPattern( pattern, value );
-            }
-
-            await InitializeValidation();
-        }
     }
 
     /// <inheritdoc/>
@@ -108,7 +88,7 @@ protected override async Task OnFirstAfterRenderAsync()
         {
             DisplayFormat = DisplayFormatConverter.Convert( DisplayFormat ),
             TimeAs24hr = TimeAs24hr,
-            Default = FormatValueAsString( Time ),
+            Default = FormatValueAsString( Value ),
             Min = Min?.ToString( Parsers.InternalTimeFormat.ToLowerInvariant() ),
             Max = Max?.ToString( Parsers.InternalTimeFormat.ToLowerInvariant() ),
             Disabled = Disabled,
@@ -165,12 +145,6 @@ protected async Task OnClickHandler( MouseEventArgs e )
         await JSModule.Activate( ElementRef, ElementId, Parsers.InternalTimeFormat );
     }
 
-    /// <inheritdoc/>
-    protected override Task OnInternalValueChanged( TValue value )
-    {
-        return TimeChanged.InvokeAsync( value );
-    }
-
     /// <inheritdoc/>
     protected override string FormatValueAsString( TValue value )
     {
@@ -272,17 +246,6 @@ private object GetLocalizationObject()
         };
     }
 
-    /// <inheritdoc/>
-    protected override string GetFormatedValueExpression()
-    {
-        if ( TimeExpression is null )
-            return null;
-
-        return HtmlFieldPrefix is not null
-            ? HtmlFieldPrefix.GetFieldName( TimeExpression )
-            : ExpressionFormatter.FormatLambda( TimeExpression );
-    }
-
     #endregion
 
     #region Properties
@@ -290,9 +253,6 @@ protected override string GetFormatedValueExpression()
     /// <inheritdoc/>
     protected override bool ShouldAutoGenerateId => true;
 
-    /// <inheritdoc/>
-    protected override TValue InternalValue { get => Time; set => Time = value; }
-
     /// <summary>
     /// Gets or sets the <see cref="IJSTimePickerModule"/> instance.
     /// </summary>
@@ -313,21 +273,6 @@ protected override string GetFormatedValueExpression()
     /// </summary>
     [Inject] protected IFlatPickrDateTimeDisplayFormatConverter DisplayFormatConverter { get; set; }
 
-    /// <summary>
-    /// Gets or sets the input time value.
-    /// </summary>
-    [Parameter] public TValue Time { get; set; }
-
-    /// <summary>
-    /// Occurs when the time has changed.
-    /// </summary>
-    [Parameter] public EventCallback<TValue> TimeChanged { get; set; }
-
-    /// <summary>
-    /// Gets or sets an expression that identifies the time field.
-    /// </summary>
-    [Parameter] public Expression<Func<TValue>> TimeExpression { get; set; }
-
     /// <summary>
     /// The earliest time to accept.
     /// </summary>
diff --git a/Source/Blazorise/Extensions/ArrayExtensions.cs b/Source/Blazorise/Extensions/ArrayExtensions.cs
index d7ef72c2a1..3a99513f2c 100644
--- a/Source/Blazorise/Extensions/ArrayExtensions.cs
+++ b/Source/Blazorise/Extensions/ArrayExtensions.cs
@@ -1,5 +1,6 @@
 #region Using directives
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 #endregion
@@ -28,6 +29,36 @@ public static bool AreEqual<T>( this IEnumerable<T> array1, IEnumerable<T> array
         return array1.SequenceEqual( array2 );
     }
 
+    /// <summary>
+    /// Compares two non-generic IEnumerable collections to determine if they are equal.
+    /// </summary>
+    /// <param name="array1">The first IEnumerable collection.</param>
+    /// <param name="array2">The second IEnumerable collection.</param>
+    /// <returns>True if the collections are equal, otherwise false.</returns>
+    public static bool AreEqual( this IEnumerable array1, IEnumerable array2 )
+    {
+        if ( array1 is null && array2 is null )
+            return true;
+
+        if ( ( array1 is not null && array2 is null ) || ( array2 is not null && array1 is null ) )
+            return false;
+
+        var enumerator1 = array1.GetEnumerator();
+        var enumerator2 = array2.GetEnumerator();
+
+        while ( enumerator1.MoveNext() )
+        {
+            if ( !enumerator2.MoveNext() || !Equals( enumerator1.Current, enumerator2.Current ) )
+                return false;
+        }
+
+        // Check if array2 still has more elements
+        if ( enumerator2.MoveNext() )
+            return false;
+
+        return true;
+    }
+
     /// <summary>
     /// Determines if all ellements in the supplied arrays are equal. Orders the elements of both collections.
     /// </summary>
diff --git a/Source/Blazorise/Extensions/ParameterExtensions.cs b/Source/Blazorise/Extensions/ParameterExtensions.cs
new file mode 100644
index 0000000000..e9c76047b0
--- /dev/null
+++ b/Source/Blazorise/Extensions/ParameterExtensions.cs
@@ -0,0 +1,64 @@
+#region Using directives
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Components;
+#endregion
+
+namespace Blazorise.Extensions;
+
+/// <summary>
+/// Helper methods for component parameters.
+/// </summary>
+public static class ParameterViewExtensions
+{
+    #region Methods
+
+    /// <summary>
+    /// Gets the value of the parameter with the specified name.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="parameters">Dictionary of all component paremeters.</param>
+    /// <param name="parameterName">The name of the parameter.</param>
+    /// <param name="currentValue">Last known parameter value.</param>
+    /// <param name="result">Receives the result, if any.</param>
+    public static bool TryGetParameter<T>( this ParameterView parameters, string parameterName, T currentValue, out ComponentParameterInfo<T> result )
+    {
+        if ( parameters.TryGetValue<T>( parameterName, out var paramNewValue ) )
+        {
+            var changed = currentValue is IEnumerable<T> array && paramNewValue is IEnumerable<T> array2
+                ? !array.AreEqual( array2 )
+                : !paramNewValue.IsEqual( currentValue );
+
+            result = new ComponentParameterInfo<T>( paramNewValue, true, changed );
+        }
+        else
+            result = new ComponentParameterInfo<T>( default );
+
+        return result.Defined;
+    }
+
+    /// <summary>
+    /// Gets the value of the parameter with the specified name.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="parameters">Dictionary of all component paremeters.</param>
+    /// <param name="parameterName">The name of the parameter.</param>
+    /// <param name="comparer">The custom comparer function.</param>
+    /// <param name="currentValue">Last known parameter value.</param>
+    /// <param name="result">Receives the result, if any.</param>
+    public static bool TryGetParameter<T>( this ParameterView parameters, string parameterName, T currentValue, Func<T, bool> comparer, out ComponentParameterInfo<T> result )
+    {
+        if ( parameters.TryGetValue<T>( parameterName, out var paramNewValue ) )
+        {
+            var changed = comparer( paramNewValue );
+
+            result = new ComponentParameterInfo<T>( paramNewValue, true, changed );
+        }
+        else
+            result = new ComponentParameterInfo<T>( default );
+
+        return result.Defined;
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/Source/Blazorise/Models/ComponentParameterInfo.cs b/Source/Blazorise/Models/ComponentParameterInfo.cs
new file mode 100644
index 0000000000..cc21d877ce
--- /dev/null
+++ b/Source/Blazorise/Models/ComponentParameterInfo.cs
@@ -0,0 +1,80 @@
+namespace Blazorise;
+
+/// <summary>
+/// Represents a component parameter that can contain the last received value, as well as information about whether it was defined or changed.
+/// </summary>
+/// <typeparam name="T">The type of the component parameter's value.</typeparam>
+public record struct ComponentParameterInfo<T>
+{
+    #region Members
+
+    private readonly bool defined;
+
+    private readonly bool changed;
+
+    #endregion
+
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ComponentParameterInfo{T}"/> structure with the specified value.
+    /// </summary>
+    /// <param name="value">The value of the component parameter.</param>
+    public ComponentParameterInfo( T value )
+    {
+        Value = value;
+        defined = false;
+        changed = false;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ComponentParameterInfo{T}"/> structure with the specified value and received information.
+    /// </summary>
+    /// <param name="value">The value of the component parameter.</param>
+    /// <param name="defined">A value indicating whether the parameter was received through the component parameters or attributes.</param>
+    /// <param name="changed">A value indicating whether the parameter has changed since it was last rendered.</param>
+    public ComponentParameterInfo( T value, bool defined, bool changed )
+    {
+        Value = value;
+        this.defined = defined;
+        this.changed = changed;
+    }
+
+    #endregion
+
+    #region Methods
+
+    /// <summary>
+    /// Retrieves the value of the current <see cref="ComponentParameterInfo{T}"/> object, or a default value if the parameter was not defined.
+    /// </summary>
+    /// <param name="defaultValue">A value to return if the <see cref="Defined"/> property is false.</param>
+    /// <returns>The value of the <see cref="Value"/> property if <see cref="Defined"/> is true; otherwise, the <paramref name="defaultValue"/> parameter.</returns>
+    public T GetValueOrDefault( T defaultValue )
+    {
+        if ( !defined )
+            return defaultValue;
+
+        return Value;
+    }
+
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// Gets the actual value that was received through the component parameters or attributes.
+    /// </summary>
+    public T Value { get; }
+
+    /// <summary>
+    /// Indicates whether the parameter was defined and received through the component parameters or attributes.
+    /// </summary>
+    public bool Defined => defined;
+
+    /// <summary>
+    /// Indicates whether the received parameter has changed since the last rendering.
+    /// </summary>
+    public bool Changed => changed;
+
+    #endregion
+}
\ No newline at end of file
diff --git a/Source/Blazorise/Utilities/Formatters/Converters.cs b/Source/Blazorise/Utilities/Formatters/Converters.cs
index 41193fb1a3..e61ad14e7e 100644
--- a/Source/Blazorise/Utilities/Formatters/Converters.cs
+++ b/Source/Blazorise/Utilities/Formatters/Converters.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
@@ -427,5 +428,77 @@ private static bool IsEqualToDefaultValue<T>( T argument )
         return false;
     }
 
+    /// <summary>
+    /// Converts a delimited string to an IReadOnlyList of the specified element type at runtime.
+    /// </summary>
+    /// <param name="csv">The input string to be parsed and converted.</param>
+    /// <param name="delimiter">The delimiter used to split the string into individual elements.</param>
+    /// <returns>
+    /// An object that can be cast to an IReadOnlyList of the appropriate type, based on the provided targetType.
+    /// </returns>
+    /// <remarks>
+    /// This method uses reflection to dynamically handle conversion to generic types at runtime.
+    /// </remarks>
+    /// <exception cref="ArgumentException">Thrown if the targetType is not a generic IReadOnlyList.</exception>
+    public static TValue ConvertCsvToReadOnlyList<TValue>( string csv, string delimiter )
+    {
+        var targetType = typeof( TValue );
+
+        Type elementType;
+        bool isArray = false;
+
+        if ( targetType.IsArray )
+        {
+            isArray = true;
+            elementType = targetType.GetElementType();
+        }
+        else if ( targetType.IsGenericType && targetType.GetGenericTypeDefinition() == typeof( IReadOnlyList<> ) )
+        {
+            elementType = targetType.GetGenericArguments().Single();
+        }
+        else
+        {
+            throw new ArgumentException( "The target type must be either an array or a generic IReadOnlyList.", nameof( targetType ) );
+        }
+
+        var multipleValues = csv.Split( delimiter, StringSplitOptions.None )
+                                  .Select( val =>
+                                  {
+                                      if ( TryChangeType( val, elementType, out var newValue ) )
+                                          return newValue;
+
+                                      // Return default value (e.g., 0 for int) if conversion fails
+                                      return Activator.CreateInstance( elementType );
+                                  } ).ToList();
+
+        if ( isArray )
+        {
+            var array = Array.CreateInstance( elementType, multipleValues.Count );
+            for ( int i = 0; i < multipleValues.Count; i++ )
+            {
+                array.SetValue( multipleValues[i], i );
+            }
+
+            return (TValue)(object)array;
+        }
+        else
+        {
+            var castedValues = typeof( Enumerable )
+                .GetMethod( "Cast" )
+                .MakeGenericMethod( elementType )
+                .Invoke( null, new object[] { multipleValues } );
+
+            var typedList = typeof( Enumerable )
+                .GetMethod( "ToList" )
+                .MakeGenericMethod( elementType )
+                .Invoke( null, new object[] { castedValues } );
+
+            var readOnlyListType = typeof( ReadOnlyCollection<> ).MakeGenericType( elementType );
+            var readOnlyList = Activator.CreateInstance( readOnlyListType, typedList );
+
+            return (TValue)readOnlyList;
+        }
+    }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Source/Blazorise/Utilities/Formatters/Parsers.cs b/Source/Blazorise/Utilities/Formatters/Parsers.cs
index c08926fc16..4d2b8669ca 100644
--- a/Source/Blazorise/Utilities/Formatters/Parsers.cs
+++ b/Source/Blazorise/Utilities/Formatters/Parsers.cs
@@ -1,6 +1,9 @@
 #region Using directives
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Globalization;
+using System.Linq;
 #endregion
 
 namespace Blazorise.Utilities;
@@ -232,4 +235,122 @@ public static bool TryParseTime<TValue>( string value, out TValue result )
 
         return false;
     }
+
+    /// <summary>
+    /// Tries to parse a string value into a date or date-related type based on the specified conversion type and input mode.
+    /// </summary>
+    /// <param name="value">The string value to parse.</param>
+    /// <param name="conversionType">The type to which the string should be converted.</param>
+    /// <param name="inputMode">The date input mode that determines the supported date formats.</param>
+    /// <param name="result">The parsed result, or the default value if parsing fails.</param>
+    /// <returns>True if parsing is successful; otherwise, false.</returns>
+    public static bool TryParseDate( string value, Type conversionType, DateInputMode inputMode, out object result )
+    {
+        if ( string.IsNullOrWhiteSpace( value ) )
+        {
+            result = default;
+            return false;
+        }
+
+        var supportedParseFormats = GetSupportedParseDateFormats( inputMode );
+
+        var type = Nullable.GetUnderlyingType( conversionType ) ?? conversionType;
+
+        if ( type == typeof( DateTime ) && DateTime.TryParseExact( value, supportedParseFormats, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDt ) )
+        {
+            result = parsedDt;
+            return true;
+        }
+
+        if ( type == typeof( DateTime ) && DateTimeOffset.TryParse( value, out var parsedDto ) )
+        {
+            result = parsedDto.DateTime;
+            return true;
+        }
+
+        if ( type == typeof( DateOnly ) && DateOnly.TryParse( value, out var parsedDto3 ) )
+        {
+            result = parsedDto3;
+            return true;
+        }
+
+        if ( type == typeof( DateTimeOffset ) && DateTimeOffset.TryParse( value, out var parsedDto2 ) )
+        {
+            result = parsedDto2;
+            return true;
+        }
+
+        result = default;
+
+        return false;
+    }
+
+    /// <summary>
+    /// Parses a comma-separated string of dates into a readonly list or array of the specified type.
+    /// </summary>
+    /// <typeparam name="TValue">The target type, either an array or IReadOnlyList.</typeparam>
+    /// <param name="csv">A string containing the date values separated by the specified delimiter.</param>
+    /// <param name="delimiter">The delimiter used to separate the values in the string.</param>
+    /// <param name="inputMode">The date input mode to determine supported date formats.</param>
+    /// <returns>A readonly list or array containing the parsed date values.</returns>
+    /// <exception cref="ArgumentException">Thrown if the target type is not an array or IReadOnlyList.</exception>
+    public static TValue ParseCsvDatesToReadOnlyList<TValue>( string csv, string delimiter, DateInputMode inputMode )
+    {
+        var targetType = typeof( TValue );
+
+        Type elementType;
+        bool isArray = false;
+
+        if ( targetType.IsArray )
+        {
+            isArray = true;
+            elementType = targetType.GetElementType();
+        }
+        else if ( targetType.IsGenericType && targetType.GetGenericTypeDefinition() == typeof( IReadOnlyList<> ) )
+        {
+            elementType = targetType.GetGenericArguments().Single();
+        }
+        else
+        {
+            throw new ArgumentException( "The target type must be either an array or a generic IReadOnlyList.", nameof( targetType ) );
+        }
+
+        var multipleValues = csv
+            .Split( delimiter, StringSplitOptions.None )
+            .Select( val =>
+            {
+                if ( TryParseDate( val, elementType, inputMode, out var newValue ) )
+                    return newValue;
+
+                return Activator.CreateInstance( elementType );
+            } ).ToList();
+
+        if ( isArray )
+        {
+            var array = Array.CreateInstance( elementType, multipleValues.Count );
+            for ( int i = 0; i < multipleValues.Count; i++ )
+            {
+                array.SetValue( multipleValues[i], i );
+            }
+
+            return (TValue)(object)array;
+        }
+        else
+        {
+            var castedValues = typeof( Enumerable )
+                .GetMethod( "Cast" )
+                .MakeGenericMethod( elementType )
+                .Invoke( null, new object[] { multipleValues } );
+
+            var typedList = typeof( Enumerable )
+                .GetMethod( "ToList" )
+                .MakeGenericMethod( elementType )
+                .Invoke( null, new object[] { castedValues } );
+
+            var readOnlyListType = typeof( ReadOnlyCollection<> ).MakeGenericType( elementType );
+            var readOnlyList = Activator.CreateInstance( readOnlyListType, typedList );
+
+            return (TValue)readOnlyList;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Source/Extensions/Blazorise.Components/Autocomplete.razor b/Source/Extensions/Blazorise.Components/Autocomplete.razor
index d7746b75fd..158f55b906 100644
--- a/Source/Extensions/Blazorise.Components/Autocomplete.razor
+++ b/Source/Extensions/Blazorise.Components/Autocomplete.razor
@@ -28,8 +28,8 @@
         <TextEdit @ref="@textEditRef"
                   ElementId="@InputElementId"
                   Role="TextRole.Search"
-                  Text="@Search"
-                  TextChanged="@OnTextChangedHandler"
+                  Value="@Search"
+                  ValueChanged="@OnTextChangedHandler"
                   Placeholder="@Placeholder"
                   Size="@Size"
                   MaxLength="@MaxEntryLength"
diff --git a/Source/Extensions/Blazorise.Components/SelectList.razor b/Source/Extensions/Blazorise.Components/SelectList.razor
index 4b5c4124db..1f4ef1c7a2 100644
--- a/Source/Extensions/Blazorise.Components/SelectList.razor
+++ b/Source/Extensions/Blazorise.Components/SelectList.razor
@@ -1,6 +1,6 @@
 @typeparam TItem
 @typeparam TValue
-<Select @ref="@selectRef" ElementId="@ElementId" TValue="TValue" Multiple="@Multiple" SelectedValue="@SelectedValue" SelectedValueChanged="@HandleSelectedValueChanged" SelectedValues="@SelectedValues" SelectedValuesChanged="@HandleSelectedValuesChanged" Class="@Class" Style="@Style" Size="@Size" MaxVisibleItems="@MaxVisibleItems" TabIndex="@TabIndex" Disabled="@Disabled" Attributes="@Attributes" SelectedValueExpression="@SelectedValueExpression" SelectedValuesExpression="@SelectedValuesExpression">
+<Select @ref="@selectRef" ElementId="@ElementId" TValue="TValue" Multiple="@Multiple" Value="@SelectedValue" ValueChanged="@HandleSelectedValueChanged" Class="@Class" Style="@Style" Size="@Size" MaxVisibleItems="@MaxVisibleItems" TabIndex="@TabIndex" Disabled="@Disabled" Attributes="@Attributes">
     <ChildContent>
         @if ( DefaultItemText != null )
         {
diff --git a/Source/Extensions/Blazorise.Components/SelectList.razor.cs b/Source/Extensions/Blazorise.Components/SelectList.razor.cs
index be675821a7..d4b9a934d5 100644
--- a/Source/Extensions/Blazorise.Components/SelectList.razor.cs
+++ b/Source/Extensions/Blazorise.Components/SelectList.razor.cs
@@ -44,13 +44,6 @@ protected Task HandleSelectedValueChanged( TValue value )
         return SelectedValueChanged.InvokeAsync( value );
     }
 
-    protected Task HandleSelectedValuesChanged( IReadOnlyList<TValue> value )
-    {
-        SelectedValues = value;
-
-        return SelectedValuesChanged.InvokeAsync( value );
-    }
-
     /// <summary>
     /// Sets focus on the input element, if it can be focused.
     /// </summary>
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellCheckEdit.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridCellCheckEdit.razor
index 6d7598f6b0..3005f65681 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellCheckEdit.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellCheckEdit.razor
@@ -13,13 +13,13 @@
         var type = typeof( Check<> ).MakeGenericType( new[] { valueType } );
 
         builder.OpenComponent( 0, type );
-        builder.AddAttribute( 1, nameof( Check<object>.Checked ), valueType switch
+        builder.AddAttribute( 1, nameof( Check<object>.Value ), valueType switch
         {
             Type typeBool when typeBool == typeof( bool ) => (bool)( CellValue ?? (bool)default ),
             Type typeBoolNull when typeBoolNull == typeof( bool? ) => (bool?)( CellValue ?? (bool?)default ),
             _ => throw new InvalidOperationException( $"Unsupported type {valueType}" )
         } );
-        builder.AddAttribute( 2, nameof( Check<object>.CheckedChanged ), valueType switch
+        builder.AddAttribute( 2, nameof( Check<object>.ValueChanged ), valueType switch
         {
             Type typeBool when typeBool == typeof( bool ) => EventCallback.Factory.Create<bool>( this, ( OnCellValueChanged<bool> ) ),
             Type typeBoolNull when typeBoolNull == typeof( bool? ) => EventCallback.Factory.Create<bool?>( this, ( OnCellValueChanged<bool?> ) ),
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellDatePicker.razor.cs b/Source/Extensions/Blazorise.DataGrid/_DataGridCellDatePicker.razor.cs
index bb853af32b..42a55b8e60 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellDatePicker.razor.cs
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellDatePicker.razor.cs
@@ -75,7 +75,7 @@ public async Task Focus()
         var type = typeof( DatePicker<> ).MakeGenericType( new[] { valueType } );
 
         builder.OpenComponent( 0, type );
-        builder.AddAttribute( 1, nameof( DatePicker<object>.Date ), valueType switch
+        builder.AddAttribute( 1, nameof( DatePicker<object>.Value ), valueType switch
         {
             Type typeDateTime when typeDateTime == typeof( DateTime ) => (DateTime)( CellValue ?? (DateTime)default ),
             Type typeDateTimeNull when typeDateTimeNull == typeof( DateTime? ) => (DateTime?)( CellValue ?? (DateTime?)default ),
@@ -85,7 +85,7 @@ public async Task Focus()
             Type typeDateTimeOffsetNull when typeDateTimeOffsetNull == typeof( DateTimeOffset? ) => (DateTimeOffset?)( CellValue ?? (DateTimeOffset?)default ),
             _ => throw new InvalidOperationException( $"Unsupported type {valueType}" )
         } );
-        builder.AddAttribute( 2, nameof( DatePicker<object>.DateChanged ), valueType switch
+        builder.AddAttribute( 2, nameof( DatePicker<object>.ValueChanged ), valueType switch
         {
             Type typeDateTime when typeDateTime == typeof( DateTime ) => EventCallback.Factory.Create<DateTime>( this, ( OnCellValueChanged<DateTime> ) ),
             Type typeDateTimeNull when typeDateTimeNull == typeof( DateTime? ) => EventCallback.Factory.Create<DateTime?>( this, ( OnCellValueChanged<DateTime?> ) ),
@@ -116,7 +116,7 @@ public async Task Focus()
         var type = typeof( DateEdit<> ).MakeGenericType( new[] { valueType } );
 
         builder.OpenComponent( 0, type );
-        builder.AddAttribute( 1, nameof( DateEdit<object>.Date ), valueType switch
+        builder.AddAttribute( 1, nameof( DateEdit<object>.Value ), valueType switch
         {
             Type typeDateTime when typeDateTime == typeof( DateTime ) => (DateTime)( CellValue ?? (DateTime)default ),
             Type typeDateTimeNull when typeDateTimeNull == typeof( DateTime? ) => (DateTime?)( CellValue ?? (DateTime?)default ),
@@ -126,7 +126,7 @@ public async Task Focus()
             Type typeDateTimeOffsetNull when typeDateTimeOffsetNull == typeof( DateTimeOffset? ) => (DateTimeOffset?)( CellValue ?? (DateTimeOffset?)default ),
             _ => throw new InvalidOperationException( $"Unsupported type {valueType}" )
         } );
-        builder.AddAttribute( 2, nameof( DateEdit<object>.DateChanged ), valueType switch
+        builder.AddAttribute( 2, nameof( DateEdit<object>.ValueChanged ), valueType switch
         {
             Type typeDateTime when typeDateTime == typeof( DateTime ) => EventCallback.Factory.Create<DateTime>( this, ( OnCellValueChanged<DateTime> ) ),
             Type typeDateTimeNull when typeDateTimeNull == typeof( DateTime? ) => EventCallback.Factory.Create<DateTime?>( this, ( OnCellValueChanged<DateTime?> ) ),
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellEdit.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridCellEdit.razor
index 8e89e88c44..01303515e9 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellEdit.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellEdit.razor
@@ -3,7 +3,7 @@
 @inherits ComponentBase
 @if ( ValueType == typeof( string ) )
 {
-    <TextEdit ElementId="@elementId" Text="@CellEditContext.CellValue?.ToString()" TextChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" />
+    <TextEdit ElementId="@elementId" Value="@CellEditContext.CellValue?.ToString()" ValueChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" />
 }
 else if ( ValueType == typeof( decimal ) )
 {
@@ -47,53 +47,53 @@ else if ( ValueType == typeof( long? ) )
 }
 else if ( ValueType == typeof( bool ) )
 {
-    <Check ElementId="@elementId" TValue="bool" Checked="@((bool)CellEditContext.CellValue)" CheckedChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <Check ElementId="@elementId" TValue="bool" Value="@((bool)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else if ( ValueType == typeof( bool? ) )
 {
-    <Check ElementId="@elementId" TValue="bool?" Checked="@((bool?)CellEditContext.CellValue)" CheckedChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <Check ElementId="@elementId" TValue="bool?" Value="@((bool?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else if ( ValueType == typeof( DateTime ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTime" Date="@((DateTime)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateTime" Value="@((DateTime)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( DateTime? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTime?" Date="@((DateTime?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateTime?" Value="@((DateTime?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( DateOnly ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateOnly" Date="@((DateOnly)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateOnly" Value="@((DateOnly)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( DateOnly? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateOnly?" Date="@((DateOnly?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateOnly?" Value="@((DateOnly?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( DateTimeOffset ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTimeOffset" Date="@((DateTimeOffset)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateTimeOffset" Value="@((DateTimeOffset)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( DateTimeOffset? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTimeOffset?" Date="@((DateTimeOffset?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
+    <DateEdit ElementId="@elementId" TValue="DateTimeOffset?" Value="@((DateTimeOffset?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" InputMode="@DateInputMode" />
 }
 else if ( ValueType == typeof( TimeSpan ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeSpan" Time="@((TimeSpan)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <TimeEdit ElementId="@elementId" TValue="TimeSpan" Value="@((TimeSpan)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else if ( ValueType == typeof( TimeSpan? ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeSpan?" Time="@((TimeSpan?)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <TimeEdit ElementId="@elementId" TValue="TimeSpan?" Value="@((TimeSpan?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else if ( ValueType == typeof( TimeOnly ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeOnly" Time="@((TimeOnly)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <TimeEdit ElementId="@elementId" TValue="TimeOnly" Value="@((TimeOnly)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else if ( ValueType == typeof( TimeSpan? ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeOnly?" Time="@((TimeOnly?)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
+    <TimeEdit ElementId="@elementId" TValue="TimeOnly?" Value="@((TimeOnly?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ReadOnly="@Readonly" />
 }
 else
 {
-    <TextEdit ElementId="@elementId" Text="@CellEditContext.CellValue?.ToString()" TextChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" />
+    <TextEdit ElementId="@elementId" Value="@CellEditContext.CellValue?.ToString()" ValueChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" />
 }
\ No newline at end of file
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellEditValidation.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridCellEditValidation.razor
index 573895ef55..ab919efd04 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellEditValidation.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellEditValidation.razor
@@ -3,7 +3,7 @@
 @inherits _DataGridCellEdit<TItem>
 @if ( ValueType == typeof( string ) )
 {
-    <TextEdit ElementId="@elementId" Text="@CellEditContext.CellValue?.ToString()" TextChanged="@OnEditValueChanged" TextExpression="@stringExpression" ReadOnly="@Column.Readonly" Pattern="@ValidationPattern">
+    <TextEdit ElementId="@elementId" Value="@CellEditContext.CellValue?.ToString()" ValueChanged="@OnEditValueChanged" ValueExpression="@stringExpression" ReadOnly="@Column.Readonly" Pattern="@ValidationPattern">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -124,7 +124,7 @@ else if ( ValueType == typeof( long? ) )
 }
 else if ( ValueType == typeof( bool ) )
 {
-    <Check ElementId="@elementId" TValue="bool" Checked="@((bool)CellEditContext.CellValue)" CheckedChanged="@OnEditValueChanged" CheckedExpression="@boolExpression" ReadOnly="@Readonly">
+    <Check ElementId="@elementId" TValue="bool" Value="@((bool)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@boolExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -135,7 +135,7 @@ else if ( ValueType == typeof( bool ) )
 }
 else if ( ValueType == typeof( bool? ) )
 {
-    <Check ElementId="@elementId" TValue="bool?" Checked="@((bool?)CellEditContext.CellValue)" CheckedChanged="@OnEditValueChanged" CheckedExpression="@nullableBoolExpression" ReadOnly="@Readonly">
+    <Check ElementId="@elementId" TValue="bool?" Value="@((bool?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableBoolExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -146,7 +146,7 @@ else if ( ValueType == typeof( bool? ) )
 }
 else if ( ValueType == typeof( DateTime ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTime" Date="@((DateTime)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@dateTimeExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateTime" Value="@((DateTime)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@dateTimeExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -157,7 +157,7 @@ else if ( ValueType == typeof( DateTime ) )
 }
 else if ( ValueType == typeof( DateTime? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTime?" Date="@((DateTime?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@nullableDateTimeExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateTime?" Value="@((DateTime?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableDateTimeExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -168,7 +168,7 @@ else if ( ValueType == typeof( DateTime? ) )
 }
 else if ( ValueType == typeof( DateOnly ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateOnly" Date="@((DateOnly)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@dateOnlyExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateOnly" Value="@((DateOnly)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@dateOnlyExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -179,7 +179,7 @@ else if ( ValueType == typeof( DateOnly ) )
 }
 else if ( ValueType == typeof( DateOnly? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateOnly?" Date="@((DateOnly?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@nullableDateOnlyExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateOnly?" Value="@((DateOnly?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableDateOnlyExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -190,7 +190,7 @@ else if ( ValueType == typeof( DateOnly? ) )
 }
 else if ( ValueType == typeof( DateTimeOffset ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTimeOffset" Date="@((DateTimeOffset)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@dateTimeOffsetExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateTimeOffset" Value="@((DateTimeOffset)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@dateTimeOffsetExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -201,7 +201,7 @@ else if ( ValueType == typeof( DateTimeOffset ) )
 }
 else if ( ValueType == typeof( DateTimeOffset? ) )
 {
-    <DateEdit ElementId="@elementId" TValue="DateTimeOffset?" Date="@((DateTimeOffset?)CellEditContext.CellValue)" DateChanged="@OnEditValueChanged" DateExpression="@nullableDateTimeOffsetExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
+    <DateEdit ElementId="@elementId" TValue="DateTimeOffset?" Value="@((DateTimeOffset?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableDateTimeOffsetExpression" ReadOnly="@Readonly" Pattern="@ValidationPattern" InputMode="@DateInputMode">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -212,7 +212,7 @@ else if ( ValueType == typeof( DateTimeOffset? ) )
 }
 else if ( ValueType == typeof( TimeSpan ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeSpan" Time="@((TimeSpan)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" TimeExpression="@timeSpanExpression" ReadOnly="@Readonly">
+    <TimeEdit ElementId="@elementId" TValue="TimeSpan" Value="@((TimeSpan)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@timeSpanExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -223,7 +223,7 @@ else if ( ValueType == typeof( TimeSpan ) )
 }
 else if ( ValueType == typeof( TimeSpan? ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeSpan?" Time="@((TimeSpan?)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" TimeExpression="@nullableTimeSpanExpression" ReadOnly="@Readonly">
+    <TimeEdit ElementId="@elementId" TValue="TimeSpan?" Value="@((TimeSpan?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableTimeSpanExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -234,7 +234,7 @@ else if ( ValueType == typeof( TimeSpan? ) )
 }
 else if ( ValueType == typeof( TimeOnly ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeOnly" Time="@((TimeOnly)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" TimeExpression="@timeOnlyExpression" ReadOnly="@Readonly">
+    <TimeEdit ElementId="@elementId" TValue="TimeOnly" Value="@((TimeOnly)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@timeOnlyExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -245,7 +245,7 @@ else if ( ValueType == typeof( TimeOnly ) )
 }
 else if ( ValueType == typeof( TimeOnly? ) )
 {
-    <TimeEdit ElementId="@elementId" TValue="TimeOnly?" Time="@((TimeOnly?)CellEditContext.CellValue)" TimeChanged="@OnEditValueChanged" TimeExpression="@nullableTimeOnlyExpression" ReadOnly="@Readonly">
+    <TimeEdit ElementId="@elementId" TValue="TimeOnly?" Value="@((TimeOnly?)CellEditContext.CellValue)" ValueChanged="@OnEditValueChanged" ValueExpression="@nullableTimeOnlyExpression" ReadOnly="@Readonly">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
@@ -256,7 +256,7 @@ else if ( ValueType == typeof( TimeOnly? ) )
 }
 else
 {
-    <TextEdit ElementId="@elementId" Text="@CellEditContext.CellValue?.ToString()" TextChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" Pattern="@ValidationPattern">
+    <TextEdit ElementId="@elementId" Value="@CellEditContext.CellValue?.ToString()" ValueChanged="@OnEditValueChanged" ReadOnly="@Column.Readonly" Pattern="@ValidationPattern">
         <Feedback>
             @if ( ShowValidationFeedback )
             {
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellFilter.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridCellFilter.razor
index 34ac2d8629..17f51c3247 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellFilter.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellFilter.razor
@@ -23,7 +23,7 @@
     }
     else
     {
-        <TextEdit Text="@GetSearchValueAsString()" TextChanged="@((newValue) => FilterChanged(newValue))" />
+        <TextEdit Value="@GetSearchValueAsString()" ValueChanged="@((newValue) => FilterChanged(newValue))" />
     }
 }
 @code {
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridCellSelectEdit.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridCellSelectEdit.razor
index 7345ba5b22..fc980426bf 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridCellSelectEdit.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridCellSelectEdit.razor
@@ -1,6 +1,6 @@
 @typeparam TItem
 @inherits ComponentBase
-<Select TValue="object" ElementId="@elementId" SelectedValue="@CellValue" SelectedValueChanged="@OnSelectedValueChanged" SelectedValueExpression="@(() => CellValue )"
+<Select TValue="object" ElementId="@elementId" Value="@CellValue" ValueChanged="@OnSelectedValueChanged" ValueExpression="@(() => CellValue )"
         Class="@Column.Class" Style="@Column.Style" Size="@Column.Size" MaxVisibleItems="@Column.MaxVisibleItems" TabIndex="@Column.TabIndex" Disabled="@Column.Disabled" Attributes="@Column.Attributes">
     <ChildContent>
         @if ( Column.DefaultItemText is not null )
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
index d21dd9283e..21177de8ce 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
@@ -12,7 +12,7 @@
                 var filterMethod = Column.GetFilterMethod() ?? Column.GetDataGridFilterMethodAsColumn();
                 <Column ColumnSize="ColumnSize.Is12">
                     <Field>
-                        <Select TValue="DataGridColumnFilterMethod" SelectedValue="@filterMethod" SelectedValueChanged="e => { Column.SetFilterMethod(e); }">
+                        <Select TValue="DataGridColumnFilterMethod" Value="@filterMethod" ValueChanged="e => { Column.SetFilterMethod(e); }">
                             @if ( Column.ColumnType == DataGridColumnType.Numeric || Column.ColumnType == DataGridColumnType.Date )
                             {
                                 <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.Equals">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodEqualsLocalizer, "Equals" )</SelectItem>
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridMultiSelectAll.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridMultiSelectAll.razor
index 55752fea83..fabdc0a71f 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridMultiSelectAll.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridMultiSelectAll.razor
@@ -9,6 +9,6 @@
 else
 {
     <Label @onclick:stopPropagation>
-        <Check TValue="bool" Indeterminate="IsIndeterminate" Checked="IsChecked" CheckedExpression="()=> IsChecked" CheckedChanged="IsCheckedChanged" @onclick:stopPropagation></Check>
+        <Check TValue="bool" Indeterminate="IsIndeterminate" Value="IsChecked" ValueChanged="IsCheckedChanged" ValueExpression="()=> IsChecked" @onclick:stopPropagation></Check>
     </Label>
 }
\ No newline at end of file
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridPagination.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridPagination.razor
index c6091490f1..db3f697e37 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridPagination.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridPagination.razor
@@ -236,7 +236,7 @@
                     }
                     else
                     {
-                        <Select @bind-SelectedValue="@PaginationContext.CurrentPage" Size="GetSize()">
+                        <Select @bind-Value="@PaginationContext.CurrentPage" Size="GetSize()">
                             @for ( int i = PaginationContext.FirstVisiblePage; i <= PaginationContext.LastVisiblePage; ++i )
                             {
                                 var pageNumber = i;
@@ -278,7 +278,7 @@
                         }
                         else
                         {
-                            <Select Size="@GetSize()" @bind-SelectedValue="@PaginationContext.CurrentPageSize">
+                            <Select Size="@GetSize()" @bind-Value="@PaginationContext.CurrentPageSize">
                                 @foreach ( var curPageSize in PaginationContext.PageSizes )
                                 {
                                     <SelectItem Value="@curPageSize">@curPageSize</SelectItem>
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridRow.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridRow.razor
index b619fbc4fc..081c24cc10 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridRow.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridRow.razor
@@ -105,7 +105,7 @@
 
                             @if ( column.ColumnType == DataGridColumnType.Check )
                             {
-                                <Check TValue="bool" ReadOnly Disabled Checked="@(displayValue == bool.TrueString)" />
+                                <Check TValue="bool" ReadOnly Disabled Value="@(displayValue == bool.TrueString)" />
                             }
                             else
                             {
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridRowEdit.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridRowEdit.razor
index 483d83fc12..fb66ee9ba0 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridRowEdit.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridRowEdit.razor
@@ -157,7 +157,7 @@ else if ( EditMode == DataGridEditMode.Inline || EditMode == DataGridEditMode.Ce
 
                                 @if ( column.ColumnType == DataGridColumnType.Check )
                                 {
-                                    <Check TValue="bool" ReadOnly Disabled Checked="@(displayValue == bool.TrueString)" />
+                                    <Check TValue="bool" ReadOnly Disabled Value="@(displayValue == bool.TrueString)" />
                                 }
                                 else
                                 {
diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridRowMultiSelect.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridRowMultiSelect.razor
index 0835815ab8..8a085b3d50 100644
--- a/Source/Extensions/Blazorise.DataGrid/_DataGridRowMultiSelect.razor
+++ b/Source/Extensions/Blazorise.DataGrid/_DataGridRowMultiSelect.razor
@@ -10,7 +10,7 @@
     else
     {
         <Label @onclick="@OnCheckedClicked">
-            <Check TValue="bool" Checked="@Checked" CheckedChanged="@OnCheckedChanged" CheckedExpression="@(()=> Checked)"></Check>
+            <Check TValue="bool" Value="@Checked" ValueChanged="@OnCheckedChanged" ValueExpression="@(()=> Checked)"></Check>
         </Label>
     }
 </TableRowCell>
\ No newline at end of file
diff --git a/Source/Extensions/Blazorise.TreeView/Internal/_TreeViewNodeContent.razor b/Source/Extensions/Blazorise.TreeView/Internal/_TreeViewNodeContent.razor
index b3b94cd494..58622272f0 100644
--- a/Source/Extensions/Blazorise.TreeView/Internal/_TreeViewNodeContent.razor
+++ b/Source/Extensions/Blazorise.TreeView/Internal/_TreeViewNodeContent.razor
@@ -4,7 +4,7 @@
     @if ( ParentTreeViewState.SelectionMode == TreeViewSelectionMode.Multiple )
     {
         <div class="b-tree-view-node-check">
-            <Check TValue="bool" Checked="@Checked" CheckedChanged="@OnCheckedChanged" Disabled="@NodeState.Disabled" />
+            <Check TValue="bool" Value="@Checked" ValueChanged="@OnCheckedChanged" Disabled="@NodeState.Disabled" />
         </div>
     }
     <span class="@ClassNames" style="@(GetCurrentStyle())" @onclick="@OnClick">
diff --git a/Tests/BasicTestApp.Client/AsyncValidateTextEditComponent.razor b/Tests/BasicTestApp.Client/AsyncValidateTextEditComponent.razor
index 340ecf8d2b..c6e17b5b34 100644
--- a/Tests/BasicTestApp.Client/AsyncValidateTextEditComponent.razor
+++ b/Tests/BasicTestApp.Client/AsyncValidateTextEditComponent.razor
@@ -12,7 +12,7 @@
 <p id="validate-text-initially-populated">
     Initially populated:
     <Validation AsyncValidator="@IsNotEmptyAsync">
-        <TextEdit Text="a">
+        <TextEdit Value="a">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -24,7 +24,7 @@
 <p id="validate-text-with-bind-initially-blank">
     Initially blank:
     <Validation AsyncValidator="@IsNotEmptyAsync">
-        <TextEdit @bind-Text="@textWithBindInitiallyBlank">
+        <TextEdit @bind-Value="@textWithBindInitiallyBlank">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -34,7 +34,7 @@
 <p id="validate-text-with-bind-initially-populated">
     Initially populated:
     <Validation AsyncValidator="@IsNotEmptyAsync">
-        <TextEdit @bind-Text="@textWithBindInitiallyPopulated">
+        <TextEdit @bind-Value="@textWithBindInitiallyPopulated">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -46,7 +46,7 @@
 <p id="validate-text-with-event-initially-blank">
     Initially blank:
     <Validation AsyncValidator="@IsNotEmptyAsync">
-        <TextEdit Text="@textWithEventInitiallyBlank" TextChanged="@((v)=> { textWithEventInitiallyBlank = v; })">
+        <TextEdit Value="@textWithEventInitiallyBlank" ValueChanged="@((v)=> { textWithEventInitiallyBlank = v; })">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -56,7 +56,7 @@
 <p id="validate-text-with-event-initially-populated">
     Initially populated:
     <Validation AsyncValidator="@IsNotEmptyAsync">
-        <TextEdit Text="@textWithEventInitiallyPopulated" TextChanged="@((v)=> {textWithEventInitiallyPopulated = v; })">
+        <TextEdit Value="@textWithEventInitiallyPopulated" ValueChanged="@((v)=> {textWithEventInitiallyPopulated = v; })">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
diff --git a/Tests/BasicTestApp.Client/DataGridPerfBindSelectedComponent.razor b/Tests/BasicTestApp.Client/DataGridPerfBindSelectedComponent.razor
index a112119b3d..e8b40b3524 100644
--- a/Tests/BasicTestApp.Client/DataGridPerfBindSelectedComponent.razor
+++ b/Tests/BasicTestApp.Client/DataGridPerfBindSelectedComponent.razor
@@ -1,6 +1,6 @@
 @using BasicTestApp.Client.PerfComponents;
 
-<Select ElementId="dataGridSelectionMode" @bind-SelectedValue="@dataGridSelectionMode">
+<Select ElementId="dataGridSelectionMode" @bind-Value="@dataGridSelectionMode">
     <SelectItem Value="DataGridSelectionMode.Single">Single</SelectItem>
     <SelectItem Value="DataGridSelectionMode.Multiple">Multiple</SelectItem>
 </Select>
diff --git a/Tests/BasicTestApp.Client/DataGridPerfComponent.razor b/Tests/BasicTestApp.Client/DataGridPerfComponent.razor
index 3ce83df114..e64c460621 100644
--- a/Tests/BasicTestApp.Client/DataGridPerfComponent.razor
+++ b/Tests/BasicTestApp.Client/DataGridPerfComponent.razor
@@ -1,6 +1,6 @@
 @using BasicTestApp.Client.PerfComponents;
 
-<Select ElementId="dataGridSelectionMode" @bind-SelectedValue="@dataGridSelectionMode">
+<Select ElementId="dataGridSelectionMode" @bind-Value="@dataGridSelectionMode">
     <SelectItem Value="DataGridSelectionMode.Single">Single</SelectItem>
     <SelectItem Value="DataGridSelectionMode.Multiple">Multiple</SelectItem>
 </Select>
diff --git a/Tests/BasicTestApp.Client/DateEditComponent.razor b/Tests/BasicTestApp.Client/DateEditComponent.razor
index a07dc4f498..60bd79b01b 100644
--- a/Tests/BasicTestApp.Client/DateEditComponent.razor
+++ b/Tests/BasicTestApp.Client/DateEditComponent.razor
@@ -1,14 +1,14 @@
 <h3>DateEdit - DateTime</h3>
 
 <p id="date-event-initially-undefined">
-    <DateEdit id="date-control" TValue="DateTime" Date="@DateValue" DateChanged="@((v)=> { DateValue = v; } )" />
+    <DateEdit id="date-control" TValue="DateTime" Value="@DateValue" ValueChanged="@((v)=> { DateValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-event-initially-undefined-result">@DateValue</span>
 </p>
 <p id="nullable-date-event-initially-null">
-    <DateEdit id="nullable-date-control" TValue="DateTime?" Date="@NullableDateValue" DateChanged="@((v)=> { NullableDateValue = v; } )" />
+    <DateEdit id="nullable-date-control" TValue="DateTime?" Value="@NullableDateValue" ValueChanged="@((v)=> { NullableDateValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -18,14 +18,14 @@
 <h3>DateEdit - DateOnly</h3>
 
 <p id="date-only-event-initially-undefined">
-    <DateEdit id="date-only-control" TValue="DateOnly" Date="@DateOnlyValue" DateChanged="@((v)=> { DateOnlyValue = v; } )" />
+    <DateEdit id="date-only-control" TValue="DateOnly" Value="@DateOnlyValue" ValueChanged="@((v)=> { DateOnlyValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-only-event-initially-undefined-result">@DateOnlyValue</span>
 </p>
 <p id="nullable-date-only-event-initially-null">
-    <DateEdit id="nullable-date-only-control" TValue="DateOnly?" Date="@NullableDateOnlyValue" DateChanged="@((v)=> { NullableDateOnlyValue = v; } )" />
+    <DateEdit id="nullable-date-only-control" TValue="DateOnly?" Value="@NullableDateOnlyValue" ValueChanged="@((v)=> { NullableDateOnlyValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -35,14 +35,14 @@
 <h3>DateEdit - DateTimeOffset</h3>
 
 <p id="date-offset-event-initially-undefined">
-    <DateEdit id="date-offset-control" TValue="DateTimeOffset" Date="@OffsetValue" DateChanged="@((v)=> { OffsetValue = v; } )" />
+    <DateEdit id="date-offset-control" TValue="DateTimeOffset" Value="@OffsetValue" ValueChanged="@((v)=> { OffsetValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-offset-event-initially-undefined-result">@OffsetValue</span>
 </p>
 <p id="nullable-date-offset-event-initially-null">
-    <DateEdit id="nullable-date-offset-control" TValue="DateTimeOffset?" Date="@NullableOffsetValue" DateChanged="@((v)=> { NullableOffsetValue = v; } )" />
+    <DateEdit id="nullable-date-offset-control" TValue="DateTimeOffset?" Value="@NullableOffsetValue" ValueChanged="@((v)=> { NullableOffsetValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -54,7 +54,7 @@
 <p id="validation-initially-undefined">
     <Validations>
         <Validation Validator="@ValidationRule.IsNotEmpty">
-            <DateEdit id="date-validation-control" TValue="DateTime" Date="@DateValue" DateChanged="@((v)=> { DateValue = v; } )" />
+            <DateEdit id="date-validation-control" TValue="DateTime" Value="@DateValue" ValueChanged="@((v)=> { DateValue = v; } )" />
         </Validation>
     </Validations>
 
diff --git a/Tests/BasicTestApp.Client/DatePickerComponent.razor b/Tests/BasicTestApp.Client/DatePickerComponent.razor
index 7df05e12ef..dbca9b63b0 100644
--- a/Tests/BasicTestApp.Client/DatePickerComponent.razor
+++ b/Tests/BasicTestApp.Client/DatePickerComponent.razor
@@ -1,14 +1,14 @@
 <h3>DatePicker - DateTime</h3>
 
 <p id="date-event-initially-undefined">
-    <DatePicker id="date-control" TValue="DateTime" Date="@DateValue" DateChanged="@((v)=> { DateValue = v; } )" />
+    <DatePicker id="date-control" TValue="DateTime" Value="@DateValue" ValueChanged="@((v)=> { DateValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-event-initially-undefined-result">@DateValue</span>
 </p>
 <p id="nullable-date-event-initially-null">
-    <DatePicker id="nullable-date-control" TValue="DateTime?" Date="@NullableDateValue" DateChanged="@((v)=> { NullableDateValue = v; } )" />
+    <DatePicker id="nullable-date-control" TValue="DateTime?" Value="@NullableDateValue" ValueChanged="@((v)=> { NullableDateValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -18,14 +18,14 @@
 <h3>DatePicker - DateOnly</h3>
 
 <p id="date-only-event-initially-undefined">
-    <DatePicker id="date-only-control" TValue="DateOnly" Date="@DateOnlyValue" DateChanged="@((v)=> { DateOnlyValue = v; } )" />
+    <DatePicker id="date-only-control" TValue="DateOnly" Value="@DateOnlyValue" ValueChanged="@((v)=> { DateOnlyValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-only-event-initially-undefined-result">@DateOnlyValue</span>
 </p>
 <p id="nullable-date-only-event-initially-null">
-    <DatePicker id="nullable-date-only-control" TValue="DateOnly?" Date="@NullableDateOnlyValue" DateChanged="@((v)=> { NullableDateOnlyValue = v; } )" />
+    <DatePicker id="nullable-date-only-control" TValue="DateOnly?" Value="@NullableDateOnlyValue" ValueChanged="@((v)=> { NullableDateOnlyValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -35,14 +35,14 @@
 <h3>DatePicker - DateTimeOffset</h3>
 
 <p id="date-offset-event-initially-undefined">
-    <DatePicker id="date-offset-control" TValue="DateTimeOffset" Date="@OffsetValue" DateChanged="@((v)=> { OffsetValue = v; } )" />
+    <DatePicker id="date-offset-control" TValue="DateTimeOffset" Value="@OffsetValue" ValueChanged="@((v)=> { OffsetValue = v; } )" />
 
     <span>The Value should update automatically as you edit in the date field</span>
 
     <span id="date-offset-event-initially-undefined-result">@OffsetValue</span>
 </p>
 <p id="nullable-date-offset-event-initially-null">
-    <DatePicker id="nullable-date-offset-control" TValue="DateTimeOffset?" Date="@NullableOffsetValue" DateChanged="@((v)=> { NullableOffsetValue = v; } )" />
+    <DatePicker id="nullable-date-offset-control" TValue="DateTimeOffset?" Value="@NullableOffsetValue" ValueChanged="@((v)=> { NullableOffsetValue = v; } )" />
 
     <span>The Value should update automatically as you type in the date field</span>
 
@@ -54,7 +54,7 @@
 <p id="validation-initially-undefined">
     <Validations>
         <Validation Validator="@ValidationRule.IsNotEmpty">
-            <DatePicker id="date-validation-control" TValue="DateTime" Date="@DateValue" DateChanged="@((v)=> { DateValue = v; } )" />
+            <DatePicker id="date-validation-control" TValue="DateTime" Value="@DateValue" ValueChanged="@((v)=> { DateValue = v; } )" />
         </Validation>
     </Validations>
 
diff --git a/Tests/BasicTestApp.Client/RadioGroupComponent.razor b/Tests/BasicTestApp.Client/RadioGroupComponent.razor
index 62e946f8e3..3dcdb6a585 100644
--- a/Tests/BasicTestApp.Client/RadioGroupComponent.razor
+++ b/Tests/BasicTestApp.Client/RadioGroupComponent.razor
@@ -1,6 +1,6 @@
 <h2>Radio group</h2>
 <p id="radiogroup-event-initially-selected">
-    <RadioGroup TValue="string" Name="colors" Inline CheckedValue="@stringValue" CheckedValueChanged="@OnValueChanged">
+    <RadioGroup TValue="string" Name="colors" Inline Value="@stringValue" ValueChanged="@OnValueChanged">
         <Radio Class="radioR" TValue="string" Value="@("red")">Red</Radio>
         <Radio Class="radioG" TValue="string" Value="@("green")">Green</Radio>
         <Radio Class="radioB" TValue="string" Value="@("blue")">Blue</Radio>
diff --git a/Tests/BasicTestApp.Client/SelectComponent.razor b/Tests/BasicTestApp.Client/SelectComponent.razor
index be833dbb98..8c2cfbcfca 100644
--- a/Tests/BasicTestApp.Client/SelectComponent.razor
+++ b/Tests/BasicTestApp.Client/SelectComponent.razor
@@ -1,7 +1,7 @@
 <h2>Select string</h2>
 <p id="select-string-initially-blank">
     Initially blank:
-    <Select TValue="string" SelectedValue="@nameInitiallyBlank" SelectedValueChanged="@((v)=> { nameInitiallyBlank = v; })">
+    <Select TValue="string" Value="@nameInitiallyBlank" ValueChanged="@((v)=> { nameInitiallyBlank = v; })">
         <SelectItem Value="string.Empty"></SelectItem>
         <SelectItem Value="@("Oliver")">Oliver</SelectItem>
         <SelectItem Value="@("Harry")">Harry</SelectItem>
@@ -12,7 +12,7 @@
 </p>
 <p id="select-string-initially-selected">
     Initially populated:
-    <Select TValue="string" SelectedValue="@nameInitiallySelected" SelectedValueChanged="@((v)=> { nameInitiallySelected = v; })">
+    <Select TValue="string" Value="@nameInitiallySelected" ValueChanged="@((v)=> { nameInitiallySelected = v; })">
         <SelectItem Value="string.Empty"></SelectItem>
         <SelectItem Value="@("Oliver")">Oliver</SelectItem>
         <SelectItem Value="@("Harry")">Harry</SelectItem>
@@ -25,7 +25,7 @@
 <h2>Select int:</h2>
 <p id="select-int-initially-blank">
     Initially blank:
-    <Select TValue="int" SelectedValue="@intInitiallyBlank" SelectedValueChanged="@((v)=> { intInitiallyBlank = v; })">
+    <Select TValue="int" Value="@intInitiallyBlank" ValueChanged="@((v)=> { intInitiallyBlank = v; })">
         <SelectItem Value="0"></SelectItem>
         <SelectItem Value="1">1</SelectItem>
         <SelectItem Value="2">2</SelectItem>
@@ -36,7 +36,7 @@
 </p>
 <p id="select-int-initially-selected">
     Initially selected:
-    <Select TValue="int" SelectedValue="@intInitiallySelected" SelectedValueChanged="@((v)=> { intInitiallySelected = v; })">
+    <Select TValue="int" Value="@intInitiallySelected" ValueChanged="@((v)=> { intInitiallySelected = v; })">
         <SelectItem Value="0"></SelectItem>
         <SelectItem Value="1">1</SelectItem>
         <SelectItem Value="2">2</SelectItem>
@@ -49,7 +49,7 @@
 <h2>Select nullable int:</h2>
 <p id="select-nullable-int-initially-blank">
     Initially blank:
-    <Select TValue="int?" SelectedValue="@nullableIntInitiallyBlank" SelectedValueChanged="@((v)=> { nullableIntInitiallyBlank = v; })">
+    <Select TValue="int?" Value="@nullableIntInitiallyBlank" ValueChanged="@((v)=> { nullableIntInitiallyBlank = v; })">
         <SelectItem Value="@((int?)null)"></SelectItem>
         <SelectItem Value="@((int?)1)">1</SelectItem>
         <SelectItem Value="@((int?)2)">2</SelectItem>
@@ -60,7 +60,7 @@
 </p>
 <p id="select-nullable-int-initially-selected">
     Initially selected:
-    <Select TValue="int?" SelectedValue="@nullableIntInitiallySelected" SelectedValueChanged="@((v)=> { nullableIntInitiallySelected = v; })">
+    <Select TValue="int?" Value="@nullableIntInitiallySelected" ValueChanged="@((v)=> { nullableIntInitiallySelected = v; })">
         <SelectItem Value="@((int?)null)"></SelectItem>
         <SelectItem Value="@((int?)1)">1</SelectItem>
         <SelectItem Value="@((int?)2)">2</SelectItem>
@@ -74,7 +74,7 @@
 <h2>Select guid:</h2>
 <p id="select-guid-initially-blank">
     Initially blank:
-    <Select TValue="Guid" SelectedValue="@guidInitiallyBlank" SelectedValueChanged="@((v)=> { guidInitiallyBlank = v; })">
+    <Select TValue="Guid" Value="@guidInitiallyBlank" ValueChanged="@((v)=> { guidInitiallyBlank = v; })">
         <SelectItem Value="Guid.Empty"></SelectItem>
         <SelectItem Value="@(Guid.Parse("413a7c18-b190-4f58-a967-338cd1566e97"))">g1</SelectItem>
         <SelectItem Value="@(Guid.Parse("00cd0391-5e22-4729-855a-fec86267722c"))">g2</SelectItem>
@@ -85,7 +85,7 @@
 </p>
 <p id="select-guid-initially-selected">
     Initially selected:
-    <Select TValue="Guid" SelectedValue="@guidInitiallySelected" SelectedValueChanged="@((v)=> { guidInitiallySelected = v; })">
+    <Select TValue="Guid" Value="@guidInitiallySelected" ValueChanged="@((v)=> { guidInitiallySelected = v; })">
         <SelectItem Value="Guid.Empty"></SelectItem>
         <SelectItem Value="@(Guid.Parse("413a7c18-b190-4f58-a967-338cd1566e97"))">g1</SelectItem>
         <SelectItem Value="@(Guid.Parse("00cd0391-5e22-4729-855a-fec86267722c"))">g2</SelectItem>
@@ -98,7 +98,7 @@
 <h2>Select nullable guid:</h2>
 <p id="select-nullable-guid-initially-blank">
     Initially blank:
-    <Select TValue="Guid?" SelectedValue="@nullableGuidInitiallyBlank" SelectedValueChanged="@((v)=> { nullableGuidInitiallyBlank = v; })">
+    <Select TValue="Guid?" Value="@nullableGuidInitiallyBlank" ValueChanged="@((v)=> { nullableGuidInitiallyBlank = v; })">
         <SelectItem Value="@((Guid?)null)"></SelectItem>
         <SelectItem Value="@((Guid?)Guid.Parse("413a7c18-b190-4f58-a967-338cd1566e97"))">g1</SelectItem>
         <SelectItem Value="@((Guid?)Guid.Parse("00cd0391-5e22-4729-855a-fec86267722c"))">g2</SelectItem>
@@ -109,7 +109,7 @@
 </p>
 <p id="select-nullable-guid-initially-selected">
     Initially selected:
-    <Select TValue="Guid?" SelectedValue="@nullableGuidInitiallySelected" SelectedValueChanged="@((v)=> { nullableGuidInitiallySelected = v; })">
+    <Select TValue="Guid?" Value="@nullableGuidInitiallySelected" ValueChanged="@((v)=> { nullableGuidInitiallySelected = v; })">
         <SelectItem Value="@((Guid?)null)"></SelectItem>
         <SelectItem Value="@((Guid?)Guid.Parse("413a7c18-b190-4f58-a967-338cd1566e97"))">g1</SelectItem>
         <SelectItem Value="@((Guid?)Guid.Parse("00cd0391-5e22-4729-855a-fec86267722c"))">g2</SelectItem>
@@ -123,7 +123,7 @@
 <h2>Select bool:</h2>
 <p id="select-bool-initially-blank">
     Initially blank:
-    <Select TValue="bool" SelectedValue="@boolInitiallyBlank" SelectedValueChanged="@((v)=> { boolInitiallyBlank = v; })">
+    <Select TValue="bool" Value="@boolInitiallyBlank" ValueChanged="@((v)=> { boolInitiallyBlank = v; })">
         <SelectItem Value="@true">True Value</SelectItem>
         <SelectItem Value="@false">False Value</SelectItem>
     </Select>
@@ -131,7 +131,7 @@
 </p>
 <p id="select-bool-initially-selected">
     Initially selected:
-    <Select TValue="bool" SelectedValue="@boolInitiallySelected" SelectedValueChanged="@((v)=> { boolInitiallySelected = v; })">
+    <Select TValue="bool" Value="@boolInitiallySelected" ValueChanged="@((v)=> { boolInitiallySelected = v; })">
         <SelectItem Value="@true">True Value</SelectItem>
         <SelectItem Value="@false">False Value</SelectItem>
     </Select>
@@ -141,7 +141,7 @@
 <h2>Select nullable bool:</h2>
 <p id="select-nullable-bool-initially-blank">
     Initially blank:
-    <Select TValue="bool?" SelectedValue="@nullableBoolInitiallyBlank" SelectedValueChanged="@((v)=> { nullableBoolInitiallyBlank = v; })">
+    <Select TValue="bool?" Value="@nullableBoolInitiallyBlank" ValueChanged="@((v)=> { nullableBoolInitiallyBlank = v; })">
         <SelectItem Value="@((bool?)null)"></SelectItem>
         <SelectItem Value="@((bool?)true)">True Value</SelectItem>
         <SelectItem Value="@((bool?)false)">False Value</SelectItem>
@@ -150,7 +150,7 @@
 </p>
 <p id="select-nullable-bool-initially-selected">
     Initially selected:
-    <Select TValue="bool?" SelectedValue="@nullableBoolInitiallySelected" SelectedValueChanged="@((v)=> { nullableBoolInitiallySelected = v; })">
+    <Select TValue="bool?" Value="@nullableBoolInitiallySelected" ValueChanged="@((v)=> { nullableBoolInitiallySelected = v; })">
         <SelectItem Value="@((bool?)null)"></SelectItem>
         <SelectItem Value="@((bool?)true)">True Value</SelectItem>
         <SelectItem Value="@((bool?)false)">False Value</SelectItem>
@@ -161,7 +161,7 @@
 <h2>Select enum:</h2>
 <p id="select-enum-initially-selected">
     Initially selected:
-    <Select TValue="DaysInWeek" SelectedValue="@enumInitiallySelected" SelectedValueChanged="@((v)=> { enumInitiallySelected = v; })">
+    <Select TValue="DaysInWeek" Value="@enumInitiallySelected" ValueChanged="@((v)=> { enumInitiallySelected = v; })">
         <SelectItem Value="@DaysInWeek.Mon">Mon</SelectItem>
         <SelectItem Value="@DaysInWeek.Tue">Tue</SelectItem>
         <SelectItem Value="@DaysInWeek.Wen">Wen</SelectItem>
@@ -176,7 +176,7 @@
 <h2>Select nullable enum:</h2>
 <p id="select-nullable-enum-initially-blank">
     Initially blank:
-    <Select TValue="DaysInWeek?" SelectedValue="@nullableEnumInitiallyBlank" SelectedValueChanged="@((v)=> { nullableEnumInitiallyBlank = v; })">
+    <Select TValue="DaysInWeek?" Value="@nullableEnumInitiallyBlank" ValueChanged="@((v)=> { nullableEnumInitiallyBlank = v; })">
         <SelectItem Value="@((DaysInWeek?)null)"></SelectItem>
         <SelectItem Value="@DaysInWeek.Mon">Mon</SelectItem>
         <SelectItem Value="@DaysInWeek.Tue">Tue</SelectItem>
@@ -190,7 +190,7 @@
 </p>
 <p id="select-nullable-enum-initially-selected">
     Initially selected:
-    <Select TValue="DaysInWeek?" SelectedValue="@nullableEnumInitiallySelected" SelectedValueChanged="@((v)=> { nullableEnumInitiallySelected = v; })">
+    <Select TValue="DaysInWeek?" Value="@nullableEnumInitiallySelected" ValueChanged="@((v)=> { nullableEnumInitiallySelected = v; })">
         <SelectItem Value="@((DaysInWeek?)null)"></SelectItem>
         <SelectItem Value="@((DaysInWeek?)DaysInWeek.Mon)">Mon</SelectItem>
         <SelectItem Value="@((DaysInWeek?)DaysInWeek.Tue)">Tue</SelectItem>
diff --git a/Tests/BasicTestApp.Client/SelectNavigationsComponent.razor b/Tests/BasicTestApp.Client/SelectNavigationsComponent.razor
index 7fcd4a9f1e..6994ee91d9 100644
--- a/Tests/BasicTestApp.Client/SelectNavigationsComponent.razor
+++ b/Tests/BasicTestApp.Client/SelectNavigationsComponent.razor
@@ -6,8 +6,8 @@
     Initially blank:
     <Select TValue="string"
                 Class="my-5"
-                SelectedValue="@(model.GetValue())"
-                SelectedValueChanged="@((e) => model.SetValue(e))">
+                Value="@(model.GetValue())"
+                ValueChanged="@((e) => model.SetValue(e))">
         <SelectItem TValue="string" Value="@("one")">One</SelectItem>
         <SelectItem TValue="string" Value="@("two")">Two</SelectItem>
         <SelectItem TValue="string" Value="@("three")">Three</SelectItem>
diff --git a/Tests/BasicTestApp.Client/TextEditComponent.razor b/Tests/BasicTestApp.Client/TextEditComponent.razor
index 8377b9aea1..1136dfe2c1 100644
--- a/Tests/BasicTestApp.Client/TextEditComponent.razor
+++ b/Tests/BasicTestApp.Client/TextEditComponent.razor
@@ -2,14 +2,14 @@
     <TextEdit></TextEdit>
 </p>
 <p id="text-event-initially-blank">
-    <TextEdit id="text-with-event" Text="@textWithEvent" TextChanged="@((s)=> textWithEvent = s )"></TextEdit>
+    <TextEdit id="text-with-event" Value="@textWithEvent" ValueChanged="@((s)=> textWithEvent = s )"></TextEdit>
 
     <span>The text below should update automatically as you type in the text field above</span>
 
     <span id="text-event-initially-blank-result">@textWithEvent</span>
 </p>
 <p id="text-bind-initially-blank">
-    <TextEdit id="text-binding" @bind-Text="@textWithBind"></TextEdit>
+    <TextEdit id="text-binding" @bind-Value="@textWithBind"></TextEdit>
 
     <span>The text below should update automatically as you type in the text field above</span>
 
diff --git a/Tests/BasicTestApp.Client/ValidateAnnotationsComponent.razor b/Tests/BasicTestApp.Client/ValidateAnnotationsComponent.razor
index 6953a64686..bc2c59bc39 100644
--- a/Tests/BasicTestApp.Client/ValidateAnnotationsComponent.razor
+++ b/Tests/BasicTestApp.Client/ValidateAnnotationsComponent.razor
@@ -5,7 +5,7 @@
     Initially blank:
     <Validations Model="@autoModelForName" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@autoModelForName.Name">
+            <TextEdit @bind-Value="@autoModelForName.Name">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -17,7 +17,7 @@
     Initially populated:
     <Validations Model="@autoModelForName2" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@autoModelForName2.Name">
+            <TextEdit @bind-Value="@autoModelForName2.Name">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -31,7 +31,7 @@
     Initially blank:
     <Validations Model="@autoModelForName" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@autoModelForName.Password">
+            <TextEdit @bind-Value="@autoModelForName.Password">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -43,7 +43,7 @@
     Initially populated:
     <Validations Model="@autoModelForName2" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@autoModelForName2.Password">
+            <TextEdit @bind-Value="@autoModelForName2.Password">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -58,7 +58,7 @@
     Initially blank:
     <Validations Model="@autoModelForName" ValidateOnLoad>
         <Validation MessageLocalizer="@((m,a)=>a?.Count() > 0 ? string.Format(m,a?.ToArray()) : m)">
-            <TextEdit @bind-Text="@autoModelForName.PasswordWithDisplay">
+            <TextEdit @bind-Value="@autoModelForName.PasswordWithDisplay">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -73,7 +73,7 @@
     Initially blank:
     <Validations @ref="@manualValidationsNameRef" Model="@manualModelForName" Mode="ValidationMode.Manual" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@manualModelForName.Name">
+            <TextEdit @bind-Value="@manualModelForName.Name">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -86,7 +86,7 @@
     Initially populated:
     <Validations @ref="@manualValidationsName2Ref" Model="@manualModelForName2" Mode="ValidationMode.Manual" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@manualModelForName2.Name">
+            <TextEdit @bind-Value="@manualModelForName2.Name">
                 <Feedback>
                     <ValidationError></ValidationError>
                 </Feedback>
@@ -101,7 +101,7 @@
     Initially populated:
     <Validations Model="@autoModelForName3" ValidateOnLoad>
         <Validation>
-            <TextEdit @bind-Text="@autoModelForName3.Name">
+            <TextEdit @bind-Value="@autoModelForName3.Name">
                 <Feedback>
                     <ValidationError>error override message</ValidationError>
                 </Feedback>
diff --git a/Tests/BasicTestApp.Client/ValidateSelectComponent.razor b/Tests/BasicTestApp.Client/ValidateSelectComponent.razor
index 04cbae372a..66cbcbe141 100644
--- a/Tests/BasicTestApp.Client/ValidateSelectComponent.razor
+++ b/Tests/BasicTestApp.Client/ValidateSelectComponent.razor
@@ -21,7 +21,7 @@
 <p id="validate-string-with-bind-initially-blank">
     Initially blank:
     <Validation Validator="@ValidateStringSelect">
-        <Select @bind-SelectedValue="@stringWithBindInitiallyBlank">
+        <Select @bind-Value="@stringWithBindInitiallyBlank">
             <ChildContent>
                 <SelectItem Value="string.Empty"></SelectItem>
                 <SelectItem Value="@("Oliver")">Oliver</SelectItem>
@@ -38,7 +38,7 @@
 <p id="validate-string-with-bind-initially-selected">
     Initially selected:
     <Validation Validator="@ValidateStringSelect">
-        <Select @bind-SelectedValue="@stringWithBindInitiallySelected">
+        <Select @bind-Value="@stringWithBindInitiallySelected">
             <ChildContent>
                 <SelectItem Value="string.Empty"></SelectItem>
                 <SelectItem Value="@("Oliver")">Oliver</SelectItem>
@@ -57,7 +57,7 @@
 <p id="validate-string-with-event-initially-blank">
     Initially blank:
     <Validation Validator="@ValidateStringSelect">
-        <Select TValue="string" SelectedValue="@stringWithEventInitiallyBlank" SelectedValueChanged="@((v)=> { stringWithEventInitiallyBlank = v; })">
+        <Select TValue="string" Value="@stringWithEventInitiallyBlank" ValueChanged="@((v)=> { stringWithEventInitiallyBlank = v; })">
             <ChildContent>
                 <SelectItem Value="string.Empty"></SelectItem>
                 <SelectItem Value="@("Oliver")">Oliver</SelectItem>
@@ -74,7 +74,7 @@
 <p id="validate-string-with-event-initially-selected">
     Initially selected:
     <Validation Validator="@ValidateStringSelect">
-        <Select TValue="string" SelectedValue="@stringWithEventInitiallySelected" SelectedValueChanged="@((v)=> { stringWithEventInitiallySelected = v; })">
+        <Select TValue="string" Value="@stringWithEventInitiallySelected" ValueChanged="@((v)=> { stringWithEventInitiallySelected = v; })">
             <ChildContent>
                 <SelectItem Value="string.Empty"></SelectItem>
                 <SelectItem Value="@("Oliver")">Oliver</SelectItem>
@@ -111,7 +111,7 @@
 <p id="validate-int-with-bind-initially-blank">
     Initially blank:
     <Validation Validator="@ValidateIntSelect">
-        <Select @bind-SelectedValue="@intWithBindInitiallyBlank">
+        <Select @bind-Value="@intWithBindInitiallyBlank">
             <ChildContent>
                 <SelectItem Value="0"></SelectItem>
                 <SelectItem Value="1">1</SelectItem>
@@ -128,7 +128,7 @@
 <p id="validate-int-with-bind-initially-selected">
     Initially selected:
     <Validation Validator="@ValidateIntSelect">
-        <Select @bind-SelectedValue="@intWithBindInitiallySelected">
+        <Select @bind-Value="@intWithBindInitiallySelected">
             <ChildContent>
                 <SelectItem Value="0"></SelectItem>
                 <SelectItem Value="1">1</SelectItem>
@@ -147,7 +147,7 @@
 <p id="validate-multi-string-initially-blank">
     Initially blank:
     <Validation Validator="@ValidateMultiStringSelect">
-        <Select @ref="selectMultipleStrings" TValue="string" Multiple>
+        <Select @ref="selectMultipleStrings" TValue="string[]" Multiple>
             <ChildContent>
                 <SelectItem Value="@("Oliver")">Oliver</SelectItem>
                 <SelectItem Value="@("Harry")">Harry</SelectItem>
@@ -182,7 +182,7 @@
 <p id="validate-enum-with-bind-initially-blank">
     Initially blank:
     <Validation Validator="@ValidateEnumSelect">
-        <Select @bind-SelectedValue="@enumWithBindInitiallyBlank">
+        <Select @bind-Value="@enumWithBindInitiallyBlank">
             <ChildContent>
                 <SelectItem Value="SelectableValues.None"></SelectItem>
                 <SelectItem Value="SelectableValues.First">First</SelectItem>
@@ -198,7 +198,7 @@
 <p id="validate-enum-with-bind-initially-selected">
     Initially selected:
     <Validation Validator="@ValidateEnumSelect">
-        <Select @bind-SelectedValue="@enumWithBindInitiallySelected">
+        <Select @bind-Value="@enumWithBindInitiallySelected">
             <ChildContent>
                 <SelectItem Value="SelectableValues.None"></SelectItem>
                 <SelectItem Value="SelectableValues.First">First</SelectItem>
@@ -245,7 +245,7 @@
     int intWithBindInitiallyBlank;
     int intWithBindInitiallySelected = 1;
 
-    public Select<string> selectMultipleStrings;
+    public Select<string[]> selectMultipleStrings;
 
     enum SelectableValues { None, First, Second, Last };
     SelectableValues enumWithBindInitiallyBlank;
diff --git a/Tests/BasicTestApp.Client/ValidateTextEditComponent.razor b/Tests/BasicTestApp.Client/ValidateTextEditComponent.razor
index 0ffa035531..17a30710cd 100644
--- a/Tests/BasicTestApp.Client/ValidateTextEditComponent.razor
+++ b/Tests/BasicTestApp.Client/ValidateTextEditComponent.razor
@@ -12,7 +12,7 @@
 <p id="validate-text-initially-populated">
     Initially populated:
     <Validation Validator="@ValidationRule.IsNotEmpty">
-        <TextEdit Text="a">
+        <TextEdit Value="a">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -24,7 +24,7 @@
 <p id="validate-text-with-bind-initially-blank">
     Initially blank:
     <Validation Validator="@ValidationRule.IsNotEmpty">
-        <TextEdit @bind-Text="@textWithBindInitiallyBlank">
+        <TextEdit @bind-Value="@textWithBindInitiallyBlank">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -34,7 +34,7 @@
 <p id="validate-text-with-bind-initially-populated">
     Initially populated:
     <Validation Validator="@ValidationRule.IsNotEmpty">
-        <TextEdit @bind-Text="@textWithBindInitiallyPopulated">
+        <TextEdit @bind-Value="@textWithBindInitiallyPopulated">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -46,7 +46,7 @@
 <p id="validate-text-with-event-initially-blank">
     Initially blank:
     <Validation Validator="@ValidationRule.IsNotEmpty">
-        <TextEdit Text="@textWithEventInitiallyBlank" TextChanged="@((v)=> { textWithEventInitiallyBlank = v; })">
+        <TextEdit Value="@textWithEventInitiallyBlank" ValueChanged="@((v)=> { textWithEventInitiallyBlank = v; })">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -56,7 +56,7 @@
 <p id="validate-text-with-event-initially-populated">
     Initially populated:
     <Validation Validator="@ValidationRule.IsNotEmpty">
-        <TextEdit Text="@textWithEventInitiallyPopulated" TextChanged="@((v)=> {textWithEventInitiallyPopulated = v; })">
+        <TextEdit Value="@textWithEventInitiallyPopulated" ValueChanged="@((v)=> {textWithEventInitiallyPopulated = v; })">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -68,7 +68,7 @@
 <p id="validate-text-using-pattern-initially-blank">
     Initially blank:
     <Validation UsePattern>
-        <TextEdit Pattern="[A-Za-z]{1}" @bind-Text="@textUsingPatternInitiallyBlank">
+        <TextEdit Pattern="[A-Za-z]{1}" @bind-Value="@textUsingPatternInitiallyBlank">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
@@ -78,7 +78,7 @@
 <p id="validate-text-using-pattern-initially-populated">
     Initially populated:
     <Validation UsePattern>
-        <TextEdit Pattern="[A-Za-z]{1}" @bind-Text="@textUsingPatternInitiallyPopulated">
+        <TextEdit Pattern="[A-Za-z]{1}" @bind-Value="@textUsingPatternInitiallyPopulated">
             <Feedback>
                 <ValidationError>error</ValidationError>
             </Feedback>
diff --git a/Tests/Blazorise.Tests/Components/DropdownComponentTest.cs b/Tests/Blazorise.Tests/Components/DropdownComponentTest.cs
index fe82fa9760..fdc7f24ef6 100644
--- a/Tests/Blazorise.Tests/Components/DropdownComponentTest.cs
+++ b/Tests/Blazorise.Tests/Components/DropdownComponentTest.cs
@@ -57,7 +57,7 @@ public async Task Checkbox_Should_RenderCheckbox()
         comp.WaitForAssertion( () =>
         {
             var checkComp = comp.FindComponent<Check<bool>>();
-            checkComp.Instance.Checked.Should().BeFalse();
+            checkComp.Instance.Value.Should().BeFalse();
         } );
     }
 
@@ -81,7 +81,7 @@ public async Task Checkbox_Should_Be_Editable()
         comp.WaitForAssertion( () =>
         {
             var checkComp = comp.FindComponent<Check<bool>>();
-            checkComp.Instance.Checked.Should().BeTrue();
+            checkComp.Instance.Value.Should().BeTrue();
         } );
     }
 
diff --git a/Tests/Blazorise.Tests/DateEditTest.cs b/Tests/Blazorise.Tests/DateEditTest.cs
index 7b241cad08..5602a30ce0 100644
--- a/Tests/Blazorise.Tests/DateEditTest.cs
+++ b/Tests/Blazorise.Tests/DateEditTest.cs
@@ -14,12 +14,12 @@ public void SetDate_WithDateTime()
         var edit = new DateEdit<DateTime>();
 
         // test
-        edit.Date = new( 2020, 4, 12 );
+        edit.Value = new( 2020, 4, 12 );
 
         // validate
-        Assert.Equal( 2020, edit.Date.Year );
-        Assert.Equal( 4, edit.Date.Month );
-        Assert.Equal( 12, edit.Date.Day );
+        Assert.Equal( 2020, edit.Value.Year );
+        Assert.Equal( 4, edit.Value.Month );
+        Assert.Equal( 12, edit.Value.Day );
     }
 
     [Fact]
@@ -29,12 +29,12 @@ public void SetDate_WithDateTimeOffset()
         var edit = new DateEdit<DateTimeOffset>();
 
         // test
-        edit.Date = new( new DateTime( 2020, 4, 12 ), new( 0, 0, 0 ) );
+        edit.Value = new( new DateTime( 2020, 4, 12 ), new( 0, 0, 0 ) );
 
         // validate
-        Assert.Equal( 2020, edit.Date.Year );
-        Assert.Equal( 4, edit.Date.Month );
-        Assert.Equal( 12, edit.Date.Day );
+        Assert.Equal( 2020, edit.Value.Year );
+        Assert.Equal( 4, edit.Value.Month );
+        Assert.Equal( 12, edit.Value.Day );
     }
 
     [Fact]
@@ -44,10 +44,10 @@ public void SetDate_WithNull()
         var edit = new DateEdit<DateTime?>();
 
         // test
-        edit.Date = null;
+        edit.Value = null;
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -57,7 +57,7 @@ public void SetDate_WithInvalidType()
         var edit = new MockDateEdit<int>();
 
         // test
-        edit.Date = 100;
+        edit.Value = 100;
 
         // validate
         Exception ex = Assert.Throws<InvalidOperationException>( () => edit.TextValue );
@@ -117,7 +117,7 @@ public void ChangeValue_DateTime()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -130,7 +130,7 @@ public void ChangeValue_DateTime_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -143,7 +143,7 @@ public void ChangeValue_DateTime_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -157,7 +157,7 @@ public void ChangeValue_DateOnly()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -170,7 +170,7 @@ public void ChangeValue_DateOnly_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -183,7 +183,7 @@ public void ChangeValue_DateOnly_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -197,7 +197,7 @@ public void ChangeValue_DateTimeOffset()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -210,7 +210,7 @@ public void ChangeValue_DateTimeOffset_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -223,7 +223,7 @@ public void ChangeValue_DateTimeOffset_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -236,10 +236,10 @@ public void MinMaxRange_Within()
         // test
         edit.Min = new DateTime( 2020, 3, 1 );
         edit.Max = new DateTime( 2020, 3, 30 );
-        edit.Date = date;
+        edit.Value = date;
 
         // validate
-        Assert.Equal( date, edit.Date );
+        Assert.Equal( date, edit.Value );
     }
 
     /* todo: turn tests back on after bug fixed.
diff --git a/Tests/Blazorise.Tests/DatePickerTest.cs b/Tests/Blazorise.Tests/DatePickerTest.cs
index 8e1de6a0e5..29d9504739 100644
--- a/Tests/Blazorise.Tests/DatePickerTest.cs
+++ b/Tests/Blazorise.Tests/DatePickerTest.cs
@@ -14,12 +14,12 @@ public void SetDate_WithDateTime()
         var edit = new DatePicker<DateTime>();
 
         // test
-        edit.Date = new( 2020, 4, 12 );
+        edit.Value = new( 2020, 4, 12 );
 
         // validate
-        Assert.Equal( 2020, edit.Date.Year );
-        Assert.Equal( 4, edit.Date.Month );
-        Assert.Equal( 12, edit.Date.Day );
+        Assert.Equal( 2020, edit.Value.Year );
+        Assert.Equal( 4, edit.Value.Month );
+        Assert.Equal( 12, edit.Value.Day );
     }
 
     [Fact]
@@ -29,12 +29,12 @@ public void SetDate_WithDateTimeOffset()
         var edit = new DatePicker<DateTimeOffset>();
 
         // test
-        edit.Date = new( new DateTime( 2020, 4, 12 ), new( 0, 0, 0 ) );
+        edit.Value = new( new DateTime( 2020, 4, 12 ), new( 0, 0, 0 ) );
 
         // validate
-        Assert.Equal( 2020, edit.Date.Year );
-        Assert.Equal( 4, edit.Date.Month );
-        Assert.Equal( 12, edit.Date.Day );
+        Assert.Equal( 2020, edit.Value.Year );
+        Assert.Equal( 4, edit.Value.Month );
+        Assert.Equal( 12, edit.Value.Day );
     }
 
     [Fact]
@@ -44,10 +44,10 @@ public void SetDate_WithNull()
         var edit = new DatePicker<DateTime?>();
 
         // test
-        edit.Date = null;
+        edit.Value = null;
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -57,7 +57,7 @@ public void SetDate_WithInvalidType()
         var edit = new MockDatePicker<int>();
 
         // test
-        edit.Date = 100;
+        edit.Value = 100;
 
         // validate
         Exception ex = Assert.Throws<InvalidOperationException>( () => edit.TextValue );
@@ -75,7 +75,7 @@ public async Task ParseValueFromStringAsync_ValidDateString()
 
         // validate
         Assert.True( result.Success );
-        Assert.Equal( expected, result.ParsedValue[0] );
+        Assert.Equal( expected, result.ParsedValue );
     }
 
     [Fact]
@@ -89,7 +89,7 @@ public async Task ParseValueFromStringAsync_InvalidDateString()
 
         // validate
         Assert.False( result.Success );
-        Assert.Equal( default, result.ParsedValue[0] );
+        Assert.Equal( default, result.ParsedValue );
     }
 
     [Fact]
@@ -117,7 +117,7 @@ public void ChangeValue_DateTime()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -130,7 +130,7 @@ public void ChangeValue_DateTime_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -143,7 +143,7 @@ public void ChangeValue_DateTime_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -157,7 +157,7 @@ public void ChangeValue_DateOnly()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -170,7 +170,7 @@ public void ChangeValue_DateOnly_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -183,7 +183,7 @@ public void ChangeValue_DateOnly_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -197,7 +197,7 @@ public void ChangeValue_DateTimeOffset()
         edit.OnChange( new() { Value = expected } );
 
         // validate
-        Assert.Equal( expected, edit.Date );
+        Assert.Equal( expected, edit.Value );
     }
 
     [Fact]
@@ -210,7 +210,7 @@ public void ChangeValue_DateTimeOffset_NullValue()
         edit.OnChange( new() );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -223,7 +223,7 @@ public void ChangeValue_DateTimeOffset_NullEventArgs()
         edit.OnChange( null );
 
         // validate
-        Assert.Null( edit.Date );
+        Assert.Null( edit.Value );
     }
 
     [Fact]
@@ -236,10 +236,10 @@ public void MinMaxRange_Within()
         // test
         edit.Min = new DateTime( 2020, 3, 1 );
         edit.Max = new DateTime( 2020, 3, 30 );
-        edit.Date = date;
+        edit.Value = date;
 
         // validate
-        Assert.Equal( date, edit.Date );
+        Assert.Equal( date, edit.Value );
     }
 
     /* todo: turn tests back on after bug fixed.
diff --git a/Tests/Blazorise.Tests/Mocks/MockDateEdit.cs b/Tests/Blazorise.Tests/Mocks/MockDateEdit.cs
index 1c3a656047..dc17abde08 100644
--- a/Tests/Blazorise.Tests/Mocks/MockDateEdit.cs
+++ b/Tests/Blazorise.Tests/Mocks/MockDateEdit.cs
@@ -19,7 +19,7 @@ public MockDateEdit( Validation validation = null, Expression<Func<T>> dateExpre
         base.IdGenerator = mockIdGenerator.Object;
 
         base.ParentValidation = validation;
-        base.DateExpression = dateExpression;
+        base.ValueExpression = dateExpression;
 
         this.OnInitialized();
     }
diff --git a/Tests/Blazorise.Tests/Mocks/MockDatePicker.cs b/Tests/Blazorise.Tests/Mocks/MockDatePicker.cs
index 6d0a694324..4b0b0b8fa6 100644
--- a/Tests/Blazorise.Tests/Mocks/MockDatePicker.cs
+++ b/Tests/Blazorise.Tests/Mocks/MockDatePicker.cs
@@ -36,7 +36,7 @@ public MockDatePicker( Validation validation = null, Expression<Func<T>> dateExp
         base.IdGenerator = mockIdGenerator.Object;
 
         base.ParentValidation = validation;
-        base.DateExpression = dateExpression;
+        base.ValueExpression = dateExpression;
 
         this.OnInitialized();
     }
@@ -48,7 +48,7 @@ public string TextValue
 
     public string ClickedId { get; private set; }
 
-    public async Task<ParseValue<IReadOnlyList<T>>> ParseValueAsync( string value )
+    public async Task<ParseValue<T>> ParseValueAsync( string value )
     {
         return await base.ParseValueFromStringAsync( value );
     }