From b2d58eb09083c2331b307511762c168b0f0c8e2a Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Tue, 31 Oct 2023 15:08:17 -0700
Subject: [PATCH 1/6] Improve performance for CssClass extensions

---
 .../Views/DashboardPart.Edit.cshtml           |  10 +-
 .../Views/AliasPart.Edit.cshtml               |   6 +-
 .../Views/AutoroutePart.Edit.cshtml           |  26 ++--
 .../Views/BackgroundTask/Edit.cshtml          |  32 ++---
 .../Views/BooleanField-Switch.Edit.cshtml     |   4 +-
 .../Views/BooleanField.Edit.cshtml            |   4 +-
 .../Views/ContentPickerField.Edit.cshtml      |   6 +-
 .../Views/DateField-Localized.Edit.cshtml     |  10 +-
 .../Views/DateField.Edit.cshtml               |  10 +-
 .../Views/DateTimeField.Edit.cshtml           |  10 +-
 .../Views/HtmlField-Monaco.Edit.cshtml        |   6 +-
 .../Views/HtmlField-Multiline.Edit.cshtml     |   6 +-
 .../Views/HtmlField-Trumbowyg.Edit.cshtml     |   6 +-
 .../Views/HtmlField-Wysiwyg.Edit.cshtml       |   6 +-
 .../Views/HtmlField.Edit.cshtml               |   6 +-
 .../Views/LinkField.Edit.cshtml               |   6 +-
 ...alizationSetContentPickerField.Edit.cshtml |   6 +-
 .../MultiTextField-CheckboxList.Edit.cshtml   |   6 +-
 .../Views/MultiTextField-Picker.Edit.cshtml   |   6 +-
 .../Views/MultiTextField.Edit.cshtml          |   6 +-
 .../Views/NumericField-Range.Edit.cshtml      |  10 +-
 .../Views/NumericField-Select.Edit.cshtml     |   6 +-
 .../Views/NumericField-Slider.Edit.cshtml     |  10 +-
 .../Views/NumericField-Spinner.Edit.cshtml    |  10 +-
 .../Views/NumericField.Edit.cshtml            |  10 +-
 .../Views/TextField-CodeMirror.Edit.cshtml    |   6 +-
 .../Views/TextField-Color.Edit.cshtml         |   6 +-
 .../Views/TextField-Email.Edit.cshtml         |   6 +-
 .../Views/TextField-IconPicker.Edit.cshtml    |   6 +-
 .../Views/TextField-Monaco.Edit.cshtml        |   6 +-
 .../TextField-PredefinedList.Edit.cshtml      |   6 +-
 .../Views/TextField-Tel.Edit.cshtml           |   6 +-
 .../Views/TextField-TextArea.Edit.cshtml      |   6 +-
 .../Views/TextField-Url.Edit.cshtml           |   6 +-
 .../Views/TextField.Edit.cshtml               |   6 +-
 .../Views/TimeField.Edit.cshtml               |  10 +-
 .../Views/UserPickerField.Edit.cshtml         |   6 +-
 .../Views/YoutubeField.Edit.cshtml            |   6 +-
 .../Views/AuditTrailPart.Edit.cshtml          |   6 +-
 .../Views/CommonPart-Date.Edit.cshtml         |  10 +-
 .../Views/CommonPart-Owner.Edit.cshtml        |   6 +-
 .../Views/Content.Edit.cshtml                 |   4 +-
 .../Views/ContentPart-BagPart.Edit.cshtml     |   7 +-
 .../Views/ContentPart-FlowPart.Edit.cshtml    |   7 +-
 .../ContentPart-WidgetsListPart.Edit.cshtml   |   7 +-
 .../Views/ContentPart.Edit.cshtml             |  26 ++--
 .../Views/FacebookPluginPart.Edit.cshtml      |   6 +-
 ...odelValidationErrorTask.Fields.Edit.cshtml |  12 +-
 .../Views/Items/ButtonPart.Fields.Edit.cshtml |  12 +-
 .../FormElementLabelPart.Fields.Edit.cshtml   |  12 +-
 .../Items/FormElementPart.Fields.Edit.cshtml  |   6 +-
 ...rmElementValidationPart.Fields.Edit.cshtml |   6 +-
 .../FormInputElementPart.Fields.Edit.cshtml   |   6 +-
 .../Views/Items/FormPart.Fields.Edit.cshtml   |  22 +--
 .../Views/Items/InputPart.Fields.Edit.cshtml  |  18 +--
 .../Views/Items/LabelPart.Fields.Edit.cshtml  |   6 +-
 .../Views/Items/SelectPart.Fields.Edit.cshtml |  12 +-
 .../Items/TextAreaPart.Fields.Edit.cshtml     |  12 +-
 .../ValidateFormFieldTask.Fields.Edit.cshtml  |  12 +-
 .../Items/ValidationPart.Fields.Edit.cshtml   |   6 +-
 .../ValidationSummaryPart.Fields.Edit.cshtml  |   4 +-
 .../Views/HtmlBodyPart-Monaco.Edit.cshtml     |   4 +-
 .../Views/HtmlBodyPart-Trumbowyg.Edit.cshtml  |   4 +-
 .../Views/HtmlBodyPart-Wysiwyg.Edit.cshtml    |   6 +-
 .../Views/HtmlBodyPart.Edit.cshtml            |   6 +-
 .../Views/LayerMetadata.Edit.cshtml           |  16 +--
 .../Views/LiquidPart.Edit.cshtml              |   6 +-
 .../MarkdownBodyPart-Wysiwyg.Edit.cshtml      |   6 +-
 .../Views/MarkdownBodyPart.Edit.cshtml        |   6 +-
 .../Views/MarkdownField-TextArea.Edit.cshtml  |   6 +-
 .../Views/MarkdownField-Wysiwyg.Edit.cshtml   |   6 +-
 .../Views/MarkdownField.Edit.cshtml           |   6 +-
 .../Views/MediaField-Attached.Edit.cshtml     |   6 +-
 .../Views/MediaField.Edit.cshtml              |   6 +-
 .../Views/ContentMenuItemPart.Edit.cshtml     |   6 +-
 .../Views/HtmlMenuItemPart.Edit.cshtml        |  14 +-
 .../Views/LinkMenuItemPart.Edit.cshtml        |  12 +-
 .../Views/MenuItem.Edit.cshtml                |   4 +-
 .../Views/MenuPart.Edit.cshtml                |   4 +-
 .../Views/SearchFormPart.Edit.cshtml          |  12 +-
 .../Views/SeoMetaPart.Edit.cshtml             |  34 ++---
 .../Views/SitemapPart.Edit.cshtml             |  20 +--
 .../Views/GeoPointField.Edit.cshtml           |   4 +-
 .../Views/TaxonomyField-Tags.Edit.cshtml      |   6 +-
 .../Views/TaxonomyField.Edit.cshtml           |   6 +-
 .../Views/TaxonomyPart.Edit.cshtml            |  10 +-
 .../Views/TitlePart.Edit.cshtml               |   6 +-
 .../Razor/CssOrchardHelperExtensions.cs       |  48 ++++++-
 .../Html/CssOrchardHelperExtensions.cs        | 127 ++++++++++++++++--
 89 files changed, 534 insertions(+), 394 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
index 5cb1b391184..193847e2ff0 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
@@ -1,15 +1,15 @@
 @using OrchardCore
 @model DashboardPartViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Position">
-    <label asp-for="Position" class="@Orchard.GetLabelCssClasses()">@T["Position"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Position">
+    <label asp-for="Position" class="@Orchard.GetLabelClasses()">@T["Position"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Position" class="form-control" />
         <span asp-validation-for="Position"></span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Width">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Width">
     <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Width" class="form-control" />
@@ -17,7 +17,7 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Height">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Height">
     <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Height" class="form-control" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
index e50848a255c..142e5c92695 100644
--- a/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Alias/Views/AliasPart.Edit.cshtml
@@ -7,9 +7,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.AliasPart.ContentItem);
 }
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Alias">
-    <label asp-for="Alias" class="@Orchard.GetLabelCssClasses()">@T["Alias"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Alias">
+    <label asp-for="Alias" class="@Orchard.GetLabelClasses()">@T["Alias"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Alias" class="form-control text-muted" disabled="@(Model.Settings?.Options == AliasPartOptions.GeneratedDisabled)" dir="@culture.GetLanguageDirection()" />
         <span asp-validation-for="Alias"></span>
         <span class="hint">
diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
index 43eff970207..5dec3759694 100644
--- a/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Autoroute/Views/AutoroutePart.Edit.cshtml
@@ -15,8 +15,8 @@
 
 @if (Model.Settings.AllowDisabled)
 {
-    <div class="@Orchard.GetWrapperCssClasses()">
-        <div class="@Orchard.GetEndCssClasses(true)">
+    <div class="@Orchard.GetWrapperClasses()">
+        <div class="@Orchard.GetEndClasses(true)">
             <div class="form-check">
                 <input type="checkbox" class="form-check-input" asp-for="Disabled" checked="@Model.Disabled" />
                 <label class="form-check-label" asp-for="Disabled">@T["Disabled"]</label>
@@ -27,9 +27,9 @@
 }
 
 <div class="autoroute-disabled" style="@(Model.Disabled ? "display: none" : string.Empty)">
-    <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Path">
-        <label asp-for="Path" class="@Orchard.GetLabelCssClasses()">@T["Permalink"]</label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Path">
+        <label asp-for="Path" class="@Orchard.GetLabelClasses()">@T["Permalink"]</label>
+        <div class="@Orchard.GetEndClasses()">
             <div class="input-group">
                 @if (!string.IsNullOrWhiteSpace(site.BaseUrl))
                 {
@@ -64,8 +64,8 @@
         {
             if (showHomepageOption)
             {
-                <div class="@Orchard.GetWrapperCssClasses()">
-                    <div class="@Orchard.GetEndCssClasses(true)">
+                <div class="@Orchard.GetWrapperClasses()">
+                    <div class="@Orchard.GetEndClasses(true)">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" asp-for="SetHomepage" checked="@Model.SetHomepage" />
                             <label class="form-check-label" asp-for="SetHomepage">@T["Set as homepage"]</label>
@@ -79,8 +79,8 @@
 
     @if (Model.Settings.AllowUpdatePath)
     {
-        <div class="@Orchard.GetWrapperCssClasses()">
-            <div class="@Orchard.GetEndCssClasses(true)">
+        <div class="@Orchard.GetWrapperClasses()">
+            <div class="@Orchard.GetEndClasses(true)">
                 <div class="form-check">
                     <input type="checkbox" class="form-check-input" asp-for="UpdatePath" checked="@Model.UpdatePath" />
                     <label class="form-check-label" asp-for="UpdatePath">@T["Refresh the path"]</label>
@@ -92,8 +92,8 @@
 
     @if (containedContentItemsAspect.Accessors.Any() && Model.Settings.AllowRouteContainedItems)
     {
-        <div class="@Orchard.GetWrapperCssClasses()">
-            <div class="@Orchard.GetEndCssClasses(true)">
+        <div class="@Orchard.GetWrapperClasses()">
+            <div class="@Orchard.GetEndClasses(true)">
                 <div class="form-check">
                     <input type="checkbox" class="form-check-input" asp-for="RouteContainedItems" checked="@Model.RouteContainedItems" />
                     <label class="form-check-label" asp-for="RouteContainedItems">@T["Route contained items"]</label>
@@ -105,8 +105,8 @@
 
     @if (Model.Settings.ManageContainedItemRoutes && Model.Settings.AllowAbsolutePath)
     {
-        <div class="@Orchard.GetWrapperCssClasses()">
-            <div class="@Orchard.GetEndCssClasses(true)">
+        <div class="@Orchard.GetWrapperClasses()">
+            <div class="@Orchard.GetEndClasses(true)">
                 <div class="form-check">
                     <input type="checkbox" class="form-check-input" asp-for="Absolute" checked="@Model.Absolute" />
                     <label class="form-check-label" asp-for="Absolute">@T["Absolute"]</label>
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
index ae181f40db2..5ed45e665d3 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
@@ -19,22 +19,22 @@
     <div class="tab-content" id="tabs">
         <div class="tab-pane fade show active" id="properties" role="tabpanel" aria-labelledby="properties-tab">
 
-            <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Title">
-                <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
-                <div class="@Orchard.GetEndCssClasses()">
+            <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Title">
+                <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
+                <div class="@Orchard.GetEndClasses()">
                     <input asp-for="Title" class="form-control-plaintext" readonly />
                 </div>
             </div>
 
-            <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Description">
-                <label asp-for="Description" class="@Orchard.GetLabelCssClasses()">@T["Description"]</label>
-                <div class="@Orchard.GetEndCssClasses()">
+            <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Description">
+                <label asp-for="Description" class="@Orchard.GetLabelClasses()">@T["Description"]</label>
+                <div class="@Orchard.GetEndClasses()">
                     <input asp-for="Description" class="form-control-plaintext" />
                 </div>
             </div>
 
-            <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Schedule">
-                <label asp-for="Schedule" class="@Orchard.GetLabelCssClasses()">@T["Schedule"]</label>
+            <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Schedule">
+                <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
                 <div class="@Orchard.GetEndCssClasses()">
                     <div class="input-group mb-3">
                         <input asp-for="Schedule" class="form-control" />
@@ -44,8 +44,8 @@
                 </div>
             </div>
 
-            <div class="@Orchard.GetWrapperCssClasses()">
-                <div class="@Orchard.GetEndCssClasses(true)">
+            <div class="@Orchard.GetWrapperClasses()">
+                <div class="@Orchard.GetEndClasses(true)">
                     <div class="form-check">
                         <input type="checkbox" class="form-check-input" asp-for="UsePipeline" checked="@Model.UsePipeline" />
                         <label class="form-check-label" asp-for="UsePipeline">@T["Use Tenant Pipeline"]</label>
@@ -59,18 +59,18 @@
         </div>
 
         <div class="tab-pane fade" id="advanced" role="tabpanel" aria-labelledby="advanced-tab">
-            <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LockTimeout">
-                <label asp-for="LockTimeout" class="@Orchard.GetLabelCssClasses()">@T["Lock timeout (ms)"]</label>
-                <div class="@Orchard.GetEndCssClasses()">
+            <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LockTimeout">
+                <label asp-for="LockTimeout" class="@Orchard.GetLabelClasses()">@T["Lock timeout (ms)"]</label>
+                <div class="@Orchard.GetEndClasses()">
                     <input asp-for="LockTimeout" type="number" min="0" max="30000" class="form-control">
                     <span class="hint">@T["The timeout in milliseconds to acquire a lock before executing the task atomically. Leave it to zero to not use any locking."]</span>
                     <span class="hint">@T["Ignored if there is no distributed lock feature enabled."]</span>
                 </div>
             </div>
 
-            <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LockExpiration">
-                <label asp-for="LockExpiration" class="@Orchard.GetLabelCssClasses()">@T["Lock expiration (ms)"]</label>
-                <div class="@Orchard.GetEndCssClasses()">
+            <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LockExpiration">
+                <label asp-for="LockExpiration" class="@Orchard.GetLabelClasses()">@T["Lock expiration (ms)"]</label>
+                <div class="@Orchard.GetEndClasses()">
                     <input asp-for="LockExpiration" type="number" min="0" max="30000" class="form-control">
                     <span class="hint">@T["The expiration in milliseconds of the lock acquired before executing the task atomically. Leave it to zero to not use any locking."]</span>
                     <span class="hint">@T["Ignored if there is no distributed lock feature enabled."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
index 94e60154d71..7d9749faf81 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml
@@ -4,8 +4,8 @@
     var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check form-switch">
             <input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
             <label asp-for="Value" class="form-check-label">@(string.IsNullOrEmpty(settings.Label) ? Model.PartFieldDefinition.DisplayName() : settings.Label)</label>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
index ad391cc7e13..211fb2ae095 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml
@@ -5,8 +5,8 @@
     var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input asp-for="Value" type="checkbox" class="form-check-input content-preview-select" checked="@Model.Value" />
             <label class="form-check-label" asp-for="Value">
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
index 28b62ac3ba2..5e68838abd5 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
@@ -15,9 +15,9 @@
 <script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
-    <label asp-for="ContentItemIds" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
+    <label asp-for="ContentItemIds" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-lg-75 w-xxl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
index 8666c816d36..873739af7e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml
@@ -6,11 +6,11 @@
     var datepickerId = Html.IdFor(m => m.Value);
 }
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <input asp-for="Value" type="text" class="form-control content-preview-select datepicker" required="@settings.Required" />
             </div>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
index c59e3adac2d..b89b9158a3c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml
@@ -5,11 +5,11 @@
 }
 
 <script asp-name="jQuery-ui-i18n" at="Foot"></script>
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <input asp-for="Value" type="date" class="form-control content-preview-select" required="@settings.Required" />
             </div>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
index 96f1e28f126..bf0082150fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml
@@ -4,11 +4,11 @@
     var settings = Model.PartFieldDefinition.GetSettings<DateTimeFieldSettings>();
 }
 <script asp-name="jQuery-ui-i18n" at="Foot"></script>
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalDateTime)_FieldWrapper">
-    <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalDateTime)_FieldWrapper">
+    <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <input asp-for="LocalDateTime" type="datetime-local" class="form-control content-preview-select" required="@settings.Required" />
             </div>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
index 585d971a318..56cf0f1c4f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml
@@ -6,9 +6,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <div id="@Html.IdFor(x => x.Html)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
         <textarea asp-for="Html" hidden>@Html.Raw(Model.Html)</textarea>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
index 32b3ddcea65..88227978536 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml
@@ -5,9 +5,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <textarea asp-for="Html" rows="5" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()"></textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
index a59fb88ff6e..25b8e3e4ab1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml
@@ -20,9 +20,9 @@ else
 <script asp-src="~/OrchardCore.ContentFields/Scripts/trumbowyg.media.tag.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/trumbowyg.media.tag.js" depends-on="trumbowyg" at="Foot"></script>
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         @if (culture.IsRightToLeft())
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
index c316f703573..c7dc81dd504 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml
@@ -12,9 +12,9 @@
 <script asp-name="trumbowyg-shortcodes" at="Foot"></script>
 
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         @if (culture.IsRightToLeft())
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
index 17b463c71a5..e9ac615c7fe 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml
@@ -5,9 +5,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Html)_FieldWrapper">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <textarea asp-for="Html" rows="5" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
index 5a4c288161f..38caad9d924 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml
@@ -9,9 +9,9 @@
     var useFormFloating = string.IsNullOrWhiteSpace(settings.UrlPlaceholder) || string.IsNullOrWhiteSpace(settings.TextPlaceholder);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Url" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div class="row">
             <div class="col-md-6" asp-validation-class-for="Url">
                 <div class="@(useFormFloating ? "form-floating" : string.Empty)">
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
index 9e6710a6c8a..a583d8d620f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
@@ -19,9 +19,9 @@
 <script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalizationSets)_FieldWrapper">
-    <label asp-for="LocalizationSets" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalizationSets)_FieldWrapper">
+    <label asp-for="LocalizationSets" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="LocalizationSetContentPicker" data-selected-items="@selectedItems" data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-xl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
index 9db7ae68795..7b83df055bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml
@@ -12,9 +12,9 @@
                 }).ToList();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
-    <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
+    <label class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @for (int i = 0; i < options.Count; i++)
         {
             var option = options[i];
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
index 45c7746ddda..19fa9077985 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
@@ -27,9 +27,9 @@
 <script asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.js" asp-name="multitextfieldpicker" at="Foot" depends-on="vuejs, vue-multiselect"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
-    <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
+    <label class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@vueElementId" class="multitextfieldpicker" data-selectedvalues="@jSelectedValues" data-options="@jOptions" data-valueskey="@valuesKey">
             <div class="w-xl-50">
                 <input v-for="v in value" v-bind:name="valuesKey" v-bind:value="v.value" type="hidden" />
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
index 34a96040176..de9b8eae61f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml
@@ -12,9 +12,9 @@
     }
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
-    <label asp-for="Values" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
+    <label asp-for="Values" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <select class="form-select content-preview-select" asp-for="Values" asp-items="options" multiple></select>
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
index b80eedf46a3..51df3b4721f 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml
@@ -12,11 +12,11 @@
     string serverDecimalSeparator = CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator;
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@name</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@name</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <div class="input-group mb-2">
                     @if (settings.Minimum.HasValue)
                     {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
index 4203ac83d04..de4fc7c175e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml
@@ -8,9 +8,9 @@
     decimal to = settings.Maximum.HasValue ? settings.Maximum.Value : 10;
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@name</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@name</label>
+    <div class="@Orchard.GetEndClasses()">
 
         <select asp-for="Value" class="form-select content-preview-select">
             @if (!settings.Required)
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
index 23be2ac55b8..36ff5c21dbc 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml
@@ -14,11 +14,11 @@
 
 <script asp-name="nouislider" at="Foot"></script>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@name</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@name</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <div class="input-group mb-2">
                     @if (settings.Minimum.HasValue)
                     {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
index d602b9b84ce..398a586f014 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml
@@ -15,11 +15,11 @@
     string serverDecimalSeparator = CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator;
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@name</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@name</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <div class="input-group">
                     @if (settings.Minimum.HasValue)
                     {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
index 3ec5b5e8961..54762277886 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml
@@ -7,11 +7,11 @@
     decimal max = settings.Maximum.HasValue ? settings.Maximum.Value : 10000;
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@name</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@name</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <div class="input-group">
                     @if (settings.Minimum.HasValue)
                     {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
index 87b902bffc4..6b4aacfc77e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml
@@ -5,9 +5,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Text" rows="5" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
index 31200ccb927..d17ddaad33d 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml
@@ -4,9 +4,9 @@
     var settings = Model.PartFieldDefinition.GetSettings<TextFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses("pt-lg-2")">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses("pt-lg-2")">
         <input asp-for="Text" class="form-control content-preview-text" type="color" style="min-height: 2.25rem" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
index 642b94275e6..6d7d36547f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml
@@ -4,9 +4,9 @@
     var settings = Model.PartFieldDefinition.GetSettings<TextFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div class="input-group">
             <span class="input-group-text">@@</span>
             <input asp-for="Text" class="form-control content-preview-text" type="email" />
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
index dd9057850e0..b60a3a06837 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml
@@ -9,9 +9,9 @@
 <script asp-name="fontpickerScript" asp-src="~/OrchardCore.ContentFields/Scripts/fontawesome-iconpicker.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/fontawesome-iconpicker.js" at="Foot" depends-on="jquery"></script>
 <script asp-name="iconpickerCustomScript" asp-src="~/OrchardCore.ContentFields/Scripts/iconpicker-custom.js" at="Foot"></script>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="hidden" asp-for="Text" id="@Html.IdFor(m=>m.Text)" />
         <div class="btn-toolbar" role="toolbar" aria-label="Icon Selector Toolbar">
             <div class="btn-group input-group">
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
index 3f0c5e1a0c4..7661592a2ae 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml
@@ -6,9 +6,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@Html.IdFor(x => x.Text)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
         <textarea asp-for="Text" hidden>@Html.Raw(Model.Text)</textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
index 5978ac7bf07..fd28a34ea71 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml
@@ -16,9 +16,9 @@
     }
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @if (listSettings.Editor == EditorOption.Radio)
         {
             var i = 0;
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
index de595587f63..c27f10e9a4b 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml
@@ -4,9 +4,9 @@
     var settings = Model.PartFieldDefinition.GetSettings<TextFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Text" class="form-control content-preview-text" type="tel" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml
index 964cc10508d..e99d3c33999 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml
@@ -5,9 +5,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Text" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
         <span class="hint">@settings.Hint</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
index 3992757561c..e85f48ebc98 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml
@@ -4,9 +4,9 @@
     var settings = Model.PartFieldDefinition.GetSettings<TextFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Text" class="form-control content-preview-text" type="url" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
index 9cf7c284ac1..e55705b81c7 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml
@@ -5,9 +5,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Text)_FieldWrapper">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Text" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
index e9cc67726cf..597a9d78ac8 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml
@@ -4,11 +4,11 @@
     var settings = Model.PartFieldDefinition.GetSettings<TimeFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
-    <label asp-for="Value" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">
+    <label asp-for="Value" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <input asp-for="Value" type="time" class="form-control content-preview-select" step="@settings.Step" required="@settings.Required" />
             </div>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
index 1da0b885bc0..7d65f572c55 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
@@ -16,9 +16,9 @@
 <script asp-name="vue-multiselect-userpicker" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-userpicker.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.UserIds)_FieldWrapper">
-    <label asp-for="UserIds" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.UserIds)_FieldWrapper">
+    <label asp-for="UserIds" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-content-type="@contentTypeName" data-editor-type="UserPicker" data-selected-users="@selectedUsers" data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-lg-75 w-xxl-50 user-picker-default__list" v-show="arrayOfUsers.length" v-cloak>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
index 4f8ca1bfa2f..02644a401a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml
@@ -4,9 +4,9 @@
     var settings = Model.PartFieldDefinition.GetSettings<YoutubeFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.RawAddress)_FieldWrapper">
-    <label asp-for="RawAddress" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.RawAddress)_FieldWrapper">
+    <label asp-for="RawAddress" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="RawAddress" class="form-control content-preview-text" required="@settings.Required" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/AuditTrailPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/AuditTrailPart.Edit.cshtml
index 3d6f219f1d4..4172ad0a88d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/AuditTrailPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/AuditTrailPart.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore.Contents.AuditTrail.ViewModels
 @using OrchardCore
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Comment" class="@Orchard.GetLabelCssClasses()">@T["Comment"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Comment" class="@Orchard.GetLabelClasses()">@T["Comment"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Comment" rows="5" class="form-control"></textarea>
         <span class="hint">@T["Optionally provide a comment about this change for the audit trail."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Date.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Date.Edit.cshtml
index dc4d39cf87c..62eb59f9532 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Date.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Date.Edit.cshtml
@@ -2,11 +2,11 @@
 @using OrchardCore
 @model DateEditorViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LocalDateTime">
-    <label asp-for="LocalDateTime" class="@Orchard.GetLabelCssClasses()">@T["Created"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
-        <div class="@Orchard.GetLimitedWidthWrapperCssClasses()">
-            <div class="@Orchard.GetLimitedWidthCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LocalDateTime">
+    <label asp-for="LocalDateTime" class="@Orchard.GetLabelClasses()">@T["Created"]</label>
+    <div class="@Orchard.GetEndClasses()">
+        <div class="@Orchard.GetLimitedWidthWrapperClasses()">
+            <div class="@Orchard.GetLimitedWidthClasses()">
                 <input asp-for="LocalDateTime" asp-format="{0:yyyy-MM-ddTHH:mm}" class="form-control" type="datetime-local" />
                 <span asp-validation-for="LocalDateTime"></span>
             </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Owner.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Owner.Edit.cshtml
index ae5dc189f64..0e6cb1af6af 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Owner.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/CommonPart-Owner.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore
 @model OwnerEditorViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="OwnerName">
-    <label asp-for="OwnerName" class="@Orchard.GetLabelCssClasses()">@T["Owner"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="OwnerName">
+    <label asp-for="OwnerName" class="@Orchard.GetLabelClasses()">@T["Owner"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="OwnerName" class="form-control" />
         <span asp-validation-for="OwnerName"></span>
         <span class="hint">@T["The owner's username of this content item."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
index b6e6bd6e790..d113ff2647a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Content.Edit.cshtml
@@ -22,8 +22,8 @@
 
         @if (Model.Actions != null)
         {
-            <div class="@Orchard.GetWrapperCssClasses("edit-item-secondary","group")">
-                <div class="@Orchard.GetEndCssClasses(true, "edit-item-actions")">
+            <div class="@Orchard.GetWrapperClasses("edit-item-secondary","group")">
+                <div class="@Orchard.GetEndClasses(true, "edit-item-actions")">
                     @await DisplayAsync(Model.Actions)
 
                     @{
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
index 6f53db0edda..9a8c497c1fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml
@@ -6,11 +6,10 @@
 @{
     ContentTypePartDefinition typePartDefinition = Model.ContentTypePartDefinition;
     var description = typePartDefinition.Description();
-    var name = typePartDefinition.PartDefinition.Name.HtmlClassify();
 }
 
-<div class="@Orchard.GetWrapperCssClasses("content-part-wrapper", $"content-part-wrapper-{name}")">
-    <div class="@Orchard.GetLabelCssClasses()">
+<div class="@Orchard.GetPartWrapperClasses(typePartDefinition)">
+    <div class="@Orchard.GetLabelClasses()">
         @typePartDefinition.DisplayName()
 
         @if (!string.IsNullOrEmpty(description))
@@ -19,7 +18,7 @@
         }
     </div>
 
-    <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetEndClasses()">
         @foreach (var shape in Model)
         {
             @await DisplayAsync(shape)
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
index 6f53db0edda..9a8c497c1fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml
@@ -6,11 +6,10 @@
 @{
     ContentTypePartDefinition typePartDefinition = Model.ContentTypePartDefinition;
     var description = typePartDefinition.Description();
-    var name = typePartDefinition.PartDefinition.Name.HtmlClassify();
 }
 
-<div class="@Orchard.GetWrapperCssClasses("content-part-wrapper", $"content-part-wrapper-{name}")">
-    <div class="@Orchard.GetLabelCssClasses()">
+<div class="@Orchard.GetPartWrapperClasses(typePartDefinition)">
+    <div class="@Orchard.GetLabelClasses()">
         @typePartDefinition.DisplayName()
 
         @if (!string.IsNullOrEmpty(description))
@@ -19,7 +18,7 @@
         }
     </div>
 
-    <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetEndClasses()">
         @foreach (var shape in Model)
         {
             @await DisplayAsync(shape)
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
index 6f53db0edda..9a8c497c1fd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml
@@ -6,11 +6,10 @@
 @{
     ContentTypePartDefinition typePartDefinition = Model.ContentTypePartDefinition;
     var description = typePartDefinition.Description();
-    var name = typePartDefinition.PartDefinition.Name.HtmlClassify();
 }
 
-<div class="@Orchard.GetWrapperCssClasses("content-part-wrapper", $"content-part-wrapper-{name}")">
-    <div class="@Orchard.GetLabelCssClasses()">
+<div class="@Orchard.GetPartWrapperClasses(typePartDefinition)">
+    <div class="@Orchard.GetLabelClasses()">
         @typePartDefinition.DisplayName()
 
         @if (!string.IsNullOrEmpty(description))
@@ -19,7 +18,7 @@
         }
     </div>
 
-    <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetEndClasses()">
         @foreach (var shape in Model)
         {
             @await DisplayAsync(shape)
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
index d8f71b9204a..ce251d22961 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml
@@ -9,10 +9,11 @@
     var description = typePartDefinition.Description();
 }
 
-@if (typePartDefinition.IsNamedPart())
-{
-    <div class="@Orchard.GetPartWrapperCssClasses(typePartDefinition)">
-        <div class="@Orchard.GetLabelCssClasses()">
+<div class="@Orchard.GetPartWrapperClasses(typePartDefinition)">
+
+    @if (typePartDefinition.IsNamedPart())
+    {
+        <div class="@Orchard.GetLabelClasses()">
             @typePartDefinition.DisplayName()
 
             @if (!string.IsNullOrEmpty(description))
@@ -21,20 +22,19 @@
             }
         </div>
 
-        <div class="@Orchard.GetEndCssClasses()">
+        <div class="@Orchard.GetEndClasses()">
             @foreach (var shape in Model)
             {
                 @await DisplayAsync(shape)
             }
         </div>
-    </div>
-}
-else
-{
-    <div class="@Orchard.GetPartWrapperCssClasses(typePartDefinition)">
-        @foreach (var shape in Model)
+    }
+    else
+    {   
+        foreach (var shape in Model)
         {
             @await DisplayAsync(shape)
         }
-    </div>
-}
+    }
+
+</div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.Edit.cshtml
index 20ec06c24ee..1f2bbc2308f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Views/FacebookPluginPart.Edit.cshtml
@@ -9,9 +9,9 @@
 <script asp-name="codemirror-mode-xml" at="Foot"></script>
 <script asp-src="~/OrchardCore.Liquid/codemirror/liquid.js" at="Foot"></script>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Liquid" rows="5" class="form-control content-preview-text"></textarea>
         <span class="hint">@T["The template of the plugin, in Liquid format."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/AddModelValidationErrorTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/AddModelValidationErrorTask.Fields.Edit.cshtml
index d0f32f24d04..b6a963af6d1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/AddModelValidationErrorTask.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/AddModelValidationErrorTask.Fields.Edit.cshtml
@@ -2,18 +2,18 @@
 @using OrchardCore.Forms.Workflows.ViewModels
 @model AddModelValidationErrorTaskViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Key">
-    <label asp-for="Key" class="@Orchard.GetLabelCssClasses()">@T["Key"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Key">
+    <label asp-for="Key" class="@Orchard.GetLabelClasses()">@T["Key"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" asp-for="Key" class="form-control" />
         <span asp-validation-for="Key"></span>
         <span class="hint">@T["The name of the form field that has an invalid value."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="ErrorMessage">
-    <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="ErrorMessage">
+    <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" asp-for="ErrorMessage" class="form-control" />
         <span asp-validation-for="ErrorMessage"></span>
         <span class="hint">@T["The validation error message to display."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ButtonPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ButtonPart.Fields.Edit.cshtml
index da609289817..e10a9ceec0c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ButtonPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ButtonPart.Fields.Edit.cshtml
@@ -2,17 +2,17 @@
 @using OrchardCore.Forms.ViewModels
 @model ButtonPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Text" class="@Orchard.GetLabelCssClasses()">@T["Text"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Text" class="@Orchard.GetLabelClasses()">@T["Text"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Text" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The text to display on the button."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="Type" class="form-select content-preview-select">
             <option value="submit">Submit</option>
             <option value="button">Button</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.Fields.Edit.cshtml
index e0b5764383b..1547f36d117 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementLabelPart.Fields.Edit.cshtml
@@ -7,9 +7,9 @@
 }
 <div class="properties-wrapper show-for-input" id="@wrapperId">
 
-    <div class="@Orchard.GetWrapperCssClasses("show-for-input-label")">
-        <label asp-for="LabelOption" class="@Orchard.GetLabelCssClasses()">@T["Label option"]</label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses("show-for-input-label")">
+        <label asp-for="LabelOption" class="@Orchard.GetLabelClasses()">@T["Label option"]</label>
+        <div class="@Orchard.GetEndClasses()">
             <select asp-for="LabelOption" class="form-select content-preview-select field-label-option-select-menu">
                 <option value="@LabelOptions.None">@T["None"]</option>
                 <option value="@LabelOptions.Standard">@T["Standard"]</option>
@@ -19,9 +19,9 @@
         </div>
     </div>
 
-    <div class="@Orchard.GetWrapperCssClasses("d-none","label-text-container")">
-        <label asp-for="Label" class="@Orchard.GetLabelCssClasses()">@T["Label Text"]</label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses("d-none","label-text-container")">
+        <label asp-for="Label" class="@Orchard.GetLabelClasses()">@T["Label Text"]</label>
+        <div class="@Orchard.GetEndClasses()">
             <input asp-for="Label" type="text" class="form-control content-preview-text" />
             <span class="hint">@T["The text to display in the label."]</span>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementPart.Fields.Edit.cshtml
index 6467a04158e..dac499e364b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementPart.Fields.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore.Forms.ViewModels
 @model FormElementPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Id" class="@Orchard.GetLabelCssClasses()">@T["ID"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Id" class="@Orchard.GetLabelClasses()">@T["ID"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Id" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The ID to render on this form element."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.Fields.Edit.cshtml
index 8d6c2bdad39..97400bd5e01 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormElementValidationPart.Fields.Edit.cshtml
@@ -3,9 +3,9 @@
 @using OrchardCore.Forms.Models
 @model FormElementValidationPartViewModel
 
-<div class="@Orchard.GetWrapperCssClasses("show-for-input")">
-    <label asp-for="ValidationOption" class="@Orchard.GetLabelCssClasses()">@T["Validation option"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses("show-for-input")">
+    <label asp-for="ValidationOption" class="@Orchard.GetLabelClasses()">@T["Validation option"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="ValidationOption" class="form-select content-preview-select">
             <option value="@ValidationOptions.None">@T["None"]</option>
             <option value="@ValidationOptions.Standard">@T["Standard"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormInputElementPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormInputElementPart.Fields.Edit.cshtml
index e57d3fc4c74..ade7324759d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormInputElementPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormInputElementPart.Fields.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore.Forms.ViewModels
 @model FormInputElementPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Name" type="text" class="form-control content-preview-text content-caption-text" />
         <span class="hint">@T["The name to render on this form element."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormPart.Fields.Edit.cshtml
index d269bfa3ed1..76af99cbd29 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/FormPart.Fields.Edit.cshtml
@@ -2,17 +2,17 @@
 @using OrchardCore
 @model FormPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Action" class="@Orchard.GetLabelCssClasses()">@T["Action"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Action" class="@Orchard.GetLabelClasses()">@T["Action"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" asp-for="Action" class="form-control content-preview-text" />
         <span class="hint">@T["The URL to submit the form to."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Method" class="@Orchard.GetLabelCssClasses()">@T["Method"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Method" class="@Orchard.GetLabelClasses()">@T["Method"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="Method" class="form-select content-preview-select">
             <option value="POST">POST</option>
             <option value="GET">GET</option>
@@ -21,9 +21,9 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="EncType" class="@Orchard.GetLabelCssClasses()">@T["EncType"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="EncType" class="@Orchard.GetLabelClasses()">@T["EncType"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="EncType" class="form-select content-preview-select">
             <option value="application/x-www-form-urlencoded">application/x-www-form-urlencoded	</option>
             <option value="multipart/form-data">multipart/form-data</option>
@@ -33,8 +33,8 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input asp-for="EnableAntiForgeryToken" class="form-check-input" />
             <label asp-for="EnableAntiForgeryToken" class="form-check-label">@T["Anti Forgery Token"]</label>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.Fields.Edit.cshtml
index d3023bf2e1c..e82d65d00d7 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/InputPart.Fields.Edit.cshtml
@@ -4,9 +4,9 @@
 @{
     var wrapperId = Html.IdFor(m => m);
 }
-<div class="@Orchard.GetWrapperCssClasses()" id="@wrapperId">
-    <label asp-for="Type" class="@Orchard.GetLabelCssClasses()">@T["Type"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" id="@wrapperId">
+    <label asp-for="Type" class="@Orchard.GetLabelClasses()">@T["Type"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="Type" class="form-select content-preview-select field-type-select-menu">
             <option value="text">@T["Text"]</option>
             <option value="number">@T["Number"]</option>
@@ -34,17 +34,17 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses("show-for-input")">
-    <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses("show-for-input")">
+    <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Placeholder" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The text to display when the field has no value."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="DefaultValue" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The default value for this field."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/LabelPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/LabelPart.Fields.Edit.cshtml
index 322bc8b85c6..625e1f9db81 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/LabelPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/LabelPart.Fields.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore.Forms.ViewModels
 @model LabelPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="For" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The ID of the form element to associate with this label."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml
index 77a75387cdd..f843c0eea5b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml
@@ -106,9 +106,9 @@
 }
 <div class="select-part-properties-wrapper" id="@widgetId">
 
-    <div class="@Orchard.GetWrapperCssClasses("show-for-input")">
-        <label asp-for="Editor" class="@Orchard.GetLabelCssClasses()">@T["Editor"]</label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses("show-for-input")">
+        <label asp-for="Editor" class="@Orchard.GetLabelClasses()">@T["Editor"]</label>
+        <div class="@Orchard.GetEndClasses()">
             <select asp-for="Editor" class="form-select content-preview-select">
                 <option value="@SelectEditorOption.Dropdown">@T["Dropdown"]</option>
                 <option value="@SelectEditorOption.Checkbox">@T["Checkbox"]</option>
@@ -118,10 +118,10 @@
         </div>
     </div>
 
-    <div class="@Orchard.GetWrapperCssClasses("field-options-wrapper")" id="@(widgetId)-selectOptions" data-defaultValue="@Model.DefaultValue">
-        <label asp-for="Options" class="@Orchard.GetLabelCssClasses()">@T["Options"]</label>
+    <div class="@Orchard.GetWrapperClasses("field-options-wrapper")" id="@(widgetId)-selectOptions" data-defaultValue="@Model.DefaultValue">
+        <label asp-for="Options" class="@Orchard.GetLabelClasses()">@T["Options"]</label>
 
-        <div class="@Orchard.GetEndCssClasses()">
+        <div class="@Orchard.GetEndClasses()">
             <input type="hidden" class="field-options-wrapper-initial-default-value" value="@Model.DefaultValue" />
             <div class="d-none field-options-wrapper-initial-options">@Html.Raw(Model.Options)</div>
             <a href="#" v-on:click.prevent.stop="showModal = true" class="float-end" title="@T["Edit Data"]"><i class="fa-solid fa-edit" aria-hidden="true"></i></a>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/TextAreaPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/TextAreaPart.Fields.Edit.cshtml
index 3afbf3b0d29..74e3d525999 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/TextAreaPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/TextAreaPart.Fields.Edit.cshtml
@@ -2,17 +2,17 @@
 @using OrchardCore.Forms.ViewModels
 @model TextAreaPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder Text"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder Text"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Placeholder" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The text to display when the textarea has no value."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="DefaultValue" class="@Orchard.GetLabelCssClasses()">@T["Default Value"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="DefaultValue" class="@Orchard.GetLabelClasses()">@T["Default Value"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="DefaultValue" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The default value for this textarea."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidateFormFieldTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidateFormFieldTask.Fields.Edit.cshtml
index b9cb2f7807e..a75e6829b78 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidateFormFieldTask.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidateFormFieldTask.Fields.Edit.cshtml
@@ -2,18 +2,18 @@
 @using OrchardCore.Forms.Workflows.ViewModels
 @model ValidateFormFieldTaskViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="FieldName">
-    <label asp-for="FieldName" class="@Orchard.GetLabelCssClasses()">@T["Field Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="FieldName">
+    <label asp-for="FieldName" class="@Orchard.GetLabelClasses()">@T["Field Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" asp-for="FieldName" class="form-control" />
         <span asp-validation-for="FieldName"></span>
         <span class="hint">@T["The name of the form field to validate."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="ErrorMessage">
-    <label asp-for="ErrorMessage" class="@Orchard.GetLabelCssClasses()">@T["Error Message"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="ErrorMessage">
+    <label asp-for="ErrorMessage" class="@Orchard.GetLabelClasses()">@T["Error Message"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" asp-for="ErrorMessage" class="form-control" />
         <span asp-validation-for="ErrorMessage"></span>
         <span class="hint">@T["The validation error message to display."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.Fields.Edit.cshtml
index 373501cd6c9..c36052bf50c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationPart.Fields.Edit.cshtml
@@ -2,9 +2,9 @@
 @using OrchardCore.Forms.ViewModels
 @model ValidationPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="For" class="@Orchard.GetLabelCssClasses()">@T["For"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="For" class="@Orchard.GetLabelClasses()">@T["For"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="For" type="text" class="form-control content-preview-text" />
         <span class="hint">@T["The field name that this validation is for."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationSummaryPart.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationSummaryPart.Fields.Edit.cshtml
index c1b477e12db..2301fdcceed 100644
--- a/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationSummaryPart.Fields.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/ValidationSummaryPart.Fields.Edit.cshtml
@@ -3,8 +3,8 @@
 
 @model ValidationSummaryViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input class="form-check-input" asp-for="ModelOnly">
             <label class="form-check-label" asp-for="ModelOnly">
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Monaco.Edit.cshtml
index 906a7ca396a..a11b2648cd8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Monaco.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Monaco.Edit.cshtml
@@ -9,8 +9,8 @@
 @await DisplayAsync(await New.ShortcodeModal())
 
 <div class="row mb-3">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <div id="@Html.IdFor(x => x.Html)_editor" asp-for="Text" style="min-height: 400px;" class="form-control" dir="@culture.GetLanguageDirection()"></div>
         <textarea asp-for="Html" class="content-preview-text" hidden>@Html.Raw(Model.Html)</textarea>
         <span class="hint">@T["The body of the content item."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Trumbowyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Trumbowyg.Edit.cshtml
index 0a36241adbd..27e1aa99f76 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Trumbowyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Trumbowyg.Edit.cshtml
@@ -22,8 +22,8 @@ else
 
 @await DisplayAsync(await New.ShortcodeModal())
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndCssClasses()">
         @if (culture.IsRightToLeft())
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Wysiwyg.Edit.cshtml
index 49b996c0ba4..db4a3b7d97b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart-Wysiwyg.Edit.cshtml
@@ -16,9 +16,9 @@
 
 @await DisplayAsync(await New.ShortcodeModal())
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @if (culture.IsRightToLeft())
         {
             <div style="text-align:right">
diff --git a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Edit.cshtml
index e1c2e209553..b6d70e13464 100644
--- a/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Html/Views/HtmlBodyPart.Edit.cshtml
@@ -7,9 +7,9 @@
 
 @await DisplayAsync(await New.ShortcodeModal())
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Html" rows="5" class="form-control content-preview-text" dir="@culture.GetLanguageDirection()"></textarea>
         <span class="hint">@T["The body of the content item."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Views/LayerMetadata.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Layers/Views/LayerMetadata.Edit.cshtml
index eb9e1ab6b5a..ccdb0316a8d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Views/LayerMetadata.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Views/LayerMetadata.Edit.cshtml
@@ -1,16 +1,16 @@
 @using OrchardCore
 @model OrchardCore.Layers.ViewModels.LayerMetadataEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Title">
-    <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Title">
+    <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Title" class="form-control" type="text" />
         <span asp-validation-for="Title"></span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input type="checkbox" class="form-check-input" asp-for="LayerMetadata.RenderTitle" checked="@Model.LayerMetadata.RenderTitle">
             <label class="form-check-label" asp-for="LayerMetadata.RenderTitle">@T["Render title"]</label>
@@ -19,9 +19,9 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="LayerMetadata.Layer">
-    <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelCssClasses()">@T["The layer the widget should be associated with."]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="LayerMetadata.Layer">
+    <label asp-for="LayerMetadata.Layer" class="@Orchard.GetLabelClasses()">@T["The layer the widget should be associated with."]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="LayerMetadata.Layer" class="form-select">
             @foreach (var layer in Model.Layers)
             {
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Views/LiquidPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Liquid/Views/LiquidPart.Edit.cshtml
index dd19b599744..5b490a24ae0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/Views/LiquidPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/Views/LiquidPart.Edit.cshtml
@@ -11,9 +11,9 @@
 <script asp-name="codemirror-mode-xml" at="Foot"></script>
 <script asp-src="~/OrchardCore.Liquid/codemirror/liquid.js" at="Foot"></script>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Liquid" class="@Orchard.GetLabelCssClasses()">@T["Body"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Liquid" class="@Orchard.GetLabelClasses()">@T["Body"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Liquid" rows="5" class="form-control content-preview-text"></textarea>
         <span class="hint">
             @T["The body of the content item, in Liquid format."]
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart-Wysiwyg.Edit.cshtml
index 0169aa1c904..74e3ebc3a9e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart-Wysiwyg.Edit.cshtml
@@ -16,9 +16,9 @@
 
 @await DisplayAsync(await New.ShortcodeModal())
 
-<div class="@Orchard.GetWrapperCssClasses("mde-editor")">
-    <label asp-for="Markdown" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses("mde-editor")">
+    <label asp-for="Markdown" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <span class="hint">@T["The markdown text of the content item."]</span>
         <textarea asp-for="Markdown" rows="5" class="form-control content-preview-text"></textarea>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Edit.cshtml
index 9abeae55d4c..08f5b85f0cc 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownBodyPart.Edit.cshtml
@@ -9,9 +9,9 @@
     var culture = await Orchard.GetContentCultureAsync(Model.MarkdownBodyPart.ContentItem);
 }
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Markdown" class="@Orchard.GetLabelCssClasses()">@Model.TypePartDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Markdown" class="@Orchard.GetLabelClasses()">@Model.TypePartDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @await DisplayAsync(await New.ShortcodeModal())
         <textarea asp-for="Markdown" rows="5" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()"></textarea>
         <span class="hint">@T["The body of the content item, in Markdown format."]</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-TextArea.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-TextArea.Edit.cshtml
index bdb4a38d5a3..f30ad769431 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-TextArea.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-TextArea.Edit.cshtml
@@ -9,10 +9,10 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
     @await DisplayAsync(await New.ShortcodeModal())
-    <label asp-for="Markdown" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Markdown" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Markdown" rows="5" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()"></textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
index 128c31cb388..764c32b9049 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml
@@ -12,10 +12,10 @@
 <style asp-name="codemirror"></style>
 <style asp-name="mdecss" asp-src="~/OrchardCore.Markdown/Styles/mde.min.css" debug-src="~/OrchardCore.Markdown/Styles/mde.css"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
     @await DisplayAsync(await New.ShortcodeModal())
-    <label asp-for="Markdown" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Markdown" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="Markdown" rows="5" class="form-control content-preview-text"></textarea>
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
index 0f1f8b09cbc..9e174a57c7c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml
@@ -9,10 +9,10 @@
     var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem);
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Markdown)_FieldWrapper">
     @await DisplayAsync(await New.ShortcodeModal())
-    <label asp-for="Markdown" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Markdown" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Markdown" class="form-control content-preview-text shortcode-modal-input" dir="@culture.GetLanguageDirection()" />
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
index 7274fb44cd6..99c3a164c36 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml
@@ -16,9 +16,9 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
-    <label asp-for="Paths" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()" id="@mediaFieldId" data-for="@Html.IdFor(m => m.Paths)">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
+    <label asp-for="Paths" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()" id="@mediaFieldId" data-for="@Html.IdFor(m => m.Paths)">
         @if (!string.IsNullOrWhiteSpace(settings.Hint))
         {
             <div class="hint mt-lg-2">@settings.Hint</div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
index 21a9e9553a8..bb4c16f5ad0 100644
--- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml
@@ -11,9 +11,9 @@
 <script asp-name="media" at="Foot"></script>
 <style asp-name="media" at="Head"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
-    <label asp-for="Paths" class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()" id="@Html.IdFor(m => m)" data-for="@Html.IdFor(m => m.Paths)">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Paths)_FieldWrapper">
+    <label asp-for="Paths" class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()" id="@Html.IdFor(m => m)" data-for="@Html.IdFor(m => m.Paths)">
         @if (!string.IsNullOrWhiteSpace(settings.Hint))
         {
             <div class="hint mt-lg-2">@settings.Hint</div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/ContentMenuItemPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/ContentMenuItemPart.Edit.cshtml
index d188ca357da..ea747a84a0b 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/ContentMenuItemPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/ContentMenuItemPart.Edit.cshtml
@@ -1,9 +1,9 @@
 @using OrchardCore
 @model ContentMenuItemPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Name" class="form-control" autofocus />
     </div>
 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
index b671bf3a502..16bbb9855e9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
@@ -1,22 +1,22 @@
 @using OrchardCore
 @model HtmlMenuItemPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Name" class="form-control" autofocus />
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Url" class="form-control" />
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Html" class="@Orchard.GetLabelCssClasses()">@T["Html"]</label>
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
     <div class="@Orchard.GetEndCssClasses()">
         <input asp-for="Html" class="form-control" />
         <span class="hint">This field will be rendered raw in place of the name; it will be enclosed in the anchor tag.</span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/LinkMenuItemPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/LinkMenuItemPart.Edit.cshtml
index 3880a39c74a..473a1c549bd 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/LinkMenuItemPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/LinkMenuItemPart.Edit.cshtml
@@ -1,16 +1,16 @@
 @using OrchardCore
 @model LinkMenuItemPartEditViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Name" class="@Orchard.GetLabelCssClasses()">@T["Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Name" class="@Orchard.GetLabelClasses()">@T["Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Name" class="form-control" autofocus />
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Url" class="@Orchard.GetLabelCssClasses()">@T["Url"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Url" class="form-control" />
     </div>
 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
index 712a9c2dd9b..f84155bdf4c 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItem.Edit.cshtml
@@ -18,10 +18,10 @@
             }
         </div>
 
-        <div class="@Orchard.GetWrapperCssClasses("edit-item-secondary","group")">
+        <div class="@Orchard.GetWrapperClasses("edit-item-secondary","group")">
             @if (Model.Actions != null)
             {
-                <div class="@Orchard.GetEndCssClasses(true, "edit-item-actions")">
+                <div class="@Orchard.GetEndClasses(true, "edit-item-actions")">
                     @await DisplayAsync(Model.Actions)
                 </div>
             }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuPart.Edit.cshtml
index 44aa7953357..a9a91f4a3b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuPart.Edit.cshtml
@@ -21,8 +21,8 @@
     var items = Model.MenuPart.ContentItem.As<MenuItemsListPart>().MenuItems;
 }
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="card text-bg-theme">
             <div class="card-body p-3">
                 <button type="button" @(canAddMenuItem ? null : "disabled=\"disabled\"") class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalMenuItems">
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchFormPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchFormPart.Edit.cshtml
index ff9810e616a..b188f0ba3a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchFormPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchFormPart.Edit.cshtml
@@ -2,17 +2,17 @@
 
 @model SearchPartViewModel
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Placeholder">
-    <label asp-for="Placeholder" class="@Orchard.GetLabelCssClasses()">@T["Placeholder"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Placeholder">
+    <label asp-for="Placeholder" class="@Orchard.GetLabelClasses()">@T["Placeholder"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" class="form-control" asp-for="Placeholder" required />
         <span class="hint">@T["The placeholder text to use in the search bar."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="IndexName">
-    <label asp-for="IndexName" class="@Orchard.GetLabelCssClasses()">@T["Index Name"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="IndexName">
+    <label asp-for="IndexName" class="@Orchard.GetLabelClasses()">@T["Index Name"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <input type="text" class="form-control" asp-for="IndexName" />
         <span class="hint">@T["Leave it empty to use the default index."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Seo/Views/SeoMetaPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Seo/Views/SeoMetaPart.Edit.cshtml
index 3d99b3e8b74..9ef2c58377f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Seo/Views/SeoMetaPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Seo/Views/SeoMetaPart.Edit.cshtml
@@ -3,8 +3,8 @@
 
 @await DisplayAsync(await New.ShortcodeModal())
 
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input type="checkbox" class="form-check-input" asp-for="Render" checked="@Model.Render" />
             <label class="form-check-label" asp-for="Render">@T["Render"]</label>
@@ -13,17 +13,17 @@
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="PageTitle">
-    <label asp-for="PageTitle" class="@Orchard.GetLabelCssClasses()">@T["Page Title"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="PageTitle">
+    <label asp-for="PageTitle" class="@Orchard.GetLabelClasses()">@T["Page Title"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="PageTitle" class="form-control content-preview-text shortcode-modal-input" />
         <span class="hint">@T["Override the default generated web browser page title (recommended to keep under 70 characters)."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="MetaDescription">
-    <label asp-for="MetaDescription" class="@Orchard.GetLabelCssClasses()">@T["Meta Description"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="MetaDescription">
+    <label asp-for="MetaDescription" class="@Orchard.GetLabelClasses()">@T["Meta Description"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <textarea asp-for="MetaDescription" class="form-control content-preview-text shortcode-modal-input"></textarea>
         <span class="hint">@T["The meta description to render for this page."]</span>
     </div>
@@ -31,26 +31,26 @@
 
 @if (Model.Settings.DisplayKeywords)
 {
-    <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="MetaKeywords">
-        <label asp-for="MetaKeywords" class="@Orchard.GetLabelCssClasses()">@T["Meta Keywords"] </label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="MetaKeywords">
+        <label asp-for="MetaKeywords" class="@Orchard.GetLabelClasses()">@T["Meta Keywords"] </label>
+        <div class="@Orchard.GetEndClasses()">
             <input asp-for="MetaKeywords" class="form-control content-preview-text shortcode-modal-input" />
             <span class="hint">@T["The meta keywords to render for this page, comma separated."]</span>
         </div>
     </div>
 }
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Canonical">
-    <label asp-for="Canonical" class="@Orchard.GetLabelCssClasses()"> @T["Canonical"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Canonical">
+    <label asp-for="Canonical" class="@Orchard.GetLabelClasses()"> @T["Canonical"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Canonical" class="form-control content-preview-text" />
         <span class="hint">@T["Override the default canonical url."]</span>
     </div>
 </div>
 
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="MetaRobots">
-    <label asp-for="MetaRobots" class="@Orchard.GetLabelCssClasses()">@T["Meta Robots"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="MetaRobots">
+    <label asp-for="MetaRobots" class="@Orchard.GetLabelClasses()">@T["Meta Robots"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="MetaRobots" class="form-control content-preview-text shortcode-modal-input" />
         <span class="hint">@T["The robots meta to render for this page."]</span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
index d68a29f0248..fdb65309dba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Sitemaps/Views/SitemapPart.Edit.cshtml
@@ -1,14 +1,14 @@
 @using OrchardCore
 @model SitemapPartViewModel
-<div class="@Orchard.GetWrapperCssClasses()">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetWrapperClasses()">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check">
             <input asp-for="OverrideSitemapConfig" class="form-check-input" />
             <label asp-for="OverrideSitemapConfig" class="form-check-label">@T["Override sitemap configuration"]</label>
             <span class="hint dashed">@T["Check to override sitemap configuration."]</span>
         </div>
     </div>
-    <div class="@Orchard.GetEndCssClasses(true)">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="form-check sitemap-form-g mt-3" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
             <input asp-for="Exclude" class="form-check-input" />
             <label asp-for="Exclude" class="form-check-label">@T["Exclude"]</label>
@@ -16,16 +16,16 @@
         </div>
     </div>
 </div>
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="ChangeFrequency" class="@Orchard.GetLabelCssClasses()">@T["Change Frequency"]</label>
-    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="ChangeFrequency" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="ChangeFrequency" class="@Orchard.GetLabelClasses()">@T["Change Frequency"]</label>
+    <div class="@Orchard.GetEndClasses("sitemap-form-g")" asp-validation-class-for="ChangeFrequency" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
         <select asp-for="ChangeFrequency" class="form-select" asp-items="Html.GetEnumSelectList<ChangeFrequency>()"></select>
         <span class="hint">@T["The frequency this content item is likely to change."]</span>
-    </div>
 </div>
-<div class="@Orchard.GetWrapperCssClasses()">
-    <label asp-for="Priority" class="@Orchard.GetLabelCssClasses()">@T["Priority"] </label>
-    <div class="@Orchard.GetEndCssClasses("sitemap-form-g")" asp-validation-class-for="Priority" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
+</div>
+<div class="@Orchard.GetWrapperClasses()">
+    <label asp-for="Priority" class="@Orchard.GetLabelClasses()">@T["Priority"] </label>
+    <div class="@Orchard.GetEndClasses("sitemap-form-g")" asp-validation-class-for="Priority" style="@(Model.OverrideSitemapConfig ? string.Empty : "display: none")">
         <select asp-for="Priority" class="form-select">
             <option value="0">@T["0.0"]</option>
             <option value="1">@T["0.1"]</option>
diff --git a/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.Edit.cshtml
index 50bb2c57397..9da02632784 100644
--- a/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Spatial/Views/GeoPointField.Edit.cshtml
@@ -8,8 +8,8 @@
     var settings = Model.PartFieldDefinition.Settings.ToObject<GeoPointFieldSettings>();
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x)_FieldWrapper">
-    <div class="@Orchard.GetEndCssClasses(true)">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x)_FieldWrapper">
+    <div class="@Orchard.GetEndClasses(true)">
         <div class="row">
             <div class="col-md-6">
                 <label asp-for="Latitude">@T["Latitude"]</label>
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
index 7c8de47647c..60dd7f70a7d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
@@ -27,9 +27,9 @@
 <script asp-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.min.js" debug-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.js" asp-name="tags-editor" at="Foot" depends-on="vuejs, vue-multiselect"></script>
 <style asp-src="~/OrchardCore.Taxonomies/Styles/tags-editor.min.css" debug-src="~/OrchardCore.Taxonomies/Styles/tags-editor.css" asp-name="tags-editor" depends-on="vue-multiselect"></style>
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.TermContentItemIds)_FieldWrapper">
-    <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.TermContentItemIds)_FieldWrapper">
+    <label class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @if (!string.IsNullOrEmpty(taxonomySettings.Hint))
         {
             <div class="hint dashed mt-lg-2">@taxonomySettings.Hint</div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
index cf28ef20589..fbd9a253871 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml
@@ -9,9 +9,9 @@
     int closingDivs = 0;
 }
 
-<div class="@Orchard.GetFieldWrapperCssClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.TermEntries)_FieldWrapper">
-    <label class="@Orchard.GetLabelCssClasses()">@Model.PartFieldDefinition.DisplayName()</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.TermEntries)_FieldWrapper">
+    <label class="@Orchard.GetLabelClasses()">@Model.PartFieldDefinition.DisplayName()</label>
+    <div class="@Orchard.GetEndClasses()">
         @if (!string.IsNullOrEmpty(settings.Hint))
         {
             <div class="hint dashed mt-lg-2">@settings.Hint</div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyPart.Edit.cshtml
index 12007986a99..3660802a3d8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyPart.Edit.cshtml
@@ -21,18 +21,18 @@
     var termContentTypes = ContentDefinitionManager.ListTypeDefinitions().Where(t => !t.HasStereotype()).OrderBy(x => x.DisplayName);
     var index = 0;
 }
-<div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="TermContentType">
-    <label asp-for="TermContentType" class="@Orchard.GetLabelCssClasses()">@T["Term Content Type"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+<div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="TermContentType">
+    <label asp-for="TermContentType" class="@Orchard.GetLabelClasses()">@T["Term Content Type"]</label>
+    <div class="@Orchard.GetEndClasses()">
         <select asp-for="TermContentType" class="form-select" asp-items="@(new SelectList(termContentTypes, "Name", "DisplayName"))">
             <option value="">@T["Select a term content type"]</option>
         </select>
     </div>
     <span asp-validation-for="TermContentType"></span>
 </div>
-<div class="@Orchard.GetWrapperCssClasses()">
+<div class="@Orchard.GetWrapperClasses()">
 
-    <div class="@Orchard.GetEndCssClasses(true)">
+    <div class="@Orchard.GetEndClasses(true)">
         @if (canAddTerm && Model.TermContentType != null)
         {
             var termContentType = ContentDefinitionManager.GetTypeDefinition(Model.TermContentType);
diff --git a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
index 4175bdd3ece..be04a07f28e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Title/Views/TitlePart.Edit.cshtml
@@ -9,9 +9,9 @@
 }
 @if (Model.Settings?.Options != TitlePartOptions.GeneratedHidden)
 {
-    <div class="@Orchard.GetWrapperCssClasses()" asp-validation-class-for="Title">
-        <label asp-for="Title" class="@Orchard.GetLabelCssClasses()">@T["Title"]</label>
-        <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Title">
+        <label asp-for="Title" class="@Orchard.GetLabelClasses()">@T["Title"]</label>
+        <div class="@Orchard.GetEndClasses()">
             <input asp-for="Title" class="form-control content-preview-text content-caption-text" disabled="@(Model.Settings?.Options == TitlePartOptions.GeneratedDisabled)" autofocus="autofocus" dir="@culture.GetLanguageDirection()" />
             <span asp-validation-for="Title"></span>
             @if (!string.IsNullOrWhiteSpace(Model.Settings?.Pattern))
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
index 76cb3975020..411c389ab60 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Html;
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Mvc.Utilities;
 
@@ -6,13 +7,16 @@ namespace OrchardCore;
 
 public static class CssOrchardHelperExtensions
 {
-    private const string FieldWrapperPrefix = "field-wrapper";
     private const string PartWrapperPrefix = "content-part-wrapper";
+    private const string FieldWrapperPrefix = "field-wrapper";
 
-    public static string GetPartWrapperCssClasses(this IOrchardHelper helper, ContentTypePartDefinition partDefinition, params string[] additionalClasses)
+    public static IHtmlContent GetPartWrapperClasses(this IOrchardHelper helper, ContentTypePartDefinition partDefinition, params string[] additionalClasses)
     {
+        var options = helper.GetThemeOptions();
+
         var items = new List<string>()
         {
+            options.WrapperClasses,
             PartWrapperPrefix,
         };
 
@@ -26,18 +30,21 @@ public static string GetPartWrapperCssClasses(this IOrchardHelper helper, Conten
             }
         }
 
-        if (additionalClasses?.Length > 0)
+        if (additionalClasses != null)
         {
             items.AddRange(additionalClasses);
         }
 
-        return helper.GetWrapperCssClasses(items.ToArray());
+        return GetHtmlContentBuilder(items);
     }
 
-    public static string GetFieldWrapperCssClasses(this IOrchardHelper helper, ContentPartFieldDefinition fieldDefinition, params string[] additionalClasses)
+    public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, ContentPartFieldDefinition fieldDefinition, params string[] additionalClasses)
     {
+        var options = helper.GetThemeOptions();
+
         var items = new List<string>()
         {
+            options.WrapperClasses,
             FieldWrapperPrefix
         };
 
@@ -51,11 +58,38 @@ public static string GetFieldWrapperCssClasses(this IOrchardHelper helper, Conte
             }
         }
 
-        if (additionalClasses?.Length > 0)
+        if (additionalClasses != null)
         {
             items.AddRange(additionalClasses);
         }
 
-        return helper.GetWrapperCssClasses(items.ToArray());
+        return GetHtmlContentBuilder(items);
+    }
+
+    private static HtmlContentBuilder GetHtmlContentBuilder(IEnumerable<string> values)
+    {
+        var builder = new HtmlContentBuilder();
+
+        foreach (var value in values)
+        {
+            if (builder.Count == 0)
+            {
+                // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
+                builder.Append(value);
+
+                continue;
+            }
+
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                continue;
+            }
+
+            // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
+            // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
+            builder.AppendHtml(new HtmlString(' ' + value));
+        }
+
+        return builder;
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
index 145bfc44f8e..92a6ad9053f 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
@@ -1,58 +1,134 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Html;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Linq;
 using OrchardCore.DisplayManagement.Html;
 
 namespace OrchardCore;
 
 public static class CssOrchardHelperExtensions
 {
+    public static IHtmlContent GetLimitedWidthWrapperClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.LimitedWidthWrapperClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetLimitedWidthClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.LimitedWidthClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetStartClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.StartClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetEndClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.EndClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetLabelClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.LabelClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetWrapperClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.WrapperClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetEndClasses(this IOrchardHelper helper, bool withOffset, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        if (withOffset && !string.IsNullOrEmpty(options.OffsetClasses))
+        {
+            var cssClasses = new List<string>(additionalClasses)
+            {
+                options.OffsetClasses
+            };
+
+            return GetHtmlContentBuilder(options.EndClasses, cssClasses);
+        }
+
+        return GetHtmlContentBuilder(options.EndClasses, additionalClasses);
+    }
+
+    public static IHtmlContent GetOffsetClasses(this IOrchardHelper helper, params string[] additionalClasses)
+    {
+        var options = helper.GetThemeOptions();
+
+        return GetHtmlContentBuilder(options.OffsetClasses, additionalClasses);
+    }
+
+    [Obsolete($"Please use {nameof(GetLimitedWidthWrapperClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLimitedWidthWrapperCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.LimitedWidthWrapperClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetLimitedWidthClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLimitedWidthCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.LimitedWidthClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetLabelClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLabelCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.LabelClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetStartClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetStartCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.StartClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetEndClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetEndCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.EndClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetWrapperClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetWrapperCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.WrapperClasses, additionalClasses));
     }
 
+    [Obsolete($"Please use {nameof(GetEndClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetEndCssClasses(this IOrchardHelper helper, bool withOffset, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         if (withOffset && !string.IsNullOrEmpty(options.OffsetClasses))
         {
@@ -67,14 +143,15 @@ public static string GetEndCssClasses(this IOrchardHelper helper, bool withOffse
         return string.Join(' ', Combine(options.EndClasses, additionalClasses.ToArray()));
     }
 
+    [Obsolete($"Please use {nameof(GetOffsetClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetOffsetCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
     {
-        var options = GetThemeOptions(helper);
+        var options = helper.GetThemeOptions();
 
         return string.Join(' ', Combine(options.OffsetClasses, additionalClasses));
     }
 
-    private static TheAdminThemeOptions GetThemeOptions(IOrchardHelper helper)
+    public static TheAdminThemeOptions GetThemeOptions(this IOrchardHelper helper)
         => helper.HttpContext.RequestServices.GetService<IOptions<TheAdminThemeOptions>>().Value;
 
     private static IEnumerable<string> Combine(string optionClasses, string[] additionalClasses)
@@ -86,4 +163,36 @@ private static IEnumerable<string> Combine(string optionClasses, string[] additi
 
         return additionalClasses.Concat(new[] { optionClasses });
     }
+
+    private static HtmlContentBuilder GetHtmlContentBuilder(string optionClasses, IEnumerable<string> values)
+    {
+        var builder = new HtmlContentBuilder();
+
+        builder.Append(optionClasses);
+
+        if (values != null)
+        {
+            foreach (var value in values)
+            {
+                if (builder.Count == 0)
+                {
+                    // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
+                    builder.Append(value);
+
+                    continue;
+                }
+
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    continue;
+                }
+
+                // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
+                // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
+                builder.AppendHtml(new HtmlString(' ' + value));
+            }
+        }
+
+        return builder;
+    }
 }

From d5ff62056d6e8d7d8f400859aed0b00714a880dc Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Tue, 31 Oct 2023 16:44:29 -0700
Subject: [PATCH 2/6] Cleanup

---
 .../Razor/CssOrchardHelperExtensions.cs       | 65 ++++++-------------
 .../Html/CssHelpers.cs                        | 29 +++++++++
 .../Html/CssOrchardHelperExtensions.cs        | 18 +----
 3 files changed, 50 insertions(+), 62 deletions(-)
 create mode 100644 src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
index 411c389ab60..eafbd44c597 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Html;
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Mvc.Utilities;
+using OrchardCore.DisplayManagement.Html;
 
 namespace OrchardCore;
 
@@ -12,82 +12,57 @@ public static class CssOrchardHelperExtensions
 
     public static IHtmlContent GetPartWrapperClasses(this IOrchardHelper helper, ContentTypePartDefinition partDefinition, params string[] additionalClasses)
     {
-        var options = helper.GetThemeOptions();
+        var builder = new HtmlContentBuilder();
 
-        var items = new List<string>()
-        {
-            options.WrapperClasses,
-            PartWrapperPrefix,
-        };
+        builder.Append(helper.GetThemeOptions().WrapperClasses);
+
+        CssHelpers.AppendValue(builder, PartWrapperPrefix);
 
         if (partDefinition != null)
         {
-            items.Add($"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
+            CssHelpers.AppendValue(builder, $"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
 
             if (partDefinition.IsNamedPart())
             {
-                items.Add($"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
+                CssHelpers.AppendValue(builder, $"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
             }
         }
 
         if (additionalClasses != null)
         {
-            items.AddRange(additionalClasses);
+            foreach( var additionalClass in additionalClasses )
+            {
+                CssHelpers.AppendValue(builder, additionalClass);
+            }
         }
 
-        return GetHtmlContentBuilder(items);
+        return builder;
     }
 
     public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, ContentPartFieldDefinition fieldDefinition, params string[] additionalClasses)
     {
-        var options = helper.GetThemeOptions();
+        var builder = new HtmlContentBuilder();
 
-        var items = new List<string>()
-        {
-            options.WrapperClasses,
-            FieldWrapperPrefix
-        };
+        builder.Append(helper.GetThemeOptions().WrapperClasses);
+
+        CssHelpers.AppendValue(builder, FieldWrapperPrefix);
 
         if (fieldDefinition != null)
         {
-            items.Add($"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
+            CssHelpers.AppendValue(builder, $"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
 
             if (fieldDefinition.IsNamedPart())
             {
-                items.Add($"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
+                CssHelpers.AppendValue(builder, $"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
             }
         }
 
         if (additionalClasses != null)
         {
-            items.AddRange(additionalClasses);
-        }
-
-        return GetHtmlContentBuilder(items);
-    }
-
-    private static HtmlContentBuilder GetHtmlContentBuilder(IEnumerable<string> values)
-    {
-        var builder = new HtmlContentBuilder();
-
-        foreach (var value in values)
-        {
-            if (builder.Count == 0)
+            foreach (var additionalClass in additionalClasses)
             {
-                // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
-                builder.Append(value);
-
-                continue;
+                CssHelpers.AppendValue(builder, additionalClass);
             }
-
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                continue;
-            }
-
-            // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
-            // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
-            builder.AppendHtml(new HtmlString(' ' + value));
         }
 
         return builder;
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
new file mode 100644
index 00000000000..8b696c3b4ac
--- /dev/null
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
@@ -0,0 +1,29 @@
+using Microsoft.AspNetCore.Html;
+
+namespace OrchardCore.DisplayManagement.Html;
+
+public class CssHelpers
+{
+    public static readonly HtmlString CssClassSeperator = new(" ");
+
+    public static void AppendValue(HtmlContentBuilder builder, string value)
+    {
+        if (builder.Count == 0)
+        {
+            // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
+            builder.Append(value);
+
+            return;
+        }
+
+        if (string.IsNullOrEmpty(value))
+        {
+            return;
+        }
+
+        // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
+        // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
+        builder.AppendHtml(CssClassSeperator);
+        builder.AppendHtml(new HtmlString(value));
+    }
+}
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
index 92a6ad9053f..b8379ed633a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json.Linq;
 using OrchardCore.DisplayManagement.Html;
 
 namespace OrchardCore;
@@ -174,22 +173,7 @@ private static HtmlContentBuilder GetHtmlContentBuilder(string optionClasses, IE
         {
             foreach (var value in values)
             {
-                if (builder.Count == 0)
-                {
-                    // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
-                    builder.Append(value);
-
-                    continue;
-                }
-
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    continue;
-                }
-
-                // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
-                // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
-                builder.AppendHtml(new HtmlString(' ' + value));
+                CssHelpers.AppendValue(builder, value);
             }
         }
 

From 24cdea42938849adfd9cf9bfc21fe486e5c41914 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Tue, 31 Oct 2023 16:48:07 -0700
Subject: [PATCH 3/6] update AppendValue helper

---
 .../OrchardCore.DisplayManagement/Html/CssHelpers.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
index 8b696c3b4ac..4de32f399ab 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
@@ -24,6 +24,6 @@ public static void AppendValue(HtmlContentBuilder builder, string value)
         // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
         // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
         builder.AppendHtml(CssClassSeperator);
-        builder.AppendHtml(new HtmlString(value));
+        builder.Append(value);
     }
 }

From 0360eefcf2721ca514d3c1d650c764cb7f8ac387 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Wed, 1 Nov 2023 07:47:08 -0700
Subject: [PATCH 4/6] cleanup

---
 .../Views/DashboardPart.Edit.cshtml           |   8 +-
 .../Views/BackgroundTask/Edit.cshtml          |   2 +-
 .../Views/HtmlMenuItemPart.Edit.cshtml        |   4 +-
 .../Html/CssHelpers.cs                        |   5 +-
 .../Html/CssOrchardHelperExtensions.cs        | 111 +++++-------------
 5 files changed, 39 insertions(+), 91 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
index 193847e2ff0..768fe006fa1 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/DashboardPart.Edit.cshtml
@@ -10,16 +10,16 @@
 </div>
 
 <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Width">
-    <label asp-for="Width" class="@Orchard.GetLabelCssClasses()">@T["Width"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Width" class="@Orchard.GetLabelClasses()">@T["Width"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Width" class="form-control" />
         <span asp-validation-for="Width"></span>
     </div>
 </div>
 
 <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Height">
-    <label asp-for="Height" class="@Orchard.GetLabelCssClasses()">@T["Height"] </label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <label asp-for="Height" class="@Orchard.GetLabelClasses()">@T["Height"] </label>
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Height" class="form-control" />
         <span asp-validation-for="Height"></span>
     </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
index 5ed45e665d3..38b32aa4026 100644
--- a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Views/BackgroundTask/Edit.cshtml
@@ -35,7 +35,7 @@
 
             <div class="@Orchard.GetWrapperClasses()" asp-validation-class-for="Schedule">
                 <label asp-for="Schedule" class="@Orchard.GetLabelClasses()">@T["Schedule"]</label>
-                <div class="@Orchard.GetEndCssClasses()">
+                <div class="@Orchard.GetEndClasses()">
                     <div class="input-group mb-3">
                         <input asp-for="Schedule" class="form-control" />
                         <button id="use-default-schedule" class="btn btn-outline-success">@T["Reset Schedule"]</button>
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
index 16bbb9855e9..500faad52db 100644
--- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/HtmlMenuItemPart.Edit.cshtml
@@ -10,14 +10,14 @@
 
 <div class="@Orchard.GetWrapperClasses()">
     <label asp-for="Url" class="@Orchard.GetLabelClasses()">@T["Url"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Url" class="form-control" />
     </div>
 </div>
 
 <div class="@Orchard.GetWrapperClasses()">
     <label asp-for="Html" class="@Orchard.GetLabelClasses()">@T["Html"]</label>
-    <div class="@Orchard.GetEndCssClasses()">
+    <div class="@Orchard.GetEndClasses()">
         <input asp-for="Html" class="form-control" />
         <span class="hint">This field will be rendered raw in place of the name; it will be enclosed in the anchor tag.</span>
     </div>
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
index 4de32f399ab..8541fda0e67 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
@@ -10,7 +10,8 @@ public static void AppendValue(HtmlContentBuilder builder, string value)
     {
         if (builder.Count == 0)
         {
-            // The 'Append' method performs a string.IsNullOrEmpty() check. So, as long as the builder has no entries, we append with no spaces.
+            // The 'Append' method performs a string.IsNullOrEmpty() check before appending the value.
+            // So, as long as the builder has no entries, we append with no spaces.
             builder.Append(value);
 
             return;
@@ -24,6 +25,8 @@ public static void AppendValue(HtmlContentBuilder builder, string value)
         // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
         // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
         builder.AppendHtml(CssClassSeperator);
+
+        // We use Append here to ensure that the value is encoded.
         builder.Append(value);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
index b8379ed633a..3de54c93192 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
@@ -11,47 +11,23 @@ namespace OrchardCore;
 public static class CssOrchardHelperExtensions
 {
     public static IHtmlContent GetLimitedWidthWrapperClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.LimitedWidthWrapperClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().LimitedWidthWrapperClasses, additionalClasses);
+    
     public static IHtmlContent GetLimitedWidthClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.LimitedWidthClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().LimitedWidthClasses, additionalClasses);
+    
     public static IHtmlContent GetStartClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.StartClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().StartClasses, additionalClasses);
+    
     public static IHtmlContent GetEndClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.EndClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().EndClasses, additionalClasses);
+    
     public static IHtmlContent GetLabelClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.LabelClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().LabelClasses, additionalClasses);
+    
     public static IHtmlContent GetWrapperClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.WrapperClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().WrapperClasses, additionalClasses);
+    
     public static IHtmlContent GetEndClasses(this IOrchardHelper helper, bool withOffset, params string[] additionalClasses)
     {
         var options = helper.GetThemeOptions();
@@ -70,59 +46,32 @@ public static IHtmlContent GetEndClasses(this IOrchardHelper helper, bool withOf
     }
 
     public static IHtmlContent GetOffsetClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return GetHtmlContentBuilder(options.OffsetClasses, additionalClasses);
-    }
-
+        => GetHtmlContentBuilder(helper.GetThemeOptions().OffsetClasses, additionalClasses);
+    
     [Obsolete($"Please use {nameof(GetLimitedWidthWrapperClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLimitedWidthWrapperCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.LimitedWidthWrapperClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().LimitedWidthWrapperClasses, additionalClasses));
+    
     [Obsolete($"Please use {nameof(GetLimitedWidthClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLimitedWidthCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.LimitedWidthClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().LimitedWidthClasses, additionalClasses));
+    
     [Obsolete($"Please use {nameof(GetLabelClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetLabelCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.LabelClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().LabelClasses, additionalClasses));
+    
     [Obsolete($"Please use {nameof(GetStartClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetStartCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.StartClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().StartClasses, additionalClasses));
+    
     [Obsolete($"Please use {nameof(GetEndClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetEndCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.EndClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().EndClasses, additionalClasses));
+    
     [Obsolete($"Please use {nameof(GetWrapperClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetWrapperCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.WrapperClasses, additionalClasses));
-    }
+        => string.Join(' ', Combine(helper.GetThemeOptions().WrapperClasses, additionalClasses));
+    
 
     [Obsolete($"Please use {nameof(GetEndClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetEndCssClasses(this IOrchardHelper helper, bool withOffset, params string[] additionalClasses)
@@ -144,12 +93,8 @@ public static string GetEndCssClasses(this IOrchardHelper helper, bool withOffse
 
     [Obsolete($"Please use {nameof(GetOffsetClasses)} instead, as this method is deprecated and will be removed in upcoming versions.")]
     public static string GetOffsetCssClasses(this IOrchardHelper helper, params string[] additionalClasses)
-    {
-        var options = helper.GetThemeOptions();
-
-        return string.Join(' ', Combine(options.OffsetClasses, additionalClasses));
-    }
-
+        => string.Join(' ', Combine(helper.GetThemeOptions().OffsetClasses, additionalClasses));
+    
     public static TheAdminThemeOptions GetThemeOptions(this IOrchardHelper helper)
         => helper.HttpContext.RequestServices.GetService<IOptions<TheAdminThemeOptions>>().Value;
 

From 6c8aa7d1020465be1d5c035bf612caa4e2d6f2e0 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Thu, 2 Nov 2023 10:01:53 -0700
Subject: [PATCH 5/6] Cleanup

---
 .../Razor/CssOrchardHelperExtensions.cs       | 37 +++++---------
 .../Html/CssHelpers.cs                        | 32 -------------
 .../Html/CssOrchardHelperExtensions.cs        | 12 ++---
 .../Html/HtmlContentBuilderExtensions.cs      | 48 +++++++++++++++++++
 4 files changed, 62 insertions(+), 67 deletions(-)
 delete mode 100644 src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
 create mode 100644 src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
index eafbd44c597..22a1054c8c2 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
@@ -2,6 +2,7 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.DisplayManagement.Html;
+using System.Collections.Generic;
 
 namespace OrchardCore;
 
@@ -16,27 +17,19 @@ public static IHtmlContent GetPartWrapperClasses(this IOrchardHelper helper, Con
 
         builder.Append(helper.GetThemeOptions().WrapperClasses);
 
-        CssHelpers.AppendValue(builder, PartWrapperPrefix);
+        builder.AppendValue(PartWrapperPrefix);
 
-        if (partDefinition != null)
+        if (partDefinition?.PartDefinition != null)
         {
-            CssHelpers.AppendValue(builder, $"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
+            builder.AppendValue($"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
 
             if (partDefinition.IsNamedPart())
             {
-                CssHelpers.AppendValue(builder, $"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
+                builder.AppendValue($"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
             }
         }
 
-        if (additionalClasses != null)
-        {
-            foreach( var additionalClass in additionalClasses )
-            {
-                CssHelpers.AppendValue(builder, additionalClass);
-            }
-        }
-
-        return builder;
+        return builder.AppendValues(additionalClasses);
     }
 
     public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, ContentPartFieldDefinition fieldDefinition, params string[] additionalClasses)
@@ -45,26 +38,18 @@ public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, Co
 
         builder.Append(helper.GetThemeOptions().WrapperClasses);
 
-        CssHelpers.AppendValue(builder, FieldWrapperPrefix);
+        builder.AppendValue(FieldWrapperPrefix);
 
-        if (fieldDefinition != null)
+        if (fieldDefinition?.PartDefinition != null)
         {
-            CssHelpers.AppendValue(builder, $"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
+            builder.AppendValue($"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
 
             if (fieldDefinition.IsNamedPart())
             {
-                CssHelpers.AppendValue(builder, $"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
-            }
-        }
-
-        if (additionalClasses != null)
-        {
-            foreach (var additionalClass in additionalClasses)
-            {
-                CssHelpers.AppendValue(builder, additionalClass);
+                builder.AppendValue($"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
             }
         }
 
-        return builder;
+        return builder.AppendValues(additionalClasses);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
deleted file mode 100644
index 8541fda0e67..00000000000
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssHelpers.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.AspNetCore.Html;
-
-namespace OrchardCore.DisplayManagement.Html;
-
-public class CssHelpers
-{
-    public static readonly HtmlString CssClassSeperator = new(" ");
-
-    public static void AppendValue(HtmlContentBuilder builder, string value)
-    {
-        if (builder.Count == 0)
-        {
-            // The 'Append' method performs a string.IsNullOrEmpty() check before appending the value.
-            // So, as long as the builder has no entries, we append with no spaces.
-            builder.Append(value);
-
-            return;
-        }
-
-        if (string.IsNullOrEmpty(value))
-        {
-            return;
-        }
-
-        // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
-        // We pass create HtmlString here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
-        builder.AppendHtml(CssClassSeperator);
-
-        // We use Append here to ensure that the value is encoded.
-        builder.Append(value);
-    }
-}
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
index 3de54c93192..ad15ed70b18 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
@@ -108,19 +108,13 @@ private static IEnumerable<string> Combine(string optionClasses, string[] additi
         return additionalClasses.Concat(new[] { optionClasses });
     }
 
-    private static HtmlContentBuilder GetHtmlContentBuilder(string optionClasses, IEnumerable<string> values)
+    private static HtmlContentBuilder GetHtmlContentBuilder(string optionClasses, IList<string> values)
     {
         var builder = new HtmlContentBuilder();
-
+        
         builder.Append(optionClasses);
 
-        if (values != null)
-        {
-            foreach (var value in values)
-            {
-                CssHelpers.AppendValue(builder, value);
-            }
-        }
+        builder.AppendValues(values);
 
         return builder;
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs
new file mode 100644
index 00000000000..dac9f7a107c
--- /dev/null
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Html;
+
+namespace OrchardCore.DisplayManagement.Html;
+
+public static class HtmlContentBuilderExtensions
+{
+    private static readonly HtmlString _cssClassSeperator = new(" ");
+
+    public static HtmlContentBuilder AppendValue(this HtmlContentBuilder builder, string value)
+    {
+        if (builder.Count == 0)
+        {
+            // The 'Append' method performs a string.IsNullOrEmpty() check before appending the value.
+            // So, as long as the builder has no entries, we append with no spaces.
+            builder.Append(value);
+
+            return builder;
+        }
+
+        if (string.IsNullOrEmpty(value))
+        {
+            return builder;
+        }
+
+        // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
+        // We pass create 'HtmlString' here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
+        builder.AppendHtml(_cssClassSeperator);
+
+        // We use 'Append' here to ensure that the value is encoded.
+        builder.Append(value);
+
+        return builder;
+    }
+
+    public static HtmlContentBuilder AppendValues(this HtmlContentBuilder builder, IList<string> values)
+    {
+        if (values?.Count > 0)
+        {
+            foreach (var value in values)
+            {
+                builder.AppendValue(value);
+            }
+        }
+
+        return builder;
+    }
+}

From 3041bbacfb26b6ab9d451f1661a6508866d5a4b5 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Thu, 2 Nov 2023 10:07:30 -0700
Subject: [PATCH 6/6] cleanup

---
 .../Razor/CssOrchardHelperExtensions.cs         | 17 ++++++++---------
 .../Html/CssOrchardHelperExtensions.cs          |  2 +-
 .../Html/HtmlContentBuilderExtensions.cs        | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
index 22a1054c8c2..f0b79d2b6a7 100644
--- a/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.ContentManagement.Display/Razor/CssOrchardHelperExtensions.cs
@@ -2,7 +2,6 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.Mvc.Utilities;
 using OrchardCore.DisplayManagement.Html;
-using System.Collections.Generic;
 
 namespace OrchardCore;
 
@@ -17,19 +16,19 @@ public static IHtmlContent GetPartWrapperClasses(this IOrchardHelper helper, Con
 
         builder.Append(helper.GetThemeOptions().WrapperClasses);
 
-        builder.AppendValue(PartWrapperPrefix);
+        builder.AppendSeparatedValue(PartWrapperPrefix);
 
         if (partDefinition?.PartDefinition != null)
         {
-            builder.AppendValue($"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
+            builder.AppendSeparatedValue($"{PartWrapperPrefix}-{partDefinition.PartDefinition.Name.HtmlClassify()}");
 
             if (partDefinition.IsNamedPart())
             {
-                builder.AppendValue($"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
+                builder.AppendSeparatedValue($"{PartWrapperPrefix}-{partDefinition.Name.HtmlClassify()}");
             }
         }
 
-        return builder.AppendValues(additionalClasses);
+        return builder.AppendSeparatedValues(additionalClasses);
     }
 
     public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, ContentPartFieldDefinition fieldDefinition, params string[] additionalClasses)
@@ -38,18 +37,18 @@ public static IHtmlContent GetFieldWrapperClasses(this IOrchardHelper helper, Co
 
         builder.Append(helper.GetThemeOptions().WrapperClasses);
 
-        builder.AppendValue(FieldWrapperPrefix);
+        builder.AppendSeparatedValue(FieldWrapperPrefix);
 
         if (fieldDefinition?.PartDefinition != null)
         {
-            builder.AppendValue($"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
+            builder.AppendSeparatedValue($"{FieldWrapperPrefix}-{fieldDefinition.PartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
 
             if (fieldDefinition.IsNamedPart())
             {
-                builder.AppendValue($"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
+                builder.AppendSeparatedValue($"{FieldWrapperPrefix}-{fieldDefinition.ContentTypePartDefinition.Name}-{fieldDefinition.Name}".HtmlClassify());
             }
         }
 
-        return builder.AppendValues(additionalClasses);
+        return builder.AppendSeparatedValues(additionalClasses);
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
index ad15ed70b18..1a5eed5f195 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/CssOrchardHelperExtensions.cs
@@ -114,7 +114,7 @@ private static HtmlContentBuilder GetHtmlContentBuilder(string optionClasses, IL
         
         builder.Append(optionClasses);
 
-        builder.AppendValues(values);
+        builder.AppendSeparatedValues(values);
 
         return builder;
     }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs
index dac9f7a107c..7d1fa591c7c 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.DisplayManagement/Html/HtmlContentBuilderExtensions.cs
@@ -5,9 +5,9 @@ namespace OrchardCore.DisplayManagement.Html;
 
 public static class HtmlContentBuilderExtensions
 {
-    private static readonly HtmlString _cssClassSeperator = new(" ");
+    private static readonly HtmlString _seperator = new(" ");
 
-    public static HtmlContentBuilder AppendValue(this HtmlContentBuilder builder, string value)
+    public static HtmlContentBuilder AppendSeparatedValue(this HtmlContentBuilder builder, string value)
     {
         if (builder.Count == 0)
         {
@@ -25,7 +25,7 @@ public static HtmlContentBuilder AppendValue(this HtmlContentBuilder builder, st
 
         // At this point, we already know that the builder has at least one entry, so we append a single space to the class name.
         // We pass create 'HtmlString' here to prevent the builder from preforming string.IsNullOrWhiteSpace again for performance reason.
-        builder.AppendHtml(_cssClassSeperator);
+        builder.AppendHtml(_seperator);
 
         // We use 'Append' here to ensure that the value is encoded.
         builder.Append(value);
@@ -33,13 +33,13 @@ public static HtmlContentBuilder AppendValue(this HtmlContentBuilder builder, st
         return builder;
     }
 
-    public static HtmlContentBuilder AppendValues(this HtmlContentBuilder builder, IList<string> values)
+    public static HtmlContentBuilder AppendSeparatedValues(this HtmlContentBuilder builder, IList<string> values)
     {
         if (values?.Count > 0)
         {
             foreach (var value in values)
             {
-                builder.AppendValue(value);
+                builder.AppendSeparatedValue(value);
             }
         }