diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 2c9ca321..0c0ba746 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -8,10 +8,11 @@
 @inject ISiteTemplateService SiteTemplateService
 @inject IUserService UserService
 @inject IInstallationService InstallationService
+@inject IStringLocalizer<Add> Localizer
 
 @if (_tenants == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
@@ -38,7 +39,7 @@ else
         </td>
         <td>
             <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                <option value="-">&lt;Select Theme&gt;</option>
+                <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
                 @foreach (var theme in _themes)
                 {
                     <option value="@theme.TypeName">@theme.Name</option>
@@ -54,7 +55,7 @@ else
             </td>
             <td>
                 <select id="defaultLayout" class="form-control" @bind="@_layouttype">
-                    <option value="-">&lt;Select Layout&gt;</option>
+                    <option value="-">&lt;@Localizer["Select Layout"]&gt;</option>
                     @foreach (var layout in _layouts)
                     {
                         <option value="@(layout.TypeName)">@(layout.Name)</option>
@@ -69,7 +70,7 @@ else
         </td>
         <td>
             <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                <option value="-">&lt;Select Container&gt;</option>
+                <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
                 @foreach (var container in _containers)
                 {
                     <option value="@container.TypeName">@container.Name</option>
@@ -83,7 +84,7 @@ else
         </td>
         <td>
             <select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype">
-                <option value="-">&lt;Select Site Template&gt;</option>
+                <option value="-">&lt;@Localizer["Select Site Template"]&gt;</option>
                 @foreach (SiteTemplate siteTemplate in _siteTemplates)
                 {
                     <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
@@ -97,8 +98,8 @@ else
         </td>
         <td>
             <select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))">
-                <option value="-">&lt;Select Tenant&gt;</option>
-                <option value="+">&lt;Create New Tenant&gt;</option>
+                <option value="-">&lt;@Localizer["Select Tenant"]&gt;</option>
+                <option value="+">&lt;@Localizer["Create New Tenant"]&gt;</option>
                 @foreach (Tenant tenant in _tenants)
                 {
                     <option value="@tenant.TenantId">@tenant.Name</option>
@@ -127,8 +128,8 @@ else
             </td>
             <td>
                 <select id="databaseType" class="custom-select" @bind="@_databasetype">
-                    <option value="LocalDB">Local Database</option>
-                    <option value="SQLServer">SQL Server</option>
+                    <option value="LocalDB">@Localizer["Local Database"]</option>
+                    <option value="SQLServer">@Localizer["SQL Server"]</option>
                 </select>
             </td>
         </tr>
@@ -154,8 +155,8 @@ else
             </td>
             <td>
                 <select id="integratedSecurity" class="custom-select" @onchange="SetIntegratedSecurity">
-                    <option value="true" selected>True</option>
-                    <option value="false">False</option>
+                    <option value="true" selected>@Localizer["True"]</option>
+                    <option value="false">@Localizer["False"]</option>
                 </select>
             </td>
         </tr>
@@ -196,8 +197,8 @@ else
         </tr>
     }
 </table>
-    <button type="button" class="btn btn-success" @onclick="SaveSite">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveSite">@Localizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 }
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index d27a1392..89c1c1d7 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -5,6 +5,7 @@
 @inject ITenantService TenantService
 @inject IAliasService AliasService
 @inject IThemeService  ThemeService
+@inject IStringLocalizer<Edit> Localizer
 
 @if (_initialized)
 {
@@ -39,7 +40,7 @@
             </td>
             <td>
                 <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value="-">&lt;Select Theme&gt;</option>
+                    <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
                     @foreach (var theme in _themes)
                     {
                         if (theme.TypeName == _themetype)
@@ -62,7 +63,7 @@
                 </td>
                 <td>
                     <select id="defaultLayout" class="form-control" @bind="@_layouttype">
-                        <option value="-">&lt;Select Layout&gt;</option>
+                        <option value="-">&lt;@Localizer["Select Layout"]&gt;</option>
                         @foreach (var layout in _layouts)
                         {
                             <option value="@(layout.TypeName)">@(layout.Name)</option>
@@ -77,7 +78,7 @@
             </td>
             <td>
                 <select id="defaultIdea" class="form-control" @bind="@_containertype">
-                    <option value="-">&lt;Select Container&gt;</option>
+                    <option value="-">&lt;@Localizer["Select Container"]&gt;</option>
                     @foreach (var container in _containers)
                     {
                         <option value="@container.TypeName">@container.Name</option>
@@ -91,15 +92,15 @@
             </td>
             <td>
                 <select id="isDeleted" class="form-control" @bind="@_isdeleted">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
+                    <option value="True">@Localizer["Yes"]</option>
+                    <option value="False">@Localizer["No"]</option>
                 </select>
             </td>
         </tr>
     </table>
     <br />
-    <button type="button" class="btn btn-success" @onclick="SaveSite">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveSite">@Localizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
     <br />
     <br />
     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
@@ -256,7 +257,7 @@
                             }
                         }
 
-                        await Log(_alias, LogLevel.Information,PermissionNames.Edit, null, "Site Saved {Site}", site);
+                        await Log(_alias, LogLevel.Information, PermissionNames.Edit, null, "Site Saved {Site}", site);
 
                         NavigationManager.NavigateTo(NavigateUrl());
                     }
@@ -277,4 +278,4 @@
             AddModuleMessage("Error Saving Site", MessageType.Error);
         }
     }
- }
+}
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index 228e311d..e11763b4 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -3,6 +3,7 @@
 @inject NavigationManager NavigationManager
 @inject IAliasService AliasService
 @inject ISiteService SiteService
+@inject IStringLocalizer<Index> Localizer
 
 @if (_sites == null)
 {
@@ -16,7 +17,7 @@ else
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
+            <th>@Localizer["Name"]</th>
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.AliasId.ToString())" ResourceKey="EditSite" /></td>
@@ -57,13 +58,13 @@ else
                 SiteService.SetAlias(alias);
                 await SiteService.DeleteSiteAsync(alias.SiteId);
                 await Log(alias, LogLevel.Information, "", null, "Site Deleted {SiteId}", alias.SiteId);
-                
+
                 var aliases = await AliasService.GetAliasesAsync();
                 foreach (Alias a in aliases.Where(item => item.SiteId == alias.SiteId && item.TenantId == alias.TenantId))
                 {
                     await AliasService.DeleteAliasAsync(a.AliasId);
                 }
-                
+
                 NavigationManager.NavigateTo(NavigateUrl());
             }
             else