diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index f8be514c..483cc107 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -118,7 +118,7 @@
             </td>
             <td>
                 <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value=string.Empty>&lt;Select Theme&gt;</option>
+                    <option value="">&lt;Select Theme&gt;</option>
                     @foreach (KeyValuePair<string, string> item in _themes)
                     {
                         <option value="@item.Key">@item.Value</option>
@@ -132,7 +132,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_layouttype">
-                    <option value=string.Empty>&lt;Select Layout&gt;</option>
+                    <option value="">&lt;Select Layout&gt;</option>
                     @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index a1c964f8..2b13870e 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -129,7 +129,7 @@
             </td>
             <td>
                 <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value=string.Empty>&lt;Select Theme&gt;</option>
+                    <option value="">&lt;Select Theme&gt;</option>
                     @foreach (KeyValuePair<string, string> item in _themes)
                     {
                         if (item.Key == _themetype)
@@ -150,7 +150,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_layouttype">
-                    <option value=string.Empty>&lt;Select Layout&gt;</option>
+                    <option value="">&lt;Select Layout&gt;</option>
                     @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index bb188e8d..b20ccd1d 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -56,7 +56,7 @@
             </td>
             <td>
                 <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value=string.Empty>&lt;Select Theme&gt;</option>
+                    <option value="">&lt;Select Theme&gt;</option>
                     @foreach (KeyValuePair<string, string> item in _themes)
                     {
                         if (item.Key == _themetype)
@@ -77,7 +77,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_layouttype">
-                    <option value=string.Empty>&lt;Select Layout&gt;</option>
+                    <option value="">&lt;Select Layout&gt;</option>
                     @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
@@ -91,7 +91,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_containertype">
-                    <option value=string.Empty>&lt;Select Container&gt;</option>
+                    <option value="">&lt;Select Container&gt;</option>
                     @foreach (KeyValuePair<string, string> container in _containers)
                     {
                         <option value="@container.Key">@container.Value</option>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 9edec56b..0bb51513 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -51,7 +51,7 @@ else
         </td>
         <td>
             <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                <option value=string.Empty>&lt;Select Theme&gt;</option>
+                <option value="">&lt;Select Theme&gt;</option>
                 @foreach (KeyValuePair<string, string> item in _themes)
                 {
                     <option value="@item.Key">@item.Value</option>
@@ -65,7 +65,7 @@ else
         </td>
         <td>
             <select class="form-control" @bind="@_layouttype">
-                <option value=string.Empty>&lt;Select Layout&gt;</option>
+                <option value="">&lt;Select Layout&gt;</option>
                 @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                 {
                     <option value="@panelayout.Key">@panelayout.Value</option>
@@ -79,7 +79,7 @@ else
         </td>
         <td>
             <select class="form-control" @bind="@_containertype">
-                <option value=string.Empty>&lt;Select Container&gt;</option>
+                <option value="">&lt;Select Container&gt;</option>
                 @foreach (KeyValuePair<string, string> container in _containers)
                 {
                     <option value="@container.Key">@container.Value</option>
@@ -93,7 +93,7 @@ else
         </td>
         <td>
             <select class="form-control" @bind="@_sitetemplatetype">
-                <option value=string.Empty>&lt;Select Site Template&gt;</option>
+                <option value="">&lt;Select Site Template&gt;</option>
                 @foreach (SiteTemplate siteTemplate in _siteTemplates)
                 {
                     <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index 43211818..838615ee 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -39,7 +39,7 @@
             </td>
             <td>
                 <select class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value=string.Empty>&lt;Select Theme&gt;</option>
+                    <option value="">&lt;Select Theme&gt;</option>
                     @foreach (KeyValuePair<string, string> item in _themes)
                     {
                         if (item.Key == _themetype)
@@ -60,7 +60,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_layouttype">
-                    <option value=string.Empty>&lt;Select Layout&gt;</option>
+                    <option value="">&lt;Select Layout&gt;</option>
                     @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
                     {
                         <option value="@panelayout.Key">@panelayout.Value</option>
@@ -74,7 +74,7 @@
             </td>
             <td>
                 <select class="form-control" @bind="@_containertype">
-                    <option value=string.Empty>&lt;Select Container&gt;</option>
+                    <option value="">&lt;Select Container&gt;</option>
                     @foreach (KeyValuePair<string, string> container in _containers)
                     {
                         <option value="@container.Key">@container.Value</option>