diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.html
index 2e18bf05a80d..eb7c734574eb 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.html
@@ -8,9 +8,9 @@
     </ng-template>
 
     <ng-template #labelField let-field="field">
-        <label [for]="field.name" [checkIsRequiredControl]="field.name" dotFieldRequired>{{
-            field.label
-        }}</label>
+        <label [for]="field.name" [checkIsRequiredControl]="field.name" dotFieldRequired>
+            {{ field.label }}
+        </label>
     </ng-template>
     <div class="dot-apps-configuration-detail__form" #formContainer>
         <div
@@ -30,9 +30,9 @@
                     type="button"></button>
                 <ng-container
                     *ngTemplateOutlet="warningIcon; context: { field: field }"></ng-container>
-                <span class="form__group-hint"
-                    ><markdown>{{ field.hint }}</markdown></span
-                >
+                <span class="form__group-hint">
+                    <markdown>{{ field.hint }}</markdown>
+                </span>
             </ng-container>
             <ng-container *ngSwitchCase="'STRING'">
                 <ng-container
@@ -46,9 +46,9 @@
                     #inputTextarea
                     pInputTextarea
                     autoResize="autoResize"></textarea>
-                <span class="p-field-hint"
-                    ><markdown>{{ field.hint }}</markdown></span
-                >
+                <span class="p-field-hint">
+                    <markdown>{{ field.hint }}</markdown>
+                </span>
             </ng-container>
             <ng-container *ngSwitchCase="'BOOL'">
                 <p-checkbox
@@ -62,9 +62,9 @@
                     binary="true"></p-checkbox>
                 <ng-container
                     *ngTemplateOutlet="warningIcon; context: { field: field }"></ng-container>
-                <span class="p-field-hint"
-                    ><markdown>{{ field.hint }}</markdown></span
-                >
+                <span class="p-field-hint">
+                    <markdown>{{ field.hint }}</markdown>
+                </span>
             </ng-container>
             <ng-container *ngSwitchCase="'SELECT'">
                 <ng-container
@@ -78,9 +78,9 @@
                         required: field.required
                     }"
                     [options]="field.options"></p-dropdown>
-                <span class="p-field-hint"
-                    ><markdown>{{ field.hint }}</markdown></span
-                >
+                <span class="p-field-hint">
+                    <markdown>{{ field.hint }}</markdown>
+                </span>
             </ng-container>
         </div>
     </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.spec.ts
index 6854f37138c3..ab89ca508587 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-detail/dot-apps-configuration-detail-form/dot-apps-configuration-detail-form.component.spec.ts
@@ -14,7 +14,7 @@ import { InputTextModule } from 'primeng/inputtext';
 import { InputTextareaModule } from 'primeng/inputtextarea';
 import { TooltipModule } from 'primeng/tooltip';
 
-import { DotIconModule, DotFieldRequiredDirective } from '@dotcms/ui';
+import { DotFieldRequiredDirective, DotIconModule } from '@dotcms/ui';
 
 import { DotAppsConfigurationDetailFormComponent } from './dot-apps-configuration-detail-form.component';
 
@@ -107,7 +107,9 @@ const formState = {
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'markdown',
-    template: `<ng-content></ng-content>`
+    template: `
+        <ng-content></ng-content>
+    `
 })
 class MockMarkdownComponent {}
 
@@ -170,7 +172,9 @@ describe('DotAppsConfigurationDetailFormComponent', () => {
         it('should load Label, Textarea & Hint with right attributes', () => {
             const row = de.query(By.css('[data-testid="name"]'));
             expect(row.query(By.css('markdown'))).toBeTruthy();
-            expect(row.query(By.css('label')).nativeElement.textContent).toBe(secrets[0].label);
+            expect(row.query(By.css('label')).nativeElement.textContent.trim()).toBe(
+                secrets[0].label
+            );
             expect(
                 row
                     .query(By.css('label'))
@@ -204,7 +208,9 @@ describe('DotAppsConfigurationDetailFormComponent', () => {
         it('should load Label, Select & Hint with right attributes', () => {
             const row = de.query(By.css('[data-testid="select"]'));
             expect(row.query(By.css('markdown'))).toBeTruthy();
-            expect(row.query(By.css('label')).nativeElement.textContent).toBe(secrets[3].label);
+            expect(row.query(By.css('label')).nativeElement.textContent.trim()).toBe(
+                secrets[3].label
+            );
             expect(row.query(By.css('p-dropdown')).nativeElement.id).toBe(secrets[3].name);
             expect(row.query(By.css('p-dropdown')).componentInstance.options).toBe(
                 secrets[3].options
@@ -219,7 +225,9 @@ describe('DotAppsConfigurationDetailFormComponent', () => {
 
         it('should load Label, Button & Hint with right attributes', () => {
             const row = de.query(By.css('[data-testid="integration"]'));
-            expect(row.query(By.css('label')).nativeElement.textContent).toBe(secrets[4].label);
+            expect(row.query(By.css('label')).nativeElement.textContent.trim()).toBe(
+                secrets[4].label
+            );
             expect(row.query(By.css('button')).nativeElement.id).toBe(secrets[4].name);
             expect(row.query(By.css('.form__group-hint')).nativeElement.textContent).toBe(
                 secrets[4].hint
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.html
index 89f2d8325982..cccd35c0d4a4 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.html
@@ -15,8 +15,8 @@ <h3 (click)="goToApps(app.key)" class="dot-apps-configuration__service-name">
             <dot-copy-link [copy]="app.key" [label]="app.key"></dot-copy-link>
         </div>
     </header>
-    <span class="dot-apps-configuration__configurations"
-        >{{
+    <span class="dot-apps-configuration__configurations">
+        {{
             app.configurationsCount
                 ? app.configurationsCount + ' ' + ('apps.configurations' | dm)
                 : ('apps.no.configurations' | dm)
@@ -31,12 +31,12 @@ <h3 (click)="goToApps(app.key)" class="dot-apps-configuration__service-name">
         <a
             *ngIf="app.description.length > 270"
             (click)="showMore = !showMore"
-            class="dot-apps-configuration__description__link_show-more"
-            >{{
+            class="dot-apps-configuration__description__link_show-more">
+            {{
                 showMore
                     ? ('apps.confirmation.description.show.less' | dm)
                     : ('apps.confirmation.description.show.more' | dm)
-            }}</a
-        >
+            }}
+        </a>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.spec.ts
index bbbff701b063..59aa8ebd9db3 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration-header/dot-apps-configuration-header.component.spec.ts
@@ -16,7 +16,9 @@ import { MockDotMessageService, MockDotRouterService } from '@dotcms/utils-testi
 import { DotAppsConfigurationHeaderComponent } from './dot-apps-configuration-header.component';
 
 @Component({
-    template: `<dot-apps-configuration-header [app]="app"></dot-apps-configuration-header>`
+    template: `
+        <dot-apps-configuration-header [app]="app"></dot-apps-configuration-header>
+    `
 })
 class TestHostComponent {
     app: DotApp;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration/dot-apps-configuration-list/dot-apps-configuration-item/dot-apps-configuration-item.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration/dot-apps-configuration-list/dot-apps-configuration-item/dot-apps-configuration-item.component.html
index 52a40390e1ba..544c559e378e 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration/dot-apps-configuration-list/dot-apps-configuration-item/dot-apps-configuration-item.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-configuration/dot-apps-configuration-list/dot-apps-configuration-item/dot-apps-configuration-item.component.html
@@ -41,6 +41,5 @@
         (click)="editConfigurationSite($event, site)"
         styleClass="p-button-text p-button-rounded p-button-sm"
         icon="pi pi-plus"
-        data-testId="add">
-    </p-button>
+        data-testId="add"></p-button>
 </ng-template>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-card/dot-apps-card.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-card/dot-apps-card.component.spec.ts
index a5b61bdc7fe8..3876d77c1bb9 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-card/dot-apps-card.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-card/dot-apps-card.component.spec.ts
@@ -16,7 +16,9 @@ import { DotAppsCardComponent } from './dot-apps-card.component';
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'markdown',
-    template: `<ng-content></ng-content>`
+    template: `
+        <ng-content></ng-content>
+    `
 })
 class MockMarkdownComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-list.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-list.component.html
index 177f69061088..43b68f56e2c2 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-list.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps-list/dot-apps-list.component.html
@@ -1,7 +1,7 @@
 <dot-portlet-base>
     <dot-not-license *ngIf="!canAccessPortlet; else licensed" />
-    <ng-template #licensed
-        ><div class="dot-apps__container">
+    <ng-template #licensed>
+        <div class="dot-apps__container">
             <div class="dot-apps__header">
                 <input
                     [placeholder]="('apps.search.placeholder' | dm) || ''"
@@ -11,11 +11,9 @@
                 <div class="dot-apps__header-actions">
                     <div class="dot-apps__header-info">
                         <dot-icon name="help" size="18"></dot-icon>
-                        <a
-                            href="https://dotcms.com/docs/latest/apps-integrations"
-                            target="_blank"
-                            >{{ 'apps.link.info' | dm }}</a
-                        >
+                        <a href="https://dotcms.com/docs/latest/apps-integrations" target="_blank">
+                            {{ 'apps.link.info' | dm }}
+                        </a>
                     </div>
                     <button
                         (click)="confirmImportExport('Import')"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.html
index 764d0902cb29..f9b62081ce59 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.html
@@ -3,8 +3,7 @@
         <p-breadcrumb
             (onItemClick)="updateBreadCrumb($event)"
             [model]="vm.categoryBreadCrumbs"
-            [home]="breadCrumbHome">
-        </p-breadcrumb>
+            [home]="breadCrumbHome"></p-breadcrumb>
     </div>
     <div class="category_listing">
         <p-table
@@ -45,9 +44,9 @@
                     </div>
                     <div class="w-2">
                         <div class="p-inputgroup">
-                            <span class="border-right-none p-inputgroup-addon"
-                                ><i class="pi pi-search"></i
-                            ></span>
+                            <span class="border-right-none p-inputgroup-addon">
+                                <i class="pi pi-search"></i>
+                            </span>
                             <input
                                 (input)="dataTable.filterGlobal($event.target.value, 'contains')"
                                 [placeholder]="'message.category.search' | dm"
@@ -136,8 +135,7 @@
                                     [attr.data-testId]="category.categoryId"
                                     [actions]="vm.categoriesActions"
                                     [item]="category"
-                                    class="listing-categories__action-button">
-                                </dot-action-menu-button>
+                                    class="listing-categories__action-button"></dot-action-menu-button>
                             </ng-container>
                         </ng-template>
                         <ng-template #last>
@@ -162,8 +160,7 @@
                                 [title]="'message.category.empty.title' | dm"
                                 [content]="'message.category.empty.content' | dm"
                                 [buttonLabel]="'message.category.empty.button.label' | dm"
-                                icon="web">
-                            </dot-empty-state>
+                                icon="web"></dot-empty-state>
                         </ng-template>
                     </td>
                 </tr>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.spec.ts
index f30babb78201..072ff41aefc2 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-categories/dot-categories-list/dot-categories-list.component.spec.ts
@@ -36,7 +36,9 @@ import { DotCategoriesListComponent } from './dot-categories-list.component';
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-categories-list></dot-categories-list>`
+    template: `
+        <dot-categories-list></dot-categories-list>
+    `
 })
 class TestHostComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.html
index 2f86e90bcf6e..89d6b9948a79 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.html
@@ -92,19 +92,16 @@
                 </td>
                 <td [ngStyle]="{ 'text-align': vm.tableColumns[0].textAlign }">
                     {{ rowData.name }}
-                    <ng-container *ngIf="rowData.path"
-                        >-
-                        <span class="container-listing__path">{{
-                            rowData.path
-                        }}</span></ng-container
-                    >
+                    <ng-container *ngIf="rowData.path">
+                        -
+                        <span class="container-listing__path">{{ rowData.path }}</span>
+                    </ng-container>
                 </td>
                 <td [ngStyle]="{ 'text-align': vm.tableColumns[1].textAlign }">
                     <dot-state-icon
                         [labels]="vm.stateLabels"
                         [state]="getContainerState(rowData)"
-                        size="14px">
-                    </dot-state-icon>
+                        size="14px"></dot-state-icon>
                 </td>
                 <td [ngStyle]="{ 'text-align': vm.tableColumns[2].textAlign }">
                     {{ rowData.friendlyName }}
@@ -118,8 +115,7 @@
                         [attr.data-testid]="rowData.identifier"
                         [actions]="setContainerActions(rowData)"
                         [item]="rowData"
-                        class="listing-datatable__action-button">
-                    </dot-action-menu-button>
+                        class="listing-datatable__action-button"></dot-action-menu-button>
                 </td>
             </tr>
         </ng-template>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-history/dot-container-history.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-history/dot-container-history.component.spec.ts
index 10894b8e99f9..0604172b076f 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-history/dot-container-history.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-history/dot-container-history.component.spec.ts
@@ -17,7 +17,9 @@ export class IframeMockComponent {
 
 @Component({
     selector: `dot-host-component`,
-    template: `<dot-container-history [containerId]="containerId"></dot-container-history>`
+    template: `
+        <dot-container-history [containerId]="containerId"></dot-container-history>
+    `
 })
 class DotTestHostComponent {
     containerId = '';
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-permissions/dot-container-permissions.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-permissions/dot-container-permissions.component.spec.ts
index 531bbbbec8d4..616aa90bd0bc 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-permissions/dot-container-permissions.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-permissions/dot-container-permissions.component.spec.ts
@@ -17,7 +17,9 @@ export class IframeMockComponent {
 
 @Component({
     selector: `dot-host-component`,
-    template: `<dot-container-permissions [containerId]="containerId"></dot-container-permissions>`
+    template: `
+        <dot-container-permissions [containerId]="containerId"></dot-container-permissions>
+    `
 })
 class DotTestHostComponent {
     containerId = '';
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/dot-container-properties.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/dot-container-properties.component.html
index 044d481d1561..78200f56d966 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/dot-container-properties.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/dot-container-properties.component.html
@@ -18,9 +18,9 @@
         </div>
         <div class="dot-container-properties__title-container">
             <div class="field">
-                <label class="block" for="title">{{
-                    'message.containers.create.title' | dm
-                }}</label>
+                <label class="block" for="title">
+                    {{ 'message.containers.create.title' | dm }}
+                </label>
                 <div class="dot-container-properties__title-container-content">
                     <input
                         [required]="true"
@@ -38,9 +38,9 @@
             </div>
         </div>
         <div class="field">
-            <label class="block" for="description">{{
-                'message.containers.create.description' | dm
-            }}</label>
+            <label class="block" for="description">
+                {{ 'message.containers.create.description' | dm }}
+            </label>
             <input
                 class="dot-container-properties__description-input w-25rem"
                 id="description"
@@ -50,9 +50,9 @@
                 pInputText />
         </div>
         <div class="field">
-            <label class="block" dotFieldRequired for="max-contents">{{
-                'message.containers.create.max_contents' | dm
-            }}</label>
+            <label class="block" dotFieldRequired for="max-contents">
+                {{ 'message.containers.create.max_contents' | dm }}
+            </label>
             <input
                 [required]="true"
                 class="dot-container-properties__max-contents-input"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.html
index 180277bb1bd2..86e9c5b441eb 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.html
@@ -9,9 +9,9 @@
             type="button"></button>
     </div>
     <div *ngIf="isEditorVisible" class="field mb-0" [@enterAnimation]>
-        <label class="block" data-testId="label">{{
-            'message.containers.create.' + label | dm
-        }}</label>
+        <label class="block" data-testId="label">
+            {{ 'message.containers.create.' + label | dm }}
+        </label>
         <dot-textarea-content
             (blur)="onTouched()"
             (input)="onTouched()"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.spec.ts
index b8eb7d57677b..19a362bb402a 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-loop-editor/dot-loop-editor.component.spec.ts
@@ -19,11 +19,13 @@ import { DotLoopEditorComponent } from './dot-loop-editor.component';
 
 @Component({
     selector: `dot-host-component`,
-    template: `<dot-loop-editor
-        (buttonClick)="showLoopInput()"
-        [formControl]="editor"
-        [label]="label"
-        [isEditorVisible]="isEditorVisible"></dot-loop-editor>`
+    template: `
+        <dot-loop-editor
+            (buttonClick)="showLoopInput()"
+            [formControl]="editor"
+            [label]="label"
+            [isEditorVisible]="isEditorVisible"></dot-loop-editor>
+    `
 })
 class DotTestHostComponent {
     isEditorVisible = true;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.html
index 93a5cd7c2956..64816009c372 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-block-editor-sidebar/dot-block-editor-sidebar.component.html
@@ -15,8 +15,7 @@
             [languageId]="blockEditorInput.languageId"
             [showVideoThumbnail]="showVideoThumbnail"
             [value]="blockEditorInput.content"
-            #blockEditor>
-        </dot-block-editor>
+            #blockEditor></dot-block-editor>
         <footer>
             <button
                 (click)="closeSidebar()"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-edit-page-info/dot-edit-page-info.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-edit-page-info/dot-edit-page-info.component.spec.ts
index 4a9b2771716b..263cfe40e5e0 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-edit-page-info/dot-edit-page-info.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-edit-page-info/dot-edit-page-info.component.spec.ts
@@ -8,10 +8,9 @@ import { DotApiLinkComponent, DotCopyButtonComponent, DotMessagePipe } from '@do
 import { DotEditPageInfoComponent } from './dot-edit-page-info.component';
 
 @Component({
-    template: ` <dot-edit-page-info
-        [title]="title"
-        [url]="url"
-        [apiLink]="apiLink"></dot-edit-page-info>`
+    template: `
+        <dot-edit-page-info [title]="title" [url]="url" [apiLink]="apiLink"></dot-edit-page-info>
+    `
 })
 class TestHostComponent {
     title = 'A title';
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette-contentlets/dot-palette-contentlets.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette-contentlets/dot-palette-contentlets.component.html
index 2bcd0056c743..2c71a919fd02 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette-contentlets/dot-palette-contentlets.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/components/dot-palette/dot-palette-contentlets/dot-palette-contentlets.component.html
@@ -39,6 +39,6 @@
 <span
     *ngIf="totalRecords < 1 && !loading"
     class="dot-content-palette__empty"
-    data-testId="emptyState"
-    >{{ 'No-Results' | dm }}</span
->
+    data-testId="emptyState">
+    {{ 'No-Results' | dm }}
+</span>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-state-controller/dot-edit-page-state-controller.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-state-controller/dot-edit-page-state-controller.component.html
index f811621e65d7..610155107704 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-state-controller/dot-edit-page-state-controller.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-state-controller/dot-edit-page-state-controller.component.html
@@ -4,8 +4,7 @@
         [model]="menuItems"
         [popup]="true"
         #menu
-        appendTo="body">
-    </p-menu>
+        appendTo="body"></p-menu>
     <dot-tab-buttons
         (openMenu)="handleMenuOpen($event)"
         (clickOption)="stateSelectorHandler($event)"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-toolbar/dot-edit-page-toolbar.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-toolbar/dot-edit-page-toolbar.component.html
index 25f76fc5ad0e..e7490b039458 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-toolbar/dot-edit-page-toolbar.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-toolbar/dot-edit-page-toolbar.component.html
@@ -45,8 +45,7 @@ <h2>{{ variant.experimentName }}</h2>
         <dot-edit-page-view-as-controller
             [pageState]="pageState"
             [variant]="variant"
-            class="flex w-full gap-2">
-        </dot-edit-page-view-as-controller>
+            class="flex w-full gap-2"></dot-edit-page-view-as-controller>
     </div>
 </dot-secondary-toolbar>
 
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-view-as-controller/dot-edit-page-view-as-controller.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-view-as-controller/dot-edit-page-view-as-controller.component.spec.ts
index ee19de0a5a99..9bc317e71c11 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-view-as-controller/dot-edit-page-view-as-controller.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-view-as-controller/dot-edit-page-view-as-controller.component.spec.ts
@@ -48,8 +48,10 @@ import { DotEditPageViewAsControllerComponent } from './dot-edit-page-view-as-co
 
 @Component({
     selector: 'dot-test-host',
-    template: ` <dot-edit-page-view-as-controller
-        [pageState]="pageState"></dot-edit-page-view-as-controller>`
+    template: `
+        <dot-edit-page-view-as-controller
+            [pageState]="pageState"></dot-edit-page-view-as-controller>
+    `
 })
 class DotTestHostComponent {
     @Input()
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.html
index 3b8af52d3e6d..6976f74636ea 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.html
@@ -2,7 +2,6 @@
     (click)="menu.toggle($event)"
     [disabled]="!actionsAvailable"
     icon="pi pi-ellipsis-v"
-    styleClass=" p-button-rounded">
-</p-button>
+    styleClass=" p-button-rounded"></p-button>
 
 <p-menu [model]="actions | async" #menu popup="popup" appendTo="body"></p-menu>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.spec.ts
index 7c589a967104..5ed8ca1181dc 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-edit-page-workflows-actions/dot-edit-page-workflows-actions.component.spec.ts
@@ -57,7 +57,9 @@ import { DotEditPageWorkflowsActionsComponent } from './dot-edit-page-workflows-
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-edit-page-workflows-actions [page]="page"></dot-edit-page-workflows-actions> `
+    template: `
+        <dot-edit-page-workflows-actions [page]="page"></dot-edit-page-workflows-actions>
+    `
 })
 class TestHostComponent {
     @Input() page: DotPage;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-form-selector/dot-form-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-form-selector/dot-form-selector.component.spec.ts
index ee93b36c5e8f..b36b47c61d12 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-form-selector/dot-form-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/components/dot-form-selector/dot-form-selector.component.spec.ts
@@ -36,7 +36,9 @@ const mockContentType: DotCMSContentType = {
 };
 
 @Component({
-    template: ` <dot-form-selector [show]="show"></dot-form-selector> `
+    template: `
+        <dot-form-selector [show]="show"></dot-form-selector>
+    `
 })
 class TestHostComponent {
     show = false;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html
index 057bb9a4607c..316e0585c30d 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.html
@@ -100,8 +100,9 @@
             [class.collapsed]="paletteCollapsed"
             [class.editMode]="isEditMode"
             class="dot-edit-content__palette">
-            <dot-palette [allowedContent]="allowedContent" [languageId]="pageLanguageId">
-            </dot-palette>
+            <dot-palette
+                [allowedContent]="allowedContent"
+                [languageId]="pageLanguageId"></dot-palette>
             <div
                 (click)="paletteCollapsed = !paletteCollapsed"
                 class="dot-edit-content__palette-visibility"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.html
index cf4105ebada5..2e11a1e5a066 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/layout/dot-edit-layout/dot-edit-layout.component.html
@@ -18,8 +18,7 @@
         [title]="pageState.page.title"
         [theme]="pageState.template.theme"
         [apiLink]="apiLink"
-        [url]="pageState.page.pageURI">
-    </dot-edit-layout-designer>
+        [url]="pageState.page.pageURI"></dot-edit-layout-designer>
 </ng-template>
 
 <ng-container
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.html
index c54f75283186..0e8863b22154 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.html
@@ -15,8 +15,8 @@
                 class="edit-page-nav__item"
                 pTooltip="{{ item.tooltip }}">
                 <dot-icon [name]="item.icon" size="32"></dot-icon>
-                <span class="edit-page-nav__item-text" data-testId="menuListItemText"
-                    >{{ item.label }}
+                <span class="edit-page-nav__item-text" data-testId="menuListItemText">
+                    {{ item.label }}
                 </span>
             </a>
         </ng-template>
@@ -26,9 +26,9 @@
                 class="edit-page-nav__item edit-page-nav__item--disabled"
                 tooltipPosition="left">
                 <dot-icon [name]="item.icon" size="32"></dot-icon>
-                <span class="edit-page-nav__item-text" data-testId="menuListItemText">{{
-                    item.label
-                }}</span>
+                <span class="edit-page-nav__item-text" data-testId="menuListItemText">
+                    {{ item.label }}
+                </span>
             </span>
         </ng-template>
     </li>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.spec.ts
index 04c3ed7a1777..9eb96b106701 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/main/dot-edit-page-nav/dot-edit-page-nav.component.spec.ts
@@ -59,6 +59,7 @@ export class MockDotPropertiesService {
     getKey(): Observable<true> {
         return observableOf(true);
     }
+
     getFeatureFlag(): Observable<boolean> {
         return observableOf(true);
     }
@@ -66,7 +67,9 @@ export class MockDotPropertiesService {
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-edit-page-nav [pageState]="pageState"></dot-edit-page-nav> `
+    template: `
+        <dot-edit-page-nav [pageState]="pageState"></dot-edit-page-nav>
+    `
 })
 class TestHostComponent {
     @Input()
@@ -284,7 +287,7 @@ describe('DotEditPageNavComponent', () => {
                 const labels = ['Layout', 'Rules', 'Experiments'];
                 menuListItems.forEach((item, index) => {
                     const label = item.query(By.css('.edit-page-nav__item-text'));
-                    expect(label.nativeElement.textContent).toBe(labels[index]);
+                    expect(label.nativeElement.textContent.trim()).toBe(labels[index]);
 
                     expect(item.nativeElement.getAttribute('ng-reflect-text')).toBe(
                         'Enterprise only'
@@ -382,7 +385,7 @@ describe('DotEditPageNavComponent', () => {
             const label = menuListItems[4].query(By.css('[data-testId="menuListItemText"]'))
                 .nativeElement.innerHTML;
             expect(MATERIAL_ICON_NAME).toEqual(iconClass);
-            expect('Experiments').toEqual(label);
+            expect('Experiments').toEqual(label.trim());
         });
     });
     describe('experiments feature flag false', () => {
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-info-seo/dot-edit-page-info-seo.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-info-seo/dot-edit-page-info-seo.component.spec.ts
index c220666ad5a7..165b878871e7 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-info-seo/dot-edit-page-info-seo.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-info-seo/dot-edit-page-info-seo.component.spec.ts
@@ -8,10 +8,12 @@ import { DotApiLinkComponent, DotCopyButtonComponent, DotMessagePipe } from '@do
 import { DotEditPageInfoSeoComponent } from './dot-edit-page-info-seo.component';
 
 @Component({
-    template: ` <dot-edit-page-info-seo
-        [title]="title"
-        [url]="url"
-        [apiLink]="apiLink"></dot-edit-page-info-seo>`
+    template: `
+        <dot-edit-page-info-seo
+            [title]="title"
+            [url]="url"
+            [apiLink]="apiLink"></dot-edit-page-info-seo>
+    `
 })
 class TestHostComponent {
     title = 'A title';
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.html
index 2554d21d8ab9..9fd3a375453e 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.html
@@ -12,8 +12,7 @@
     [model]="menuItems"
     [popup]="true"
     #menu
-    appendTo="body">
-</p-menu>
+    appendTo="body"></p-menu>
 <dot-tab-buttons
     (openMenu)="handleMenuOpen($event)"
     (clickOption)="stateSelectorHandler($event)"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.spec.ts
index ca46462cf516..a8307f416ff4 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-state-controller-seo/dot-edit-page-state-controller-seo.component.spec.ts
@@ -94,8 +94,9 @@ const pageRenderStateMock: DotPageRenderState = new DotPageRenderState(
 @Component({
     selector: 'dot-test-host-component',
     template: `
-        <dot-edit-page-state-controller-seo [pageState]="pageState" [variant]="variant">
-        </dot-edit-page-state-controller-seo>
+        <dot-edit-page-state-controller-seo
+            [pageState]="pageState"
+            [variant]="variant"></dot-edit-page-state-controller-seo>
     `
 })
 class TestHostComponent {
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-toolbar-seo/dot-edit-page-toolbar-seo.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-toolbar-seo/dot-edit-page-toolbar-seo.component.html
index 7ba47460de9c..813768d6ebe5 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-toolbar-seo/dot-edit-page-toolbar-seo.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-toolbar-seo/dot-edit-page-toolbar-seo.component.html
@@ -48,8 +48,7 @@ <h2>{{ variant.experimentName }}</h2>
         <dot-edit-page-view-as-controller-seo
             [pageState]="pageState"
             [variant]="variant"
-            class="flex gap-2">
-        </dot-edit-page-view-as-controller-seo>
+            class="flex gap-2"></dot-edit-page-view-as-controller-seo>
     </div>
 </dot-secondary-toolbar>
 
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-view-as-controller-seo/dot-edit-page-view-as-controller-seo.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-view-as-controller-seo/dot-edit-page-view-as-controller-seo.component.spec.ts
index 211b1c6290be..d9a407d1b027 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-view-as-controller-seo/dot-edit-page-view-as-controller-seo.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/seo/components/dot-edit-page-view-as-controller-seo/dot-edit-page-view-as-controller-seo.component.spec.ts
@@ -42,8 +42,10 @@ import { DotEditPageViewAsControllerSeoComponent } from './dot-edit-page-view-as
 
 @Component({
     selector: 'dot-test-host',
-    template: `<dot-edit-page-view-as-controller-seo
-        [pageState]="pageState"></dot-edit-page-view-as-controller-seo>`
+    template: `
+        <dot-edit-page-view-as-controller-seo
+            [pageState]="pageState"></dot-edit-page-view-as-controller-seo>
+    `
 })
 class DotTestHostComponent {
     @Input()
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.html
index 5ceb26e80952..e6133a751afe 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-listing-panel/dot-pages-listing-panel.component.html
@@ -64,22 +64,27 @@
         <ng-template pTemplate="header">
             <tr *ngIf="vm.pages.items.length !== 0">
                 <th pSortableColumn="title" style="width: 25%">
-                    {{ 'title' | dm }}<p-sortIcon field="title"></p-sortIcon>
+                    {{ 'title' | dm }}
+                    <p-sortIcon field="title"></p-sortIcon>
                 </th>
                 <th pSortableColumn="urlMap" style="width: 20%">
-                    {{ 'url' | dm }}<p-sortIcon field="urlMap"></p-sortIcon>
+                    {{ 'url' | dm }}
+                    <p-sortIcon field="urlMap"></p-sortIcon>
                 </th>
                 <th pSortableColumn="contentType" style="width: 12%">
-                    {{ 'type' | dm }}<p-sortIcon field="contentType"></p-sortIcon>
+                    {{ 'type' | dm }}
+                    <p-sortIcon field="contentType"></p-sortIcon>
                 </th>
                 <th pSortableColumn="languageId" style="width: 12%">
-                    {{ 'status' | dm }}<p-sortIcon field="languageId"></p-sortIcon>
+                    {{ 'status' | dm }}
+                    <p-sortIcon field="languageId"></p-sortIcon>
                 </th>
                 <th style="width: 12%">
                     {{ 'Last-Editor' | dm }}
                 </th>
                 <th pSortableColumn="modDate" style="width: 14%">
-                    {{ 'Last-Edited' | dm }}<p-sortIcon field="modDate"></p-sortIcon>
+                    {{ 'Last-Edited' | dm }}
+                    <p-sortIcon field="modDate"></p-sortIcon>
                 </th>
                 <th style="width: 5%"></th>
             </tr>
@@ -110,9 +115,9 @@
                             [labels]="dotStateLabels"
                             [state]="rowData"
                             size="14px"></dot-state-icon>
-                        <dot-badge bordered="{true}">{{
-                            vm.languageLabels[rowData['languageId']]
-                        }}</dot-badge>
+                        <dot-badge bordered="{true}">
+                            {{ vm.languageLabels[rowData['languageId']] }}
+                        </dot-badge>
                         <dot-contentlet-lock-icon
                             locked="{{ rowData['locked'] }}"></dot-contentlet-lock-icon>
                     </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-advanced/dot-template-advanced.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-advanced/dot-template-advanced.component.html
index d3a178e870ac..79c8979a4f37 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-advanced/dot-template-advanced.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-advanced/dot-template-advanced.component.html
@@ -4,7 +4,7 @@
     </dot-portlet-toolbar>
 
     <form [formGroup]="form">
-        <dot-container-selector (swap)="containerChange($event)"> </dot-container-selector>
+        <dot-container-selector (swap)="containerChange($event)"></dot-container-selector>
         <dot-textarea-content
             (monacoInit)="initEditor($event)"
             [show]="['code']"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts
index 2fce70869666..2920af40aad3 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-builder/dot-template-builder.component.spec.ts
@@ -46,8 +46,10 @@ import {
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'dotcms-template-builder-lib',
-    template: ` <ng-content select="[toolbar-left]"></ng-content>
-        <ng-content select="[toolbar-actions-right]"></ng-content>`
+    template: `
+        <ng-content select="[toolbar-left]"></ng-content>
+        <ng-content select="[toolbar-actions-right]"></ng-content>
+    `
 })
 class TemplateBuilderMockComponent {
     @Input() layout: DotLayout;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.html
index f4c4f140c3a0..117d9918d119 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.html
@@ -5,9 +5,9 @@
     data-testId="dialogForm">
     <form *ngIf="form" [formGroup]="form" class="p-fluid" data-testId="form">
         <div class="field" data-testId="titleField">
-            <label for="title" dotFieldRequired>{{
-                'templates.properties.form.label.title' | dm
-            }}</label>
+            <label for="title" dotFieldRequired>
+                {{ 'templates.properties.form.label.title' | dm }}
+            </label>
             <input
                 id="title"
                 pInputText
@@ -18,9 +18,9 @@
                 [field]="form.get('title')"></dot-field-validation-message>
         </div>
         <div class="field" data-testId="descriptionField">
-            <label for="description">{{
-                'templates.properties.form.label.description' | dm
-            }}</label>
+            <label for="description">
+                {{ 'templates.properties.form.label.description' | dm }}
+            </label>
             <textarea id="description" pInputTextarea formControlName="friendlyName"></textarea>
         </div>
         <ng-container *ngIf="form.get('theme')">
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.spec.ts
index 4c2343f2e361..e9a79d00a3a0 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.spec.ts
@@ -180,7 +180,7 @@ describe('DotTemplatePropsComponent', () => {
 
                 expect(label.classes['p-label-input-required']).toBe(true);
                 expect(label.attributes.for).toBe('title');
-                expect(label.nativeElement.textContent).toBe('Title');
+                expect(label.nativeElement.textContent.trim()).toBe('Title');
 
                 expect(input.attributes.autofocus).toBeDefined();
                 expect(input.attributes.pInputText).toBeDefined();
@@ -212,7 +212,7 @@ describe('DotTemplatePropsComponent', () => {
                 expect(field.classes['field']).toBe(true);
 
                 expect(label.attributes.for).toBe('description');
-                expect(label.nativeElement.textContent).toBe('Description');
+                expect(label.nativeElement.textContent.trim()).toBe('Description');
 
                 expect(textarea.attributes.pInputTextarea).toBeDefined();
                 expect(textarea.attributes.formControlName).toBe('friendlyName');
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.html b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.html
index 2d02235eeeae..f340b143bc16 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.html
@@ -40,8 +40,7 @@
         [title]="'message.template.empty.title' | dm"
         [content]="'message.template.empty.content' | dm"
         [buttonLabel]="'message.template.empty.button.label' | dm"
-        icon="web">
-    </dot-empty-state>
+        icon="web"></dot-empty-state>
 
     <ng-template #rowTemplate let-rowData="rowData">
         <td [ngStyle]="{ 'text-align': tableColumns[0].textAlign }">
@@ -51,8 +50,7 @@
             <dot-state-icon
                 [labels]="setStateLabels()"
                 [state]="getTemplateState(rowData)"
-                size="14px">
-            </dot-state-icon>
+                size="14px"></dot-state-icon>
         </td>
         <td [ngStyle]="{ 'text-align': tableColumns[2].textAlign }" data-testId="theme-cell">
             <ng-container *ngIf="rowData.themeInfo?.inode === 'SYSTEM_THEME'; else linkTemplate">
@@ -63,9 +61,9 @@
                     *ngIf="rowData.themeInfo"
                     (click)="goToFolder($event, rowData.themeInfo?.path)"
                     data-testId="theme-folder-link"
-                    target="_self"
-                    >{{ rowData.themeInfo?.title }}</a
-                >
+                    target="_self">
+                    {{ rowData.themeInfo?.title }}
+                </a>
             </ng-template>
         </td>
         <td [ngStyle]="{ 'text-align': tableColumns[3].textAlign }">
@@ -80,8 +78,7 @@
                 [attr.data-testid]="rowData.identifier"
                 [actions]="setTemplateActions(rowData)"
                 [item]="rowData"
-                class="listing-datatable__action-button">
-            </dot-action-menu-button>
+                class="listing-datatable__action-button"></dot-action-menu-button>
         </td>
     </ng-template>
 </dot-listing-data-table>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts
index 6ed61b0fdf1d..a3842fc8cadd 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts
@@ -555,7 +555,8 @@ describe('DotTemplateListComponent', () => {
             expect(
                 links.every(
                     (link, i) =>
-                        link.nativeElement.textContent === templatesWithoutSystem[i].themeInfo.title
+                        link.nativeElement.textContent.trim() ===
+                        templatesWithoutSystem[i].themeInfo.title
                 )
             ).toBe(true);
         });
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-binary-settings/dot-binary-settings.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-binary-settings/dot-binary-settings.component.html
index 018bca3bdee7..7ccce0e5b4a9 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-binary-settings/dot-binary-settings.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-binary-settings/dot-binary-settings.component.html
@@ -12,9 +12,9 @@
             <a
                 href="https://www.dotcms.com/docs/latest/field-variables#BinaryField"
                 target="_blank"
-                rel="noopener"
-                >{{ 'binary-field-settings.system.link.to.documentation' | dm }}</a
-            >
+                rel="noopener">
+                {{ 'binary-field-settings.system.link.to.documentation' | dm }}
+            </a>
         </small>
     </div>
     @for (option of systemOptions; track option.key) {
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-block-editor-settings/dot-block-editor-settings.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-block-editor-settings/dot-block-editor-settings.component.html
index f3ec042c0243..c34b82455f64 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-block-editor-settings/dot-block-editor-settings.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-block-editor-settings/dot-block-editor-settings.component.html
@@ -1,9 +1,9 @@
 <!-- Block Editor Settings -->
 <form [formGroup]="form" class="wrapper">
     <div *ngFor="let setting of settings" class="field">
-        <label [checkIsRequiredControl]="setting.key" [for]="setting.key" dotFieldRequired>{{
-            setting.label
-        }}</label>
+        <label [checkIsRequiredControl]="setting.key" [for]="setting.key" dotFieldRequired>
+            {{ setting.label }}
+        </label>
         <p-multiSelect
             [id]="setting.key"
             [placeholder]="setting.placeholder"
@@ -13,7 +13,6 @@
             appendTo="body"
             display="chip"
             optionLabel="label"
-            optionValue="code">
-        </p-multiSelect>
+            optionValue="code"></p-multiSelect>
     </div>
 </form>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-to-block-info/dot-convert-to-block-info.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-to-block-info/dot-convert-to-block-info.component.html
index 2392eb80e05b..ebdac79cf234 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-to-block-info/dot-convert-to-block-info.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-to-block-info/dot-convert-to-block-info.component.html
@@ -11,14 +11,14 @@
     {{ 'contenttypes.field.properties.wysiwyg.info.button' | dm }}
 </button>
 
-<ng-template #learnMore
-    ><a
+<ng-template #learnMore>
+    <a
         [ngStyle]="{ 'text-decoration': 'none' }"
         class="p-element p-button-outlined p-button-sm p-button p-component"
         href="https://www.dotcms.com/docs/latest/block-editor"
         rel="noopener"
         target="_blank"
-        data-testId="learnMore"
-        >{{ 'learn-more' | dm }}</a
-    ></ng-template
->
+        data-testId="learnMore">
+        {{ 'learn-more' | dm }}
+    </a>
+</ng-template>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.html
index a14982cd2ec8..bd2ad34645f2 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.html
@@ -15,9 +15,9 @@ <h4 data-testId="header">
 
 <div class="field-checkbox">
     <p-checkbox [(ngModel)]="accept" [binary]="true" inputId="agreed"></p-checkbox>
-    <label for="agreed" data-testId="iUnderstand">{{
-        'contenttypes.field.properties.wysiwyg.convert.iunderstand' | dm
-    }}</label>
+    <label for="agreed" data-testId="iUnderstand">
+        {{ 'contenttypes.field.properties.wysiwyg.convert.iunderstand' | dm }}
+    </label>
 </div>
 
 <p>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.spec.ts
index ae4d647e3a23..96beda5da57d 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/dot-convert-wysiwyg-to-block/dot-convert-wysiwyg-to-block.component.spec.ts
@@ -50,7 +50,7 @@ describe('DotConvertWysiwygToBlockComponent', () => {
         expect(infoContent.innerText).toBe('Info Content');
         expect(header.innerText).toBe('Header');
         expect(content.innerText).toBe('Content');
-        expect(iUnderstand.innerText).toBe('I understand');
+        expect(iUnderstand.innerText.trim()).toBe('I understand');
         expect(buttonConvert.innerText).toBe('Button');
     });
 });
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-field-dragabble-item/content-type-field-dragabble-item.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-field-dragabble-item/content-type-field-dragabble-item.component.html
index c066671dd25c..f6311965e129 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-field-dragabble-item/content-type-field-dragabble-item.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-field-dragabble-item/content-type-field-dragabble-item.component.html
@@ -3,14 +3,13 @@
 <dot-icon class="field-icon" name="{{ icon }}"></dot-icon>
 <div class="field-properties">
     <div class="field-properties__info-container">
-        <span class="info-container__name"> {{ field.name }}</span>
+        <span class="info-container__name">{{ field.name }}</span>
         <p-button
             *ngIf="!field.fixed"
             (click)="removeItem($event)"
             id="info-container__delete"
             styleClass="p-button-text p-button-sm p-button-danger p-button-rounded"
-            icon="pi pi-trash">
-        </p-button>
+            icon="pi pi-trash"></p-button>
     </div>
     <div class="field-properties__actions-container">
         <dot-copy-link
@@ -25,8 +24,7 @@
                 [class.open]="open"
                 data-testid="field-info-button"
                 styleClass="p-button-text p-button-sm  p-button-rounded"
-                icon="pi pi-info-circle">
-            </p-button>
+                icon="pi pi-info-circle"></p-button>
         </div>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-drop-zone/content-type-fields-drop-zone.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-drop-zone/content-type-fields-drop-zone.component.html
index f81204f13164..4786977b9835 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-drop-zone/content-type-fields-drop-zone.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-drop-zone/content-type-fields-drop-zone.component.html
@@ -10,16 +10,14 @@
                 (editField)="editFieldHandler($event)"
                 (removeField)="removeField($event)"
                 (removeRow)="removeFieldRow($event, i)"
-                [fieldRow]="row">
-            </dot-content-type-fields-row>
+                [fieldRow]="row"></dot-content-type-fields-row>
 
             <ng-template #tab_container>
                 <dot-content-type-fields-tab
                     (editTab)="saveFieldsHandler($event)"
                     (removeTab)="removeTab($event, i)"
                     [fieldTab]="row"
-                    class="row-header__drag">
-                </dot-content-type-fields-tab>
+                    class="row-header__drag"></dot-content-type-fields-tab>
             </ng-template>
         </ng-template>
         <dot-add-rows (selectColums)="addRow($event)"></dot-add-rows>
@@ -51,8 +49,7 @@
                     (valid)="setDialogOkButtonState($event)"
                     [formFieldData]="currentField"
                     [contentType]="contentType"
-                    #fieldPropertiesForm>
-                </dot-content-type-fields-properties-form>
+                    #fieldPropertiesForm></dot-content-type-fields-properties-form>
                 <dot-convert-wysiwyg-to-block
                     *ngIf="
                         !!currentField?.id &&
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/content-type-fields-properties-form.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/content-type-fields-properties-form.component.html
index 06b3b61dad6c..e2bdb98e6dc8 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/content-type-fields-properties-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/content-type-fields-properties-form.component.html
@@ -8,8 +8,7 @@
             [propertyName]="property"
             [field]="formFieldData"
             [group]="form"
-            dotDynamicFieldProperty>
-        </ng-container>
+            dotDynamicFieldProperty></ng-container>
     </div>
     <dot-relationship-tree
         *ngIf="formFieldData?.relationships"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/categories-property/categories-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/categories-property/categories-property.component.html
index 4b79845fb8c9..2ed9223a1a10 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/categories-property/categories-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/categories-property/categories-property.component.html
@@ -12,11 +12,11 @@
         #searchableDropdown
         labelPropertyName="categoryName"
         placeholder="{{ placeholder }}"
-        width="100%">
-    </dot-searchable-dropdown>
+        width="100%"></dot-searchable-dropdown>
 
     <dot-field-validation-message
         [field]="group.controls[property.name]"
-        [message]="'contenttypes.field.properties.category.error.required' | dm">
-    </dot-field-validation-message>
+        [message]="
+            'contenttypes.field.properties.category.error.required' | dm
+        "></dot-field-validation-message>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/checkbox-property/checkbox-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/checkbox-property/checkbox-property.component.html
index 991809e886f5..efa3ad84d83b 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/checkbox-property/checkbox-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/checkbox-property/checkbox-property.component.html
@@ -3,6 +3,5 @@
         [label]="setCheckboxLabel(property.name) | dm"
         [value]="property.value"
         [formControlName]="property.name"
-        binary="true">
-    </p-checkbox>
+        binary="true"></p-checkbox>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/data-type-property/data-type-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/data-type-property/data-type-property.component.html
index b8f51c87e99d..b5bd0ba62087 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/data-type-property/data-type-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/data-type-property/data-type-property.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="radioInputs" [formGroup]="group" class="field">
-    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>{{
-        'contenttypes.field.properties.data_type.label' | dm
-    }}</label>
+    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>
+        {{ 'contenttypes.field.properties.data_type.label' | dm }}
+    </label>
 
     <div class="formgroup-inline">
         <div *ngFor="let radio of radioInputs" class="field-checkbox">
@@ -9,8 +9,7 @@
                 [label]="radio.text | dm"
                 [name]="property.name"
                 [value]="radio.value"
-                [formControlName]="property.name">
-            </p-radioButton>
+                [formControlName]="property.name"></p-radioButton>
         </div>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/default-value-property/default-value-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/default-value-property/default-value-property.component.html
index c4694030512d..70fd9e291c25 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/default-value-property/default-value-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/default-value-property/default-value-property.component.html
@@ -1,10 +1,9 @@
 <div [formGroup]="group" class="field">
-    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>{{
-        'contenttypes.field.properties.default_value.label' | dm
-    }}</label>
+    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>
+        {{ 'contenttypes.field.properties.default_value.label' | dm }}
+    </label>
     <input [id]="property.name" [formControlName]="property.name" pInputText type="text" />
     <dot-field-validation-message
         [field]="group.controls[property.name]"
-        [message]="this.errorLabel">
-    </dot-field-validation-message>
+        [message]="this.errorLabel"></dot-field-validation-message>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.html
index a59d2c42159e..41fd54a602d5 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.html
@@ -6,5 +6,4 @@
     [style]="{ width: '100%' }"
     data-testId="dropdown"
     optionValue="id"
-    appendTo="body">
-</p-dropdown>
+    appendTo="body"></p-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.spec.ts
index 38ce7c3e052a..9054ec79353d 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-cardinality-selector/dot-cardinality-selector.component.spec.ts
@@ -29,8 +29,11 @@ const cardinalities: DotRelationshipCardinality[] = [
 
 @Component({
     selector: 'dot-host-component',
-    template: `<dot-cardinality-selector [value]="cardinalityIndex" [disabled]="disabled">
-    </dot-cardinality-selector>`
+    template: `
+        <dot-cardinality-selector
+            [value]="cardinalityIndex"
+            [disabled]="disabled"></dot-cardinality-selector>
+    `
 })
 class HostTestComponent {
     @Input()
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-edit-relationship/dot-edit-relationships.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-edit-relationship/dot-edit-relationships.component.html
index 2ad805be0524..2c922e34ba03 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-edit-relationship/dot-edit-relationships.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-edit-relationship/dot-edit-relationships.component.html
@@ -8,5 +8,4 @@
     [totalRecords]="dotPaginatorService.totalRecords"
     [placeholder]="'contenttypes.field.properties.relationship.existing.placeholder' | dm"
     width="100%"
-    labelPropertyName="label">
-</dot-searchable-dropdown>
+    labelPropertyName="label"></dot-searchable-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.html
index 97d18456b83e..d3c971b7b802 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.html
@@ -1,7 +1,7 @@
 <div class="field">
-    <label dotFieldRequired for="contentType">{{
-        'contenttypes.field.properties.relationships.contentType.label' | dm
-    }}</label>
+    <label dotFieldRequired for="contentType">
+        {{ 'contenttypes.field.properties.relationships.contentType.label' | dm }}
+    </label>
     <dot-searchable-dropdown
         (switch)="triggerChanged()"
         (filterChange)="getContentTypeList($event)"
@@ -17,8 +17,7 @@
         [totalRecords]="paginatorService.totalRecords"
         id="contentType"
         labelPropertyName="name"
-        width="100%">
-    </dot-searchable-dropdown>
+        width="100%"></dot-searchable-dropdown>
 </div>
 <div class="field">
     <label for="cardinality">{{ 'contenttypes.field.properties.relationships.label' | dm }}</label>
@@ -26,6 +25,5 @@
         (switch)="cardinalityChanged($event)"
         [value]="cardinality"
         [disabled]="editing"
-        id="cardinality">
-    </dot-cardinality-selector>
+        id="cardinality"></dot-cardinality-selector>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.spec.ts
index b539f408e19c..570511c0f28b 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-new-relationships/dot-new-relationships.component.spec.ts
@@ -55,11 +55,12 @@ const contentTypeMock: DotCMSContentType = {
 
 @Component({
     selector: 'dot-host-component',
-    template: ` <dot-new-relationships
-        [cardinality]="cardinalityIndex"
-        [velocityVar]="velocityVar"
-        [editing]="editing">
-    </dot-new-relationships>`
+    template: `
+        <dot-new-relationships
+            [cardinality]="cardinalityIndex"
+            [velocityVar]="velocityVar"
+            [editing]="editing"></dot-new-relationships>
+    `
 })
 class HostTestComponent {
     cardinalityIndex: number;
@@ -271,7 +272,7 @@ describe('DotNewRelationshipsComponent', () => {
             const labels = de.queryAll(By.css('label'));
             const contentTypeLabel = labels[0].nativeElement;
             const relationshipsLabel = labels[1].nativeElement.textContent;
-            expect(contentTypeLabel.textContent).toEqual('Content Type');
+            expect(contentTypeLabel.textContent.trim()).toEqual('Content Type');
             expect(contentTypeLabel.classList.contains('p-label-input-required')).toBeTruthy();
             expect(relationshipsLabel).toEqual('Relationship');
         });
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-relationships-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-relationships-property.component.html
index be73cb34655f..3e54490548fa 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-relationships-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/dot-relationships-property/dot-relationships-property.component.html
@@ -3,15 +3,13 @@
         (click)="clean()"
         [(ngModel)]="status"
         [label]="'contenttypes.field.properties.relationship.new.label' | dm"
-        [value]="STATUS_NEW">
-    </p-radioButton>
+        [value]="STATUS_NEW"></p-radioButton>
 
     <p-radioButton
         (click)="clean()"
         [(ngModel)]="status"
         [label]="'contenttypes.field.properties.relationship.existing.label' | dm"
-        [value]="STATUS_EXISTING">
-    </p-radioButton>
+        [value]="STATUS_EXISTING"></p-radioButton>
 </div>
 
 <div class="relationship__config">
@@ -21,24 +19,21 @@
         [velocityVar]="group.get(property.name).value.velocityVar"
         [cardinality]="group.get(property.name).value.cardinality"
         [editing]="editing"
-        class="relationships__new">
-    </dot-new-relationships>
+        class="relationships__new"></dot-new-relationships>
 
     <ng-template #existing>
         <div class="field">
-            <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired
-                >Relationship</label
-            >
+            <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>
+                Relationship
+            </label>
             <dot-edit-relationships
                 (switch)="handleChange($event)"
                 [id]="property.name"
-                class="relationships__existing">
-            </dot-edit-relationships>
+                class="relationships__existing"></dot-edit-relationships>
         </div>
     </ng-template>
 
     <dot-field-validation-message
         [message]="getValidationErrorMessage()"
-        [field]="group.controls[property.name]">
-    </dot-field-validation-message>
+        [field]="group.controls[property.name]"></dot-field-validation-message>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/name-property/name-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/name-property/name-property.component.html
index af835883bda4..74e817dbc694 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/name-property/name-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/name-property/name-property.component.html
@@ -1,7 +1,7 @@
 <div [formGroup]="group" class="field">
     <label [for]="property.name" dotFieldRequired>
-        {{ 'contenttypes.field.properties.name.label' | dm }}</label
-    >
+        {{ 'contenttypes.field.properties.name.label' | dm }}
+    </label>
     <input
         [formControlName]="property.name"
         [id]="property.name"
@@ -12,10 +12,9 @@
         maxlength="255" />
     <dot-field-validation-message
         [message]="'contenttypes.field.properties.name.error.required' | dm"
-        [field]="group.controls[property.name]">
-    </dot-field-validation-message>
+        [field]="group.controls[property.name]"></dot-field-validation-message>
     <div *ngIf="property.field.variable" class="form__field-variable">
-        <b>{{ 'contenttypes.field.properties.name.variable' | dm }}: </b>
+        <b>{{ 'contenttypes.field.properties.name.variable' | dm }}:</b>
         <dot-copy-link
             [label]="property.field.variable"
             [copy]="property.field.variable"></dot-copy-link>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/regex-check-property/regex-check-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/regex-check-property/regex-check-property.component.html
index dd0c856d7a93..81af200fec47 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/regex-check-property/regex-check-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/regex-check-property/regex-check-property.component.html
@@ -1,7 +1,7 @@
 <div [formGroup]="group" class="field">
-    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>{{
-        'contenttypes.field.properties.validation_regex.label' | dm
-    }}</label>
+    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>
+        {{ 'contenttypes.field.properties.validation_regex.label' | dm }}
+    </label>
     <div class="form__validation-input-container">
         <input [id]="property.name" [formControlName]="property.name" pInputText type="text" />
         <p-dropdown
@@ -9,7 +9,6 @@
             [style]="{ width: '125px' }"
             [options]="regexCheckTemplates"
             [formControlName]="property.name"
-            appendTo="body">
-        </p-dropdown>
+            appendTo="body"></p-dropdown>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/values-property/values-property.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/values-property/values-property.component.html
index 323ffaa63f85..0de2110d0bd3 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/values-property/values-property.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-properties-form/field-properties/values-property/values-property.component.html
@@ -2,9 +2,9 @@
     <dot-field-helper
         *ngIf="helpText && isValidHelperClass()"
         [message]="helpText"></dot-field-helper>
-    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>{{
-        'contenttypes.field.properties.value.label' | dm
-    }}</label>
+    <label [for]="property.name" [checkIsRequiredControl]="property.name" dotFieldRequired>
+        {{ 'contenttypes.field.properties.value.label' | dm }}
+    </label>
     <dot-textarea-content
         [id]="property.name"
         [formControlName]="property.name"
@@ -13,6 +13,7 @@
         height="15.7rem"></dot-textarea-content>
     <dot-field-validation-message
         [field]="group.controls[property.name]"
-        message="{{ 'contenttypes.field.properties.value.message' | dm }}">
-    </dot-field-validation-message>
+        message="{{
+            'contenttypes.field.properties.value.message' | dm
+        }}"></dot-field-validation-message>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-row/content-type-fields-row.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-row/content-type-fields-row.component.html
index bd4ad4a768e3..054e799c3db4 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-row/content-type-fields-row.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-row/content-type-fields-row.component.html
@@ -22,7 +22,6 @@
             (remove)="onRemoveField($event)"
             (edit)="this.editField.emit(field)"
             [field]="field"
-            [isSmall]="fieldRow.columns.length > 1">
-        </dot-content-type-field-dragabble-item>
+            [isSmall]="fieldRow.columns.length > 1"></dot-content-type-field-dragabble-item>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-tab/content-type-fields-tab.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-tab/content-type-fields-tab.component.html
index 9a7113a63aa3..7a264a692185 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-tab/content-type-fields-tab.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-tab/content-type-fields-tab.component.html
@@ -11,6 +11,5 @@
     [pTooltip]="'contenttypes.action.delete' | dm"
     class="field__actions-delete"
     icon="pi pi-trash"
-    styleClass="p-button-rounded p-button-text p-button-sm p-button-danger">
-</p-button>
+    styleClass="p-button-rounded p-button-text p-button-sm p-button-danger"></p-button>
 <hr />
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
index 9a7e43dab299..df158c37fe53 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
@@ -12,11 +12,10 @@
             class="p-checkbox-sm"
             formControlName="newEditContent"
             binary="true"
-            inputId="newEditContentLabel">
-        </p-checkbox>
-        <label for="newEditContentLabel"
-            ><span [innerHTML]="'content.type.form.banner.message' | dm"></span
-        ></label>
+            inputId="newEditContentLabel"></p-checkbox>
+        <label for="newEditContentLabel">
+            <span [innerHTML]="'content.type.form.banner.message' | dm"></span>
+        </label>
     </div>
     <div class="field form__group--validation">
         <label dotFieldRequired for="content-type-form-name">{{ nameFieldLabel }}</label>
@@ -42,9 +41,9 @@
     </div>
 
     <div class="field">
-        <label for="content-type-form-description">{{
-            'contenttypes.form.label.description' | dm
-        }}</label>
+        <label for="content-type-form-description">
+            {{ 'contenttypes.form.label.description' | dm }}
+        </label>
         <input
             [tabindex]="3"
             id="content-type-form-description"
@@ -54,9 +53,9 @@
             formControlName="description" />
     </div>
     <div class="field">
-        <label for="content-type-form-host">{{
-            'contenttypes.form.field.host_folder.label' | dm
-        }}</label>
+        <label for="content-type-form-host">
+            {{ 'contenttypes.form.field.host_folder.label' | dm }}
+        </label>
         <dot-site-selector-field
             [system]="true"
             [tabindex]="4"
@@ -65,18 +64,18 @@
             width="100%"></dot-site-selector-field>
     </div>
     <div class="field">
-        <label for="content-type-form-workflow">{{
-            'contenttypes.form.label.workflow' | dm
-        }}</label>
+        <label for="content-type-form-workflow">
+            {{ 'contenttypes.form.label.workflow' | dm }}
+        </label>
         <dot-workflows-selector-field
             [tabindex]="5"
             id="content-type-form-workflow"
             formControlName="workflows"></dot-workflows-selector-field>
     </div>
     <div class="field" formGroupName="systemActionMappings">
-        <label for="content-type-form-workflow">{{
-            'contenttypes.form.label.workflow.actions' | dm
-        }}</label>
+        <label for="content-type-form-workflow">
+            {{ 'contenttypes.form.label.workflow.actions' | dm }}
+        </label>
         <dot-workflows-actions-selector-field
             [tabindex]="6"
             [workflows]="workflowsSelected$ | async"
@@ -85,14 +84,14 @@
     <span
         *ngIf="form.get('workflows').disabled"
         class="p-field-hint form-workflow-community-message"
-        id="field-workflow-hint"
-        >{{ 'contenttypes.form.hint.error.only.default.scheme.available.in.Community' | dm }}</span
-    >
+        id="field-workflow-hint">
+        {{ 'contenttypes.form.hint.error.only.default.scheme.available.in.Community' | dm }}
+    </span>
     <div class="content-type__form-dates">
         <div class="field">
-            <label for="content-type-form-publish-date-field">{{
-                'contenttypes.form.label.publish.date.field' | dm
-            }}</label>
+            <label for="content-type-form-publish-date-field">
+                {{ 'contenttypes.form.label.publish.date.field' | dm }}
+            </label>
             <p-dropdown
                 (onChange)="handleDateVarChange($event, 'publishDateVar')"
                 [options]="dateVarOptions"
@@ -106,9 +105,9 @@
                 formControlName="publishDateVar"></p-dropdown>
         </div>
         <div class="field">
-            <label for="content-type-form-expire-date-field">{{
-                'contenttypes.form.field.expire.date.field' | dm
-            }}</label>
+            <label for="content-type-form-expire-date-field">
+                {{ 'contenttypes.form.field.expire.date.field' | dm }}
+            </label>
             <p-dropdown
                 (onChange)="handleDateVarChange($event, 'expireDateVar')"
                 [showClear]="true"
@@ -126,9 +125,9 @@
     <small
         *ngIf="!dateVarOptions.length"
         class="p-field-hint field__date-hint"
-        id="field-dates-hint"
-        >{{ 'contenttypes.form.message.no.date.fields.defined' | dm }}</small
-    >
+        id="field-dates-hint">
+        {{ 'contenttypes.form.message.no.date.fields.defined' | dm }}
+    </small>
 
     <div *ngIf="form.get('detailPage')" class="field">
         <label for="content-type-form-detail-page">
@@ -142,9 +141,9 @@
     <div *ngIf="form.get('urlMapPattern')" class="field form__group--helper">
         <dot-field-helper
             [message]="'contenttypes.hint.URL.map.pattern.hint1' | dm"></dot-field-helper>
-        <label for="content-type-form-url-map-pattern">{{
-            'contenttypes.form.label.URL.pattern' | dm
-        }}</label>
+        <label for="content-type-form-url-map-pattern">
+            {{ 'contenttypes.form.label.URL.pattern' | dm }}
+        </label>
         <input
             [tabindex]="10"
             id="content-type-form-url-map-pattern"
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.html
index 6fd7705c0bac..939eb20b5d70 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.html
@@ -19,8 +19,7 @@ <h4 (click)="editInlineActivate($event)">{{ contentType.name }}</h4>
                 <dot-inline-edit
                     [inlineEditContentTemplate]="inlineEditContentTemplate"
                     [inlineEditDisplayTemplate]="inlineEditDisplayTemplate"
-                    #dotEditInline>
-                </dot-inline-edit>
+                    #dotEditInline></dot-inline-edit>
             </header>
         </div>
 
@@ -68,8 +67,7 @@ <h4 (click)="editInlineActivate($event)">{{ contentType.name }}</h4>
                     (onClick)="fireAddRowEvent()"
                     [model]="actions"
                     icon="pi pi-plus"
-                    label="{{ 'contenttypes.content.row' | dm }}">
-                </p-splitButton>
+                    label="{{ 'contenttypes.content.row' | dm }}"></p-splitButton>
                 <dot-content-types-fields-list
                     [baseType]="contentType.baseType"></dot-content-types-fields-list>
             </div>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/dot-content-types-edit.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/dot-content-types-edit.component.html
index fb0c63661ce6..66e8a13e0435 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/dot-content-types-edit.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/dot-content-types-edit.component.html
@@ -11,8 +11,7 @@
         [layout]="layout"
         [loading]="loadingFields"
         [contentType]="data"
-        #fieldsDropZone>
-    </dot-content-type-fields-drop-zone>
+        #fieldsDropZone></dot-content-type-fields-drop-zone>
 </dot-content-type-layout>
 
 <dot-dialog
@@ -27,6 +26,5 @@
         (send)="handleFormSubmit($event)"
         [layout]="layout"
         [data]="data"
-        #form>
-    </dot-content-types-form>
+        #form></dot-content-types-form>
 </dot-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.html
index 11a87836115c..e1a2813414f1 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.html
@@ -6,9 +6,9 @@
     width="592px">
     <form (ngSubmit)="submit()" [formGroup]="form" class="p-fluid" novalidate>
         <div class="field">
-            <label dotFieldRequired for="title" data-testId="titleMenuLabel">{{
-                'contenttypes.content.add_to_menu.name' | dm
-            }}</label>
+            <label dotFieldRequired for="title" data-testId="titleMenuLabel">
+                {{ 'contenttypes.content.add_to_menu.name' | dm }}
+            </label>
             <input
                 id="title"
                 #titleName
@@ -23,8 +23,8 @@
                 }}"></dot-field-validation-message>
         </div>
         <div class="field">
-            <label dotFieldRequired for="menu" data-testId="menuOptionLabel"
-                >{{ 'contenttypes.content.add_to_menu.show_under' | dm }}
+            <label dotFieldRequired for="menu" data-testId="menuOptionLabel">
+                {{ 'contenttypes.content.add_to_menu.show_under' | dm }}
             </label>
             <p-dropdown
                 [options]="menu$ | async"
@@ -36,8 +36,8 @@
                 optionValue="id"></p-dropdown>
         </div>
         <div class="field">
-            <label dotFieldRequired for="cardViewMode" data-testId="ViewModeLabel"
-                >{{ 'contenttypes.content.add_to_menu.default_view' | dm }}
+            <label dotFieldRequired for="cardViewMode" data-testId="ViewModeLabel">
+                {{ 'contenttypes.content.add_to_menu.default_view' | dm }}
             </label>
             <div class="field">
                 <p-radioButton
@@ -46,8 +46,7 @@
                     data-testId="cardViewMode"
                     name="defaultView"
                     value="card"
-                    formControlName="defaultView">
-                </p-radioButton>
+                    formControlName="defaultView"></p-radioButton>
             </div>
             <div class="field">
                 <p-radioButton
@@ -55,8 +54,7 @@
                     data-testId="listViewMode"
                     name="defaultView"
                     value="list"
-                    formControlName="defaultView">
-                </p-radioButton>
+                    formControlName="defaultView"></p-radioButton>
             </div>
         </div>
     </form>
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.spec.ts b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.spec.ts
index 3c1dcaa0f595..7c7f0ce5633d 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-add-to-menu/dot-add-to-menu.component.spec.ts
@@ -51,7 +51,9 @@ const contentTypeVar = {
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-add-to-menu [contentType]="contentType"></dot-add-to-menu> `
+    template: `
+        <dot-add-to-menu [contentType]="contentType"></dot-add-to-menu>
+    `
 })
 class TestHostComponent {
     contentType = contentTypeVar;
diff --git a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-content-type-copy-dialog/dot-content-type-copy-dialog.component.html b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-content-type-copy-dialog/dot-content-type-copy-dialog.component.html
index 3fd0c0bd4974..d3cf000e046e 100644
--- a/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-content-type-copy-dialog/dot-content-type-copy-dialog.component.html
+++ b/core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-content-type-copy-dialog/dot-content-type-copy-dialog.component.html
@@ -25,8 +25,8 @@
         </div>
 
         <div class="field form__group--validation">
-            <label for="content-type-form-variable-name"
-                >{{ 'contenttypes.form.label.variable_name' | dm }}
+            <label for="content-type-form-variable-name">
+                {{ 'contenttypes.form.label.variable_name' | dm }}
             </label>
             <input
                 [tabindex]="2"
@@ -49,9 +49,9 @@
         </div>
 
         <div class="field">
-            <label for="content-type-form-host">{{
-                'contenttypes.form.field.host_folder.label' | dm
-            }}</label>
+            <label for="content-type-form-host">
+                {{ 'contenttypes.form.field.host_folder.label' | dm }}
+            </label>
             <dot-site-selector-field
                 [system]="true"
                 [tabindex]="4"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-action-button/dot-action-button.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-action-button/dot-action-button.component.html
index cc4ada1f9bef..0536db79b101 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-action-button/dot-action-button.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-action-button/dot-action-button.component.html
@@ -4,8 +4,7 @@
     (click)="buttonOnClick($event)"
     [disabled]="disabled"
     [icon]="icon"
-    styleClass="p-button-rounded">
-</p-button>
+    styleClass="p-button-rounded"></p-button>
 
 <p *ngIf="label" [class.action-button__label--disabled]="disabled" class="action-button__label">
     {{ label }}
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-bulk-information/dot-bulk-information.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-bulk-information/dot-bulk-information.component.spec.ts
index 31e9f9df2fc3..d014b64d52e8 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-bulk-information/dot-bulk-information.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-bulk-information/dot-bulk-information.component.spec.ts
@@ -42,7 +42,9 @@ const mockBulkResponseFail: DotActionBulkResult = {
 };
 
 @Component({
-    template: ` <div class="TestDynamicDialog"></div> `
+    template: `
+        <div class="TestDynamicDialog"></div>
+    `
 })
 export class TestDynamicDialogComponent {
     constructor(public dialogService: DialogService) {}
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-download-bundle-dialog/dot-download-bundle-dialog.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-download-bundle-dialog/dot-download-bundle-dialog.component.html
index 8bd2dd28d042..b1a608b17c81 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-download-bundle-dialog/dot-download-bundle-dialog.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-download-bundle-dialog/dot-download-bundle-dialog.component.html
@@ -15,8 +15,7 @@
                 [options]="downloadOptions"
                 class="p-button-tabbed"
                 id="download-btn"
-                formControlName="downloadOptionSelected">
-            </p-selectButton>
+                formControlName="downloadOptionSelected"></p-selectButton>
         </div>
         <div class="field">
             <label for="filterKey">{{ 'download.bundle.filter' | dm }}</label>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-dropdown-component/dot-dropdown.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-dropdown-component/dot-dropdown.component.spec.ts
index 62e17abacd8b..97f7f562f317 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-dropdown-component/dot-dropdown.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-dropdown-component/dot-dropdown.component.spec.ts
@@ -11,10 +11,12 @@ import { DotDropdownComponent } from './dot-dropdown.component';
 
 @Component({
     selector: 'dot-test-host-component',
-    template: `<dot-dropdown-component
-        [icon]="icon"
-        [title]="title"
-        [disabled]="disabled"></dot-dropdown-component>`
+    template: `
+        <dot-dropdown-component
+            [icon]="icon"
+            [title]="title"
+            [disabled]="disabled"></dot-dropdown-component>
+    `
 })
 class DotTestHostComponent {
     disabled: boolean;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.html
index 79c687ed9e9e..cf0d7210eed2 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.html
@@ -18,10 +18,7 @@
             class="p-button-primary"
             data-testid="copyBtn"></button>
     </div>
-    <a
-        (click)="revealPassword($event)"
-        href="#"
-        class="dot-generate-secure-password__reveal-link"
-        >{{ revealBtnLabel }}</a
-    >
+    <a (click)="revealPassword($event)" href="#" class="dot-generate-secure-password__reveal-link">
+        {{ revealBtnLabel }}
+    </a>
 </dot-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.spec.ts
index 2ab3ddd70011..63d6c3a004a9 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-generate-secure-password/dot-generate-secure-password.component.spec.ts
@@ -100,10 +100,10 @@ describe('DotGenerateSecurePasswordComponent', () => {
                 By.css('.dot-generate-secure-password__reveal-link')
             );
             revealButton.nativeElement.click();
-            expect(revealButton.nativeElement.text).toBe('Reveal');
+            expect(revealButton.nativeElement.text).toContain('Reveal');
             fixture.detectChanges();
             expect(comp.typeInput).toBe('text');
-            expect(revealButton.nativeElement.text).toBe('hide');
+            expect(revealButton.nativeElement.text).toContain('hide');
         });
 
         it('should reset on close', () => {
@@ -115,7 +115,7 @@ describe('DotGenerateSecurePasswordComponent', () => {
             expect(comp.typeInput).toBe('password');
             expect(comp.value).toBe('');
             expect(comp.dialogShow).toBe(false);
-            expect(revealButton.nativeElement.text).toBe('Reveal');
+            expect(revealButton.nativeElement.text.trim()).toBe('Reveal');
         });
     });
 
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-page-selector/dot-page-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-page-selector/dot-page-selector.component.spec.ts
index 80880aefd706..8f40241c63ad 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-page-selector/dot-page-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-page-selector/dot-page-selector.component.spec.ts
@@ -90,8 +90,9 @@ class MockDotPageSelectorService {
     selector: 'dot-fake-form',
     template: `
         <form [formGroup]="form">
-            <dot-page-selector [style]="{ width: '100%' }" formControlName="page">
-            </dot-page-selector>
+            <dot-page-selector
+                [style]="{ width: '100%' }"
+                formControlName="page"></dot-page-selector>
         </form>
     `
 })
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-dialog/dot-push-publish-dialog.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-dialog/dot-push-publish-dialog.component.html
index 8f2e8bc2faa2..e4acbb7e0c03 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-dialog/dot-push-publish-dialog.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-dialog/dot-push-publish-dialog.component.html
@@ -8,7 +8,6 @@
         *ngIf="eventData"
         (value)="formData = $event"
         (valid)="updateFormValid($event)"
-        [data]="eventData">
-    </dot-push-publish-form>
+        [data]="eventData"></dot-push-publish-form>
     <span *ngIf="errorMessage" class="dot-push-publish-dialog__error">{{ errorMessage }}</span>
 </dot-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.html
index d59c4d8ae781..58f50b3cc68e 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.html
@@ -9,8 +9,7 @@
     [options]="pushEnvironments"
     [defaultLabel]="'contenttypes.content.push_publish.select_environment' | dm"
     appendTo="body"
-    optionLabel="name">
-</p-multiSelect>
+    optionLabel="name"></p-multiSelect>
 
 <ul *ngIf="showList" class="environment-selector__list">
     <li *ngFor="let environment of selectedEnvironments" class="environment-selector__list-item">
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.spec.ts
index 47e4892a8d55..e5f8e8fa40b8 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-push-publish-env-selector/dot-push-publish-env-selector.component.spec.ts
@@ -42,11 +42,13 @@ export class PushPublishServiceMock {
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <form [formGroup]="group">
-        <dot-push-publish-env-selector
-            showList="true"
-            formControlName="environment"></dot-push-publish-env-selector>
-    </form>`
+    template: `
+        <form [formGroup]="group">
+            <dot-push-publish-env-selector
+                showList="true"
+                formControlName="environment"></dot-push-publish-env-selector>
+        </form>
+    `
 })
 class TestHostComponent {
     group: UntypedFormGroup;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html
index f3c664ba4551..9121252783f1 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.html
@@ -14,8 +14,7 @@
     [width]="width"
     #searchableDropdown
     labelPropertyName="hostname"
-    cssClassDataList="site_selector__data-list">
-</dot-searchable-dropdown>
+    cssClassDataList="site_selector__data-list"></dot-searchable-dropdown>
 
 <ng-template #hostName>
     <span class="site-selector__title">{{ currentSite?.hostname }}</span>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts
index 3e83c4847c4d..f37ca3c508d0 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-site-selector/dot-site-selector.component.spec.ts
@@ -48,7 +48,9 @@ const sites: Site[] = [
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-site-selector [id]="id" [cssClass]="cssClass"></dot-site-selector> `
+    template: `
+        <dot-site-selector [id]="id" [cssClass]="cssClass"></dot-site-selector>
+    `
 })
 class TestHostComponent {
     @Input() id: string;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-textarea-content/dot-textarea-content.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-textarea-content/dot-textarea-content.component.html
index 59d42a17fe61..389dc8f3a7e9 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-textarea-content/dot-textarea-content.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-textarea-content/dot-textarea-content.component.html
@@ -2,8 +2,7 @@
     *ngIf="selectOptions.length > 1"
     [(ngModel)]="selected"
     [options]="selectOptions"
-    class="textarea-content__select-field">
-</p-selectButton>
+    class="textarea-content__select-field"></p-selectButton>
 <textarea
     *ngIf="selected === 'plain'"
     (keydown.enter)="onKeyEnter($event)"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-workflows-selector-field/dot-workflows-selector-field.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-workflows-selector-field/dot-workflows-selector-field.component.html
index 8f70107fbe02..738be59f8c73 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-workflows-selector-field/dot-workflows-selector-field.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/dot-workflows-selector-field/dot-workflows-selector-field.component.html
@@ -9,11 +9,11 @@
     optionLabel="name"
     dataKey="id">
     <ng-template let-workflow pTemplate="item">
-        <span [class.workflow__archive-label]="workflow.archived" class="workflow__label">{{
-            workflow.name
-        }}</span>
-        <span *ngIf="workflow.archived" class="workflow__archive-message"
-            >({{ 'dot.common.archived' | dm }})</span
-        >
+        <span [class.workflow__archive-label]="workflow.archived" class="workflow__label">
+            {{ workflow.name }}
+        </span>
+        <span *ngIf="workflow.archived" class="workflow__archive-message">
+            ({{ 'dot.common.archived' | dm }})
+        </span>
     </ng-template>
 </p-multiSelect>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-comment-and-assign-form/dot-comment-and-assign-form.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-comment-and-assign-form/dot-comment-and-assign-form.component.html
index 8e6db103dbfb..e2477cb73854 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-comment-and-assign-form/dot-comment-and-assign-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-comment-and-assign-form/dot-comment-and-assign-form.component.html
@@ -12,8 +12,7 @@
             [style]="{ width: '100%' }"
             id="dotRoles"
             formControlName="assign"
-            appendTo="body">
-        </p-dropdown>
+            appendTo="body"></p-dropdown>
     </div>
     <div *ngIf="data['commentable']" class="field">
         <label for="comment">{{ 'comment.form.comments' | dm }}</label>
@@ -22,8 +21,7 @@
             [style]="{ width: '100%' }"
             id="comment"
             pInputTextarea
-            formControlName="comments">
-        </textarea>
+            formControlName="comments"></textarea>
     </div>
 
     <div *ngIf="data['moveable']" class="field">
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-push-publish-form/dot-push-publish-form.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-push-publish-form/dot-push-publish-form.component.html
index 143acd6d1600..779628b57101 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-push-publish-form/dot-push-publish-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/forms/dot-push-publish-form/dot-push-publish-form.component.html
@@ -7,19 +7,18 @@
     #formEl="ngForm"
     novalidate>
     <div class="field">
-        <label dotFieldRequired for="pushActionSelected"
-            >{{ 'contenttypes.content.push_publish.I_want_To' | dm }}:
+        <label dotFieldRequired for="pushActionSelected">
+            {{ 'contenttypes.content.push_publish.I_want_To' | dm }}:
         </label>
         <p-selectButton
             [options]="pushActions"
             class="push-publish-dialog__action-select p-button-tabbed"
             id="pushActionSelected"
-            formControlName="pushActionSelected">
-        </p-selectButton>
+            formControlName="pushActionSelected"></p-selectButton>
     </div>
 
     <div class="field">
-        <label for="filterKey">{{ 'contenttypes.content.push_publish.filters' | dm }}: </label>
+        <label for="filterKey">{{ 'contenttypes.content.push_publish.filters' | dm }}:</label>
         <p-dropdown
             [autofocus]="true"
             [options]="filterOptions"
@@ -31,8 +30,8 @@
 
     <div class="field form-group__two-cols push-publish-dialog__publish-dates-container">
         <div class="field push-publish-dialog__publish-date">
-            <label dotFieldRequired for="publishDate"
-                >{{ 'contenttypes.content.push_publish.publish_date' | dm }}:
+            <label dotFieldRequired for="publishDate">
+                {{ 'contenttypes.content.push_publish.publish_date' | dm }}:
             </label>
             <div class="push-publish-dialog__calendar">
                 <p-calendar
@@ -54,8 +53,8 @@
                 }}"></dot-field-validation-message>
         </div>
         <div class="field push-publish-dialog__expire-date">
-            <label dotFieldRequired for="expireDate"
-                >{{ 'contenttypes.content.push_publish.expire_date' | dm }}:
+            <label dotFieldRequired for="expireDate">
+                {{ 'contenttypes.content.push_publish.expire_date' | dm }}:
             </label>
             <div class="push-publish-dialog__calendar">
                 <p-calendar
@@ -77,11 +76,12 @@
         </div>
     </div>
     <div class="field push-publish-dialog__timezone-label">
-        <span>{{ localTimezone }}</span> -
-        <a (click)="toggleTimezonePicker($event)" href="#"> {{ changeTimezoneActionLabel }}</a>
+        <span>{{ localTimezone }}</span>
+        -
+        <a (click)="toggleTimezonePicker($event)" href="#">{{ changeTimezoneActionLabel }}</a>
     </div>
     <div [hidden]="!showTimezonePicker" class="field" data-testid="timeZoneSelectContainer">
-        <label for="timezoneId">{{ 'time-zone' | dm }}: </label>
+        <label for="timezoneId">{{ 'time-zone' | dm }}:</label>
         <p-dropdown
             (onChange)="updateTimezoneLabel($event.value)"
             [options]="timeZoneOptions"
@@ -93,8 +93,8 @@
             appendTo="body"></p-dropdown>
     </div>
     <div class="field">
-        <label dotFieldRequired for="environment"
-            >{{ 'contenttypes.content.push_publish.push_to' | dm }}:
+        <label dotFieldRequired for="environment">
+            {{ 'contenttypes.content.push_publish.push_to' | dm }}:
         </label>
         <dot-push-publish-env-selector
             [assetIdentifier]="assetIdentifier"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.html
index c77b7122501c..e0d8064c2185 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.html
@@ -10,5 +10,4 @@
     id="detailFrame"
     name="detailFrame"
     title="detailFrame"
-    width="100%">
-</iframe>
+    width="100%"></iframe>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.html
index c148a569881e..972cb63a58ab 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.html
@@ -3,8 +3,7 @@
         (custom)="onCustomEvent($event)"
         [isLoading]="isLoading"
         [src]="url | async"
-        #iframe>
-    </dot-iframe>
+        #iframe></dot-iframe>
 </ng-template>
 <ng-template #notLicense>
     <dot-not-license />
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.html b/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.html
index f9963cb2f69b..751a2ad7d876 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.html
@@ -3,10 +3,10 @@
         (click)="handleClick(item)"
         [class.selected]="item[labelPropertyName] === valueString"
         class="searchable-dropdown__data-list-item"
-        data-testid="searchable-dropdown-data-list-item"
-        ><i *ngIf="item[labelPropertyName] === valueString" class="pi pi-check"></i
-        >{{ item.label }}</span
-    >
+        data-testid="searchable-dropdown-data-list-item">
+        <i *ngIf="item[labelPropertyName] === valueString" class="pi pi-check"></i>
+        {{ item.label }}
+    </span>
 </ng-template>
 
 <ng-template #defaultFilterTemplate>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.spec.ts
index c1ec8f1ad451..ea1e4d6126bb 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/_common/searchable-dropdown/component/searchable-dropdown.component.spec.ts
@@ -24,22 +24,23 @@ import { SEARCHABLE_NGFACES_MODULES } from '../searchable-dropdown.module';
 
 @Component({
     selector: 'dot-host-component',
-    template: ` <dot-searchable-dropdown
-        [action]="action"
-        [cssClass]="cssClass"
-        [data]="data"
-        [labelPropertyName]="labelPropertyName"
-        [multiple]="multiple"
-        [pageLinkSize]="pageLinkSize"
-        [persistentPlaceholder]="persistentPlaceholder"
-        [placeholder]="placeholder"
-        [rows]="rows"
-        [totalRecords]="totalRecords"
-        [valuePropertyName]="valuePropertyName"
-        [overlayWidth]="overlayWidth"
-        [width]="width"
-        [disabled]="disabled">
-    </dot-searchable-dropdown>`
+    template: `
+        <dot-searchable-dropdown
+            [action]="action"
+            [cssClass]="cssClass"
+            [data]="data"
+            [labelPropertyName]="labelPropertyName"
+            [multiple]="multiple"
+            [pageLinkSize]="pageLinkSize"
+            [persistentPlaceholder]="persistentPlaceholder"
+            [placeholder]="placeholder"
+            [rows]="rows"
+            [totalRecords]="totalRecords"
+            [valuePropertyName]="valuePropertyName"
+            [overlayWidth]="overlayWidth"
+            [width]="width"
+            [disabled]="disabled"></dot-searchable-dropdown>
+    `
 })
 class HostTestComponent {
     @Input()
@@ -197,7 +198,7 @@ describe('SearchableDropdownComponent', () => {
         const dataviewDataEl = de.query(
             By.css('p-dataview .p-dataview-content .searchable-dropdown__data-list-item')
         );
-        expect(dataviewDataEl.nativeElement.textContent).toEqual('site-0');
+        expect(dataviewDataEl.nativeElement.textContent.trim()).toEqual('site-0');
         expect(comp.selectedOptionIndex).toBe(0);
         expect(comp.selectedOptionValue).toBe(data[0].name);
     });
@@ -256,7 +257,7 @@ describe('SearchableDropdownComponent', () => {
         const dataviewDataEl = de.query(
             By.css('p-dataview .p-dataview-content .searchable-dropdown__data-list-item')
         );
-        expect(dataviewDataEl.nativeElement.textContent).toEqual('site-0 - demo.dotcms.com');
+        expect(dataviewDataEl.nativeElement.textContent).toContain('site-0 - demo.dotcms.com');
     });
 
     it('should the pageChange call the paginate method', async () => {
@@ -384,36 +385,38 @@ describe('SearchableDropdownComponent', () => {
 
 @Component({
     selector: 'dot-host-component',
-    template: ` <dot-searchable-dropdown
-        [action]="action"
-        [cssClass]="cssClass"
-        [data]="data"
-        [labelPropertyName]="labelPropertyName"
-        [multiple]="multiple"
-        [pageLinkSize]="pageLinkSize"
-        [persistentPlaceholder]="persistentPlaceholder"
-        [placeholder]="placeholder"
-        [rows]="rows"
-        [totalRecords]="totalRecords"
-        [valuePropertyName]="valuePropertyName"
-        [width]="width"
-        #searchableDropdown
-        cssClassDataList="site_selector__data-list">
-        <ng-template let-data="item" pTemplate="listItem">
-            <div
-                (click)="handleClick(item)"
-                class="searchable-dropdown__data-list-item templateTestItem">
-                {{ data.label }}
-            </div>
-        </ng-template>
-        <ng-template let-persona="item" pTemplate="select">
-            <div
-                (click)="searchableDropdown.toggleOverlayPanel($event)"
-                class="dot-persona-selector__testContainer">
-                Test
-            </div>
-        </ng-template>
-    </dot-searchable-dropdown>`
+    template: `
+        <dot-searchable-dropdown
+            [action]="action"
+            [cssClass]="cssClass"
+            [data]="data"
+            [labelPropertyName]="labelPropertyName"
+            [multiple]="multiple"
+            [pageLinkSize]="pageLinkSize"
+            [persistentPlaceholder]="persistentPlaceholder"
+            [placeholder]="placeholder"
+            [rows]="rows"
+            [totalRecords]="totalRecords"
+            [valuePropertyName]="valuePropertyName"
+            [width]="width"
+            #searchableDropdown
+            cssClassDataList="site_selector__data-list">
+            <ng-template let-data="item" pTemplate="listItem">
+                <div
+                    (click)="handleClick(item)"
+                    class="searchable-dropdown__data-list-item templateTestItem">
+                    {{ data.label }}
+                </div>
+            </ng-template>
+            <ng-template let-persona="item" pTemplate="select">
+                <div
+                    (click)="searchableDropdown.toggleOverlayPanel($event)"
+                    class="dot-persona-selector__testContainer">
+                    Test
+                </div>
+            </ng-template>
+        </dot-searchable-dropdown>
+    `
 })
 class HostTestExternalTemplateComponent {
     @Input() data: any[];
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-add-persona-dialog/dot-create-persona-form/dot-create-persona-form.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-add-persona-dialog/dot-create-persona-form/dot-create-persona-form.component.html
index e50d9c65deec..041929c0f6f7 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-add-persona-dialog/dot-create-persona-form/dot-create-persona-form.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-add-persona-dialog/dot-create-persona-form/dot-create-persona-form.component.html
@@ -20,8 +20,7 @@
             pInputText />
         <dot-field-validation-message
             [message]="'modes.persona.name.error.required' | dm"
-            [field]="form.get('name')">
-        </dot-field-validation-message>
+            [field]="form.get('name')"></dot-field-validation-message>
     </div>
 
     <div class="field">
@@ -40,8 +39,7 @@
             url="/api/v1/temp"
             accept="image/*,.webp"
             auto="true"
-            mode="basic">
-        </p-fileUpload>
+            mode="basic"></p-fileUpload>
         <div *ngIf="tempUploadedFile" class="form__file-detail">
             <img [src]="tempUploadedFile.thumbnailUrl" />
             <span>{{ tempUploadedFile.fileName }}</span>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-base-type-selector/dot-base-type-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-base-type-selector/dot-base-type-selector.component.html
index bc8dec7ba82d..30195495db89 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-base-type-selector/dot-base-type-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-base-type-selector/dot-base-type-selector.component.html
@@ -1,2 +1,4 @@
-<p-dropdown (onChange)="change($event)" [options]="options | async" [style]="{ width: '155px' }">
-</p-dropdown>
+<p-dropdown
+    (onChange)="change($event)"
+    [options]="options | async"
+    [style]="{ width: '155px' }"></p-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.html
index 4d41c293c71f..9c2f6d9efe85 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.html
@@ -1,5 +1,6 @@
-<dot-container-selector (swap)="containerChange($event)" innerClass="d-secondary">
-</dot-container-selector>
+<dot-container-selector
+    (swap)="containerChange($event)"
+    innerClass="d-secondary"></dot-container-selector>
 <ul class="container-selector__list">
     <li
         *ngFor="let dotContainerColumnBox of data; let i = index"
@@ -7,12 +8,11 @@
         <p-button
             (click)="removeContainerItem(i)"
             icon="pi pi-trash"
-            styleClass="p-button-rounded p-button-text p-button-danger">
-        </p-button>
-        <span class="container-selector__list-item-text"
-            >{{ dotContainerColumnBox.container?.name }} ({{
+            styleClass="p-button-rounded p-button-text p-button-danger"></p-button>
+        <span class="container-selector__list-item-text">
+            {{ dotContainerColumnBox.container?.name }} ({{
                 dotContainerColumnBox.container?.parentPermissionable.hostname
-            }})</span
-        >
+            }})
+        </span>
     </li>
 </ul>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.spec.ts
index 3e68ac015ad7..71c1e8885b3d 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector-layout/dot-container-selector-layout.component.spec.ts
@@ -117,7 +117,7 @@ describe('DotContainerSelectorLayoutComponent', () => {
         await fixture.whenStable();
 
         const dataItem = de.query(By.css('.container-selector__list-item-text'));
-        expect(dataItem.nativeNode.textContent).toEqual('Container 1 (demo.dotcms.com)');
+        expect(dataItem.nativeNode.textContent.trim()).toEqual('Container 1 (demo.dotcms.com)');
     });
 
     it('should pass the innerClass', () => {
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector/dot-container-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector/dot-container-selector.component.html
index fdab618718d3..799287e8d586 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector/dot-container-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-container-selector/dot-container-selector.component.html
@@ -13,5 +13,4 @@
     placeholder="{{ 'editpage.container.add.label' | dm }}"
     persistentPlaceholder="true"
     width="fit-content"
-    overlayWidth="440px">
-</dot-searchable-dropdown>
+    overlayWidth="440px"></dot-searchable-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-content-type-selector/dot-content-type-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-content-type-selector/dot-content-type-selector.component.html
index d81719b569e2..6fa199be1c62 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-content-type-selector/dot-content-type-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-content-type-selector/dot-content-type-selector.component.html
@@ -6,5 +6,4 @@
     [showClear]="true"
     [resetFilterOnHide]="true"
     appendTo="body"
-    filterBy="label">
-</p-dropdown>
+    filterBy="label"></p-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.html
index ede004b0ac32..863c29e3ff37 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.html
@@ -4,5 +4,4 @@
     (custom)="onCustomEvent($event)"
     (charge)="onLoad($event)"
     [header]="header"
-    [url]="url">
-</dot-iframe-dialog>
+    [url]="url"></dot-iframe-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-reorder-menu/dot-reorder-menu.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-reorder-menu/dot-reorder-menu.component.html
index aa776516de9a..35c1f7c301a8 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-reorder-menu/dot-reorder-menu.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-reorder-menu/dot-reorder-menu.component.html
@@ -2,5 +2,4 @@
     *ngIf="!!url"
     (shutdown)="onClose()"
     [header]="'editpage.content.contentlet.menu.reorder.title' | dm"
-    [url]="url">
-</dot-iframe-dialog>
+    [url]="url"></dot-iframe-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.html
index e023b9d084be..3b62735ffd74 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.html
@@ -11,7 +11,6 @@
             class="p-dropdown-sm"
             id="device-selector"
             dataKey="inode"
-            optionLabel="name">
-        </p-dropdown>
+            optionLabel="name"></p-dropdown>
     </div>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.spec.ts
index 7ac571257081..a5d968092910 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-device-selector/dot-device-selector.component.spec.ts
@@ -22,7 +22,9 @@ import { DotDeviceSelectorComponent } from './dot-device-selector.component';
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-device-selector [value]="value"></dot-device-selector> `
+    template: `
+        <dot-device-selector [value]="value"></dot-device-selector>
+    `
 })
 class TestHostComponent {
     value: DotDevice = mockDotDevices[0];
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-grid/dot-edit-layout-grid.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-grid/dot-edit-layout-grid.component.html
index f02a2a401bfb..55280579b596 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-grid/dot-edit-layout-grid.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-grid/dot-edit-layout-grid.component.html
@@ -8,8 +8,7 @@
             [pTooltip]="'editpage.layout.css.class.add.to.row' | dm"
             icon="pi pi-ellipsis-h"
             tooltipPosition="left"
-            styleClass="p-button-rounded p-button-sm p-button-text">
-        </p-button>
+            styleClass="p-button-rounded p-button-sm p-button-text"></p-button>
     </div>
 
     <div
@@ -20,22 +19,19 @@
             (switch)="propagateGridLayoutChange()"
             (remove)="onRemoveContainer(i)"
             [data]="gridBox.containers"
-            [multiple]="true">
-        </dot-container-selector-layout>
+            [multiple]="true"></dot-container-selector-layout>
         <div class="box__actions">
             <p-button
                 (click)="addColumnClass(i)"
                 [pTooltip]="'editpage.layout.css.class.add.to.box' | dm"
                 class="box__add-box-class-button"
                 styleClass="p-button-rounded p-button-text p-button-sm"
-                icon="pi pi-ellipsis-h">
-            </p-button>
+                icon="pi pi-ellipsis-h"></p-button>
             <p-button
                 (click)="onRemoveContainer(i)"
                 [pTooltip]="'editpage.action.delete' | dm"
                 styleClass="p-button-rounded p-button-text p-button-sm p-button-danger"
-                icon="pi pi-times">
-            </p-button>
+                icon="pi pi-times"></p-button>
         </div>
     </div>
 </div>
@@ -49,9 +45,9 @@
     #dialog>
     <form *ngIf="addClassDialogShow" [formGroup]="form" class="p-fluid" novalidate>
         <div class="field">
-            <label dotFieldRequired for="classToAdd">{{
-                'editpage.layout.css.class.names' | dm
-            }}</label>
+            <label dotFieldRequired for="classToAdd">
+                {{ 'editpage.layout.css.class.names' | dm }}
+            </label>
             <input
                 class="box__add-class-text"
                 id="classToAdd"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-sidebar/dot-edit-layout-sidebar.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-sidebar/dot-edit-layout-sidebar.component.spec.ts
index 62023c5aebc4..63c477dfb270 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-sidebar/dot-edit-layout-sidebar.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-edit-layout-sidebar/dot-edit-layout-sidebar.component.spec.ts
@@ -25,9 +25,11 @@ let fakeValue: DotLayoutSideBar;
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <form [formGroup]="form">
-        <dot-edit-layout-sidebar formControlName="sidebar"></dot-edit-layout-sidebar>
-    </form>`
+    template: `
+        <form [formGroup]="form">
+            <dot-edit-layout-sidebar formControlName="sidebar"></dot-edit-layout-sidebar>
+        </form>
+    `
 })
 class TestHostComponent {
     form: UntypedFormGroup;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-theme-selector/dot-theme-selector.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-theme-selector/dot-theme-selector.component.spec.ts
index a9a206cd802e..d70056e82565 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-theme-selector/dot-theme-selector.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/components/dot-theme-selector/dot-theme-selector.component.spec.ts
@@ -29,9 +29,11 @@ import { DotThemeSelectorComponent } from './dot-theme-selector.component';
 
 @Component({
     selector: 'dot-site-selector',
-    template: `<select>
-        <option>Fake site selector</option>
-    </select>`
+    template: `
+        <select>
+            <option>Fake site selector</option>
+        </select>
+    `
 })
 class MockDotSiteSelectorComponent {
     @Input() system;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/dot-edit-layout-designer.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/dot-edit-layout-designer.component.html
index 9073420713b7..46796cd4509f 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/dot-edit-layout-designer.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-edit-layout-designer/dot-edit-layout-designer.component.html
@@ -2,8 +2,7 @@
     *ngIf="themeDialogVisibility"
     (selected)="changeThemeHandler($event)"
     (shutdown)="closeThemeDialog()"
-    [value]="currentTheme">
-</dot-theme-selector>
+    [value]="currentTheme"></dot-theme-selector>
 <dot-secondary-toolbar>
     <div class="main-toolbar-left">
         <dot-edit-page-info
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-field-helper/dot-field-helper.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-field-helper/dot-field-helper.component.html
index a075ef638448..9ee4e0a00aee 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-field-helper/dot-field-helper.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-field-helper/dot-field-helper.component.html
@@ -1,8 +1,7 @@
 <p-button
     (click)="hint.toggle($event); $event.preventDefault()"
     icon="pi pi-question-circle"
-    styleClass="p-button-rounded p-button-sm p-button-text">
-</p-button>
+    styleClass="p-button-rounded p-button-sm p-button-text"></p-button>
 <p-overlayPanel [dismissable]="true" [style]="{ width: '350px' }" #hint appendTo="body">
     <div [innerHTML]="message"></div>
 </p-overlayPanel>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-iframe-dialog/dot-iframe-dialog.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-iframe-dialog/dot-iframe-dialog.component.html
index aaf1bc298edb..1b2189feaa8b 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-iframe-dialog/dot-iframe-dialog.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-iframe-dialog/dot-iframe-dialog.component.html
@@ -12,6 +12,5 @@
         (keyWasDown)="onKeyDown($event)"
         (custom)="custom.emit($event)"
         [src]="url"
-        class="dialog__iframe">
-    </dot-iframe>
+        class="dialog__iframe"></dot-iframe>
 </dot-dialog>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-language-selector/dot-language-selector.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-language-selector/dot-language-selector.component.html
index db71c28b03c1..261591b4bd83 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-language-selector/dot-language-selector.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-language-selector/dot-language-selector.component.html
@@ -15,9 +15,7 @@
             <div class="h-full w-full flex align-items-center gap-3">
                 <span>
                     {{ value.language }}
-                    <ng-container *ngIf="value.countryCode">
-                        ({{ value.countryCode }})
-                    </ng-container>
+                    <ng-container *ngIf="value.countryCode">({{ value.countryCode }})</ng-container>
                 </span>
             </div>
         }
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.spec.ts
index d7815b44cb2a..9cd03b82833b 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.spec.ts
@@ -11,7 +11,9 @@ import { DotLargeMessageDisplayComponent } from './dot-large-message-display.com
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-large-message-display></dot-large-message-display> `
+    template: `
+        <dot-large-message-display></dot-large-message-display>
+    `
 })
 class TestHostComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-link/dot-link.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-link/dot-link.component.spec.ts
index c604894fba8b..93d744286952 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-link/dot-link.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-link/dot-link.component.spec.ts
@@ -9,7 +9,9 @@ import { MockDotMessageService } from '@dotcms/utils-testing';
 import { DotLinkComponent } from '././dot-link.component';
 
 @Component({
-    template: ` <dot-link [href]="href" [icon]="icon" [label]="label"></dot-link>`
+    template: `
+        <dot-link [href]="href" [icon]="icon" [label]="label"></dot-link>
+    `
 })
 class TestHostComponent {
     href = 'api/v1/123';
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/action-header/action-header.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/action-header/action-header.component.html
index 38cc067c7c44..d6ac09ecc5b4 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/action-header/action-header.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/action-header/action-header.component.html
@@ -12,9 +12,9 @@
         <div
             *ngIf="(options && options.secondary) || selectedItems.length"
             class="action-header__group-actions">
-            <span class="action-header__selected-items-counter"
-                >{{ selectedItems.length }} {{ 'selected' | dm }}</span
-            >
+            <span class="action-header__selected-items-counter">
+                {{ selectedItems.length }} {{ 'selected' | dm }}
+            </span>
             <ng-container *ngIf="options && options.secondary">
                 <p-splitButton
                     *ngFor="let action of options.secondary"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.html
index 16d822f2259e..73c3a5bf214b 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.html
@@ -125,7 +125,6 @@
             *ngIf="actions"
             [actions]="actions"
             [item]="rowData"
-            class="listing-datatable__action-button">
-        </dot-action-menu-button>
+            class="listing-datatable__action-button"></dot-action-menu-button>
     </td>
 </ng-template>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts
index ab31526b9553..2a7ecc609227 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-listing-data-table/dot-listing-data-table.component.spec.ts
@@ -46,30 +46,34 @@ import { DotActionButtonComponent } from '../_common/dot-action-button/dot-actio
 
 @Component({
     selector: 'dot-empty-state',
-    template: `<h1>Im empty</h1>`
+    template: `
+        <h1>Im empty</h1>
+    `
 })
 class EmptyMockComponent {}
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-listing-data-table
-        (rowWasClicked)="rowWasClicked($event)"
-        (selectedItems)="selectedItems($event)"
-        [columns]="columns"
-        [url]="url"
-        [actionHeaderOptions]="actionHeaderOptions"
-        [buttonActions]="buttonActions"
-        [sortOrder]="sortOrder"
-        [sortField]="sortField"
-        [multipleSelection]="multipleSelection"
-        [paginationPerPage]="paginationPerPage"
-        [actions]="actions"
-        [dataKey]="dataKey"
-        [checkbox]="checkbox"
-        [mapItems]="mapItems"
-        [paginatorExtraParams]="paginatorExtraParams">
-        <dot-empty-state></dot-empty-state>
-    </dot-listing-data-table>`
+    template: `
+        <dot-listing-data-table
+            (rowWasClicked)="rowWasClicked($event)"
+            (selectedItems)="selectedItems($event)"
+            [columns]="columns"
+            [url]="url"
+            [actionHeaderOptions]="actionHeaderOptions"
+            [buttonActions]="buttonActions"
+            [sortOrder]="sortOrder"
+            [sortField]="sortField"
+            [multipleSelection]="multipleSelection"
+            [paginationPerPage]="paginationPerPage"
+            [actions]="actions"
+            [dataKey]="dataKey"
+            [checkbox]="checkbox"
+            [mapItems]="mapItems"
+            [paginatorExtraParams]="paginatorExtraParams">
+            <dot-empty-state></dot-empty-state>
+        </dot-listing-data-table>
+    `
 })
 class TestHostComponent {
     @Input() columns: DataTableColumn[];
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.html
index b12dcd15bd40..b1c865fdb71d 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.html
@@ -14,8 +14,7 @@
         <dot-icon
             class="dot-nav__item-arrow"
             aria-hidden="true"
-            name="{{ data.isOpen ? 'arrow_drop_down' : 'arrow_drop_up' }}">
-        </dot-icon>
+            name="{{ data.isOpen ? 'arrow_drop_down' : 'arrow_drop_up' }}"></dot-icon>
     </div>
 </div>
 <dot-sub-nav
@@ -23,5 +22,4 @@
     [ngStyle]="customStyles"
     [data]="data"
     [collapsed]="collapsed"
-    #subnav>
-</dot-sub-nav>
+    #subnav></dot-sub-nav>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.spec.ts
index ebcd54ebc769..c3a5b809b754 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-nav-item/dot-nav-item.component.spec.ts
@@ -19,7 +19,9 @@ import { DotSubNavComponent } from '../dot-sub-nav/dot-sub-nav.component';
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-nav-item [data]="menu" [collapsed]="collapsed"></dot-nav-item> `
+    template: `
+        <dot-nav-item [data]="menu" [collapsed]="collapsed"></dot-nav-item>
+    `
 })
 class TestHostComponent {
     menu: DotMenu = {
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.html
index 03d250d831b2..69c29bc1cbc7 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.html
@@ -5,8 +5,8 @@
             [class.dot-nav-sub__link--active]="subItem.active"
             [routerLink]="subItem.menuLink"
             [state]="{ menuId: data.id }"
-            class="dot-nav-sub__link"
-            >{{ subItem.label }}</a
-        >
+            class="dot-nav-sub__link">
+            {{ subItem.label }}
+        </a>
     </li>
 </ul>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/dot-navigation.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/dot-navigation.component.html
index 30b0aff06eaa..29d3a4f5155b 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/dot-navigation.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/dot-navigation.component.html
@@ -8,8 +8,7 @@
                 (menuClick)="onMenuClick($event)"
                 (itemClick)="onItemClick($event)"
                 [data]="item"
-                [collapsed]="dotNavigationService.collapsed$ | async">
-            </dot-nav-item>
+                [collapsed]="dotNavigationService.collapsed$ | async"></dot-nav-item>
         </li>
     </ul>
 </nav>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.html
index 54e2ff26917d..caf1522fc633 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.html
@@ -12,9 +12,9 @@
 
     <p-avatar *ngIf="!persona" [text]="'modes.persona.no.persona' | dm" dotAvatar></p-avatar>
 
-    <span class="dot-persona-selector__name">{{
-        persona?.name || ('modes.persona.no.persona' | dm)
-    }}</span>
+    <span class="dot-persona-selector__name">
+        {{ persona?.name || ('modes.persona.no.persona' | dm) }}
+    </span>
 
     <ng-container *ngIf="!readonly">
         <i class="pi pi-chevron-down"></i>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.spec.ts
index 2d10bb73aec3..f7821b392a88 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selected-item/dot-persona-selected-item.component.spec.ts
@@ -22,7 +22,9 @@ const messageServiceMock = new MockDotMessageService({
 });
 
 @Component({
-    template: ` <dot-persona-selected-item [persona]="persona"></dot-persona-selected-item>`
+    template: `
+        <dot-persona-selected-item [persona]="persona"></dot-persona-selected-item>
+    `
 })
 class TestHostComponent {
     persona = mockDotPersona;
@@ -78,7 +80,7 @@ describe('DotPersonaSelectedItemComponent', () => {
 
     it('should render persona name and label', () => {
         const name = de.query(By.css('.dot-persona-selector__name')).nativeElement;
-        expect(name.innerText).toBe('Global Investor');
+        expect(name.innerText.trim()).toBe('Global Investor');
     });
 
     describe('tooltip properties', () => {
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.html
index 5a9c88cd96da..f00190e229d0 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.html
@@ -17,8 +17,8 @@
         'dot-persona-selector-option__selected': selected
     }"
     class="dot-persona-selector-option__label"
-    style="-webkit-box-orient: vertical; -moz-box-orient: vertical"
-    >{{ persona.name }}
+    style="-webkit-box-orient: vertical; -moz-box-orient: vertical">
+    {{ persona.name }}
 </span>
 
 <button
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.spec.ts
index 4d48114f3c01..deb5cb089dfb 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector-option/dot-persona-selector-option.component.spec.ts
@@ -14,7 +14,9 @@ import { MockDotMessageService, mockDotPersona } from '@dotcms/utils-testing';
 import { DotPersonaSelectorOptionComponent } from './dot-persona-selector-option.component';
 
 @Component({
-    template: ` <dot-persona-selector-option [persona]="persona"></dot-persona-selector-option>`
+    template: `
+        <dot-persona-selector-option [persona]="persona"></dot-persona-selector-option>
+    `
 })
 class TestHostComponent {
     persona = mockDotPersona;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/components/dot-portlet-box/dot-portlet-box.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/components/dot-portlet-box/dot-portlet-box.component.spec.ts
index b2902921a0b0..57e154c7d1d0 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/components/dot-portlet-box/dot-portlet-box.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/components/dot-portlet-box/dot-portlet-box.component.spec.ts
@@ -5,7 +5,9 @@ import { By } from '@angular/platform-browser';
 import { DotPortletBoxComponent } from './dot-portlet-box.component';
 
 @Component({
-    template: `<dot-portlet-box><div>Hello World</div></dot-portlet-box>`
+    template: `
+        <dot-portlet-box><div>Hello World</div></dot-portlet-box>
+    `
 })
 class DefaultTestHostComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/dot-portlet-base.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/dot-portlet-base.component.spec.ts
index 8e07b09ed7c0..4b9ae555e07f 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/dot-portlet-base.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-portlet-base/dot-portlet-base.component.spec.ts
@@ -6,20 +6,26 @@ import { By } from '@angular/platform-browser';
 import { DotPortletBoxComponent } from './components/dot-portlet-box/dot-portlet-box.component';
 import { DotPortletBaseComponent } from './dot-portlet-base.component';
 @Component({
-    template: `<dot-portlet-base><div>Hello World</div></dot-portlet-base>`
+    template: `
+        <dot-portlet-base><div>Hello World</div></dot-portlet-base>
+    `
 })
 class DefaultTestHostComponent {}
 
 @Component({
-    template: `<dot-portlet-base [boxed]="false"><div>Hello World</div></dot-portlet-base>`
+    template: `
+        <dot-portlet-base [boxed]="false"><div>Hello World</div></dot-portlet-base>
+    `
 })
 class DefaultTestHostUnboxedComponent {}
 
 @Component({
-    template: `<dot-portlet-base>
-        <dot-portlet-toolbar></dot-portlet-toolbar>
-        <div>Hello World</div>
-    </dot-portlet-base>`
+    template: `
+        <dot-portlet-base>
+            <dot-portlet-toolbar></dot-portlet-toolbar>
+            <div>Hello World</div>
+        </dot-portlet-base>
+    `
 })
 class DefaultTestHostWithToolbarComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-relationship-tree/dot-relationship-tree.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-relationship-tree/dot-relationship-tree.component.spec.ts
index 3f50a4b4878c..a173e62ae701 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-relationship-tree/dot-relationship-tree.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-relationship-tree/dot-relationship-tree.component.spec.ts
@@ -23,10 +23,12 @@ const fakeContentType: DotCMSContentType = {
 
 @Component({
     selector: 'dot-test-host-component',
-    template: ` <dot-relationship-tree
-        [velocityVar]="velocityVar"
-        [contentType]="contentType"
-        [isParentField]="isParentField"></dot-relationship-tree>`
+    template: `
+        <dot-relationship-tree
+            [velocityVar]="velocityVar"
+            [contentType]="contentType"
+            [isParentField]="isParentField"></dot-relationship-tree>
+    `
 })
 class TestHostComponent {
     velocityVar = 'Parent.Children';
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.html
index 26827250d716..1de2c9d339f4 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.html
@@ -15,7 +15,7 @@
 
         <ng-template #imageFallback>
             <div class="dot-theme-item__image--fallback">
-                <span> {{ item.label.charAt(0) }}</span>
+                <span>{{ item.label.charAt(0) }}</span>
             </div>
         </ng-template>
         <span class="dot-theme-item__meta">
@@ -65,5 +65,4 @@
     labelPropertyName="name"
     overlayWidth="490px"
     valuePropertyName="name"
-    width="100%">
-</dot-searchable-dropdown>
+    width="100%"></dot-searchable-dropdown>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.spec.ts
index 50853437ce8f..6576e5dc9555 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-theme-selector-dropdown/dot-theme-selector-dropdown.component.spec.ts
@@ -32,9 +32,11 @@ const messageServiceMock = new MockDotMessageService({
 
 @Component({
     selector: 'dot-site-selector',
-    template: `<select>
-        <option>Fake site selector</option>
-    </select>`
+    template: `
+        <select>
+            <option>Fake site selector</option>
+        </select>
+    `
 })
 class MockDotSiteSelectorComponent {
     @Input() system;
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-login-as/dot-login-as.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-login-as/dot-login-as.component.html
index 31b95036bdf2..539f1cd9119d 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-login-as/dot-login-as.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-login-as/dot-login-as.component.html
@@ -27,8 +27,7 @@
                     placeholder="{{ 'loginas.select.loginas.user' | dm }}"
                     formControlName="loginAsUser"
                     labelPropertyName="fullName"
-                    overlayWidth="300px">
-                </dot-searchable-dropdown>
+                    overlayWidth="300px"></dot-searchable-dropdown>
             </div>
             <div *ngIf="needPassword" class="field">
                 <input
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.html
index 1734a9e49db6..07cab43bdd1f 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.html
@@ -6,9 +6,9 @@
     [isSaving]="isSaving$ | async">
     <form class="my-account p-fluid" #myAccountForm="ngForm">
         <div class="field">
-            <label dotFieldRequired for="dot-my-account-first-name-input">{{
-                'First-Name' | dm
-            }}</label>
+            <label dotFieldRequired for="dot-my-account-first-name-input">
+                {{ 'First-Name' | dm }}
+            </label>
             <input
                 [(ngModel)]="dotAccountUser.givenName"
                 id="dot-my-account-first-name-input"
@@ -22,9 +22,9 @@
         </div>
 
         <div class="field">
-            <label dotFieldRequired for="dot-my-account-first-name-input">{{
-                'Last-Name' | dm
-            }}</label>
+            <label dotFieldRequired for="dot-my-account-first-name-input">
+                {{ 'Last-Name' | dm }}
+            </label>
             <input
                 [(ngModel)]="dotAccountUser.surname"
                 id="dot-my-account-last-name-input"
@@ -38,9 +38,9 @@
         </div>
 
         <div class="field">
-            <label dotFieldRequired for="dot-my-account-email-input">{{
-                'email-address' | dm
-            }}</label>
+            <label dotFieldRequired for="dot-my-account-email-input">
+                {{ 'email-address' | dm }}
+            </label>
             <input
                 [(ngModel)]="dotAccountUser.email"
                 [pattern]="emailRegex"
@@ -67,14 +67,13 @@
                 #showStarterCheckbox
                 data-testid="showStarterBtn"
                 binary="true"
-                label="{{ 'starter.show.getting.started' | dm }}">
-            </p-checkbox>
+                label="{{ 'starter.show.getting.started' | dm }}"></p-checkbox>
         </div>
 
         <div class="field">
-            <label dotFieldRequired for="dot-my-account-current-password-input">{{
-                'current-password' | dm
-            }}</label>
+            <label dotFieldRequired for="dot-my-account-current-password-input">
+                {{ 'current-password' | dm }}
+            </label>
             <input
                 [(ngModel)]="dotAccountUser.currentPassword"
                 [feedback]="false"
@@ -88,17 +87,16 @@
             <small
                 *ngIf="confirmPasswordFailedMsg"
                 class="p-invalid"
-                data-testId="dotCurrrentPasswordFailedMsg"
-                >{{ confirmPasswordFailedMsg }}</small
-            >
+                data-testId="dotCurrrentPasswordFailedMsg">
+                {{ confirmPasswordFailedMsg }}
+            </small>
         </div>
         <div class="field">
             <p-checkbox
                 (onChange)="toggleChangePasswordOption()"
                 id="dot-my-account-change-password-option"
                 binary="true"
-                label="{{ 'change-password' | dm }}">
-            </p-checkbox>
+                label="{{ 'change-password' | dm }}"></p-checkbox>
         </div>
         <div class="field">
             <label for="dot-my-account-new-password-input">{{ 'new-password' | dm }}</label>
@@ -115,14 +113,14 @@
             <small
                 *ngIf="newPasswordFailedMsg"
                 class="p-invalid"
-                data-testId="dotSavePasswordFailedMsg"
-                >{{ newPasswordFailedMsg }}</small
-            >
+                data-testId="dotSavePasswordFailedMsg">
+                {{ newPasswordFailedMsg }}
+            </small>
         </div>
         <div class="field">
-            <label for="dot-my-account-confirm-new-password-input">{{
-                're-enter-new-password' | dm
-            }}</label>
+            <label for="dot-my-account-confirm-new-password-input">
+                {{ 're-enter-new-password' | dm }}
+            </label>
             <input
                 (keyup)="checkPasswords()"
                 [(ngModel)]="passwordConfirm"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.spec.ts
index a699c2867d43..c6e43c73444e 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-my-account/dot-my-account.component.spec.ts
@@ -176,14 +176,16 @@ describe('DotMyAccountComponent', () => {
         const cancel = de.nativeElement.querySelector('.dialog__button-cancel');
         const save = de.nativeElement.querySelector('.dialog__button-accept');
 
-        expect(firstName.innerText).toEqual(messageServiceMock.get('First-Name'));
-        expect(lasttName.innerText).toEqual(messageServiceMock.get('Last-Name'));
-        expect(email.innerText).toEqual(messageServiceMock.get('email-address'));
-        expect(currentPassword.innerText).toEqual(messageServiceMock.get('current-password'));
-        expect(changePassword.innerText).toEqual(messageServiceMock.get('change-password'));
-        expect(newPassword.innerText).toEqual(messageServiceMock.get('new-password'));
-        expect(confirmPassword.innerText).toEqual(messageServiceMock.get('re-enter-new-password'));
-        expect(showStarter.nativeElement.innerText).toEqual(
+        expect(firstName.innerText).toContain(messageServiceMock.get('First-Name'));
+        expect(lasttName.innerText).toContain(messageServiceMock.get('Last-Name'));
+        expect(email.innerText).toContain(messageServiceMock.get('email-address'));
+        expect(currentPassword.innerText).toContain(messageServiceMock.get('current-password'));
+        expect(changePassword.innerText).toContain(messageServiceMock.get('change-password'));
+        expect(newPassword.innerText).toContain(messageServiceMock.get('new-password'));
+        expect(confirmPassword.innerText).toContain(
+            messageServiceMock.get('re-enter-new-password')
+        );
+        expect(showStarter.nativeElement.innerText).toContain(
             messageServiceMock.get('starter.show.getting.started')
         );
         expect(cancel.innerText).toEqual(messageServiceMock.get('modes.Close'));
@@ -431,7 +433,7 @@ describe('DotMyAccountComponent', () => {
             By.css('[data-testId="dotSavePasswordFailedMsg"]')
         );
 
-        expect(passwordFailMsg.nativeElement.innerText).toEqual(
+        expect(passwordFailMsg.nativeElement.innerText.trim()).toEqual(
             errorResponse.error.errors[0].message.trim()
         );
     });
@@ -475,7 +477,7 @@ describe('DotMyAccountComponent', () => {
             By.css('[data-testId="dotCurrrentPasswordFailedMsg"]')
         );
 
-        expect(passwordFailMsg.nativeElement.innerText).toEqual(
+        expect(passwordFailMsg.nativeElement.innerText).toContain(
             errorResponse.error.errors[0].message.trim()
         );
     });
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.html
index 4e9f7c372005..e9cd0898cec9 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.html
@@ -25,9 +25,9 @@ <h5 class="announcements__title">{{ 'announcements' | dm }}</h5>
                         aria-labelledby="announcement-label date-label">
                         <div class="announcements__content">
                             <span class="announcements__label">{{ item.title }}</span>
-                            <span class="announcements__date">{{
-                                item.announcementDateAsISO8601 | date
-                            }}</span>
+                            <span class="announcements__date">
+                                {{ item.announcementDateAsISO8601 | date }}
+                            </span>
                         </div>
                     </a>
                 </li>
@@ -43,9 +43,9 @@ <h5 class="announcements__title">{{ 'announcements' | dm }}</h5>
                     class="announcements__link"
                     target="_blank"
                     data-testId="announcement_link_all"
-                    rel="noopener"
-                    >{{ 'announcements.show.all' | dm }}</a
-                >
+                    rel="noopener">
+                    {{ 'announcements.show.all' | dm }}
+                </a>
             </div>
         </div>
 
@@ -59,9 +59,9 @@ <h5 class="announcements__title">{{ item.title | dm }}</h5>
                         class="announcements__about-link"
                         data-testId="announcements__about-link"
                         target="_blank"
-                        rel="noopener"
-                        >{{ item.label }}</a
-                    >
+                        rel="noopener">
+                        {{ item.label }}
+                    </a>
                 }
             </div>
         }
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/components/dot-notifications/dot-notifications-item.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/components/dot-notifications/dot-notifications-item.component.html
index e4928aa7e916..61036cf30656 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/components/dot-notifications/dot-notifications-item.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/components/dot-notifications/dot-notifications-item.component.html
@@ -8,9 +8,9 @@
                     *ngIf="showLinkAction"
                     [href]="data.notificationData.actions[0].action"
                     class="notification-item__link"
-                    id="{{ 'notification-item-link-action' + data.id }}"
-                    >{{ data.notificationData.actions[0].text }}</a
-                >
+                    id="{{ 'notification-item-link-action' + data.id }}">
+                    {{ data.notificationData.actions[0].text }}
+                </a>
                 <dot-custom-time
                     id="{{ 'notification-item-date-' + data.id }}"
                     time="{{ data.timeSent }}"></dot-custom-time>
@@ -23,7 +23,6 @@
             id="{{ 'notification-item-button-close-' + data.id }}"
             icon="pi pi-times"
             title="{{ 'notifications_dismiss' | dm }}"
-            styleClass="p-button-rounded p-button-text p-button-sm p-button-primary">
-        </p-button>
+            styleClass="p-button-rounded p-button-text p-button-sm p-button-primary"></p-button>
     </div>
 </li>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html
index be7d20f1044f..57d636b8995b 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.html
@@ -3,13 +3,11 @@
         (click)="onActiveAnnouncements($event)"
         [class.dot-toolbar-notifications__button-active]="activeAnnouncements"
         icon="pi pi-megaphone"
-        styleClass="p-button-rounded p-button-text">
-    </p-button>
+        styleClass="p-button-rounded p-button-text"></p-button>
     <span
         *ngIf="showUnreadAnnouncement()"
         class="dot-toolbar__badge"
-        id="dot-toolbar-notifications-badge">
-    </span>
+        id="dot-toolbar-notifications-badge"></span>
 
     <dot-toolbar-announcements
         (hideMenu)="markAnnocumentsAsRead()"
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.html b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.html
index c665765567fe..55514784b667 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.html
@@ -34,8 +34,7 @@
             class="toolbar__site-selector"
             #siteSelector
             cssClass="d-secondary"
-            width="200px">
-        </dot-site-selector>
+            width="200px"></dot-site-selector>
         <dot-toolbar-notifications></dot-toolbar-notifications>
         <dot-toolbar-user></dot-toolbar-user>
     </div>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.html b/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.html
index 316d8abea4be..a9db8263f5c1 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.html
@@ -11,8 +11,7 @@
                 class="p-dropdown-sm"
                 #languageDropdown
                 data-testId="language"
-                formControlName="language">
-            </p-dropdown>
+                formControlName="language"></p-dropdown>
         </div>
 
         <h3 class="login__title" data-testId="header">
@@ -25,9 +24,9 @@ <h3 class="login__title" data-testId="header">
             class="login__message"
             data-testId="message"></p>
         <div class="field form__group--validation">
-            <label dotFieldRequired data-testId="emailLabel" for="inputtext">{{
-                loginInfo.i18nMessagesMap['emailAddressLabel']
-            }}</label>
+            <label dotFieldRequired data-testId="emailLabel" for="inputtext">
+                {{ loginInfo.i18nMessagesMap['emailAddressLabel'] }}
+            </label>
 
             <input
                 id="inputtext"
@@ -45,13 +44,12 @@ <h3 class="login__title" data-testId="header">
                         loginInfo.i18nMessagesMap['emailAddressLabel']
                     )
                 "
-                [field]="loginForm.get('login')">
-            </dot-field-validation-message>
+                [field]="loginForm.get('login')"></dot-field-validation-message>
         </div>
         <div class="field form__group--validation">
-            <label dotFieldRequired data-testId="passwordLabel" for="password">{{
-                loginInfo.i18nMessagesMap['password']
-            }}</label>
+            <label dotFieldRequired data-testId="passwordLabel" for="password">
+                {{ loginInfo.i18nMessagesMap['password'] }}
+            </label>
 
             <input
                 id="password"
@@ -68,8 +66,7 @@ <h3 class="login__title" data-testId="header">
                         loginInfo.i18nMessagesMap['password']
                     )
                 "
-                [field]="loginForm.get('password')">
-            </dot-field-validation-message>
+                [field]="loginForm.get('password')"></dot-field-validation-message>
         </div>
         <div class="login__password-settings field">
             <p-checkbox
@@ -81,9 +78,9 @@ <h3 class="login__title" data-testId="header">
                 *ngIf="!isLoginInProgress"
                 [routerLink]="['/public/forgotPassword']"
                 class="password-settings__forgot-password"
-                data-testId="actionLink"
-                >{{ loginInfo.i18nMessagesMap['get-new-password'] }}</a
-            >
+                data-testId="actionLink">
+                {{ loginInfo.i18nMessagesMap['get-new-password'] }}
+            </a>
         </div>
         <div class="field">
             <dot-loading-indicator></dot-loading-indicator>
@@ -97,22 +94,21 @@ <h3 class="login__title" data-testId="header">
                 data-testId="submitButton"></button>
         </div>
         <div class="login__footer">
-            <span data-testId="server"
-                >{{ loginInfo.i18nMessagesMap['Server'] }}: {{ loginInfo.entity.serverId }}</span
-            >
+            <span data-testId="server">
+                {{ loginInfo.i18nMessagesMap['Server'] }}: {{ loginInfo.entity.serverId }}
+            </span>
             |
-            <span data-testId="version"
-                >{{ loginInfo.entity.levelName }}: {{ loginInfo.entity.version }} -
-                {{ loginInfo.entity.buildDateString }}</span
-            >
+            <span data-testId="version">
+                {{ loginInfo.entity.levelName }}: {{ loginInfo.entity.version }} -
+                {{ loginInfo.entity.buildDateString }}
+            </span>
             <span
                 *ngIf="loginInfo.entity.levelName.indexOf('COMMUNITY') !== -1"
                 [innerHTML]="
                     ' - ' +
                     loginInfo.i18nMessagesMap['angular.login.component.community.licence.message']
                 "
-                data-testId="license">
-            </span>
+                data-testId="license"></span>
         </div>
     </form>
 </div>
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.spec.ts
index f88d106e5ac8..360a85e23813 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.spec.ts
@@ -132,14 +132,14 @@ describe('DotLoginComponent', () => {
             const versionInformation: DebugElement = de.query(By.css('[data-testId="version"]'));
             const licenseInformation: DebugElement = de.query(By.css('[data-testId="license"]'));
 
-            expect(header.nativeElement.innerHTML).toContain('Welcome!');
-            expect(emailLabel.nativeElement.innerHTML).toEqual('Email Address');
-            expect(passwordLabel.nativeElement.innerHTML).toEqual('Password');
+            expect(header.nativeElement.innerHTML.trim()).toContain('Welcome!');
+            expect(emailLabel.nativeElement.innerHTML.trim()).toEqual('Email Address');
+            expect(passwordLabel.nativeElement.innerHTML.trim()).toEqual('Password');
             expect(recoverPasswordLink.nativeElement.innerHTML.trim()).toEqual('Recover Password');
-            expect(rememberMe.nativeElement.innerHTML).toEqual('Remember Me');
-            expect(submitButton.nativeElement.innerHTML).toContain('Sign In');
-            expect(serverInformation.nativeElement.innerHTML).toEqual('Server: 860173b0');
-            expect(versionInformation.nativeElement.innerHTML).toEqual(
+            expect(rememberMe.nativeElement.innerHTML.trim()).toEqual('Remember Me');
+            expect(submitButton.nativeElement.innerHTML.trim()).toContain('Sign In');
+            expect(serverInformation.nativeElement.innerHTML.trim()).toEqual('Server: 860173b0');
+            expect(versionInformation.nativeElement.innerHTML.trim()).toEqual(
                 'COMMUNITY EDITION: 5.0.0 - March 13, 2019'
             );
             expect(licenseInformation.nativeElement.innerHTML).toEqual(
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.html b/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.html
index 124ceb85bdc5..0af25ef26c57 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.html
@@ -3,9 +3,9 @@ <h3 data-testId="header">{{ loginInfo.i18nMessagesMap['forgot-password'] }}</h3>
     <p [innerHTML]="message" class="p-invalid" data-testId="errorMessage"></p>
     <form [formGroup]="forgotPasswordForm" class="p-fluid">
         <div class="field form__group--validation">
-            <label dotFieldRequired data-testId="usernameLabel" for="username">{{
-                loginInfo.i18nMessagesMap['emailAddressLabel']
-            }}</label>
+            <label dotFieldRequired data-testId="usernameLabel" for="username">
+                {{ loginInfo.i18nMessagesMap['emailAddressLabel'] }}
+            </label>
             <input
                 id="username"
                 pInputText
@@ -21,8 +21,7 @@ <h3 data-testId="header">{{ loginInfo.i18nMessagesMap['forgot-password'] }}</h3>
                         loginInfo.i18nMessagesMap['emailAddressLabel']
                     )
                 "
-                [field]="forgotPasswordForm.get('login')">
-            </dot-field-validation-message>
+                [field]="forgotPasswordForm.get('login')"></dot-field-validation-message>
         </div>
         <div class="field">
             <button
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.spec.ts
index 7ad26d83f16d..bbed5ddcd31c 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/components/login/forgot-password-component/forgot-password.component.spec.ts
@@ -69,7 +69,7 @@ describe('ForgotPasswordComponent', () => {
         const submitButton: DebugElement = de.query(By.css('[data-testId="submitButton"]'));
 
         expect(header.nativeElement.innerHTML).toEqual('Forgot Password');
-        expect(inputLabel.nativeElement.innerHTML).toEqual('Email Address');
+        expect(inputLabel.nativeElement.innerHTML).toContain('Email Address');
         expect(cancelButton.nativeElement.innerHTML).toContain('Cancel');
         expect(submitButton.nativeElement.innerHTML).toContain('Recover Password');
     });
diff --git a/core-web/apps/dotcms-ui/src/app/view/components/login/reset-password-component/reset-password.component.html b/core-web/apps/dotcms-ui/src/app/view/components/login/reset-password-component/reset-password.component.html
index 0b25e0bf70b3..8f70ba437ba5 100644
--- a/core-web/apps/dotcms-ui/src/app/view/components/login/reset-password-component/reset-password.component.html
+++ b/core-web/apps/dotcms-ui/src/app/view/components/login/reset-password-component/reset-password.component.html
@@ -3,9 +3,9 @@ <h3 data-testId="header">{{ loginInfo.i18nMessagesMap['reset-password'] }}</h3>
     <p [innerHTML]="message" class="error-message p-invalid" data-testid="errorMessage"></p>
     <form [formGroup]="resetPasswordForm" class="p-fluid">
         <div class="field form__group--validation">
-            <label dotFieldRequired for="password" data-testId="enterLabel">{{
-                loginInfo.i18nMessagesMap['enter-password']
-            }}</label>
+            <label dotFieldRequired for="password" data-testId="enterLabel">
+                {{ loginInfo.i18nMessagesMap['enter-password'] }}
+            </label>
             <input
                 id="password"
                 autocomplete="new-password"
@@ -20,13 +20,12 @@ <h3 data-testId="header">{{ loginInfo.i18nMessagesMap['reset-password'] }}</h3>
                         '{0}',
                         loginInfo.i18nMessagesMap['enter-password']
                     )
-                ">
-            </dot-field-validation-message>
+                "></dot-field-validation-message>
         </div>
         <div class="field form__group--validation">
-            <label dotFieldRequired for="confirmPassword" data-testId="confirmLabel">{{
-                loginInfo.i18nMessagesMap['re-enter-password']
-            }}</label>
+            <label dotFieldRequired for="confirmPassword" data-testId="confirmLabel">
+                {{ loginInfo.i18nMessagesMap['re-enter-password'] }}
+            </label>
             <input
                 (keypress)="cleanMessage()"
                 id="confirmPassword"
@@ -41,8 +40,7 @@ <h3 data-testId="header">{{ loginInfo.i18nMessagesMap['reset-password'] }}</h3>
                         '{0}',
                         loginInfo.i18nMessagesMap['re-enter-password']
                     )
-                ">
-            </dot-field-validation-message>
+                "></dot-field-validation-message>
         </div>
         <div class="field">
             <button
diff --git a/core-web/apps/dotcms-ui/src/app/view/directives/dot-gravatar/dot-gravatar.directive.spec.ts b/core-web/apps/dotcms-ui/src/app/view/directives/dot-gravatar/dot-gravatar.directive.spec.ts
index 2156f77c72b5..0f660c3625d8 100644
--- a/core-web/apps/dotcms-ui/src/app/view/directives/dot-gravatar/dot-gravatar.directive.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/directives/dot-gravatar/dot-gravatar.directive.spec.ts
@@ -11,7 +11,9 @@ import { DotGravatarService } from '@dotcms/app/api/services/dot-gravatar-servic
 import { DotGravatarDirective } from './dot-gravatar.directive';
 
 @Component({
-    template: `<p-avatar [email]="email" dotGravatar></p-avatar> `
+    template: `
+        <p-avatar [email]="email" dotGravatar></p-avatar>
+    `
 })
 class TestHostComponent {
     //Some dummy email from this post https://stackoverflow.com/questions/41786225/what-is-a-good-gravatar-example-email
diff --git a/core-web/apps/dotcms-ui/src/app/view/directives/dot-maxlength/dot-maxlength.directive.spec.ts b/core-web/apps/dotcms-ui/src/app/view/directives/dot-maxlength/dot-maxlength.directive.spec.ts
index 0716aa34f1eb..7a87f8a74f4c 100644
--- a/core-web/apps/dotcms-ui/src/app/view/directives/dot-maxlength/dot-maxlength.directive.spec.ts
+++ b/core-web/apps/dotcms-ui/src/app/view/directives/dot-maxlength/dot-maxlength.directive.spec.ts
@@ -5,7 +5,9 @@ import { By } from '@angular/platform-browser';
 import { DotMaxlengthDirective } from './dot-maxlength.directive';
 
 @Component({
-    template: `<div contenteditable="true" dotMaxlength="10"></div>`
+    template: `
+        <div contenteditable="true" dotMaxlength="10"></div>
+    `
 })
 class TestComponent {}
 
diff --git a/core-web/apps/dotcms-ui/src/stories/primeng/misc/Ripple.component.ts b/core-web/apps/dotcms-ui/src/stories/primeng/misc/Ripple.component.ts
index 836f468e9478..f31b6fffcaaa 100644
--- a/core-web/apps/dotcms-ui/src/stories/primeng/misc/Ripple.component.ts
+++ b/core-web/apps/dotcms-ui/src/stories/primeng/misc/Ripple.component.ts
@@ -4,12 +4,9 @@ import { PrimeNGConfig } from 'primeng/api';
 
 @Component({
     selector: 'dot-p-button-ripple',
-    template: `<button
-        class="p-button-success"
-        type="button"
-        pButton
-        pRipple
-        label="Success"></button>`
+    template: `
+        <button class="p-button-success" type="button" pButton pRipple label="Success"></button>
+    `
 })
 export class RippleComponent implements OnInit {
     constructor(private primengConfig: PrimeNGConfig) {}
diff --git a/core-web/apps/dotcms-ui/src/stories/primeng/overlay/DynamicDialogButton.component.ts b/core-web/apps/dotcms-ui/src/stories/primeng/overlay/DynamicDialogButton.component.ts
index 717ea6480c2d..1b99bcd6db4c 100644
--- a/core-web/apps/dotcms-ui/src/stories/primeng/overlay/DynamicDialogButton.component.ts
+++ b/core-web/apps/dotcms-ui/src/stories/primeng/overlay/DynamicDialogButton.component.ts
@@ -9,12 +9,14 @@ import { Product } from './Product.interface';
 @Component({
     selector: 'dot-p-dialog-button',
     providers: [DialogService, MessageService],
-    template: `<button
-        (click)="show()"
-        type="button"
-        pButton
-        icon="pi pi-info-circle"
-        label="Show"></button>`
+    template: `
+        <button
+            (click)="show()"
+            type="button"
+            pButton
+            icon="pi pi-info-circle"
+            label="Show"></button>
+    `
 })
 export class DynamicDialogButtonComponent implements OnDestroy {
     constructor(
diff --git a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.html b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.html
index 7a0629a676f7..2a0a996889f6 100644
--- a/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/ai-content-prompt/ai-content-prompt.component.html
@@ -29,8 +29,7 @@
                         class="ai-content__generated-text"
                         #generatedText
                         formControlName="generatedText"
-                        pInputTextarea>
-                    </textarea>
+                        pInputTextarea></textarea>
 
                     <dot-copy-button
                         *ngIf="generatedText.value"
@@ -125,7 +124,6 @@
             acceptIcon="null"
             key="ai-image-prompt"
             rejectButtonStyleClass="p-button-outlined"
-            rejectIcon="null">
-        </p-confirmDialog>
+            rejectIcon="null"></p-confirmDialog>
     </p-dialog>
 }
diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-form/bubble-form.component.html b/core-web/libs/block-editor/src/lib/extensions/bubble-form/bubble-form.component.html
index c8d9b380bc56..2af9b8dae17c 100644
--- a/core-web/libs/block-editor/src/lib/extensions/bubble-form/bubble-form.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/bubble-form/bubble-form.component.html
@@ -6,19 +6,16 @@
                     [formControlName]="control.key"
                     [binary]="true"
                     [id]="control.key"></p-checkbox>
-                <label
-                    [checkIsRequiredControl]="control.key"
-                    [for]="control.key"
-                    dotFieldRequired
-                    >{{ control.label | titlecase }}</label
-                >
+                <label [checkIsRequiredControl]="control.key" [for]="control.key" dotFieldRequired>
+                    {{ control.label | titlecase }}
+                </label>
             </ng-container>
             <ng-container *ngSwitchDefault>
                 <label
                     [ngClass]="{ 'p-label-input-required': control.required }"
-                    [for]="control.key"
-                    >{{ control.label | titlecase }}</label
-                >
+                    [for]="control.key">
+                    {{ control.label | titlecase }}
+                </label>
                 <input
                     *ngSwitchDefault
                     [formControlName]="control.key"
@@ -33,9 +30,9 @@
         </ng-container>
         <span
             *ngIf="form.controls[control.key].invalid && form.controls[control.key].dirty"
-            class="error-message"
-            >This field is required</span
-        >
+            class="error-message">
+            This field is required
+        </span>
     </div>
 
     <div class="form-action">
diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/bubble-link-form.component.html b/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/bubble-link-form.component.html
index 10beb804c702..49c5c886d0f9 100644
--- a/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/bubble-link-form.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/bubble-link-form.component.html
@@ -51,14 +51,12 @@
         [items]="items"
         [loading]="loading"
         [title]="noResultsTitle"
-        #suggestions>
-    </dot-suggestion-page>
+        #suggestions></dot-suggestion-page>
 
     <!-- Form Actions -->
     <dot-form-actions
         *ngIf="!showSuggestions && currentLink"
         (hide)="hide.emit($event)"
         (remove)="removeLink.emit($event)"
-        [link]="currentLink">
-    </dot-form-actions>
+        [link]="currentLink"></dot-form-actions>
 </div>
diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/components/suggestion-page/suggestion-page.component.html b/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/components/suggestion-page/suggestion-page.component.html
index f06ed588e973..2163b10fe9f5 100644
--- a/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/components/suggestion-page/suggestion-page.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/bubble-link-form/components/suggestion-page/suggestion-page.component.html
@@ -7,8 +7,7 @@
             [label]="item.label"
             [url]="item.icon"
             [data]="item.data"
-            [page]="true">
-        </dot-suggestions-list-item>
+            [page]="true"></dot-suggestions-list-item>
     </dot-suggestion-list>
 </div>
 
@@ -17,6 +16,8 @@
 </ng-template>
 
 <ng-template #emptyBlock>
-    <dot-empty-message (back)="handleBackButton()" [title]="title" [showBackBtn]="true">
-    </dot-empty-message>
+    <dot-empty-message
+        (back)="handleBackButton()"
+        [title]="title"
+        [showBackBtn]="true"></dot-empty-message>
 </ng-template>
diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-menu/bubble-menu.component.html b/core-web/libs/block-editor/src/lib/extensions/bubble-menu/bubble-menu.component.html
index 43ca5c54f281..51ef85905c01 100644
--- a/core-web/libs/block-editor/src/lib/extensions/bubble-menu/bubble-menu.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/bubble-menu/bubble-menu.component.html
@@ -4,8 +4,10 @@
         <div class="divider"></div>
     </ng-container>
     <ng-container *ngFor="let item of items; let i = index">
-        <dot-bubble-menu-button (click)="command.emit(item)" [active]="item.active" [item]="item">
-        </dot-bubble-menu-button>
+        <dot-bubble-menu-button
+            (click)="command.emit(item)"
+            [active]="item.active"
+            [item]="item"></dot-bubble-menu-button>
         <div *ngIf="item.divider" class="divider"></div>
     </ng-container>
 </div>
diff --git a/core-web/libs/block-editor/src/lib/extensions/floating-button/floating-button.component.html b/core-web/libs/block-editor/src/lib/extensions/floating-button/floating-button.component.html
index 8460d8ad2922..5f70099613a3 100644
--- a/core-web/libs/block-editor/src/lib/extensions/floating-button/floating-button.component.html
+++ b/core-web/libs/block-editor/src/lib/extensions/floating-button/floating-button.component.html
@@ -12,9 +12,9 @@
 <ng-template #error>
     <div class="alert">
         <i class="pi pi-exclamation-circle"></i>
-        <span
-            >Something went wrong, please try again later or
-            <a href="https://www.dotcms.com/contact-us/"> contact support </a>
+        <span>
+            Something went wrong, please try again later or
+            <a href="https://www.dotcms.com/contact-us/">contact support</a>
         </span>
     </div>
 </ng-template>
diff --git a/core-web/libs/block-editor/src/lib/nodes/contentlet-block/contentlet-block.component.html b/core-web/libs/block-editor/src/lib/nodes/contentlet-block/contentlet-block.component.html
index 76708eb49867..08bdfa981c80 100644
--- a/core-web/libs/block-editor/src/lib/nodes/contentlet-block/contentlet-block.component.html
+++ b/core-web/libs/block-editor/src/lib/nodes/contentlet-block/contentlet-block.component.html
@@ -5,8 +5,7 @@
                 [width]="94"
                 [height]="94"
                 [iconSize]="'72px'"
-                [contentlet]="data">
-            </dot-contentlet-thumbnail>
+                [contentlet]="data"></dot-contentlet-thumbnail>
         </ng-template>
 
         <h3 *pTemplate="'title'" class="title">{{ data.title }}</h3>
@@ -14,7 +13,7 @@ <h3 *pTemplate="'title'" class="title">{{ data.title }}</h3>
 
         <ng-template pTemplate="footer">
             <div class="state">
-                <dot-state-icon [state]="data | contentletState" size="16px"> </dot-state-icon>
+                <dot-state-icon [state]="data | contentletState" size="16px"></dot-state-icon>
                 @if (data.language) {
                     <dot-badge [bordered]="true">{{ data.language | lowercase }}</dot-badge>
                 }
diff --git a/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.html b/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.html
index 2f1522e98fc8..e20ca9b99b5d 100644
--- a/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.html
+++ b/core-web/libs/block-editor/src/lib/shared/components/suggestions/suggestions.component.html
@@ -9,8 +9,7 @@ <h3 *ngIf="!!title">{{ title }}</h3>
                 [label]="item.label"
                 [url]="item.icon"
                 [data]="item.data"
-                [disabled]="item.disabled">
-            </dot-suggestions-list-item>
+                [disabled]="item.disabled"></dot-suggestions-list-item>
             <ng-template #divider>
                 <div class="divider"></div>
             </ng-template>
@@ -22,6 +21,5 @@ <h3 *ngIf="!!title">{{ title }}</h3>
     <dot-empty-message
         (back)="handleBackButton()"
         [title]="noResultsMessage"
-        [showBackBtn]="!isFilterActive">
-    </dot-empty-message>
+        [showBackBtn]="!isFilterActive"></dot-empty-message>
 </ng-template>
diff --git a/core-web/libs/block-editor/src/lib/shared/directives/draggable/draggable.directive.spec.ts b/core-web/libs/block-editor/src/lib/shared/directives/draggable/draggable.directive.spec.ts
index 1ce0c580d7ee..63f576a64fdb 100644
--- a/core-web/libs/block-editor/src/lib/shared/directives/draggable/draggable.directive.spec.ts
+++ b/core-web/libs/block-editor/src/lib/shared/directives/draggable/draggable.directive.spec.ts
@@ -5,7 +5,9 @@ import { By } from '@angular/platform-browser';
 import { DraggableDirective } from './draggable.directive';
 
 @Component({
-    template: `<div tiptapDraggable>Hello Tiptap!</div>`
+    template: `
+        <div tiptapDraggable>Hello Tiptap!</div>
+    `
 })
 class TestComponent {}
 
diff --git a/core-web/libs/block-editor/src/lib/shared/directives/node-view-content/node-view-content.directive.spec.ts b/core-web/libs/block-editor/src/lib/shared/directives/node-view-content/node-view-content.directive.spec.ts
index 30c2b3725ee7..a3298e1119d8 100644
--- a/core-web/libs/block-editor/src/lib/shared/directives/node-view-content/node-view-content.directive.spec.ts
+++ b/core-web/libs/block-editor/src/lib/shared/directives/node-view-content/node-view-content.directive.spec.ts
@@ -5,7 +5,9 @@ import { By } from '@angular/platform-browser';
 import { NodeViewContentDirective } from './node-view-content.directive';
 
 @Component({
-    template: `<div tiptapNodeViewContent>Hello Tiptap!</div>`
+    template: `
+        <div tiptapNodeViewContent>Hello Tiptap!</div>
+    `
 })
 class TestComponent {}
 
diff --git a/core-web/libs/data-access/src/lib/dot-http-error-manager/dot-http-error-manager.service.ts b/core-web/libs/data-access/src/lib/dot-http-error-manager/dot-http-error-manager.service.ts
index 23f9e5c866da..d63bd46c136f 100644
--- a/core-web/libs/data-access/src/lib/dot-http-error-manager/dot-http-error-manager.service.ts
+++ b/core-web/libs/data-access/src/lib/dot-http-error-manager/dot-http-error-manager.service.ts
@@ -78,7 +78,7 @@ export class DotHttpErrorManagerService {
             ? this.isLicenseError(response)
                 ? this.handleLicense()
                 : this.handleForbidden()
-            : this.errorHandlers?.[code as HttpCode](response) ?? false;
+            : (this.errorHandlers?.[code as HttpCode](response) ?? false);
     }
 
     private contentletIsForbidden(error: string): boolean {
diff --git a/core-web/libs/dot-rules/src/lib/components/dot-autocomplete-tags/dot-autocomplete-tags.component.html b/core-web/libs/dot-rules/src/lib/components/dot-autocomplete-tags/dot-autocomplete-tags.component.html
index 6c660a266007..6d4cd60eea5d 100644
--- a/core-web/libs/dot-rules/src/lib/components/dot-autocomplete-tags/dot-autocomplete-tags.component.html
+++ b/core-web/libs/dot-rules/src/lib/components/dot-autocomplete-tags/dot-autocomplete-tags.component.html
@@ -11,6 +11,6 @@
     [inputId]="inputId"
     field="label">
     <ng-template let-value pTemplate="selectedItem">
-        <span style="margin-right: 20px"> {{ value }} </span>
+        <span style="margin-right: 20px">{{ value }}</span>
     </ng-template>
 </p-autoComplete>
diff --git a/core-web/libs/dot-rules/src/lib/components/dot-unlicense/dot-unlicense.component.html b/core-web/libs/dot-rules/src/lib/components/dot-unlicense/dot-unlicense.component.html
index 1700cbdcef99..d945a7bed312 100644
--- a/core-web/libs/dot-rules/src/lib/components/dot-unlicense/dot-unlicense.component.html
+++ b/core-web/libs/dot-rules/src/lib/components/dot-unlicense/dot-unlicense.component.html
@@ -7,9 +7,9 @@ <h4>
         <p>{{ rulesTitle }} {{ onlyEnterpriseLabel }}</p>
         <ul>
             <li>
-                <a target="_blank" href="https://dotcms.com/product/features/feature-list">{{
-                    learnMoreEnterpriseLabel
-                }}</a>
+                <a target="_blank" href="https://dotcms.com/product/features/feature-list">
+                    {{ learnMoreEnterpriseLabel }}
+                </a>
             </li>
             <li>
                 <a target="_blank" href="https://dotcms.com/contact-us/">{{ contactUsLabel }}</a>
@@ -19,9 +19,9 @@ <h4>
             <a
                 pButton
                 href="https://dotcms.com/licensing/request-a-license-3/index"
-                target="_blank"
-                >{{ requestTrialLabel }}</a
-            >
+                target="_blank">
+                {{ requestTrialLabel }}
+            </a>
         </p>
     </div>
 </div>
diff --git a/core-web/libs/dot-rules/src/lib/components/dropdown/dropdown.ts b/core-web/libs/dot-rules/src/lib/components/dropdown/dropdown.ts
index b4bdd6c3f504..39225de2a5ae 100644
--- a/core-web/libs/dot-rules/src/lib/components/dropdown/dropdown.ts
+++ b/core-web/libs/dot-rules/src/lib/components/dropdown/dropdown.ts
@@ -38,16 +38,14 @@ import { map, mergeMap, toArray } from 'rxjs/operators';
             #inputDropdown
             ng-valid
             class="ui fluid ng-valid"
-            appendTo="body">
-        </p-dropdown>
+            appendTo="body"></p-dropdown>
         <dot-autocomplete-tags
             *ngIf="maxSelections > 1"
             (onChange)="fireChange($event)"
             [inputId]="name"
             [value]="modelValue"
             [options]="dropdownOptions | async"
-            [placeholder]="placeholder">
-        </dot-autocomplete-tags>
+            [placeholder]="placeholder"></dot-autocomplete-tags>
     `
 })
 export class Dropdown implements ControlValueAccessor, OnChanges {
diff --git a/core-web/libs/dot-rules/src/lib/components/input-date/input-date.ts b/core-web/libs/dot-rules/src/lib/components/input-date/input-date.ts
index c0d718e65702..0258df9e9982 100644
--- a/core-web/libs/dot-rules/src/lib/components/input-date/input-date.ts
+++ b/core-web/libs/dot-rules/src/lib/components/input-date/input-date.ts
@@ -16,16 +16,18 @@ import { NgControl, ControlValueAccessor } from '@angular/forms';
     changeDetection: ChangeDetectionStrategy.OnPush,
     // host: { role: 'text' },
     selector: 'cw-input-date',
-    template: `<p-calendar
-        (onBlur)="onBlur($event)"
-        (onSelect)="updateValue($event)"
-        [(ngModel)]="modelValue"
-        [showTime]="true"
-        [placeholder]="placeholder"
-        [disabled]="disabled"
-        [tabindex]="tabIndex || ''"
-        hourFormat="12"
-        showButtonBar="true"></p-calendar>`
+    template: `
+        <p-calendar
+            (onBlur)="onBlur($event)"
+            (onSelect)="updateValue($event)"
+            [(ngModel)]="modelValue"
+            [showTime]="true"
+            [placeholder]="placeholder"
+            [disabled]="disabled"
+            [tabindex]="tabIndex || ''"
+            hourFormat="12"
+            showButtonBar="true"></p-calendar>
+    `
 })
 export class InputDate implements ControlValueAccessor {
     private static DEFAULT_VALUE: Date;
diff --git a/core-web/libs/dot-rules/src/lib/components/restdropdown/RestDropdown.ts b/core-web/libs/dot-rules/src/lib/components/restdropdown/RestDropdown.ts
index 36bb199feb9e..329a79e74fb6 100644
--- a/core-web/libs/dot-rules/src/lib/components/restdropdown/RestDropdown.ts
+++ b/core-web/libs/dot-rules/src/lib/components/restdropdown/RestDropdown.ts
@@ -23,8 +23,7 @@ import { Verify } from '../../services/validation/Verify';
             [minSelections]="minSelections"
             [allowAdditions]="allowAdditions"
             [options]="options | async"
-            placeholder="{{ placeholder }}">
-        </cw-input-dropdown>
+            placeholder="{{ placeholder }}"></cw-input-dropdown>
     `
 })
 export class RestDropdown implements AfterViewInit, OnChanges, ControlValueAccessor {
diff --git a/core-web/libs/dot-rules/src/lib/condition-types/serverside-condition/serverside-condition.ts b/core-web/libs/dot-rules/src/lib/condition-types/serverside-condition/serverside-condition.ts
index 677487522e32..38b92f9d2847 100644
--- a/core-web/libs/dot-rules/src/lib/condition-types/serverside-condition/serverside-condition.ts
+++ b/core-web/libs/dot-rules/src/lib/condition-types/serverside-condition/serverside-condition.ts
@@ -17,108 +17,108 @@ import { Verify } from '../../services/validation/Verify';
 @Component({
     changeDetection: ChangeDetectionStrategy.OnPush,
     selector: 'cw-serverside-condition',
-    template: `<form>
-        <div flex layout="row" class="cw-condition-component-body">
-            <ng-template [ngForOf]="_inputs" ngFor let-input>
-                <div *ngIf="input.type === 'spacer'" flex class="cw-input cw-input-placeholder">
-                    &nbsp;
-                </div>
-                <cw-input-dropdown
-                    *ngIf="input.type === 'dropdown'"
-                    (touch)="onBlur(input)"
-                    [allowAdditions]="input.allowAdditions"
-                    [class.cw-comparator-selector]="input.name === 'comparison'"
-                    [class.cw-last]="islast"
-                    [formControl]="input.control"
-                    [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
-                    [required]="input.required"
-                    [value]="input.value"
-                    [placeholder]="input.placeholder | async"
-                    [options]="input.options"
-                    flex
-                    class="cw-input">
-                </cw-input-dropdown>
-
-                <div
-                    *ngIf="input.type === 'restDropdown'"
-                    [class.cw-last]="islast"
-                    flex
-                    layout-fill
-                    layout="column"
-                    class="cw-input">
-                    <cw-input-rest-dropdown
+    template: `
+        <form>
+            <div flex layout="row" class="cw-condition-component-body">
+                <ng-template [ngForOf]="_inputs" ngFor let-input>
+                    <div *ngIf="input.type === 'spacer'" flex class="cw-input cw-input-placeholder">
+                        &nbsp;
+                    </div>
+                    <cw-input-dropdown
+                        *ngIf="input.type === 'dropdown'"
                         (touch)="onBlur(input)"
-                        [value]="input.value"
+                        [allowAdditions]="input.allowAdditions"
+                        [class.cw-comparator-selector]="input.name === 'comparison'"
+                        [class.cw-last]="islast"
                         [formControl]="input.control"
                         [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
-                        [minSelections]="input.minSelections"
-                        [maxSelections]="input.maxSelections"
                         [required]="input.required"
-                        [allowAdditions]="input.allowAdditions"
-                        [class.cw-comparator-selector]="input.name === 'comparison'"
+                        [value]="input.value"
+                        [placeholder]="input.placeholder | async"
+                        [options]="input.options"
+                        flex
+                        class="cw-input"></cw-input-dropdown>
+
+                    <div
+                        *ngIf="input.type === 'restDropdown'"
                         [class.cw-last]="islast"
                         flex
-                        class="cw-input"
-                        placeholder="{{ input.placeholder | async }}"
-                        optionUrl="{{ input.optionUrl }}"
-                        optionValueField="{{ input.optionValueField }}"
-                        optionLabelField="{{ input.optionLabelField }}"
-                        #rdInput="ngForm">
-                    </cw-input-rest-dropdown>
+                        layout-fill
+                        layout="column"
+                        class="cw-input">
+                        <cw-input-rest-dropdown
+                            (touch)="onBlur(input)"
+                            [value]="input.value"
+                            [formControl]="input.control"
+                            [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
+                            [minSelections]="input.minSelections"
+                            [maxSelections]="input.maxSelections"
+                            [required]="input.required"
+                            [allowAdditions]="input.allowAdditions"
+                            [class.cw-comparator-selector]="input.name === 'comparison'"
+                            [class.cw-last]="islast"
+                            flex
+                            class="cw-input"
+                            placeholder="{{ input.placeholder | async }}"
+                            optionUrl="{{ input.optionUrl }}"
+                            optionValueField="{{ input.optionValueField }}"
+                            optionLabelField="{{ input.optionLabelField }}"
+                            #rdInput="ngForm"></cw-input-rest-dropdown>
+                        <div
+                            *ngIf="
+                                rdInput.touched &&
+                                !rdInput.valid &&
+                                (input.argIndex == null || input.argIndex < _rhArgCount)
+                            "
+                            flex="50"
+                            class="name cw-warn basic label">
+                            {{ getErrorMessage(input) }}
+                        </div>
+                    </div>
+
                     <div
-                        *ngIf="
-                            rdInput.touched &&
-                            !rdInput.valid &&
-                            (input.argIndex == null || input.argIndex < _rhArgCount)
-                        "
-                        flex="50"
-                        class="name cw-warn basic label">
-                        {{ getErrorMessage(input) }}
+                        *ngIf="input.type === 'text' || input.type === 'number'"
+                        [class.cw-last]="islast"
+                        flex
+                        layout-fill
+                        layout="column"
+                        class="cw-input">
+                        <input
+                            (blur)="onBlur(input)"
+                            [placeholder]="input.placeholder | async"
+                            [formControl]="input.control"
+                            [type]="input.type"
+                            [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
+                            pInputText
+                            #fInput="ngForm" />
+                        <div
+                            *ngIf="
+                                fInput.touched &&
+                                !fInput.valid &&
+                                (input.argIndex == null || input.argIndex < _rhArgCount)
+                            "
+                            flex="50"
+                            class="name cw-warn basic label">
+                            {{ getErrorMessage(input) }}
+                        </div>
                     </div>
-                </div>
-
-                <div
-                    *ngIf="input.type === 'text' || input.type === 'number'"
-                    [class.cw-last]="islast"
-                    flex
-                    layout-fill
-                    layout="column"
-                    class="cw-input">
-                    <input
+
+                    <cw-input-date
+                        *ngIf="input.type === 'datetime'"
                         (blur)="onBlur(input)"
-                        [placeholder]="input.placeholder | async"
                         [formControl]="input.control"
-                        [type]="input.type"
+                        [class.cw-last]="islast"
+                        [placeholder]="input.placeholder | async"
                         [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
-                        pInputText
-                        #fInput="ngForm" />
-                    <div
-                        *ngIf="
-                            fInput.touched &&
-                            !fInput.valid &&
-                            (input.argIndex == null || input.argIndex < _rhArgCount)
-                        "
-                        flex="50"
-                        class="name cw-warn basic label">
-                        {{ getErrorMessage(input) }}
-                    </div>
-                </div>
-
-                <cw-input-date
-                    *ngIf="input.type === 'datetime'"
-                    (blur)="onBlur(input)"
-                    [formControl]="input.control"
-                    [class.cw-last]="islast"
-                    [placeholder]="input.placeholder | async"
-                    [hidden]="input.argIndex !== null && input.argIndex >= _rhArgCount"
-                    [value]="input.value"
-                    flex
-                    layout-fill
-                    class="cw-input"
-                    #gInput="ngForm"></cw-input-date>
-            </ng-template>
-        </div>
-    </form>`
+                        [value]="input.value"
+                        flex
+                        layout-fill
+                        class="cw-input"
+                        #gInput="ngForm"></cw-input-date>
+                </ng-template>
+            </div>
+        </form>
+    `
 })
 export class ServersideCondition {
     @Input() componentInstance: ServerSideFieldModel;
diff --git a/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.component.ts b/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.component.ts
index f618be0d3795..02beaf8f2978 100644
--- a/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.component.ts
+++ b/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.component.ts
@@ -28,7 +28,8 @@ const UNITS = {
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [DecimalPipe],
     selector: 'cw-visitors-location-component',
-    template: `<div
+    template: `
+        <div
             *ngIf="comparisonDropdown != null"
             flex
             layout="row"
@@ -41,8 +42,7 @@ const UNITS = {
                 [class.cw-comparator-selector]="true"
                 flex
                 class="cw-input"
-                placeholder="{{ comparisonDropdown.placeholder }}">
-            </cw-input-dropdown>
+                placeholder="{{ comparisonDropdown.placeholder }}"></cw-input-dropdown>
             <div flex layout-fill layout="row" layout-align="start center" class="cw-input">
                 <input
                     [value]="getRadiusInPreferredUnit() | number: '1.0-0'"
@@ -70,7 +70,8 @@ const UNITS = {
             (cancel)="showingMap = !showingMap"
             [headerText]="'Select an area'"
             [hidden]="!showingMap"
-            [circle]="circle"></cw-area-picker-dialog-component> `
+            [circle]="circle"></cw-area-picker-dialog-component>
+    `
 })
 export class VisitorsLocationComponent {
     @Input() circle: GCircle = { center: { lat: 38.89, lng: -77.04 }, radius: 10000 };
diff --git a/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.container.ts b/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.container.ts
index d935d03a20e6..cab247d46904 100644
--- a/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.container.ts
+++ b/core-web/libs/dot-rules/src/lib/custom-types/visitors-location/visitors-location.container.ts
@@ -29,15 +29,17 @@ const I8N_BASE = 'api.sites.ruleengine';
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [DecimalPipe],
     selector: 'cw-visitors-location-container',
-    template: `<cw-visitors-location-component
-        (comparisonChange)="onComparisonChange($event)"
-        (areaChange)="onUpdate($event)"
-        [circle]="circle$ | async"
-        [preferredUnit]="preferredUnit"
-        [comparisonValue]="comparisonValue"
-        [comparisonControl]="comparisonControl"
-        [comparisonOptions]="comparisonOptions"
-        [fromLabel]="fromLabel"></cw-visitors-location-component> `
+    template: `
+        <cw-visitors-location-component
+            (comparisonChange)="onComparisonChange($event)"
+            (areaChange)="onUpdate($event)"
+            [circle]="circle$ | async"
+            [preferredUnit]="preferredUnit"
+            [comparisonValue]="comparisonValue"
+            [comparisonControl]="comparisonControl"
+            [comparisonOptions]="comparisonOptions"
+            [fromLabel]="fromLabel"></cw-visitors-location-component>
+    `
 })
 export class VisitorsLocationContainer {
     @Input() componentInstance: ServerSideFieldModel;
diff --git a/core-web/libs/dot-rules/src/lib/google-map/area-picker-dialog.component.ts b/core-web/libs/dot-rules/src/lib/google-map/area-picker-dialog.component.ts
index 50be9553d69d..3a04424cd5eb 100644
--- a/core-web/libs/dot-rules/src/lib/google-map/area-picker-dialog.component.ts
+++ b/core-web/libs/dot-rules/src/lib/google-map/area-picker-dialog.component.ts
@@ -27,16 +27,18 @@ let mapIdCounter = 1;
             }
         `
     ],
-    template: `<cw-modal-dialog
-        (ok)="onOkAction($event)"
-        (cancel)="onCancelAction($event)"
-        [headerText]="headerText"
-        [hidden]="hidden"
-        [okEnabled]="true">
-        <div *ngIf="!hidden" class="cw-dialog-body">
-            <div *ngIf="!hidden" class="g-map" id="{{ mapId }}"></div>
-        </div>
-    </cw-modal-dialog>`
+    template: `
+        <cw-modal-dialog
+            (ok)="onOkAction($event)"
+            (cancel)="onCancelAction($event)"
+            [headerText]="headerText"
+            [hidden]="hidden"
+            [okEnabled]="true">
+            <div *ngIf="!hidden" class="cw-dialog-body">
+                <div *ngIf="!hidden" class="g-map" id="{{ mapId }}"></div>
+            </div>
+        </cw-modal-dialog>
+    `
 })
 export class AreaPickerDialogComponent implements OnChanges {
     @Input() apiKey = '';
diff --git a/core-web/libs/dot-rules/src/lib/modal-dialog/dialog-component.ts b/core-web/libs/dot-rules/src/lib/modal-dialog/dialog-component.ts
index 8184c6d25092..55770e9c2d2d 100644
--- a/core-web/libs/dot-rules/src/lib/modal-dialog/dialog-component.ts
+++ b/core-web/libs/dot-rules/src/lib/modal-dialog/dialog-component.ts
@@ -5,37 +5,39 @@ import { KeyCode } from '../services/util/key-util';
 @Component({
     changeDetection: ChangeDetectionStrategy.OnPush,
     selector: 'cw-modal-dialog',
-    template: `<p-dialog
-        [style]="{ width: '900px' }"
-        [header]="headerText"
-        [visible]="!hidden"
-        [modal]="true"
-        [dismissableMask]="true"
-        [closable]="false"
-        [draggable]="false"
-        appendTo="body">
-        <p-message
-            *ngIf="errorMessage"
-            [text]="errorMessage"
-            style="margin-bottom: 16px; display: block;"
-            severity="error"></p-message>
+    template: `
+        <p-dialog
+            [style]="{ width: '900px' }"
+            [header]="headerText"
+            [visible]="!hidden"
+            [modal]="true"
+            [dismissableMask]="true"
+            [closable]="false"
+            [draggable]="false"
+            appendTo="body">
+            <p-message
+                *ngIf="errorMessage"
+                [text]="errorMessage"
+                style="margin-bottom: 16px; display: block;"
+                severity="error"></p-message>
 
-        <ng-content></ng-content>
-        <p-footer>
-            <button
-                (click)="ok.emit()"
-                [label]="okButtonText"
-                [disabled]="!okEnabled"
-                type="button"
-                pButton></button>
-            <button
-                (click)="cancel.emit(true)"
-                type="button"
-                pButton
-                label="Cancel"
-                class="ui-button-secondary"></button>
-        </p-footer>
-    </p-dialog> `
+            <ng-content></ng-content>
+            <p-footer>
+                <button
+                    (click)="ok.emit()"
+                    [label]="okButtonText"
+                    [disabled]="!okEnabled"
+                    type="button"
+                    pButton></button>
+                <button
+                    (click)="cancel.emit(true)"
+                    type="button"
+                    pButton
+                    label="Cancel"
+                    class="ui-button-secondary"></button>
+            </p-footer>
+        </p-dialog>
+    `
 })
 export class ModalDialogComponent {
     @Input() okEnabled = true;
diff --git a/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-component.ts b/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-component.ts
index 8a3e7fca4e8f..6fe5e2c98b8a 100644
--- a/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-component.ts
+++ b/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-component.ts
@@ -14,46 +14,47 @@ import { IBundle } from '../services/bundle-service';
 @Component({
     changeDetection: ChangeDetectionStrategy.OnPush,
     selector: 'cw-add-to-bundle-dialog-component',
-    template: ` <p-dialog
-        [visible]="!hidden"
-        [modal]="true"
-        [dismissableMask]="true"
-        [closable]="false"
-        [focusOnShow]="false"
-        [draggable]="false"
-        width="700"
-        header="Add to Bundle"
-        appendTo="body">
-        <p-message
-            *ngIf="errorMessage"
-            [text]="errorMessage"
-            style="margin-bottom: 16px; display: block;"
-            severity="error"></p-message>
-        <cw-input-dropdown
-            (onDropDownChange)="setSelectedBundle($event)"
-            (keyup.enter)="addToBundle.emit(selectedBundle)"
-            [focus]="!hidden"
-            [options]="options"
-            [value]="bundleStores ? bundleStores[0]?.id : null"
-            flex
-            allowAdditions="true">
-        </cw-input-dropdown>
-        <p-footer>
-            <button
-                (click)="cancel.emit()"
-                type="button"
-                pButton
-                secondary
-                label="Cancel"
-                class="ui-button-secondary"></button>
-            <button
-                (click)="addToBundle.emit(selectedBundle)"
-                [disabled]="!selectedBundle"
-                type="button"
-                pButton
-                label="Add"></button>
-        </p-footer>
-    </p-dialog>`
+    template: `
+        <p-dialog
+            [visible]="!hidden"
+            [modal]="true"
+            [dismissableMask]="true"
+            [closable]="false"
+            [focusOnShow]="false"
+            [draggable]="false"
+            width="700"
+            header="Add to Bundle"
+            appendTo="body">
+            <p-message
+                *ngIf="errorMessage"
+                [text]="errorMessage"
+                style="margin-bottom: 16px; display: block;"
+                severity="error"></p-message>
+            <cw-input-dropdown
+                (onDropDownChange)="setSelectedBundle($event)"
+                (keyup.enter)="addToBundle.emit(selectedBundle)"
+                [focus]="!hidden"
+                [options]="options"
+                [value]="bundleStores ? bundleStores[0]?.id : null"
+                flex
+                allowAdditions="true"></cw-input-dropdown>
+            <p-footer>
+                <button
+                    (click)="cancel.emit()"
+                    type="button"
+                    pButton
+                    secondary
+                    label="Cancel"
+                    class="ui-button-secondary"></button>
+                <button
+                    (click)="addToBundle.emit(selectedBundle)"
+                    [disabled]="!selectedBundle"
+                    type="button"
+                    pButton
+                    label="Add"></button>
+            </p-footer>
+        </p-dialog>
+    `
 })
 export class AddToBundleDialogComponent implements OnChanges {
     @Input() hidden = false;
diff --git a/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-container.ts b/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-container.ts
index 9051c689cff1..97fa4a88f497 100644
--- a/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-container.ts
+++ b/core-web/libs/dot-rules/src/lib/push-publish/add-to-bundle-dialog-container.ts
@@ -14,12 +14,14 @@ import { BundleService, IBundle } from '../services/bundle-service';
 @Component({
     changeDetection: ChangeDetectionStrategy.OnPush,
     selector: 'cw-add-to-bundle-dialog-container',
-    template: `<cw-add-to-bundle-dialog-component
-        (cancel)="onClose()"
-        (addToBundle)="addToBundle($event)"
-        [bundleStores]="bundleService.bundles$ | async"
-        [hidden]="hidden"
-        [errorMessage]="errorMessage | async"></cw-add-to-bundle-dialog-component>`
+    template: `
+        <cw-add-to-bundle-dialog-component
+            (cancel)="onClose()"
+            (addToBundle)="addToBundle($event)"
+            [bundleStores]="bundleService.bundles$ | async"
+            [hidden]="hidden"
+            [errorMessage]="errorMessage | async"></cw-add-to-bundle-dialog-component>
+    `
 })
 // tslint:disable-next-line:component-class-suffix
 export class AddToBundleDialogContainer implements OnChanges {
diff --git a/core-web/libs/dot-rules/src/lib/rule-action-component.ts b/core-web/libs/dot-rules/src/lib/rule-action-component.ts
index a8e2d7a75eda..1921e1dfc9a6 100644
--- a/core-web/libs/dot-rules/src/lib/rule-action-component.ts
+++ b/core-web/libs/dot-rules/src/lib/rule-action-component.ts
@@ -22,15 +22,13 @@ import { ServerSideTypeModel } from './services/ServerSideFieldModel';
                     [options]="typeDropdown.options"
                     flex
                     class="cw-type-dropdown"
-                    placeholder="{{ actionTypePlaceholder }}">
-                </cw-input-dropdown>
+                    placeholder="{{ actionTypePlaceholder }}"></cw-input-dropdown>
             </div>
             <cw-serverside-condition
                 (parameterValueChange)="onParameterValueChange($event)"
                 [componentInstance]="action"
                 flex="75"
-                class="cw-condition-component">
-            </cw-serverside-condition>
+                class="cw-condition-component"></cw-serverside-condition>
             <div class="cw-btn-group cw-delete-btn">
                 <div class="ui basic icon buttons">
                     <button
diff --git a/core-web/libs/dot-rules/src/lib/rule-component.ts b/core-web/libs/dot-rules/src/lib/rule-component.ts
index 227cb76b0a2b..5162a1d40273 100644
--- a/core-web/libs/dot-rules/src/lib/rule-component.ts
+++ b/core-web/libs/dot-rules/src/lib/rule-component.ts
@@ -56,155 +56,160 @@ const I8N_BASE = 'api.sites.ruleengine';
 @Component({
     changeDetection: ChangeDetectionStrategy.Default,
     selector: 'rule',
-    template: `<form [formGroup]="formModel" let rf="ngForm">
-        <cw-add-to-bundle-dialog-container
-            (close)="showAddToBundleDialog = false"
-            [assetId]="rule.key"
-            [hidden]="!showAddToBundleDialog"></cw-add-to-bundle-dialog-container>
-        <div
-            [class.cw-hidden]="hidden"
-            [class.cw-disabled]="!rule.enabled"
-            [class.cw-saving]="saving"
-            [class.cw-saved]="saved"
-            [class.cw-out-of-sync]="!saved && !saving"
-            class="cw-rule">
+    template: `
+        <form [formGroup]="formModel" let rf="ngForm">
+            <cw-add-to-bundle-dialog-container
+                (close)="showAddToBundleDialog = false"
+                [assetId]="rule.key"
+                [hidden]="!showAddToBundleDialog"></cw-add-to-bundle-dialog-container>
             <div
-                *ngIf="!hidden"
-                (click)="setRuleExpandedState(!rule._expanded)"
-                class="cw-header"
-                flex
-                layout="row">
-                <div class="cw-header-info" flex="70" layout="row" layout-align="start center">
-                    <i
-                        [class.pi-angle-right]="!rule._expanded"
-                        [class.pi-angle-down]="rule._expanded"
-                        class="cw-header-info-arrow pi"
-                        aria-hidden="true"></i>
-                    <div flex="70" layout="column">
-                        <input
-                            (click)="$event.stopPropagation()"
-                            class="cw-rule-name-input"
-                            pInputText
-                            placeholder="{{ rsrc('inputs.name.placeholder') | async }}"
-                            formControlName="name"
-                            dotAutofocus />
-                        <div
-                            [hidden]="
-                                !formModel.controls['name'].touched ||
-                                formModel.controls['name'].valid
-                            "
-                            class="name cw-warn basic label"
-                            flex="50">
-                            Name is required
+                [class.cw-hidden]="hidden"
+                [class.cw-disabled]="!rule.enabled"
+                [class.cw-saving]="saving"
+                [class.cw-saved]="saved"
+                [class.cw-out-of-sync]="!saved && !saving"
+                class="cw-rule">
+                <div
+                    *ngIf="!hidden"
+                    (click)="setRuleExpandedState(!rule._expanded)"
+                    class="cw-header"
+                    flex
+                    layout="row">
+                    <div class="cw-header-info" flex="70" layout="row" layout-align="start center">
+                        <i
+                            [class.pi-angle-right]="!rule._expanded"
+                            [class.pi-angle-down]="rule._expanded"
+                            class="cw-header-info-arrow pi"
+                            aria-hidden="true"></i>
+                        <div flex="70" layout="column">
+                            <input
+                                (click)="$event.stopPropagation()"
+                                class="cw-rule-name-input"
+                                pInputText
+                                placeholder="{{ rsrc('inputs.name.placeholder') | async }}"
+                                formControlName="name"
+                                dotAutofocus />
+                            <div
+                                [hidden]="
+                                    !formModel.controls['name'].touched ||
+                                    formModel.controls['name'].valid
+                                "
+                                class="name cw-warn basic label"
+                                flex="50">
+                                Name is required
+                            </div>
                         </div>
-                    </div>
-                    <span *ngIf="!hideFireOn" class="cw-fire-on-label">{{
-                        rsrc('inputs.fireOn.label') | async
-                    }}</span>
-                    <cw-input-dropdown
-                        *ngIf="!hideFireOn"
-                        (onDropDownChange)="
-                            updateFireOn.emit({
-                                type: 'RULE_UPDATE_FIRE_ON',
-                                payload: { rule: rule, value: $event }
-                            })
-                        "
-                        (click)="$event.stopPropagation()"
-                        [value]="fireOn.value"
-                        [options]="fireOn.options"
-                        class="cw-fire-on-dropdown"
-                        flex="none"
-                        placeholder="{{ fireOn.placeholder | async }}">
-                    </cw-input-dropdown>
-                </div>
-                <div class="cw-header-actions" flex="30" layout="row" layout-align="end center">
-                    <span class="cw-rule-status-text" title="{{ statusText() }}">{{
-                        statusText(30)
-                    }}</span>
-                    <p-inputSwitch
-                        (onChange)="setRuleEnabledState($event)"
-                        [(ngModel)]="rule.enabled"
-                        [ngModelOptions]="{ standalone: true }"
-                        [pTooltip]="rule.enabled ? tooltipRuleOnText : tooltipRuleOffText"
-                        tooltipPosition="bottom"></p-inputSwitch>
-                    <div class="cw-btn-group">
-                        <button
-                            (click)="ruleOptions.toggle($event); $event.stopPropagation()"
-                            class="p-button-secondary"
-                            pButton
-                            icon="pi pi-ellipsis-v"></button>
-                        <button
-                            (click)="
-                                onCreateConditionGroupClicked();
-                                setRuleExpandedState(true);
-                                $event.stopPropagation()
+                        <span *ngIf="!hideFireOn" class="cw-fire-on-label">
+                            {{ rsrc('inputs.fireOn.label') | async }}
+                        </span>
+                        <cw-input-dropdown
+                            *ngIf="!hideFireOn"
+                            (onDropDownChange)="
+                                updateFireOn.emit({
+                                    type: 'RULE_UPDATE_FIRE_ON',
+                                    payload: { rule: rule, value: $event }
+                                })
                             "
-                            [disabled]="!rule.isPersisted()"
-                            class="p-button-secondary"
-                            style="margin-left:0.5rem"
-                            pButton
-                            icon="pi pi-plus"
-                            arial-label="Add Group"></button>
-                        <p-menu
-                            [model]="ruleActionOptions"
-                            #ruleOptions
-                            appendTo="body"
-                            popup="true"></p-menu>
+                            (click)="$event.stopPropagation()"
+                            [value]="fireOn.value"
+                            [options]="fireOn.options"
+                            class="cw-fire-on-dropdown"
+                            flex="none"
+                            placeholder="{{ fireOn.placeholder | async }}"></cw-input-dropdown>
                     </div>
-                </div>
-            </div>
-            <div *ngIf="rule._expanded" class="cw-accordion-body">
-                <condition-group
-                    *ngFor="let group of rule._conditionGroups; let i = index"
-                    (createCondition)="onCreateCondition($event)"
-                    (deleteCondition)="onDeleteCondition($event, group)"
-                    (updateConditionGroupOperator)="onUpdateConditionGroupOperator($event, group)"
-                    (updateConditionType)="onUpdateConditionType($event, group)"
-                    (updateConditionParameter)="onUpdateConditionParameter($event, group)"
-                    (updateConditionOperator)="onUpdateConditionOperator($event, group)"
-                    [group]="group"
-                    [conditionTypes]="conditionTypes"
-                    [groupIndex]="i"
-                    [conditionTypePlaceholder]="conditionTypePlaceholder"></condition-group>
-                <div class="cw-action-group">
-                    <div class="cw-action-separator">
-                        {{ rsrc('inputs.action.firesActions') | async }}
+                    <div class="cw-header-actions" flex="30" layout="row" layout-align="end center">
+                        <span class="cw-rule-status-text" title="{{ statusText() }}">
+                            {{ statusText(30) }}
+                        </span>
+                        <p-inputSwitch
+                            (onChange)="setRuleEnabledState($event)"
+                            [(ngModel)]="rule.enabled"
+                            [ngModelOptions]="{ standalone: true }"
+                            [pTooltip]="rule.enabled ? tooltipRuleOnText : tooltipRuleOffText"
+                            tooltipPosition="bottom"></p-inputSwitch>
+                        <div class="cw-btn-group">
+                            <button
+                                (click)="ruleOptions.toggle($event); $event.stopPropagation()"
+                                class="p-button-secondary"
+                                pButton
+                                icon="pi pi-ellipsis-v"></button>
+                            <button
+                                (click)="
+                                    onCreateConditionGroupClicked();
+                                    setRuleExpandedState(true);
+                                    $event.stopPropagation()
+                                "
+                                [disabled]="!rule.isPersisted()"
+                                class="p-button-secondary"
+                                style="margin-left:0.5rem"
+                                pButton
+                                icon="pi pi-plus"
+                                arial-label="Add Group"></button>
+                            <p-menu
+                                [model]="ruleActionOptions"
+                                #ruleOptions
+                                appendTo="body"
+                                popup="true"></p-menu>
+                        </div>
                     </div>
-                    <div class="cw-rule-actions" flex layout="column">
-                        <div
-                            *ngFor="let ruleAction of ruleActions; let i = index"
-                            class="cw-action-row"
-                            layout="row">
-                            <rule-action
-                                (updateRuleActionType)="onUpdateRuleActionType($event)"
-                                (updateRuleActionParameter)="onUpdateRuleActionParameter($event)"
-                                (deleteRuleAction)="onDeleteRuleAction($event)"
-                                [action]="ruleAction"
-                                [index]="i"
-                                [actionTypePlaceholder]="actionTypePlaceholder"
-                                [ruleActionTypes]="ruleActionTypes"
-                                flex
-                                layout="row"></rule-action>
-                            <div class="cw-btn-group cw-add-btn">
-                                <div
-                                    *ngIf="i === ruleActions.length - 1"
-                                    class="ui basic icon buttons">
-                                    <button
-                                        (click)="onCreateRuleAction()"
-                                        [disabled]="!ruleAction.isPersisted()"
-                                        class="p-button-rounded p-button-success p-button-text"
-                                        pButton
-                                        type="button"
-                                        icon="pi pi-plus"
-                                        arial-label="Add Action"></button>
+                </div>
+                <div *ngIf="rule._expanded" class="cw-accordion-body">
+                    <condition-group
+                        *ngFor="let group of rule._conditionGroups; let i = index"
+                        (createCondition)="onCreateCondition($event)"
+                        (deleteCondition)="onDeleteCondition($event, group)"
+                        (updateConditionGroupOperator)="
+                            onUpdateConditionGroupOperator($event, group)
+                        "
+                        (updateConditionType)="onUpdateConditionType($event, group)"
+                        (updateConditionParameter)="onUpdateConditionParameter($event, group)"
+                        (updateConditionOperator)="onUpdateConditionOperator($event, group)"
+                        [group]="group"
+                        [conditionTypes]="conditionTypes"
+                        [groupIndex]="i"
+                        [conditionTypePlaceholder]="conditionTypePlaceholder"></condition-group>
+                    <div class="cw-action-group">
+                        <div class="cw-action-separator">
+                            {{ rsrc('inputs.action.firesActions') | async }}
+                        </div>
+                        <div class="cw-rule-actions" flex layout="column">
+                            <div
+                                *ngFor="let ruleAction of ruleActions; let i = index"
+                                class="cw-action-row"
+                                layout="row">
+                                <rule-action
+                                    (updateRuleActionType)="onUpdateRuleActionType($event)"
+                                    (updateRuleActionParameter)="
+                                        onUpdateRuleActionParameter($event)
+                                    "
+                                    (deleteRuleAction)="onDeleteRuleAction($event)"
+                                    [action]="ruleAction"
+                                    [index]="i"
+                                    [actionTypePlaceholder]="actionTypePlaceholder"
+                                    [ruleActionTypes]="ruleActionTypes"
+                                    flex
+                                    layout="row"></rule-action>
+                                <div class="cw-btn-group cw-add-btn">
+                                    <div
+                                        *ngIf="i === ruleActions.length - 1"
+                                        class="ui basic icon buttons">
+                                        <button
+                                            (click)="onCreateRuleAction()"
+                                            [disabled]="!ruleAction.isPersisted()"
+                                            class="p-button-rounded p-button-success p-button-text"
+                                            pButton
+                                            type="button"
+                                            icon="pi pi-plus"
+                                            arial-label="Add Action"></button>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
-    </form> `
+        </form>
+    `
 })
 class RuleComponent {
     @Input() rule: RuleModel;
diff --git a/core-web/libs/dot-rules/src/lib/rule-condition-component.ts b/core-web/libs/dot-rules/src/lib/rule-condition-component.ts
index e50de438093a..a081012908eb 100644
--- a/core-web/libs/dot-rules/src/lib/rule-condition-component.ts
+++ b/core-web/libs/dot-rules/src/lib/rule-condition-component.ts
@@ -14,7 +14,8 @@ import { I18nService } from './services/system/locale/I18n';
 
 @Component({
     selector: 'rule-condition',
-    template: `<div *ngIf="typeDropdown != null" flex layout="row" class="cw-condition cw-entry">
+    template: `
+        <div *ngIf="typeDropdown != null" flex layout="row" class="cw-condition cw-entry">
             <div class="cw-btn-group cw-condition-toggle">
                 <button
                     *ngIf="index !== 0"
@@ -31,8 +32,7 @@ import { I18nService } from './services/system/locale/I18n';
                 [value]="condition.type?.key"
                 flex="25"
                 class="cw-type-dropdown"
-                placeholder="{{ conditionTypePlaceholder }}">
-            </cw-input-dropdown>
+                placeholder="{{ conditionTypePlaceholder }}"></cw-input-dropdown>
             <div [ngSwitch]="condition.type?.key" flex="75" class="cw-condition-row-main">
                 <ng-template [ngSwitchCase]="'NoSelection'">
                     <div class="cw-condition-component"></div>
@@ -46,8 +46,7 @@ import { I18nService } from './services/system/locale/I18n';
                     <cw-serverside-condition
                         (parameterValueChange)="onParameterValueChange($event)"
                         [componentInstance]="condition"
-                        class="cw-condition-component">
-                    </cw-serverside-condition>
+                        class="cw-condition-component"></cw-serverside-condition>
                 </ng-template>
             </div>
         </div>
@@ -62,7 +61,8 @@ import { I18nService } from './services/system/locale/I18n';
                     class="p-button-rounded p-button-danger p-button-text"
                     aria-label="Delete Condition"></button>
             </div>
-        </div> `
+        </div>
+    `
 })
 export class ConditionComponent implements OnInit {
     @Input() condition: ConditionModel;
diff --git a/core-web/libs/dot-rules/src/lib/rule-condition-group-component.ts b/core-web/libs/dot-rules/src/lib/rule-condition-group-component.ts
index 346cc82beb5b..505318bbe908 100644
--- a/core-web/libs/dot-rules/src/lib/rule-condition-group-component.ts
+++ b/core-web/libs/dot-rules/src/lib/rule-condition-group-component.ts
@@ -16,52 +16,56 @@ import { I18nService } from './services/system/locale/I18n';
 
 @Component({
     selector: 'condition-group',
-    template: `<div class="cw-rule-group">
-        <div *ngIf="groupIndex === 0" class="cw-condition-group-separator">
-            {{ rsrc('inputs.group.whenConditions.label') | async }}
-        </div>
-        <div *ngIf="groupIndex !== 0" class="cw-condition-group-separator">
-            <button
-                (click)="toggleGroupOperator()"
-                [label]="group.operator"
-                pButton
-                tiny
-                class="p-button-secondary p-button-sm"></button>
-            <span flex class="cw-header-text">
-                {{ rsrc('inputs.group.whenFurtherConditions.label') | async }}
-            </span>
-        </div>
-        <div flex layout="column" class="cw-conditions">
-            <div
-                *ngFor="let condition of group?._conditions; trackBy: trackByFn; let i = index"
-                layout="row"
-                class="cw-condition-row">
-                <rule-condition
-                    (deleteCondition)="deleteCondition.emit($event)"
-                    (updateConditionType)="updateConditionType.emit($event)"
-                    (updateConditionParameter)="updateConditionParameter.emit($event)"
-                    (updateConditionOperator)="updateConditionOperator.emit($event)"
-                    [condition]="condition"
-                    [conditionTypes]="conditionTypes"
-                    [conditionTypePlaceholder]="conditionTypePlaceholder"
-                    [index]="i"
-                    flex
-                    layout="row"></rule-condition>
-                <div class="cw-btn-group cw-add-btn">
-                    <div *ngIf="i === group?._conditions.length - 1" class="ui basic icon buttons">
-                        <button
-                            (click)="onCreateCondition()"
-                            [disabled]="!condition.isPersisted()"
-                            pButton
-                            type="button"
-                            icon="pi pi-plus"
-                            class="p-button-rounded p-button-success p-button-text"
-                            arial-label="Add Condition"></button>
+    template: `
+        <div class="cw-rule-group">
+            <div *ngIf="groupIndex === 0" class="cw-condition-group-separator">
+                {{ rsrc('inputs.group.whenConditions.label') | async }}
+            </div>
+            <div *ngIf="groupIndex !== 0" class="cw-condition-group-separator">
+                <button
+                    (click)="toggleGroupOperator()"
+                    [label]="group.operator"
+                    pButton
+                    tiny
+                    class="p-button-secondary p-button-sm"></button>
+                <span flex class="cw-header-text">
+                    {{ rsrc('inputs.group.whenFurtherConditions.label') | async }}
+                </span>
+            </div>
+            <div flex layout="column" class="cw-conditions">
+                <div
+                    *ngFor="let condition of group?._conditions; trackBy: trackByFn; let i = index"
+                    layout="row"
+                    class="cw-condition-row">
+                    <rule-condition
+                        (deleteCondition)="deleteCondition.emit($event)"
+                        (updateConditionType)="updateConditionType.emit($event)"
+                        (updateConditionParameter)="updateConditionParameter.emit($event)"
+                        (updateConditionOperator)="updateConditionOperator.emit($event)"
+                        [condition]="condition"
+                        [conditionTypes]="conditionTypes"
+                        [conditionTypePlaceholder]="conditionTypePlaceholder"
+                        [index]="i"
+                        flex
+                        layout="row"></rule-condition>
+                    <div class="cw-btn-group cw-add-btn">
+                        <div
+                            *ngIf="i === group?._conditions.length - 1"
+                            class="ui basic icon buttons">
+                            <button
+                                (click)="onCreateCondition()"
+                                [disabled]="!condition.isPersisted()"
+                                pButton
+                                type="button"
+                                icon="pi pi-plus"
+                                class="p-button-rounded p-button-success p-button-text"
+                                arial-label="Add Condition"></button>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div> `
+    `
 })
 export class ConditionGroupComponent implements OnChanges {
     private static I8N_BASE = 'api.sites.ruleengine.rules';
diff --git a/core-web/libs/dot-rules/src/lib/rule-engine.ts b/core-web/libs/dot-rules/src/lib/rule-engine.ts
index 603f9041df6a..e38ef252ff8f 100644
--- a/core-web/libs/dot-rules/src/lib/rule-engine.ts
+++ b/core-web/libs/dot-rules/src/lib/rule-engine.ts
@@ -42,9 +42,9 @@ const I8N_BASE = 'api.sites.ruleengine';
                 *ngIf="showCloseButton"
                 (click)="globalError.message = ''"
                 class="material-icons"
-                class="close-button"
-                >X</i
-            >
+                class="close-button">
+                X
+            </i>
         </div>
         <dot-not-license
             *ngIf="
@@ -71,25 +71,25 @@ const I8N_BASE = 'api.sites.ruleengine';
                         (click)="setFieldFilter('enabled', null)"
                         [class.active]="!isFilteringField('enabled')"
                         class="cw-filter-link"
-                        href="javascript:void(0)"
-                        >{{ rsrc('inputs.filter.status.all.label') | async }}</a
-                    >
+                        href="javascript:void(0)">
+                        {{ rsrc('inputs.filter.status.all.label') | async }}
+                    </a>
                     <span>&#124;</span>
                     <a
                         (click)="setFieldFilter('enabled', true)"
                         [class.active]="isFilteringField('enabled', true)"
                         class="cw-filter-link"
-                        href="javascript:void(0)"
-                        >{{ rsrc('inputs.filter.status.active.label') | async }}</a
-                    >
+                        href="javascript:void(0)">
+                        {{ rsrc('inputs.filter.status.active.label') | async }}
+                    </a>
                     <span>&#124;</span>
                     <a
                         (click)="setFieldFilter('enabled', false)"
                         [class.active]="isFilteringField('enabled', false)"
                         class="cw-filter-link"
-                        href="javascript:void(0)"
-                        >{{ rsrc('inputs.filter.status.inactive.label') | async }}</a
-                    >
+                        href="javascript:void(0)">
+                        {{ rsrc('inputs.filter.status.inactive.label') | async }}
+                    </a>
                 </div>
             </div>
             <div *ngIf="!rules.length" class="cw-rule-engine__empty">
@@ -101,9 +101,9 @@ const I8N_BASE = 'api.sites.ruleengine';
                             | async
                     }}{{ rsrc('inputs.add.one.now') | async }}
                 </h2>
-                <span *ngIf="pageId && !isContentletHost">{{
-                    rsrc('inputs.page.rules.fired.every.time') | async
-                }}</span>
+                <span *ngIf="pageId && !isContentletHost">
+                    {{ rsrc('inputs.page.rules.fired.every.time') | async }}
+                </span>
                 <button
                     (click)="addRule()"
                     pButton
diff --git a/core-web/libs/edit-content/src/lib/components/dot-edit-content-aside/components/dot-content-aside-information/dot-content-aside-information.component.html b/core-web/libs/edit-content/src/lib/components/dot-edit-content-aside/components/dot-content-aside-information/dot-content-aside-information.component.html
index 79b1f8ec42dc..15356991f411 100644
--- a/core-web/libs/edit-content/src/lib/components/dot-edit-content-aside/components/dot-content-aside-information/dot-content-aside-information.component.html
+++ b/core-web/libs/edit-content/src/lib/components/dot-edit-content-aside/components/dot-content-aside-information/dot-content-aside-information.component.html
@@ -22,9 +22,10 @@
             <span class="sidebar-card__label">{{ contentType.name }}</span>
         </a>
         <button class="sidebar-card" data-testId="references-button" aria-label="References">
-            <span class="sidebar-card__header"
-                >{{ 'References' | dm }} <i class="pi pi-eye" aria-hidden="true"></i
-            ></span>
+            <span class="sidebar-card__header">
+                {{ 'References' | dm }}
+                <i class="pi pi-eye" aria-hidden="true"></i>
+            </span>
         </button>
         <div class="content-history__container" data-testId="history-container">
             @if (loading) {
@@ -44,12 +45,12 @@
                         data-testId="publish-history"
                         aria-label="Publish History">
                         <span class="content-history__title">{{ 'Published' | dm }}</span>
-                        <span *ngIf="contentlet?.publishUserName" class="content-history__author">{{
-                            contentlet?.publishUserName
-                        }}</span>
-                        <span class="content-history__date">{{
-                            contentlet?.publishDate | dotRelativeDate: 'MM/dd/yyyy' : null
-                        }}</span>
+                        <span *ngIf="contentlet?.publishUserName" class="content-history__author">
+                            {{ contentlet?.publishUserName }}
+                        </span>
+                        <span class="content-history__date">
+                            {{ contentlet?.publishDate | dotRelativeDate: 'MM/dd/yyyy' : null }}
+                        </span>
                     </button>
                 }
                 @if (contentlet?.modDate) {
@@ -61,9 +62,9 @@
                         aria-label="Modification History">
                         <span class="content-history__title">{{ 'Modified' | dm }}</span>
                         <span class="content-history__author">{{ contentlet?.modUserName }}</span>
-                        <span class="content-history__date">{{
-                            contentlet?.modDate | dotRelativeDate: 'MM/dd/yyyy' : null
-                        }}</span>
+                        <span class="content-history__date">
+                            {{ contentlet?.modDate | dotRelativeDate: 'MM/dd/yyyy' : null }}
+                        </span>
                     </button>
                 }
                 <button
@@ -73,12 +74,12 @@
                     data-testId="create-history"
                     aria-label="Creation History">
                     <span class="content-history__title">{{ 'Created' | dm }}</span>
-                    <span class="content-history__author">{{
-                        contentlet?.ownerName || 'You'
-                    }}</span>
-                    <span class="content-history__date">{{
-                        contentlet?.createDate | dotRelativeDate: 'MM/dd/yyyy' : null
-                    }}</span>
+                    <span class="content-history__author">
+                        {{ contentlet?.ownerName || 'You' }}
+                    </span>
+                    <span class="content-history__date">
+                        {{ contentlet?.createDate | dotRelativeDate: 'MM/dd/yyyy' : null }}
+                    </span>
                 </button>
             }
         </div>
diff --git a/core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.html b/core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.html
index 135154761379..3a45cc62bbea 100644
--- a/core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.html
+++ b/core-web/libs/edit-content/src/lib/feature/edit-content/edit-content.layout.component.html
@@ -11,9 +11,9 @@
                 <span [innerHTML]="('edit.content.layout.beta.message' | dm) + ' '"></span>
                 <a
                     [routerLink]="'/content-types-angular/edit/' + vm.contentType.variable"
-                    data-testId="content-type"
-                    >{{ 'edit.content.layout.beta.message.switch' | dm }}</a
-                >
+                    data-testId="content-type">
+                    {{ 'edit.content.layout.beta.message.switch' | dm }}
+                </a>
                 <span>{{ ' ' }}{{ 'edit.content.layout.beta.message.needed' | dm }}</span>
             </div>
         </ng-template>
diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.html b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.html
index 362d8848a5cb..77e6909ea875 100644
--- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.html
+++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.html
@@ -1,9 +1,9 @@
 <form (ngSubmit)="onSubmit()" [formGroup]="form" class="editor-mode__form">
     @if (allowFileNameEdit) {
         <div class="editor-mode__input-container">
-            <label class="p-label-input-required" data-testId="editor-label" for="file-name">{{
-                'dot.binary.field.action.create.new.file.label' | dm
-            }}</label>
+            <label class="p-label-input-required" data-testId="editor-label" for="file-name">
+                {{ 'dot.binary.field.action.create.new.file.label' | dm }}
+            </label>
             <input
                 id="file-name"
                 autocomplete="off"
diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html
index 63c28faaf460..9aea3678a186 100644
--- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html
+++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html
@@ -21,8 +21,7 @@
                     [iconSize]="'48px'"
                     [contentlet]="contentlet"
                     [playableVideo]="true"
-                    data-testId="contentlet-thumbnail">
-                </dot-contentlet-thumbnail>
+                    data-testId="contentlet-thumbnail"></dot-contentlet-thumbnail>
             }
         </div>
         <div class="preview-metadata__container">
@@ -132,9 +131,9 @@
                 <div [attr.data-testId]="'resource-link-' + sourceLink.key" class="file-info__item">
                     <span class="file-info__title">{{ sourceLink.key | dm }}:</span>
                     <div class="file-info__link">
-                        <a [href]="sourceLink.value" target="_blank">{{
-                            sourceLink.value || ('dot.binary.field.no.link.found' | dm)
-                        }}</a>
+                        <a [href]="sourceLink.value" target="_blank">
+                            {{ sourceLink.value || ('dot.binary.field.no.link.found' | dm) }}
+                        </a>
                         <dot-copy-button [copy]="sourceLink.value" />
                     </div>
                 </div>
diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-ui-message/dot-binary-field-ui-message.component.html b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-ui-message/dot-binary-field-ui-message.component.html
index 308daa82f604..94c664b22052 100644
--- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-ui-message/dot-binary-field-ui-message.component.html
+++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-binary-field/components/dot-binary-field-ui-message/dot-binary-field-ui-message.component.html
@@ -5,6 +5,6 @@
         style="font-size: 2rem; width: auto"></i>
 </div>
 <div class="text">
-    <span [innerHTML]="uiMessage.message | dm: uiMessage.args" data-testId="ui-message-span"></span
-    ><ng-content></ng-content>
+    <span [innerHTML]="uiMessage.message | dm: uiMessage.args" data-testId="ui-message-span"></span>
+    <ng-content></ng-content>
 </div>
diff --git a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-host-folder-field/componentes/treeselect.component.ts b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-host-folder-field/componentes/treeselect.component.ts
index fe110c3d95a7..42b916a0a0e7 100644
--- a/core-web/libs/edit-content/src/lib/fields/dot-edit-content-host-folder-field/componentes/treeselect.component.ts
+++ b/core-web/libs/edit-content/src/lib/fields/dot-edit-content-host-folder-field/componentes/treeselect.component.ts
@@ -95,9 +95,9 @@ export const TREESELECT_VALUE_ACCESSOR = {
                             <div *ngFor="let node of value" class="p-treeselect-token">
                                 <span class="p-treeselect-token-label">{{ node.label }}</span>
                             </div>
-                            <ng-container *ngIf="emptyValue">{{
-                                placeholder || 'empty'
-                            }}</ng-container>
+                            <ng-container *ngIf="emptyValue">
+                                {{ placeholder || 'empty' }}
+                            </ng-container>
                         </ng-template>
                     </ng-template>
                 </div>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goal-select/dot-experiments-configuration-goal-select.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goal-select/dot-experiments-configuration-goal-select.component.html
index 066a0a314c8a..53f9f4214eb2 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goal-select/dot-experiments-configuration-goal-select.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goal-select/dot-experiments-configuration-goal-select.component.html
@@ -51,9 +51,9 @@
                         </dot-experiment-options>
                     </div>
                     <div class="field flex-auto flex flex-column">
-                        <label class="p-label-input-required">{{
-                            'experiments.goal.reach_page.form.name.label' | dm
-                        }}</label>
+                        <label class="p-label-input-required">
+                            {{ 'experiments.goal.reach_page.form.name.label' | dm }}
+                        </label>
                         <input
                             [maxlength]="this.maxNameLength + 1"
                             [placeholder]="'experiments.goal.reach_page.form.name.placeholder' | dm"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goals/dot-experiments-configuration-goals.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goals/dot-experiments-configuration-goals.component.html
index 3a76e9160d10..2837ca498a81 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goals/dot-experiments-configuration-goals.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-goals/dot-experiments-configuration-goals.component.html
@@ -8,9 +8,9 @@ <h2 class="flex align-items-center gap-1 uppercase">
                         [size]="16"
                         data-testId="goal-title-step-done"
                         name="check_circle"></dot-icon>
-                    <span class="p-label-input-required" data-testId="goals-card-name">{{
-                        'experiments.configure.goals.name' | dm
-                    }}</span>
+                    <span class="p-label-input-required" data-testId="goals-card-name">
+                        {{ 'experiments.configure.goals.name' | dm }}
+                    </span>
                 </h2>
             </div>
 
@@ -46,10 +46,10 @@ <h3 class="flex description" data-testId="goals-empty-msg">
                         </ng-template>
                         <ng-template #rows let-row>
                             <div class="flex col flex-wrap align-items-center capitalize">
-                                <ng-container *ngIf="row.isDefault"
-                                    ><span data-testId="goal-default-parameter">{{
-                                        'experiments.goal.conditions.default' | dm
-                                    }}</span>
+                                <ng-container *ngIf="row.isDefault">
+                                    <span data-testId="goal-default-parameter">
+                                        {{ 'experiments.goal.conditions.default' | dm }}
+                                    </span>
                                     -
                                 </ng-container>
                                 {{
@@ -94,8 +94,8 @@ <h3 class="flex description" data-testId="goals-empty-msg">
     <ng-template #titleTpl>
         <div class="flex align-items-center flex-1">
             <h3 class="flex-grow-1 flex gap-1 detail__title">
-                <span data-testId="goal-label-type-goal"
-                    >{{ GOALS_METADATA_MAP[vm.goals.primary.type].label | dm }}
+                <span data-testId="goal-label-type-goal">
+                    {{ GOALS_METADATA_MAP[vm.goals.primary.type].label | dm }}
                 </span>
                 -
                 <span data-testId="goal-label-name-goal">{{ vm.goals.primary.name | dm }}</span>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling-add/dot-experiments-configuration-scheduling-add.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling-add/dot-experiments-configuration-scheduling-add.component.html
index 22abc5a5e143..12ca9b040f84 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling-add/dot-experiments-configuration-scheduling-add.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling-add/dot-experiments-configuration-scheduling-add.component.html
@@ -38,8 +38,7 @@
                         [stepMinute]="30"
                         id="endTime"
                         data-testId="scheduling-endDate"
-                        formControlName="endDate">
-                    </p-calendar>
+                        formControlName="endDate"></p-calendar>
                 </div>
             </form>
         </div>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling/dot-experiments-configuration-scheduling.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling/dot-experiments-configuration-scheduling.component.html
index e825da26727f..a078f615f1ea 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling/dot-experiments-configuration-scheduling.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-scheduling/dot-experiments-configuration-scheduling.component.html
@@ -15,9 +15,9 @@ <h2 class="flex align-items-center gap-1 uppercase" data-testId="scheduling-card
         <p-card styleClass="card-rounded">
             <div class="flex flex-row align-items-center align-content-between gap-2">
                 <div class="title flex flex-grow-1 flex-column">
-                    <span data-testId="scheduling-card-title-row">{{
-                        'experiments.configure.scheduling.start' | dm
-                    }}</span>
+                    <span data-testId="scheduling-card-title-row">
+                        {{ 'experiments.configure.scheduling.start' | dm }}
+                    </span>
                 </div>
 
                 <div
@@ -51,9 +51,9 @@ <h2 class="flex align-items-center gap-1 uppercase" data-testId="scheduling-card
         </span>
         <span
             *ngIf="vm.scheduling?.startDate && vm.scheduling.endDate"
-            class="scheduling-setup-date-spacing"
-            >-</span
-        >
+            class="scheduling-setup-date-spacing">
+            -
+        </span>
         <span *ngIf="!!vm.scheduling?.endDate">
             {{ 'end' | dm | titlecase }}:
             <span>{{ vm.scheduling.endDate | date: 'EEE, LLL dd, Y, h:mm aa zz' }}</span>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic-split-add/dot-experiments-configuration-traffic-split-add.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic-split-add/dot-experiments-configuration-traffic-split-add.component.html
index b33bc7449a3f..a7299d049da8 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic-split-add/dot-experiments-configuration-traffic-split-add.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic-split-add/dot-experiments-configuration-traffic-split-add.component.html
@@ -18,13 +18,11 @@
                         (click)="splitVariantsEvenly()"
                         [label]="'experiments.configure.traffic.split.evenly' | dm"
                         [value]="splitEvenly"
-                        formControlName="type">
-                    </p-radioButton>
+                        formControlName="type"></p-radioButton>
                     <p-radioButton
                         [label]="'experiments.configure.traffic.split.custom' | dm"
                         [value]="customPercentages"
-                        formControlName="type">
-                    </p-radioButton>
+                        formControlName="type"></p-radioButton>
                 </div>
 
                 <div class="experiment-traffic-split__variants">
@@ -53,15 +51,14 @@
                                 [min]="0"
                                 class="experiment-traffic-split__variants-weight p-inputtext-sm"
                                 formControlName="weight"
-                                mode="decimal">
-                            </p-inputNumber>
+                                mode="decimal"></p-inputNumber>
 
                             <ng-template #splitEvenTemplate>
                                 <span
                                     class="experiment-traffic-split__variants-weight"
-                                    data-testId="variant-weight"
-                                    >{{ variant.value.weight }}</span
-                                >
+                                    data-testId="variant-weight">
+                                    {{ variant.value.weight }}
+                                </span>
                             </ng-template>
                         </div>
                     </ng-container>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic/dot-experiments-configuration-traffic.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic/dot-experiments-configuration-traffic.component.html
index f12b550fe457..c0d9d1a45a1f 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic/dot-experiments-configuration-traffic.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-traffic/dot-experiments-configuration-traffic.component.html
@@ -15,9 +15,9 @@ <h2 class="flex align-items-center gap-1 uppercase" data-testId="traffic-card-ti
         <p-card>
             <div class="flex flex-row align-items-center align-content-between gap-2">
                 <div class="title flex flex-grow-1 flex-column">
-                    <span data-testId="card-title">{{
-                        'experiments.configure.traffic.load.name' | dm
-                    }}</span>
+                    <span data-testId="card-title">
+                        {{ 'experiments.configure.traffic.load.name' | dm }}
+                    </span>
                 </div>
                 <div
                     [pTooltip]="vm.disabledTooltipLabel | dm"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants-add/dot-experiments-configuration-variants-add.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants-add/dot-experiments-configuration-variants-add.component.html
index 427a64792e3e..20927777e729 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants-add/dot-experiments-configuration-variants-add.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants-add/dot-experiments-configuration-variants-add.component.html
@@ -12,9 +12,9 @@
                 data-testId="new-variant-form"
                 novalidate>
                 <div class="field">
-                    <label class="p-label-input-required" for="name">{{
-                        'experiments.configure.variant.add.form.name.label' | dm
-                    }}</label>
+                    <label class="p-label-input-required" for="name">
+                        {{ 'experiments.configure.variant.add.form.name.label' | dm }}
+                    </label>
                     <input
                         [maxlength]="this.maxNameLength + 1"
                         [tabindex]="1"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants/dot-experiments-configuration-variants.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants/dot-experiments-configuration-variants.component.html
index 7ff4070d3e49..7706b7c731a3 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants/dot-experiments-configuration-variants.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/components/dot-experiments-configuration-variants/dot-experiments-configuration-variants.component.html
@@ -8,14 +8,13 @@ <h2 class="flex align-items-center gap-1 uppercase">
                         [size]="16"
                         data-testId="variant-title-step-done"
                         name="check_circle"></dot-icon>
-                    <span class="p-label-input-required" data-testId="variants-card-header">{{
-                        'experiments.configure.variants.name' | dm
-                    }}</span>
+                    <span class="p-label-input-required" data-testId="variants-card-header">
+                        {{ 'experiments.configure.variants.name' | dm }}
+                    </span>
                 </h2>
                 <dot-experiments-configuration-items-count
                     [count]="vm.trafficProportion.variants?.length"
-                    [maxLength]="maxVariantsAllowed">
-                </dot-experiments-configuration-items-count>
+                    [maxLength]="maxVariantsAllowed"></dot-experiments-configuration-items-count>
             </div>
         </ng-template>
 
@@ -34,7 +33,7 @@ <h2 class="flex align-items-center gap-1 uppercase">
                                 variant.name === defaultVariantName || vm.disabledTooltipLabel;
                                 else editVariantNameTpl
                             ">
-                            <span data-testId="variant-name-original"> {{ variant.name }} </span>
+                            <span data-testId="variant-name-original">{{ variant.name }}</span>
                         </ng-container>
 
                         <dot-copy-button
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/dot-experiments-configuration.component.spec.ts b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/dot-experiments-configuration.component.spec.ts
index fd33451f381d..00b89653029d 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/dot-experiments-configuration.component.spec.ts
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-configuration/dot-experiments-configuration.component.spec.ts
@@ -86,7 +86,9 @@ const defaultVmMock: ConfigurationViewModel = {
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: `p-confirmPopup`,
-    template: `ConfirmPopupMockComponent`,
+    template: `
+        ConfirmPopupMockComponent
+    `,
     standalone: true
 })
 export class ConfirmPopupMockComponent {}
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-create/dot-experiments-create.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-create/dot-experiments-create.component.html
index f0f1ff988dfe..7abc7bafaee3 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-create/dot-experiments-create.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-create/dot-experiments-create.component.html
@@ -13,9 +13,9 @@
                 data-testId="new-experiment-form"
                 novalidate>
                 <div class="field">
-                    <label dotFieldRequired for="name">{{
-                        'experiments.create.form.name.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="name">
+                        {{ 'experiments.create.form.name.label' | dm }}
+                    </label>
                     <input
                         [maxlength]="this.maxNameLength + 1"
                         [tabindex]="1"
@@ -34,9 +34,9 @@
                 </div>
 
                 <div class="field">
-                    <label for="description">{{
-                        'experiments.create.form.description.label' | dm
-                    }}</label>
+                    <label for="description">
+                        {{ 'experiments.create.form.description.label' | dm }}
+                    </label>
                     <textarea
                         [tabindex]="2"
                         id="description"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-status-filter/dot-experiments-status-filter.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-status-filter/dot-experiments-status-filter.component.html
index 28c848c42924..c1b80001d16f 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-status-filter/dot-experiments-status-filter.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/components/dot-experiments-status-filter/dot-experiments-status-filter.component.html
@@ -5,5 +5,4 @@
     [filter]="false"
     [style]="{ width: '15rem' }"
     defaultLabel="{{ 'experimentspage.experiment.status.placeholder' | dm }}"
-    dotDropdown>
-</p-multiSelect>
+    dotDropdown></p-multiSelect>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/components/dot-experiments-experiment-summary/dot-experiments-experiment-summary.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/components/dot-experiments-experiment-summary/dot-experiments-experiment-summary.component.html
index a6512c960c90..e4defde973c0 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/components/dot-experiments-experiment-summary/dot-experiments-experiment-summary.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-reports/components/dot-experiments-experiment-summary/dot-experiments-experiment-summary.component.html
@@ -14,16 +14,16 @@
     <div *ngIf="goals" class="flex align-items-center justify-content-center gap-3">
         <i class="pi pi-flag"></i>
         <div class="flex-grow-1">
-            <span class="font-bold">{{ 'experiments.summary.winner.testing' | dm }} </span>
+            <span class="font-bold">{{ 'experiments.summary.winner.testing' | dm }}</span>
             <span data-TestId="goal-label">{{ goals.primary.name }}</span>
         </div>
     </div>
     <div *ngIf="scheduling" class="flex align-items-center justify-content-center gap-3">
         <i class="pi pi-calendar"></i>
         <div class="flex-grow-1">
-            <span data-TestId="schedule-start-date">{{
-                scheduling.startDate | date: 'longDate'
-            }}</span>
+            <span data-TestId="schedule-start-date">
+                {{ scheduling.startDate | date: 'longDate' }}
+            </span>
             -
             <span data-TestId="schedule-end-date">{{ scheduling.endDate | date: 'longDate' }}</span>
         </div>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-shell/dot-experiments-shell.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-shell/dot-experiments-shell.component.html
index e8bde6a75848..f294d32e01de 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-shell/dot-experiments-shell.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-shell/dot-experiments-shell.component.html
@@ -1 +1,2 @@
-<router-outlet></router-outlet> <p-toast></p-toast>
+<router-outlet></router-outlet>
+<p-toast></p-toast>
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-reach-page/dot-experiments-goal-configuration-reach-page.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-reach-page/dot-experiments-goal-configuration-reach-page.component.html
index fd23372c301f..22b3db4cad5f 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-reach-page/dot-experiments-goal-configuration-reach-page.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-reach-page/dot-experiments-goal-configuration-reach-page.component.html
@@ -7,9 +7,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
             formArrayName="conditions">
             <div [formGroupName]="i" class="condition flex">
                 <div class="field flex-none flex flex-column w-15rem">
-                    <label dotFieldRequired for="parameter">{{
-                        'experiments.goal.reach_page.form.conditions.parameter.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="parameter">
+                        {{ 'experiments.goal.reach_page.form.conditions.parameter.label' | dm }}
+                    </label>
                     <p-dropdown
                         [dotOptions]="parametersList"
                         id="parameter"
@@ -26,9 +26,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
                 </div>
 
                 <div class="field flex-none flex flex-column w-15rem">
-                    <label dotFieldRequired for="operator">{{
-                        'experiments.goal.reach_page.form.conditions.operator.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="operator">
+                        {{ 'experiments.goal.reach_page.form.conditions.operator.label' | dm }}
+                    </label>
                     <p-dropdown
                         [dotOptions]="operatorsList"
                         id="operator"
@@ -46,9 +46,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
                 </div>
 
                 <div class="field flex-grow-1 flex flex-column">
-                    <label dotFieldRequired for="value">{{
-                        'experiments.goal.reach_page.form.conditions.value.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="value">
+                        {{ 'experiments.goal.reach_page.form.conditions.value.label' | dm }}
+                    </label>
                     <input
                         id="value"
                         data-testId="value-input"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-url-parameter-component/dot-experiments-goal-configuration-url-parameter-component.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-url-parameter-component/dot-experiments-goal-configuration-url-parameter-component.component.html
index d5d156640226..070006019f97 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-url-parameter-component/dot-experiments-goal-configuration-url-parameter-component.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-goal-configuration-url-parameter-component/dot-experiments-goal-configuration-url-parameter-component.component.html
@@ -7,9 +7,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
             formArrayName="conditions">
             <div [formGroupName]="i" class="condition flex">
                 <div class="field flex-grow-1 flex flex-column w-15rem" formGroupName="value">
-                    <label dotFieldRequired for="name">{{
-                        'experiments.goal.url_parameter.form.conditions.parameter.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="name">
+                        {{ 'experiments.goal.url_parameter.form.conditions.parameter.label' | dm }}
+                    </label>
                     <input
                         id="name"
                         data-testId="name-input"
@@ -30,9 +30,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
                 </div>
 
                 <div class="field flex-none flex flex-column w-15rem">
-                    <label dotFieldRequired for="operator">{{
-                        'experiments.goal.url_parameter.form.conditions.operator.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="operator">
+                        {{ 'experiments.goal.url_parameter.form.conditions.operator.label' | dm }}
+                    </label>
                     <p-dropdown
                         [dotOptions]="operatorsList"
                         id="operator"
@@ -50,9 +50,9 @@ <h3>{{ 'experiments.goal.reach_page.form.conditions.label' | dm }}</h3>
                 </div>
 
                 <div class="field flex-grow-1 flex flex-column" formGroupName="value">
-                    <label dotFieldRequired for="value">{{
-                        'experiments.goal.url_parameter.form.conditions.value.label' | dm
-                    }}</label>
+                    <label dotFieldRequired for="value">
+                        {{ 'experiments.goal.url_parameter.form.conditions.value.label' | dm }}
+                    </label>
                     <input
                         id="value"
                         data-testId="value-input"
diff --git a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-inline-edit-text/dot-experiments-inline-edit-text.component.html b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-inline-edit-text/dot-experiments-inline-edit-text.component.html
index f0f35a339fc6..8563f31dbb22 100644
--- a/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-inline-edit-text/dot-experiments-inline-edit-text.component.html
+++ b/core-web/libs/portlets/dot-experiments/portlet/src/lib/shared/ui/dot-experiments-inline-edit-text/dot-experiments-inline-edit-text.component.html
@@ -14,9 +14,9 @@
         </div>
 
         <ng-template #noTextDefinedTpl>
-            <span class="text-muted" data-testId="empty-text-message">{{
-                emptyTextMessage | dm
-            }}</span>
+            <span class="text-muted" data-testId="empty-text-message">
+                {{ emptyTextMessage | dm }}
+            </span>
         </ng-template>
     </ng-template>
 
diff --git a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/components/dot-locale-create-edit/dot-locale-create-edit.component.html b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/components/dot-locale-create-edit/dot-locale-create-edit.component.html
index 7d1483bdf45d..49f96bb4be62 100644
--- a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/components/dot-locale-create-edit/dot-locale-create-edit.component.html
+++ b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/components/dot-locale-create-edit/dot-locale-create-edit.component.html
@@ -6,9 +6,9 @@
     @if (languageId?.value) {
         <!--Edit language-->
         <div class="field">
-            <label class="p-label-input-required" for="langEdit">{{
-                'locale.display.name' | dm
-            }}</label>
+            <label class="p-label-input-required" for="langEdit">
+                {{ 'locale.display.name' | dm }}
+            </label>
             <input
                 [maxlength]="50"
                 id="langEdit"
@@ -60,16 +60,15 @@
                 id="localeType"
                 #localeTypeDropdown
                 data-testId="localeType"
-                appendTo="body">
-            </p-dropdown>
+                appendTo="body"></p-dropdown>
         </div>
 
         @if (localeTypeDropdown.value == 1) {
             <!--Standard Locale-->
             <div class="field">
-                <label class="p-label-input-required" for="languageDropdown">{{
-                    'locales.language' | dm
-                }}</label>
+                <label class="p-label-input-required" for="languageDropdown">
+                    {{ 'locales.language' | dm }}
+                </label>
                 <p-dropdown
                     [filter]="true"
                     [options]="data.languages"
@@ -130,9 +129,9 @@
         } @else {
             <!--Custom Locale-->
             <div class="field">
-                <label class="p-label-input-required" for="language">{{
-                    'locale.display.name' | dm
-                }}</label>
+                <label class="p-label-input-required" for="language">
+                    {{ 'locale.display.name' | dm }}
+                </label>
                 <input
                     [maxlength]="50"
                     id="language"
@@ -143,9 +142,9 @@
                 <span class="p-field-hint">{{ 'locale.display.name.hint' | dm }}</span>
             </div>
             <div class="field">
-                <label class="p-label-input-required" for="languageCode">{{
-                    'locale.id' | dm
-                }}</label>
+                <label class="p-label-input-required" for="languageCode">
+                    {{ 'locale.id' | dm }}
+                </label>
                 <input
                     [maxlength]="5"
                     id="languageCode"
@@ -158,9 +157,9 @@
         }
     }
     @if (showError | async) {
-        <span class="locale-add__error-message" data-testId="error-message">{{
-            'locale.error.message' | dm
-        }}</span>
+        <span class="locale-add__error-message" data-testId="error-message">
+            {{ 'locale.error.message' | dm }}
+        </span>
     }
 
     <div class="locale-add__buttons">
diff --git a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/dot-locales-list.component.html b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/dot-locales-list.component.html
index ce8f4abf04ff..0414d374d3de 100644
--- a/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/dot-locales-list.component.html
+++ b/core-web/libs/portlets/dot-locales/portlet/src/lib/dot-locales-list/dot-locales-list.component.html
@@ -28,13 +28,16 @@
         <ng-template pTemplate="header">
             <tr>
                 <th scope="col" pSortableColumn="isoCode">
-                    {{ 'locales.locale' | dm }} <p-sortIcon field="isoCode"></p-sortIcon>
+                    {{ 'locales.locale' | dm }}
+                    <p-sortIcon field="isoCode"></p-sortIcon>
                 </th>
                 <th scope="col" pSortableColumn="language">
-                    {{ 'locales.language' | dm }} <p-sortIcon field="language"></p-sortIcon>
+                    {{ 'locales.language' | dm }}
+                    <p-sortIcon field="language"></p-sortIcon>
                 </th>
                 <th scope="col" pSortableColumn="country">
-                    {{ 'locales.country' | dm }} <p-sortIcon field="country"></p-sortIcon>
+                    {{ 'locales.country' | dm }}
+                    <p-sortIcon field="country"></p-sortIcon>
                 </th>
                 <th scope="col">{{ 'locales.variables' | dm }}</th>
                 <th scope="col" style="width: 40px">{{ 'locales.menu' | dm }}</th>
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.html
index e27a6d35496f..8f5fac9f91b3 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/components/edit-ema-navigation-bar/edit-ema-navigation-bar.component.html
@@ -2,8 +2,7 @@
     <ng-container *ngFor="let item of items">
         <ng-container
             [ngTemplateOutlet]="item.action ? button : anchor"
-            [ngTemplateOutletContext]="{ item: item }">
-        </ng-container>
+            [ngTemplateOutletContext]="{ item: item }"></ng-container>
     </ng-container>
 </nav>
 
@@ -20,8 +19,7 @@
         rel="noopener">
         <ng-container
             [ngTemplateOutlet]="item.icon ? icon : iconURL"
-            [ngTemplateOutletContext]="{ item: item }">
-        </ng-container>
+            [ngTemplateOutletContext]="{ item: item }"></ng-container>
         <span class="item__label" data-testId="nav-bar-item-label">
             {{ item.label | dm }}
         </span>
@@ -37,8 +35,7 @@
         data-testId="nav-bar-item">
         <ng-container
             [ngTemplateOutlet]="item.icon ? icon : iconURL"
-            [ngTemplateOutletContext]="{ item: item }">
-        </ng-container>
+            [ngTemplateOutletContext]="{ item: item }"></ng-container>
         <span class="item__label" data-testId="nav-bar-item-label">
             {{ item.label | dm }}
         </span>
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-ema-info-display/dot-ema-info-display.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-ema-info-display/dot-ema-info-display.component.html
index 60ef3d9f7f88..ca9e1530c2e7 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-ema-info-display/dot-ema-info-display.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-ema-info-display/dot-ema-info-display.component.html
@@ -11,6 +11,6 @@
             *ngIf="!!op.icon"
             [class]="op.icon + ' info-container__icon'"
             data-testId="info-icon"></i>
-        <span [innerHTML]="op.info.message | dm: op.info.args" data-testId="info-text"> </span>
+        <span [innerHTML]="op.info.message | dm: op.info.args" data-testId="info-text"></span>
     </div>
 }
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/components/edit-ema-palette-contentlets/edit-ema-palette-contentlets.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/components/edit-ema-palette-contentlets/edit-ema-palette-contentlets.component.html
index 3bb793e77dc5..4fbf10983c3c 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/components/edit-ema-palette-contentlets/edit-ema-palette-contentlets.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-palette/components/edit-ema-palette-contentlets/edit-ema-palette-contentlets.component.html
@@ -51,8 +51,9 @@
                         draggable="true">
                         <dot-icon [size]="20" name="drag_indicator"></dot-icon>
 
-                        <dot-contentlet-thumbnail [iconSize]="'24px'" [contentlet]="contentlet">
-                        </dot-contentlet-thumbnail>
+                        <dot-contentlet-thumbnail
+                            [iconSize]="'24px'"
+                            [contentlet]="contentlet"></dot-contentlet-thumbnail>
 
                         <span>{{ contentlet.title }}</span>
                     </div>
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.html
index 52ec4ee9135b..fe22358d3b74 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/edit-ema-toolbar/edit-ema-toolbar.component.html
@@ -48,8 +48,7 @@
                 target="_blank"
                 data-testId="ema-api-link"
                 icon="pi pi-link"
-                label="API">
-            </a>
+                label="API"></a>
         </div>
         <div class="p-toolbar-group-right" data-testId="toolbar-right-content">
             <dot-ema-running-experiment
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/edit-ema-editor.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/edit-ema-editor.component.html
index a23c3ffc1e8f..bf03fa5d59b3 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/edit-ema-editor.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/edit-ema-editor.component.html
@@ -81,20 +81,22 @@
         [variantId]="es.editorData.variantId"
         data-testId="palette" />
 
-    @if ( es.editorData.canEditVariant && (es.editorData.mode === editorMode.EDIT ||
-    es.editorData.mode === editorMode.EDIT_VARIANT) ) {
-    <dot-edit-ema-dialog
-        (action)="onCustomEvent($event)"
-        (reloadFromDialog)="reloadFromDialog()"
-        #dialog
-        data-testId="ema-dialog"></dot-edit-ema-dialog>
-    <p-confirmDialog
-        [style]="{
-            width: '400px'
-        }"
-        rejectIcon="hidden"
-        acceptIcon="hidden"
-        rejectButtonStyleClass="p-button-outlined"
-        data-testId="confirm-dialog"></p-confirmDialog>
+    @if (
+        es.editorData.canEditVariant &&
+        (es.editorData.mode === editorMode.EDIT || es.editorData.mode === editorMode.EDIT_VARIANT)
+    ) {
+        <dot-edit-ema-dialog
+            (action)="onCustomEvent($event)"
+            (reloadFromDialog)="reloadFromDialog()"
+            #dialog
+            data-testId="ema-dialog"></dot-edit-ema-dialog>
+        <p-confirmDialog
+            [style]="{
+                width: '400px'
+            }"
+            rejectIcon="hidden"
+            acceptIcon="hidden"
+            rejectButtonStyleClass="p-button-outlined"
+            data-testId="confirm-dialog"></p-confirmDialog>
     }
 </ng-container>
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-block-editor/dot-content-compare-block-editor.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-block-editor/dot-content-compare-block-editor.component.html
index 4c01054fd376..8eb180875cb3 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-block-editor/dot-content-compare-block-editor.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-block-editor/dot-content-compare-block-editor.component.html
@@ -13,11 +13,9 @@
     [value]="data.working[field]"
     [ngStyle]="{ display: 'none' }"
     id="blockEditor"
-    #blockEditor>
-</dot-block-editor>
+    #blockEditor></dot-block-editor>
 <dot-block-editor
     [value]="data.compare[field]"
     [ngStyle]="{ display: 'none' }"
     id="blockEditorCompare"
-    #blockEditorCompare>
-</dot-block-editor>
+    #blockEditorCompare></dot-block-editor>
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-table/dot-content-compare-table.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-table/dot-content-compare-table.component.html
index 0436e95c893c..02b63e23b369 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-table/dot-content-compare-table.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/components/dot-content-compare-table/dot-content-compare-table.component.html
@@ -34,8 +34,7 @@
                         [(ngModel)]="showDiff"
                         [options]="displayOptions"
                         class="p-button-compact"
-                        data-testid="show-diff">
-                    </p-selectButton>
+                        data-testid="show-diff"></p-selectButton>
                     <button
                         (click)="bringBack.emit(data.compare.inode)"
                         [label]="'Bring-Back' | dm"
@@ -72,8 +71,7 @@
                         *ngIf="data.working[field.variable]"
                         [fileURL]="'/dA/' + data.working[field.variable] + '/fileAsset/'"
                         [label]="'/dA/' + data.working[field.variable] + '/fileAsset/'"
-                        data-testId="table-file-working">
-                    </dot-content-compare-preview-field>
+                        data-testId="table-file-working"></dot-content-compare-preview-field>
                 </td>
                 <td>
                     <dot-content-compare-preview-field
@@ -85,8 +83,7 @@
                                     : '/dA/' + data.compare[field.variable] + '/fileAsset/'
                                     : showDiff
                         "
-                        data-testId="table-file-compare">
-                    </dot-content-compare-preview-field>
+                        data-testId="table-file-compare"></dot-content-compare-preview-field>
                 </td>
             </ng-container>
             <ng-container *ngSwitchCase="'Binary'">
@@ -95,8 +92,7 @@
                         *ngIf="data.working[field.variable + 'Version']"
                         [fileURL]="data.working[field.variable + 'Version']"
                         [label]="data.working[field.variable + 'Version']"
-                        data-testId="table-binary-working">
-                    </dot-content-compare-preview-field>
+                        data-testId="table-binary-working"></dot-content-compare-preview-field>
                 </td>
                 <td>
                     <dot-content-compare-preview-field
@@ -106,8 +102,7 @@
                             data.working[field.variable + 'Version']
                                 | dotDiff: data.compare[field.variable + 'Version'] : showDiff
                         "
-                        data-testId="table-binary-compare">
-                    </dot-content-compare-preview-field>
+                        data-testId="table-binary-compare"></dot-content-compare-preview-field>
                 </td>
             </ng-container>
 
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/dot-content-compare.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/dot-content-compare.component.html
index 8bfde33267bb..fc4db8a29d88 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/dot-content-compare.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-content-compare/dot-content-compare.component.html
@@ -5,6 +5,5 @@
         (changeVersion)="store.updateCompare($event)"
         (bringBack)="bringBack($event)"
         [data]="vm.data"
-        [showDiff]="vm.showDiff">
-    </dot-content-compare-table>
+        [showDiff]="vm.showDiff"></dot-content-compare-table>
 </ng-container>
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.html
index 0ae72e7b0ac4..370ea73c2037 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.html
@@ -48,10 +48,9 @@ <h3 class="dot-device-selector__header-title">
                         <button (click)="change(option)" class="device-list__button">
                             <div class="device-list-item__content">
                                 <span class="device-list-item__name">{{ option.name }}</span>
-                                <span class="device-list-item__dimensions"
-                                    >{{ option.cssWidth | number }} x
-                                    {{ option.cssHeight | number }}</span
-                                >
+                                <span class="device-list-item__dimensions">
+                                    {{ option.cssWidth | number }} x {{ option.cssHeight | number }}
+                                </span>
                             </div>
                         </button>
                     </li>
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.spec.ts b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.spec.ts
index 23ce985fe11d..eebc8b14216b 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.spec.ts
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-device-selector-seo/dot-device-selector-seo.component.spec.ts
@@ -25,8 +25,10 @@ import { DotDeviceSelectorSeoComponent } from './dot-device-selector-seo.compone
 
 @Component({
     selector: 'dot-test-host-component',
-    template: `<button (click)="op.openMenu($event)" type="text">Open</button>
-        <dot-device-selector-seo [apiLink]="apiLink" #op></dot-device-selector-seo> `
+    template: `
+        <button (click)="op.openMenu($event)" type="text">Open</button>
+        <dot-device-selector-seo [apiLink]="apiLink" #op></dot-device-selector-seo>
+    `
 })
 class TestHostComponent {
     apiLink = 'api/v1/page/render/an/url/test?language_id=1';
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/dot-page-tools-seo.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/dot-page-tools-seo.component.html
index 1881c7ae4525..fb22882696ef 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/dot-page-tools-seo.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-page-tools-seo/dot-page-tools-seo.component.html
@@ -25,8 +25,8 @@
                     rel="noopener">
                     <img src="{{ tool.icon }}" alt="{{ tool.title }}" width="42" height="42" />
                     <div class="page-tools-list__content">
-                        <span class="page-tools-list__title"
-                            >{{ tool.title }}
+                        <span class="page-tools-list__title">
+                            {{ tool.title }}
                             <i class="pi pi-external-link page-tools-external-link"></i>
                         </span>
                         <p class="page-tools-list__description">
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-results-seo-tool/dot-results-seo-tool.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-results-seo-tool/dot-results-seo-tool.component.html
index d34eea1804eb..49e7146332fc 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-results-seo-tool/dot-results-seo-tool.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-results-seo-tool/dot-results-seo-tool.component.html
@@ -5,9 +5,9 @@
             <div [ngSwitch]="seoMedia">
                 <div *ngSwitchCase="seoMediaTypes.GOOGLE">
                     <div *ngFor="let preview of allPreview">
-                        <span class="results-seo-tool__main-card-title"
-                            >{{ preview.type }} Version</span
-                        >
+                        <span class="results-seo-tool__main-card-title">
+                            {{ preview.type }} Version
+                        </span>
                         <div
                             [class.results-seo-tool__version--small]="preview.isMobile"
                             class="results-seo-tool__card"
@@ -66,12 +66,12 @@ <h5>{{ mainPreview.title }}</h5>
 <p-card *ngFor="let result of currentResults$ | async" class="results-seo-tool__result-card">
     <ng-template pTemplate="header">
         <div class="results-seo-tool__result-card-title">
-            <span data-testId="result-key"> {{ result.title | titlecase }}</span>
+            <span data-testId="result-key">{{ result.title | titlecase }}</span>
         </div>
     </ng-template>
     <ul class="results-seo-tool__result-card-list">
         <li *ngFor="let item of result.items" data-testId="seo-tag">
-            <i [ngClass]="[item.color, item.itemIcon]" class="pi"> </i>
+            <i [ngClass]="[item.color, item.itemIcon]" class="pi"></i>
             <span [innerHTML]="item.message | safeHtml"></span>
         </li>
     </ul>
diff --git a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-select-seo-tool/dot-select-seo-tool.component.html b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-select-seo-tool/dot-select-seo-tool.component.html
index f0ae9568ec0f..16cd0c51438c 100644
--- a/core-web/libs/portlets/edit-ema/ui/src/lib/dot-select-seo-tool/dot-select-seo-tool.component.html
+++ b/core-web/libs/portlets/edit-ema/ui/src/lib/dot-select-seo-tool/dot-select-seo-tool.component.html
@@ -7,9 +7,9 @@
         <h5 class="dot-select-seo-tool__title" data-testId="select-seo-tool-title">
             {{ socialMediaTiles[socialMedia]?.label }}
         </h5>
-        <span class="dot-select-seo-tool__details" data-testId="select-seo-tool-details">{{
-            socialMediaTiles[socialMedia]?.description | dm
-        }}</span>
+        <span class="dot-select-seo-tool__details" data-testId="select-seo-tool-details">
+            {{ socialMediaTiles[socialMedia]?.description | dm }}
+        </span>
     </div>
 </ng-container>
 <ng-template #deviceBlock>
diff --git a/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.spec.ts b/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.spec.ts
index 40aebf30d05a..df9118c5cd7b 100644
--- a/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.spec.ts
+++ b/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.spec.ts
@@ -19,6 +19,6 @@ describe('NoComponentComponent', () => {
 
     it('should display the content type', () => {
         const noComponent = spectator.debugElement.nativeElement;
-        expect(noComponent?.innerHTML).toBe('No Component for exampleContentType');
+        expect(noComponent?.innerHTML).toContain('No Component for exampleContentType');
     });
 });
diff --git a/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.ts b/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.ts
index ca273aacc436..2d42d04cf1f7 100644
--- a/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.ts
+++ b/core-web/libs/sdk/angular/src/lib/components/no-component/no-component.component.ts
@@ -9,7 +9,9 @@ import { DotCMSContentlet } from '../../models';
 @Component({
     selector: 'dotcms-no-component',
     standalone: true,
-    template: `No Component for {{ contentlet.contentType }}`,
+    template: `
+        No Component for {{ contentlet.contentType }}
+    `,
     styleUrl: './no-component.component.css',
     changeDetection: ChangeDetectionStrategy.OnPush
 })
diff --git a/core-web/libs/sdk/angular/src/lib/layout/row/row.component.ts b/core-web/libs/sdk/angular/src/lib/layout/row/row.component.ts
index 6419800eadfa..2c7dd66c2732 100644
--- a/core-web/libs/sdk/angular/src/lib/layout/row/row.component.ts
+++ b/core-web/libs/sdk/angular/src/lib/layout/row/row.component.ts
@@ -7,9 +7,11 @@ import { ColumnComponent } from '../column/column.component';
     selector: 'dotcms-row',
     standalone: true,
     imports: [ColumnComponent],
-    template: `@for (column of row.columns; track $index) {
-        <dotcms-column [column]="column" />
-    }`,
+    template: `
+        @for (column of row.columns; track $index) {
+            <dotcms-column [column]="column" />
+        }
+    `,
     styleUrl: './row.component.css',
     changeDetection: ChangeDetectionStrategy.OnPush
 })
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/add-style-classes-dialog/add-style-classes-dialog.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/add-style-classes-dialog/add-style-classes-dialog.component.html
index b9b1ad4e450a..0a4e281b6d65 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/add-style-classes-dialog/add-style-classes-dialog.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/add-style-classes-dialog/add-style-classes-dialog.component.html
@@ -12,8 +12,7 @@
         dotSelectItem
         data-testId="autocomplete"
         inputId="auto-complete-input"
-        appendTo="body">
-    </p-autoComplete>
+        appendTo="body"></p-autoComplete>
     <ng-container *ngIf="isJsonClasses$ | async; else suggestionNotes">
         <ul data-testId="list">
             <li>
@@ -39,6 +38,6 @@
 </div>
 <div class="dialog__actions-container">
     <p-button (onClick)="save()" data-testId="update-btn">
-        {{ 'dot.template.builder.classes.dialog.update.button' | dm }}</p-button
-    >
+        {{ 'dot.template.builder.classes.dialog.update.button' | dm }}
+    </p-button>
 </div>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/add-widget/add-widget.component.spec.ts b/core-web/libs/template-builder/src/lib/components/template-builder/components/add-widget/add-widget.component.spec.ts
index 105ca1c8ca78..0b26826ea251 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/add-widget/add-widget.component.spec.ts
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/add-widget/add-widget.component.spec.ts
@@ -8,7 +8,9 @@ import { colIcon, rowIcon } from '../../assets/icons';
 
 @Component({
     selector: 'dotcms-host-component',
-    template: ` <dotcms-add-widget [label]="label" [icon]="icon"></dotcms-add-widget> `
+    template: `
+        <dotcms-add-widget [label]="label" [icon]="icon"></dotcms-add-widget>
+    `
 })
 class HostComponent {
     @Input() label = 'Add Widget';
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties-item/dot-layout-properties-item.component.spec.ts b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties-item/dot-layout-properties-item.component.spec.ts
index c563778f2e39..01c341b00aef 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties-item/dot-layout-properties-item.component.spec.ts
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties-item/dot-layout-properties-item.component.spec.ts
@@ -18,9 +18,11 @@ import { DotLayoutPropertiesItemComponent } from './dot-layout-properties-item.c
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'dot-test-host-component',
-    template: `<form [formGroup]="group">
-        <dot-layout-properties-item formControlName="header"></dot-layout-properties-item>
-    </form>`
+    template: `
+        <form [formGroup]="group">
+            <dot-layout-properties-item formControlName="header"></dot-layout-properties-item>
+        </form>
+    `
 })
 class TestHostComponent {
     group: UntypedFormGroup;
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.html
index 6958b28cba96..2b29ea975312 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.html
@@ -7,14 +7,12 @@
         <dot-layout-properties-item
             [label]="'editpage.layout.properties.header' | dm"
             class="property-item__header"
-            formControlName="header">
-        </dot-layout-properties-item>
+            formControlName="header"></dot-layout-properties-item>
 
         <dot-layout-properties-item
             [label]="'editpage.layout.properties.footer' | dm"
             class="property-item__footer"
-            formControlName="footer">
-        </dot-layout-properties-item>
+            formControlName="footer"></dot-layout-properties-item>
         <dot-layout-property-sidebar formControlName="sidebar"></dot-layout-property-sidebar>
     </div>
 </p-overlayPanel>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.spec.ts b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.spec.ts
index 5549a167ebfa..2d4425f31e28 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.spec.ts
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-properties.component.spec.ts
@@ -17,9 +17,11 @@ import { DotLayoutSidebarModule } from './dot-layout-property-sidebar/dot-layout
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'dot-test-host-component',
-    template: `<form [formGroup]="group">
-        <dot-layout-properties></dot-layout-properties>
-    </form>`
+    template: `
+        <form [formGroup]="group">
+            <dot-layout-properties></dot-layout-properties>
+        </form>
+    `
 })
 class TestHostComponent {
     group: UntypedFormGroup;
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.html
index 1420e9e928d5..53645dba0bd0 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.html
@@ -3,12 +3,10 @@
     [ngModel]="value.location === 'left'"
     [label]="'editpage.layout.properties.sidebar.left' | dm"
     class="property-item__sidebar-left"
-    #propertyItemLeft>
-</dot-layout-properties-item>
+    #propertyItemLeft></dot-layout-properties-item>
 <dot-layout-properties-item
     (switch)="setValue($event, 'right')"
     [ngModel]="value.location === 'right'"
     [label]="'editpage.layout.properties.sidebar.right' | dm"
     class="property-item__sidebar-right"
-    #propertyItemRight>
-</dot-layout-properties-item>
+    #propertyItemRight></dot-layout-properties-item>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.spec.ts b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.spec.ts
index a85507fcd1cf..1f7e3e6686ef 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.spec.ts
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/dot-layout-properties/dot-layout-property-sidebar/dot-layout-property-sidebar.component.spec.ts
@@ -22,9 +22,11 @@ import { DotLayoutPropertiesItemModule } from '../dot-layout-properties-item/dot
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'dot-test-host-component',
-    template: `<form [formGroup]="group">
-        <dot-layout-property-sidebar formControlName="sidebar"></dot-layout-property-sidebar>
-    </form>`
+    template: `
+        <form [formGroup]="group">
+            <dot-layout-property-sidebar formControlName="sidebar"></dot-layout-property-sidebar>
+        </form>
+    `
 })
 class TestHostComponent {
     group: UntypedFormGroup;
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/remove-confirm-dialog/remove-confirm-dialog.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/remove-confirm-dialog/remove-confirm-dialog.component.html
index b48f61480c02..41e1ef803129 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/remove-confirm-dialog/remove-confirm-dialog.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/remove-confirm-dialog/remove-confirm-dialog.component.html
@@ -3,5 +3,4 @@
     (onClick)="openConfirmationDialog($event)"
     data-testId="btn-remove-item"
     styleClass="p-button-text p-button-sm p-button-rounded"
-    icon="pi pi-trash">
-</p-button>
+    icon="pi pi-trash"></p-button>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-box/template-builder-box.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-box/template-builder-box.component.html
index 5714cbcb11cf..22fac5714955 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-box/template-builder-box.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-box/template-builder-box.component.html
@@ -57,8 +57,7 @@
                     *ngIf="actions.includes('delete')"
                     (deleteConfirmed)="requestColumnDelete()"
                     (deleteRejected)="deleteColumnRejected.emit()"
-                    [skipConfirmation]="items.length === 0">
-                </dotcms-remove-confirm-dialog>
+                    [skipConfirmation]="items.length === 0"></dotcms-remove-confirm-dialog>
             </div>
         </div>
         <p-scrollPanel [style]="{ width: '100%', height: '10.9375rem' }">
@@ -68,8 +67,7 @@
                 </p>
                 <dotcms-remove-confirm-dialog
                     (deleteConfirmed)="deleteContainer.emit(i)"
-                    data-testId="btn-trash-container">
-                </dotcms-remove-confirm-dialog>
+                    data-testId="btn-trash-container"></dotcms-remove-confirm-dialog>
             </div>
         </p-scrollPanel>
     </div>
@@ -96,7 +94,6 @@
             *ngIf="actions.includes('delete')"
             (deleteConfirmed)="deleteColumn.emit()"
             (deleteRejected)="deleteColumnRejected.emit()"
-            [skipConfirmation]="items.length === 0">
-        </dotcms-remove-confirm-dialog>
+            [skipConfirmation]="items.length === 0"></dotcms-remove-confirm-dialog>
     </div>
 </ng-template>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.html
index b2cbb05cafd0..92e0c3a09a0c 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.html
@@ -7,8 +7,7 @@
             (onClick)="editClasses()"
             data-testid="row-style-class-button"
             styleClass="p-button-text p-button-sm p-button-rounded"
-            icon="pi pi-palette">
-        </p-button>
+            icon="pi pi-palette"></p-button>
         <div class="row__drag-container">
             <i
                 [style.font-size.px]="20"
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.spec.ts b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.spec.ts
index db63bfaecdef..19f6a66eb60b 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.spec.ts
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-row/template-builder-row.component.spec.ts
@@ -22,9 +22,11 @@ import { TemplateBuilderBackgroundColumnsComponent } from '../template-builder-b
 
 @Component({
     selector: 'dotcms-host-component',
-    template: ` <dotcms-template-builder-row [row]="row" [isResizing]="isResizing">
-        <p>Some component</p>
-    </dotcms-template-builder-row>`
+    template: `
+        <dotcms-template-builder-row [row]="row" [isResizing]="isResizing">
+            <p>Some component</p>
+        </dotcms-template-builder-row>
+    `
 })
 class HostComponent {
     isResizing = false;
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-section/template-builder-section.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-section/template-builder-section.component.html
index 73b43d920db8..c13820657360 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-section/template-builder-section.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-section/template-builder-section.component.html
@@ -3,5 +3,4 @@
     (click)="deleteSection.emit()"
     styleClass="p-button-rounded p-button-text"
     icon="pi pi-trash"
-    data-testId="delete-section-button">
-</p-button>
+    data-testId="delete-section-button"></p-button>
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-theme-selector/template-builder-theme-selector.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-theme-selector/template-builder-theme-selector.component.html
index dab9df01db5e..6e83b358b98e 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-theme-selector/template-builder-theme-selector.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-theme-selector/template-builder-theme-selector.component.html
@@ -8,8 +8,7 @@
         #siteSelector
         dotSiteSelector
         optionLabel="name"
-        filterBy="name">
-    </p-dropdown>
+        filterBy="name"></p-dropdown>
 
     <div class="theme-header__search-box">
         <input
diff --git a/core-web/libs/template-builder/src/lib/components/template-builder/template-builder.component.html b/core-web/libs/template-builder/src/lib/components/template-builder/template-builder.component.html
index a7d8bf9d4d16..d929928692e3 100644
--- a/core-web/libs/template-builder/src/lib/components/template-builder/template-builder.component.html
+++ b/core-web/libs/template-builder/src/lib/components/template-builder/template-builder.component.html
@@ -36,9 +36,9 @@
         <dotcms-template-builder-section
             *ngIf="vm.layoutProperties.header"
             (deleteSection)="deleteSection('header')"
-            data-testId="template-builder-header"
-            >{{ 'dot.template.builder.header' | dm }}</dotcms-template-builder-section
-        >
+            data-testId="template-builder-header">
+            {{ 'dot.template.builder.header' | dm }}
+        </dotcms-template-builder-section>
         <div
             [ngClass]="{
                 'template-builder__container--right':
@@ -106,8 +106,8 @@
         <dotcms-template-builder-section
             *ngIf="vm.layoutProperties.footer"
             (deleteSection)="deleteSection('footer')"
-            data-testId="template-builder-footer"
-            >{{ 'dot.template.builder.footer' | dm }}</dotcms-template-builder-section
-        >
+            data-testId="template-builder-footer">
+            {{ 'dot.template.builder.footer' | dm }}
+        </dotcms-template-builder-section>
     </div>
 </ng-container>
diff --git a/core-web/libs/ui/src/lib/components/dot-action-menu-button/dot-action-menu-button.component.html b/core-web/libs/ui/src/lib/components/dot-action-menu-button/dot-action-menu-button.component.html
index 85149e769bf9..2d410d65483e 100644
--- a/core-web/libs/ui/src/lib/components/dot-action-menu-button/dot-action-menu-button.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-action-menu-button/dot-action-menu-button.component.html
@@ -7,6 +7,5 @@
         [icon]="filteredActions[0].icon"
         [pTooltip]="filteredActions[0].label"
         styleClass="p-button-sm p-button-rounded p-button-text"
-        data-testid="dot-action-tooltip-button">
-    </p-button>
+        data-testid="dot-action-tooltip-button"></p-button>
 }
diff --git a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/components/ai-image-prompt-form/ai-image-prompt-form.component.html b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/components/ai-image-prompt-form/ai-image-prompt-form.component.html
index 386276e9c326..3243ebb10cf7 100644
--- a/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/components/ai-image-prompt-form/ai-image-prompt-form.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-ai-image-prompt/components/ai-image-prompt-form/ai-image-prompt-form.component.html
@@ -12,25 +12,25 @@
                 <label dotFieldRequired>{{ 'block-editor.extension.ai-image.input' | dm }}</label>
                 <div>
                     <p-radioButton formControlName="type" inputId="optionOne" value="input" />
-                    <label class="ml-2" for="optionOne">{{
-                        'block-editor.extension.ai-image.custom.prompt' | dm
-                    }}</label>
+                    <label class="ml-2" for="optionOne">
+                        {{ 'block-editor.extension.ai-image.custom.prompt' | dm }}
+                    </label>
                 </div>
                 <span>{{ 'block-editor.extension.ai-image.custom.prompt.desc' | dm }}</span>
                 @if (hasEditorContent) {
                     <div data-testid="ai-existing-content">
                         <p-radioButton formControlName="type" inputId="option2" value="auto" />
-                        <label class="ml-2" for="option2">{{
-                            'block-editor.extension.ai-image.existing.content' | dm
-                        }}</label>
+                        <label class="ml-2" for="option2">
+                            {{ 'block-editor.extension.ai-image.existing.content' | dm }}
+                        </label>
                     </div>
                     <span>{{ 'block-editor.extension.ai-image.existing.content.desc' | dm }}</span>
                 }
             </div>
             <div class="field ai-image-prompt__orientation">
-                <label dotFieldRequired for="orientation">{{
-                    'block-editor.extension.ai-image.orientation' | dm
-                }}</label>
+                <label dotFieldRequired for="orientation">
+                    {{ 'block-editor.extension.ai-image.orientation' | dm }}
+                </label>
                 <p-dropdown
                     [options]="orientationOptions"
                     formControlName="size"
@@ -62,13 +62,12 @@
                         cols="30"
                         formControlName="text"
                         pInputTextarea
-                        rows="11">
-                    </textarea>
+                        rows="11"></textarea>
                 </div>
                 @if (aiProcessedPrompt && !isLoading) {
                     <div class="field">
-                        <label class="ai-image-prompt__rewritten-label" for="prompt-rewritten"
-                            >{{ 'block-editor.extension.ai-image.rewritten' | dm }}
+                        <label class="ai-image-prompt__rewritten-label" for="prompt-rewritten">
+                            {{ 'block-editor.extension.ai-image.rewritten' | dm }}
                         </label>
                         <div class="ai-image-prompt__text-wrapper">
                             <textarea
@@ -78,8 +77,7 @@
                                 cols="30"
                                 pInputTextarea
                                 readonly
-                                rows="11">
-                            </textarea>
+                                rows="11"></textarea>
                             <dot-copy-button
                                 [copy]="aiProcessedPrompt"
                                 customClass="p-button-rounded" />
diff --git a/core-web/libs/ui/src/lib/components/dot-api-link/dot-api-link.component.spec.ts b/core-web/libs/ui/src/lib/components/dot-api-link/dot-api-link.component.spec.ts
index 19fce7862d97..d9cfa4d72e68 100644
--- a/core-web/libs/ui/src/lib/components/dot-api-link/dot-api-link.component.spec.ts
+++ b/core-web/libs/ui/src/lib/components/dot-api-link/dot-api-link.component.spec.ts
@@ -9,7 +9,9 @@ import { MockDotMessageService } from '@dotcms/utils-testing';
 import { DotApiLinkComponent } from './dot-api-link.component';
 
 @Component({
-    template: `<dot-api-link [href]="href"></dot-api-link>`
+    template: `
+        <dot-api-link [href]="href"></dot-api-link>
+    `
 })
 class TestHostComponent {
     href = 'api/v1/123';
diff --git a/core-web/libs/ui/src/lib/components/dot-asset-search/components/dot-asset-card/dot-asset-card.component.html b/core-web/libs/ui/src/lib/components/dot-asset-search/components/dot-asset-card/dot-asset-card.component.html
index 8a388a306d37..17561ba86abf 100644
--- a/core-web/libs/ui/src/lib/components/dot-asset-search/components/dot-asset-card/dot-asset-card.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-asset-search/components/dot-asset-card/dot-asset-card.component.html
@@ -14,7 +14,7 @@ <h2 *pTemplate="'title'" class="title" data-testId="dot-card-title">
     <ng-template pTemplate="footer">
         <div class="state">
             <span class="badge" data-testId="dot-card-language">{{ contentlet?.language }}</span>
-            <dot-state-icon [state]="contentlet" size="16px"> </dot-state-icon>
+            <dot-state-icon [state]="contentlet" size="16px"></dot-state-icon>
         </div>
     </ng-template>
 </p-card>
diff --git a/core-web/libs/ui/src/lib/components/dot-binary-option-selector/dot-binary-option-selector.component.html b/core-web/libs/ui/src/lib/components/dot-binary-option-selector/dot-binary-option-selector.component.html
index 0803a47d7d41..887c6e9b2260 100644
--- a/core-web/libs/ui/src/lib/components/dot-binary-option-selector/dot-binary-option-selector.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-binary-option-selector/dot-binary-option-selector.component.html
@@ -8,7 +8,7 @@
                 type="radio"
                 name="options" />
             <div class="item">
-                <span class="material-icons"> {{ firstOption.icon }} </span>
+                <span class="material-icons">{{ firstOption.icon }}</span>
                 <span data-testId="label-op1">{{ firstOption.label | dm }}</span>
             </div>
         </label>
@@ -20,7 +20,7 @@
                 type="radio"
                 name="options" />
             <div class="item">
-                <span class="material-icons"> {{ secondOption.icon }} </span>
+                <span class="material-icons">{{ secondOption.icon }}</span>
                 <span data-testId="label-op2">{{ secondOption.label | dm }}</span>
             </div>
         </label>
diff --git a/core-web/libs/ui/src/lib/components/dot-drop-zone/directive/dot-drop-zone-value-accesor/dot-drop-zone-value-accessor.directive.stories.ts b/core-web/libs/ui/src/lib/components/dot-drop-zone/directive/dot-drop-zone-value-accesor/dot-drop-zone-value-accessor.directive.stories.ts
index 9052a332bab4..c66a430253ae 100644
--- a/core-web/libs/ui/src/lib/components/dot-drop-zone/directive/dot-drop-zone-value-accesor/dot-drop-zone-value-accessor.directive.stories.ts
+++ b/core-web/libs/ui/src/lib/components/dot-drop-zone/directive/dot-drop-zone-value-accesor/dot-drop-zone-value-accessor.directive.stories.ts
@@ -43,10 +43,16 @@ import { DotDropZoneComponent } from '../../dot-drop-zone.component';
                 <div class="dot-drop-zone__content" id="dot-drop-zone__content">
                     Drop files here.
                     @if (accept.length) {
-                        <div><strong>Allowed Type:</strong> {{ accept }}</div>
+                        <div>
+                            <strong>Allowed Type:</strong>
+                            {{ accept }}
+                        </div>
                     }
                     @if (maxFileSize) {
-                        <div><strong>Max File Size:</strong> {{ maxFileSize }}</div>
+                        <div>
+                            <strong>Max File Size:</strong>
+                            {{ maxFileSize }}
+                        </div>
                     }
                 </div>
             </dot-drop-zone>
diff --git a/core-web/libs/ui/src/lib/components/dot-empty-container/dot-empty-container.component.html b/core-web/libs/ui/src/lib/components/dot-empty-container/dot-empty-container.component.html
index e86676a25d10..0c9eec942bc1 100644
--- a/core-web/libs/ui/src/lib/components/dot-empty-container/dot-empty-container.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-empty-container/dot-empty-container.component.html
@@ -36,9 +36,9 @@ <h2 class="message__subtitle" data-Testid="message-subtitle">
                     class="message__external-link"
                     data-Testid="message-contact-link"
                     href="https://dotcms.com/contact-us/"
-                    target="_blank"
-                    >{{ 'Contact-Us-for-more-Information' | dm }}</a
-                >
+                    target="_blank">
+                    {{ 'Contact-Us-for-more-Information' | dm }}
+                </a>
             }
         </div>
     }
diff --git a/core-web/libs/ui/src/lib/components/dot-form-dialog/dot-form-dialog.component.spec.ts b/core-web/libs/ui/src/lib/components/dot-form-dialog/dot-form-dialog.component.spec.ts
index e969216e5c4c..67d77439e904 100644
--- a/core-web/libs/ui/src/lib/components/dot-form-dialog/dot-form-dialog.component.spec.ts
+++ b/core-web/libs/ui/src/lib/components/dot-form-dialog/dot-form-dialog.component.spec.ts
@@ -21,7 +21,9 @@ const dispatchKeydownEvent = (comp: HTMLBaseElement, key: string, meta = false,
 };
 
 @Component({
-    template: `<dot-form-dialog><form>Hello World</form></dot-form-dialog>`
+    template: `
+        <dot-form-dialog><form>Hello World</form></dot-form-dialog>
+    `
 })
 class TestHostComponent {}
 
diff --git a/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-ng.component.html b/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-ng.component.html
index ae19b98fcabc..8254c8ff8046 100644
--- a/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-ng.component.html
+++ b/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-ng.component.html
@@ -26,8 +26,7 @@
             (save)="saveVariable($event)"
             [autoFocus]="autoFocus"
             [showHiddenField]="showHiddenField"
-            [forbiddenkeys]="forbiddenkeys()">
-        </dot-key-value-table-input-row>
+            [forbiddenkeys]="forbiddenkeys()"></dot-key-value-table-input-row>
     </ng-template>
     <ng-template pTemplate="body" let-variable let-rowIndex="rowIndex">
         <dot-key-value-table-row
@@ -35,8 +34,7 @@
             (save)="updateKeyValue($event, rowIndex)"
             [showHiddenField]="showHiddenField"
             [variable]="variable"
-            #tableRow>
-        </dot-key-value-table-row>
+            #tableRow></dot-key-value-table-row>
     </ng-template>
     <ng-template pTemplate="emptymessage" let-variables>
         <tr data-testId="no-rows">
diff --git a/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-table-row/dot-key-value-table-row.component.spec.ts b/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-table-row/dot-key-value-table-row.component.spec.ts
index be814ede5ee0..1eabb731db51 100644
--- a/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-table-row/dot-key-value-table-row.component.spec.ts
+++ b/core-web/libs/ui/src/lib/components/dot-key-value-ng/dot-key-value-table-row/dot-key-value-table-row.component.spec.ts
@@ -57,8 +57,9 @@ const triggerEditableColumnClick = (spectator: Spectator<TestHostComponent>) =>
     template: `
         <p-table [value]="variablesList" #table>
             <ng-template pTemplate="body" let-variable let-rowIndex="rowIndex">
-                <dot-key-value-table-row [showHiddenField]="showHiddenField" [variable]="variable">
-                </dot-key-value-table-row>
+                <dot-key-value-table-row
+                    [showHiddenField]="showHiddenField"
+                    [variable]="variable"></dot-key-value-table-row>
             </ng-template>
         </p-table>
     `
diff --git a/core-web/libs/ui/src/lib/components/dot-link/dot-link.component.spec.ts b/core-web/libs/ui/src/lib/components/dot-link/dot-link.component.spec.ts
index 4e84ea858173..d752e82f477e 100644
--- a/core-web/libs/ui/src/lib/components/dot-link/dot-link.component.spec.ts
+++ b/core-web/libs/ui/src/lib/components/dot-link/dot-link.component.spec.ts
@@ -11,7 +11,9 @@ import { DotMessagePipe } from '../../dot-message/dot-message.pipe';
 import { DotApiLinkComponent } from '../dot-api-link/dot-api-link.component';
 
 @Component({
-    template: ` <dot-link [href]="href" [icon]="icon" [label]="label"></dot-link>`
+    template: `
+        <dot-link [href]="href" [icon]="icon" [label]="label"></dot-link>
+    `
 })
 class TestHostComponent {
     href = 'api/v1/123';
diff --git a/core-web/libs/ui/src/lib/directives/dot-avatar/dot-avatar.directive.spec.ts b/core-web/libs/ui/src/lib/directives/dot-avatar/dot-avatar.directive.spec.ts
index b4500045c884..1b876b79b4fc 100644
--- a/core-web/libs/ui/src/lib/directives/dot-avatar/dot-avatar.directive.spec.ts
+++ b/core-web/libs/ui/src/lib/directives/dot-avatar/dot-avatar.directive.spec.ts
@@ -7,7 +7,9 @@ import { AvatarModule } from 'primeng/avatar';
 import { DotAvatarDirective } from './dot-avatar.directive';
 
 @Component({
-    template: ` <p-avatar [text]="text" [image]="image" dotAvatar></p-avatar> `
+    template: `
+        <p-avatar [text]="text" [image]="image" dotAvatar></p-avatar>
+    `
 })
 class TestHostComponent {
     text: string;
diff --git a/core-web/libs/ui/src/lib/directives/dot-trim-input/dot-trim-input.directive.spec.ts b/core-web/libs/ui/src/lib/directives/dot-trim-input/dot-trim-input.directive.spec.ts
index 0466ac448ce0..2b7d6398e4af 100644
--- a/core-web/libs/ui/src/lib/directives/dot-trim-input/dot-trim-input.directive.spec.ts
+++ b/core-web/libs/ui/src/lib/directives/dot-trim-input/dot-trim-input.directive.spec.ts
@@ -8,7 +8,9 @@ import { DotTrimInputDirective } from '@dotcms/ui';
 const STRING_WITH_SPACES = '   Test Value   ';
 
 @Component({
-    template: `<input [(ngModel)]="name" dotTrimInput data-testId="input-to-trim" />`
+    template: `
+        <input [(ngModel)]="name" dotTrimInput data-testId="input-to-trim" />
+    `
 })
 export class DotTrimInputHostMockComponent {
     name = STRING_WITH_SPACES;
diff --git a/core-web/libs/ui/src/lib/dot-container-options/mock-containers-dropdown.component.ts b/core-web/libs/ui/src/lib/dot-container-options/mock-containers-dropdown.component.ts
index 358bf5aee8a2..31d7044b63cf 100644
--- a/core-web/libs/ui/src/lib/dot-container-options/mock-containers-dropdown.component.ts
+++ b/core-web/libs/ui/src/lib/dot-container-options/mock-containers-dropdown.component.ts
@@ -2,6 +2,8 @@ import { Component } from '@angular/core';
 
 @Component({
     selector: 'dot-containers-dropdown-mock',
-    template: ` <p-dropdown dotContainerOptions></p-dropdown>`
+    template: `
+        <p-dropdown dotContainerOptions></p-dropdown>
+    `
 })
 export class MockContainersDropdownComponent {}
diff --git a/core-web/libs/ui/src/lib/dot-field-required/dot-field-required.spec.ts b/core-web/libs/ui/src/lib/dot-field-required/dot-field-required.spec.ts
index a2598937e83d..ca1d7b2abd17 100644
--- a/core-web/libs/ui/src/lib/dot-field-required/dot-field-required.spec.ts
+++ b/core-web/libs/ui/src/lib/dot-field-required/dot-field-required.spec.ts
@@ -17,9 +17,13 @@ import { DotFieldRequiredDirective } from './dot-field-required.directive';
             <label data-testid="nameLabel" dotFieldRequired for="name">Name</label>
             <input id="name" type="text" formControlName="name" />
             <br />
-            <label data-testid="textLabel" checkIsRequiredControl="text" dotFieldRequired for="text"
-                >Text</label
-            >
+            <label
+                data-testid="textLabel"
+                checkIsRequiredControl="text"
+                dotFieldRequired
+                for="text">
+                Text
+            </label>
             <input id="text" type="text" formControlName="text" />
         </form>
     `
diff --git a/core-web/libs/ui/src/lib/dot-remove-confirm-popup/dot-remove-confirm-popup.directive.spec.ts b/core-web/libs/ui/src/lib/dot-remove-confirm-popup/dot-remove-confirm-popup.directive.spec.ts
index 67e4f957a273..f01e0e94b914 100644
--- a/core-web/libs/ui/src/lib/dot-remove-confirm-popup/dot-remove-confirm-popup.directive.spec.ts
+++ b/core-web/libs/ui/src/lib/dot-remove-confirm-popup/dot-remove-confirm-popup.directive.spec.ts
@@ -9,7 +9,9 @@ import { DotRemoveConfirmPopupWithEscapeDirective } from '@dotcms/ui';
 
 @Component({
     selector: 'dot-escape-confirm-popup-host',
-    template: `<p-confirmPopup dotRemoveConfirmPopupWithEscape></p-confirmPopup>`,
+    template: `
+        <p-confirmPopup dotRemoveConfirmPopupWithEscape></p-confirmPopup>
+    `,
     imports: [ConfirmPopupModule]
 })
 class CustomHostComponent {}
diff --git a/core-web/libs/utils-testing/src/lib/split-button.mock.ts b/core-web/libs/utils-testing/src/lib/split-button.mock.ts
index 79e0f9fa9835..da7df061b814 100644
--- a/core-web/libs/utils-testing/src/lib/split-button.mock.ts
+++ b/core-web/libs/utils-testing/src/lib/split-button.mock.ts
@@ -3,9 +3,11 @@ import { Component, EventEmitter, Input, NgModule, Output } from '@angular/core'
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
     selector: 'p-splitButton',
-    template: `<div class="p-splitbutton">
-        <button (click)="onClick.emit()"></button>
-    </div>`
+    template: `
+        <div class="p-splitbutton">
+            <button (click)="onClick.emit()"></button>
+        </div>
+    `
 })
 export class SplitButtonMockComponent {
     // eslint-disable-next-line @angular-eslint/no-output-on-prefix