diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/OtpInput/BitOtpInputDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/OtpInput/BitOtpInputDemo.razor.cs
index 5918efb887..0c2936b58f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/OtpInput/BitOtpInputDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/OtpInput/BitOtpInputDemo.razor.cs
@@ -20,7 +20,7 @@ public partial class BitOtpInputDemo
             DefaultValue = "null",
             Description = "Custom CSS classes for different parts of the BitOtpInput.",
             LinkType = LinkType.Link,
-            Href = "#otpinput-class-styles",
+            Href = "#class-styles",
         },
         new()
         {
@@ -79,7 +79,7 @@ public partial class BitOtpInputDemo
             DefaultValue = "null",
             Description = "Custom CSS styles for different parts of the BitOtpInput.",
             LinkType = LinkType.Link,
-            Href = "#otpinput-class-styles",
+            Href = "#class-styles",
         },
         new()
         {
@@ -88,7 +88,7 @@ public partial class BitOtpInputDemo
             DefaultValue = "null",
             Description = "Type of the inputs.",
             LinkType = LinkType.Link,
-            Href = "#inputType-enum",
+            Href = "#input-type-enum",
         },
         new()
         {
@@ -102,7 +102,7 @@ public partial class BitOtpInputDemo
     [
         new()
         {
-            Id = "otpinput-class-styles",
+            Id = "class-styles",
             Title = "BitOtpInputClassStyles",
             Description = "",
             Parameters = new()
@@ -135,29 +135,47 @@ public partial class BitOtpInputDemo
     [
         new()
         {
-            Id = "inputType-enum",
+            Id = "input-type-enum",
             Name = "BitInputType",
-            Items = new()
-            {
+            Items =
+            [
+                new()
+                {
+                    Name= "Text",
+                    Description="The input expects text characters.",
+                    Value="0",
+                },
                 new()
                 {
-                    Name = "Text",
-                    Description = "The OtpInput characters are shown as text.",
-                    Value = "0"
+                    Name= "Password",
+                    Description="The input expects password characters.",
+                    Value="1",
                 },
                 new()
                 {
-                    Name = "Password",
-                    Description = "The OtpInput characters are masked.",
-                    Value = "1"
+                    Name= "Number",
+                    Description="The input expects number characters.",
+                    Value="2",
                 },
                 new()
                 {
-                    Name = "Number",
-                    Description = "The OtpInput characters are number.",
-                    Value = "2"
+                    Name= "Email",
+                    Description="The input expects email characters.",
+                    Value="3",
+                },
+                new()
+                {
+                    Name= "Tel",
+                    Description="The input expects tel characters.",
+                    Value="4",
+                },
+                new()
+                {
+                    Name= "Url",
+                    Description="The input expects url characters.",
+                    Value="5",
                 }
-            }
+            ]
         }
     ];
     private readonly List<ComponentParameter> componentPublicMembers =
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor
index 36d870474b..454b2f48d2 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor
@@ -9,6 +9,7 @@
                ComponentDescription="Text fields give people a way to enter and edit text. They’re used in forms, modal dialogs, tables, and other surfaces where text input is required."
                ComponentParameters="componentParameters"
                ComponentSubClasses="componentSubClasses"
+               ComponentSubEnums="componentSubEnums"
                ComponentPublicMembers="componentPublicMembers">
     <ComponentExampleBox Title="Basics" RazorCode="@example1RazorCode" Id="example1">
         <ExamplePreview>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor.cs
index bf4bea7f7d..5384e0d53f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/TextField/BitTextFieldDemo.razor.cs
@@ -219,7 +219,7 @@ public partial class BitTextFieldDemo
             DefaultValue = "BitInputType.Text",
             Description = "Input type.",
             LinkType = LinkType.Link,
-            Href = "#text-field-type-enum"
+            Href = "#input-type-enum"
         }
     ];
 
@@ -352,48 +352,48 @@ public partial class BitTextFieldDemo
     [
         new()
         {
-            Id = "text-field-type-enum",
+            Id = "input-type-enum",
             Name = "BitInputType",
             Description = "",
-            Items = new()
-            {
+            Items =
+            [
                 new()
                 {
                     Name= "Text",
-                    Description="The TextField characters are shown as text.",
+                    Description="The input expects text characters.",
                     Value="0",
                 },
                 new()
                 {
                     Name= "Password",
-                    Description="The TextField characters are masked.",
+                    Description="The input expects password characters.",
                     Value="1",
                 },
                 new()
                 {
                     Name= "Number",
-                    Description="The TextField characters are number.",
+                    Description="The input expects number characters.",
                     Value="2",
                 },
                 new()
                 {
                     Name= "Email",
-                    Description="The TextField act as an email input.",
+                    Description="The input expects email characters.",
                     Value="3",
                 },
                 new()
                 {
                     Name= "Tel",
-                    Description="The TextField act as a tel input.",
+                    Description="The input expects tel characters.",
                     Value="4",
                 },
                 new()
                 {
                     Name= "Url",
-                    Description="The TextField act as a url input.",
+                    Description="The input expects url characters.",
                     Value="5",
                 }
-            }
+            ]
         }
     ];