diff --git a/core-web/apps/dotcms-ui/src/stories/primeng/data/Tree.stories.ts b/core-web/apps/dotcms-ui/src/stories/primeng/data/Tree.stories.ts
index c7f7ab212f29..abde4ddbccf8 100644
--- a/core-web/apps/dotcms-ui/src/stories/primeng/data/Tree.stories.ts
+++ b/core-web/apps/dotcms-ui/src/stories/primeng/data/Tree.stories.ts
@@ -1,27 +1,26 @@
-// also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { TreeNode } from 'primeng/api';
+import { Tree, TreeModule } from 'primeng/tree';
 
-import { TreeModule } from 'primeng/tree';
+import type { Meta, StoryObj } from '@storybook/angular';
 
-export default {
+const meta: Meta<Tree> = {
     title: 'PrimeNG/Data/Tree',
-    decorators: [
-        moduleMetadata({
-            imports: [TreeModule]
-        })
-    ],
+    component: Tree,
     parameters: {
         layout: 'centered',
         docs: {
             description: {
                 component:
-                    'Paginator is a generic component to display content in paged format.: https://primefaces.org/primeng/showcase/#/paginator'
+                    'Tree is used to display hierarchical data: https://www.primefaces.org/primeng-v15-lts/tree'
             }
         }
     }
-} as Meta;
+};
+export default meta;
+
+type Story = StoryObj<Tree>;
 
-const files = [
+export const files: TreeNode[] = [
     {
         label: 'Documents',
         data: 'Documents Folder',
@@ -102,21 +101,14 @@ const files = [
     }
 ];
 
-const BasicTemplate = `<p-tree [value]="files"></p-tree>`;
-
-export const Basic: Story = () => {
-    return {
-        template: BasicTemplate,
+export const Default: Story = {
+    render: () => ({
+        moduleMetadata: {
+            imports: [TreeModule]
+        },
         props: {
             files
-        }
-    };
-};
-
-Basic.parameters = {
-    docs: {
-        source: {
-            code: BasicTemplate
-        }
-    }
+        },
+        template: `<p-tree [value]="files"></p-tree>`
+    })
 };
diff --git a/core-web/apps/dotcms-ui/src/stories/primeng/form/Chips.stories.ts b/core-web/apps/dotcms-ui/src/stories/primeng/form/Chips.stories.ts
index 01486b9c8cd5..b1c7db1f78a2 100644
--- a/core-web/apps/dotcms-ui/src/stories/primeng/form/Chips.stories.ts
+++ b/core-web/apps/dotcms-ui/src/stories/primeng/form/Chips.stories.ts
@@ -1,54 +1,41 @@
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { Meta, StoryObj } from '@storybook/angular';
 
+import { FormsModule } from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { Chips, ChipsModule } from 'primeng/chips';
 
-export default {
+const meta: Meta = {
     title: 'PrimeNG/Form/Chips',
     component: Chips,
     parameters: {
         docs: {
             description: {
                 component:
-                    'Chips is used to enter multiple values on an input field: https://primeng.org/checkbox'
+                    'Chips is used to enter multiple values on an input field: https://primeng.org/chips'
             }
         }
     },
-    decorators: [
-        moduleMetadata({
-            imports: [ChipsModule, BrowserAnimationsModule]
-        })
-    ],
+    argTypes: {
+        values: {
+            name: 'values',
+            description: 'Array of strings, each representing a chip.'
+        }
+    },
     args: {
-        values: ['first']
-    }
-} as Meta;
-
-const ChipsTemplate = `<p-chips [(ngModel)]="values" ></p-chips>`;
-
-const Template: Story<Chips> = (props: Chips) => {
-    const template = ChipsTemplate;
-
-    return {
-        props,
-        template
-    };
-};
-
-export const Basic: Story = Template.bind({});
-
-Basic.argTypes = {
-    values: {
-        name: 'values',
-        description: 'Array of strings, each representing a chip.'
+        values: ['one', 'two']
     }
 };
-
-Basic.parameters = {
-    docs: {
-        source: {
-            code: ChipsTemplate
-        }
-    }
+export default meta;
+
+type Story = StoryObj<Chips>;
+
+export const Default: Story = {
+    render: (args) => ({
+        props: args,
+        moduleMetadata: {
+            imports: [ChipsModule, BrowserAnimationsModule, FormsModule]
+        },
+        template: `<p-chips [(ngModel)]="values" />`
+    })
 };
diff --git a/core-web/apps/dotcms-ui/src/stories/primeng/form/TreeSelect.stories.ts b/core-web/apps/dotcms-ui/src/stories/primeng/form/TreeSelect.stories.ts
new file mode 100644
index 000000000000..ddee524d21a9
--- /dev/null
+++ b/core-web/apps/dotcms-ui/src/stories/primeng/form/TreeSelect.stories.ts
@@ -0,0 +1,231 @@
+import { Meta, StoryObj } from '@storybook/angular';
+
+import { FormsModule } from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
+import { TreeSelectModule, TreeSelect } from 'primeng/treeselect';
+
+import { files } from './../data/Tree.stories';
+
+const meta: Meta<TreeSelect> = {
+    title: 'PrimeNG/Form/TreeSelect',
+    component: TreeSelect,
+    parameters: {
+        layout: 'centered',
+        docs: {
+            description: {
+                component:
+                    'TreeSelect is a form component to choose from hierarchical data.: https://www.primefaces.org/primeng-v15-lts/treeselect'
+            }
+        }
+    }
+};
+export default meta;
+
+type Story = StoryObj<TreeSelect>;
+
+const storyConfigBase: Partial<Story['render']> = {
+    moduleMetadata: {
+        imports: [TreeSelectModule, FormsModule, BrowserAnimationsModule, BrowserModule]
+    },
+    props: {
+        files,
+        selectedNodes: ''
+    }
+};
+
+export const Default: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                [(ngModel)]="selectedNodes"
+                class="md:w-20rem w-full" containerStyleClass="w-full"
+                [options]="files"
+                placeholder="Select Item"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+            </p-treeSelect> 
+        </div>
+        `
+    })
+};
+
+export const Invalid: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                class="md:w-20rem w-full ng-invalid ng-dirty"
+                containerStyleClass="w-full"
+                [(ngModel)]="selectedNodes"
+                [options]="files"
+                placeholder="Select Item"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+            </p-treeSelect> 
+        </div>
+        `
+    })
+};
+
+export const WithLabel: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <span class="md:w-20rem w-full">
+                <label for="treeselect">Label</label>
+                <p-treeSelect
+                    containerStyleClass="w-full"
+                    [(ngModel)]="selectedNodes"
+                    [options]="files"
+                    placeholder="Select Item"
+                    [showClear]="true"
+                >
+                    <ng-template pTemplate="triggericon">
+                        <i class="pi pi-chevron-down"></i>
+                    </ng-template>
+                </p-treeSelect> 
+            </span>
+        </div>
+        `
+    })
+};
+
+export const WithFloatLabel: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <div class="md:w-20rem w-full">
+                <span class="p-float-label w-full">
+                    <p-treeSelect
+                        containerStyleClass="w-full"
+                        [(ngModel)]="selectedNodes"
+                        [options]="files"
+                        placeholder="Select Item"
+                        [showClear]="true"
+                    >
+                        <ng-template pTemplate="triggericon">
+                            <i class="pi pi-chevron-down"></i>
+                        </ng-template>
+                    </p-treeSelect> 
+                    <label for="treeselect">Float Label</label>
+                </span>
+            </div>
+        </div>
+        `
+    })
+};
+
+export const Disable: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                [disabled]="true"
+                [(ngModel)]="selectedNodes"
+                class="md:w-20rem w-full" containerStyleClass="w-full"
+                [options]="files"
+                placeholder="Select Item"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+            </p-treeSelect> 
+        </div>
+        `
+    })
+};
+
+export const Multiple: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `  
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                class="w-full md:w-20rem"
+                containerStyleClass="w-full"
+                [(ngModel)]="selectedNodes"
+                [options]="files"
+                [metaKeySelection]="false"
+                selectionMode="multiple"
+                placeholder="Select Item"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+            </p-treeSelect> 
+        </div>
+        `
+    })
+};
+
+export const Checkbox: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `  
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                class="w-full md:w-20rem"
+                containerStyleClass="w-full"
+                [(ngModel)]="selectedNodes"
+                [options]="files"
+                [showClear]="true"
+                display="chip"
+                [metaKeySelection]="false"
+                selectionMode="checkbox"
+                placeholder="Select Item"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+            </p-treeSelect> 
+        </div>
+        `
+    })
+};
+
+export const Filter: Story = {
+    render: () => ({
+        ...storyConfigBase,
+        template: `  
+        <div class="card flex justify-content-center w-25rem h-25rem">
+            <p-treeSelect
+                class="md:w-20rem w-full"
+                containerStyleClass="w-full"
+                [(ngModel)]="selectedNodes"
+                [options]="files"
+                placeholder="Select Item"
+                [filter]="true"
+                [filterInputAutoFocus]="true"
+                [showClear]="true"
+            >
+                <ng-template pTemplate="triggericon">
+                    <i class="pi pi-chevron-down"></i>
+                </ng-template>
+                <ng-template pTemplate="filtericon">
+                    <i class="pi pi-search"></i>
+                </ng-template>
+                <ng-template pTemplate="closeicon">
+                    <i class="pi pi-times"></i>
+                </ng-template>
+            </p-treeSelect>
+        </div>
+        `
+    })
+};
diff --git a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/_tree.scss b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/_tree.scss
index 57a1bad486b5..a3eedd4f615e 100644
--- a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/_tree.scss
+++ b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/_tree.scss
@@ -9,7 +9,7 @@
 }
 
 .p-tree .p-tree-container .p-treenode {
-    padding: 0.25rem;
+    padding: $spacing-0;
 }
 
 .p-tree .p-tree-container .p-treenode .p-treenode-content {
diff --git a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_chips.scss b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_chips.scss
index 8883cd35116e..b974e7298dd7 100644
--- a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_chips.scss
+++ b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_chips.scss
@@ -1,4 +1,5 @@
 @use "variables" as *;
+@import "common";
 
 p-chips.ng-dirty.ng-invalid > .p-chips > .p-inputtext {
     border-color: $error;
@@ -20,11 +21,7 @@ p-chips.ng-dirty.ng-invalid > .p-chips > .p-inputtext {
 }
 
 .p-chips .p-chips-multiple-container .p-chips-token {
-    padding: 0.375rem $spacing-2;
-    margin-right: $spacing-1;
-    background: $bg-highlight;
-    color: $color-palette-primary;
-    border-radius: $border-radius-xs;
+    @extend #field-chip-token;
 }
 
 .p-chips .p-chips-multiple-container .p-chips-token .p-chips-token-icon {
diff --git a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_treeselect.scss b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_treeselect.scss
new file mode 100644
index 000000000000..407aebd44228
--- /dev/null
+++ b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_treeselect.scss
@@ -0,0 +1,115 @@
+@use "variables" as *;
+@import "common";
+
+.p-treeselect {
+    @extend #form-field-base;
+    padding: 0;
+    transition: background-color $basic-speed, border-color $basic-speed, box-shadow $basic-speed;
+
+    &:not(.p-disabled) {
+        &:hover {
+            @extend #form-field-hover;
+        }
+
+        &.p-focus {
+            @extend #form-field-focus;
+            outline-offset: 0;
+            box-shadow: $shadow-xs;
+        }
+    }
+
+    &.p-disabled {
+        @extend #form-field-disabled;
+
+        .p-treeselect-trigger {
+            color: $color-palette-gray-500;
+        }
+    }
+
+    &.p-treeselect-chip {
+        .p-treeselect-token {
+            @extend #field-chip-token;
+        }
+    }
+
+    .p-treeselect-label {
+        padding: $spacing-1 $spacing-2;
+        transition: background-color $basic-speed, border-color $basic-speed,
+            box-shadow $basic-speed;
+
+        &.p-placeholder {
+            color: $color-palette-gray-500;
+        }
+    }
+
+    .p-treeselect-trigger {
+        @extend #field-trigger;
+    }
+}
+
+.p-inputwrapper-filled {
+    .p-treeselect {
+        &.p-treeselect-chip {
+            .p-treeselect-label {
+                padding: $spacing-0 $spacing-1;
+            }
+        }
+    }
+}
+
+.p-treeselect-panel {
+    @extend #field-panel;
+
+    .p-treeselect-header {
+        @extend #field-panel-header;
+        gap: $spacing-1;
+
+        .p-treeselect-filter-container {
+            .p-treeselect-filter {
+                @extend #field-panel-filter;
+            }
+
+            .p-treeselect-filter-icon {
+                @extend #field-panel-filter-icon;
+            }
+        }
+
+        .p-treeselect-close {
+            @extend #field-panel-icon-close;
+        }
+    }
+
+    .p-treeselect-items-wrapper {
+        .p-tree {
+            border: 0 none;
+            padding: 0;
+        }
+
+        .p-tree-empty-message {
+            padding: $spacing-2 $spacing-2;
+            color: $black;
+            background: transparent;
+        }
+    }
+}
+
+p-treeselect {
+    &.ng-invalid {
+        &.ng-dirty {
+            .p-treeselect {
+                border-color: $error;
+            }
+        }
+    }
+
+    &.p-treeselect-clearable {
+        .p-treeselect-label-container {
+            padding-right: $spacing-5;
+        }
+
+        .p-treeselect-clear-icon {
+            color: $color-palette-gray-500;
+            right: $spacing-7;
+        }
+    }
+}
diff --git a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/common.scss b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/common.scss
index 7ca594c88f4c..9a90df753fbf 100644
--- a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/common.scss
+++ b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/common.scss
@@ -110,6 +110,19 @@ $select-border-size: 2px;
     color: $color-palette-primary;
 }
 
+#field-panel-icon-close {
+    color: $color-palette-primary;
+    width: $spacing-5;
+    height: $spacing-5;
+    border-radius: $border-radius-circular;
+    transition: color 0.15s, box-shadow 0.15s;
+
+    :focus {
+        outline: 0 none;
+        outline-offset: 0;
+    }
+}
+
 #field-panel-items {
     padding: 0;
 }
@@ -148,3 +161,12 @@ $select-border-size: 2px;
     justify-content: center;
     gap: $spacing-0;
 }
+
+#field-chip-token {
+    padding: 0.375rem $spacing-2;
+    margin-right: $spacing-1;
+    background: $bg-highlight;
+    color: $color-palette-primary;
+    border-radius: $border-radius-xs;
+    font-size: $font-size-sm;
+}
diff --git a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/index.scss b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/index.scss
index 4a8ec91d0fed..5a11c254b228 100644
--- a/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/index.scss
+++ b/core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/index.scss
@@ -11,3 +11,4 @@
 @use "radiobutton";
 @use "selectbutton";
 @use "slider";
+@use "treeselect";
diff --git a/core-web/yarn.lock b/core-web/yarn.lock
index 1f6fe4dff391..6fb595fc88d1 100644
--- a/core-web/yarn.lock
+++ b/core-web/yarn.lock
@@ -10852,7 +10852,7 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
@@ -14005,7 +14005,7 @@ import-local@^3.0.2:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
@@ -16096,11 +16096,6 @@ lodash-es@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -16109,33 +16104,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
-
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -16211,11 +16184,6 @@ lodash.once@^4.0.0, lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -21925,7 +21893,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -21943,6 +21911,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -22039,7 +22016,7 @@ stringify-package@^1.0.0, stringify-package@^1.0.1:
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
   integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -22067,6 +22044,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -24016,7 +24000,7 @@ worker-farm@^1.6.0, worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -24051,6 +24035,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
diff --git a/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css b/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css
index 9b306decc6ca..ccabd5c13cce 100644
--- a/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css
+++ b/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css
@@ -4403,10 +4403,10 @@
 
 .dijitTitlePane {
   border-radius: 1px;
-  box-shadow: 0 1px 3px var(--color-palette-black-op-10), 0 1px 2px var(--color-palette-black-op-20);
+  box-shadow: 0px 2px 8px 0px hsla(230, 13%, 9%, 0.02);
 }
 .dijitTitlePaneHover {
-  box-shadow: 0 3px 6px var(--color-palette-black-op-10), 0 3px 6px var(--color-palette-black-op-20);
+  box-shadow: 0px 4px 8px 0px hsla(230, 13%, 9%, 0.06);
 }
 .dijitTitlePaneHover .dijitTitlePaneContentOuter {
   border: none;
@@ -4462,7 +4462,7 @@
   background-color: #ffffff;
   border-radius: 0px;
   border: none;
-  box-shadow: 0 3px 6px var(--color-palette-black-op-10), 0 3px 6px var(--color-palette-black-op-20);
+  box-shadow: 0px 4px 8px 0px hsla(230, 13%, 9%, 0.06);
 }
 .dijitDialogCloseIcon {
   width: 17px;
@@ -4514,7 +4514,7 @@
   color: #14151a;
   border: 0 none;
   border-radius: 0.375rem;
-  box-shadow: 0px 0px 4px rgba(20, 21, 26, 0.04), 0px 8px 16px rgba(20, 21, 26, 0.08);
+  box-shadow: 0px 10px 18px 0px hsla(230, 13%, 9%, 0.1);
   padding: 0.5rem;
   margin-top: 0.5rem;
 }
@@ -5079,7 +5079,7 @@
   color: #14151a;
   border: 0 none;
   border-radius: 0.375rem;
-  box-shadow: 0px 0px 4px rgba(20, 21, 26, 0.04), 0px 8px 16px rgba(20, 21, 26, 0.08);
+  box-shadow: 0px 10px 18px 0px hsla(230, 13%, 9%, 0.1);
   padding: 0.5rem;
   margin-top: 0.5rem;
 }
@@ -10384,7 +10384,7 @@ a.category_higlighted, a.tag_higlighted {
 }
 
 .context-menu {
-  box-shadow: 0 3px 6px var(--color-palette-black-op-10), 0 3px 6px var(--color-palette-black-op-20);
+  box-shadow: 0px 4px 8px 0px hsla(230, 13%, 9%, 0.06);
   position: absolute;
   background: #ffffff;
   border: 1px solid #d1d4db;
@@ -11229,5 +11229,3 @@ body {
   padding: 0;
   height: calc(100vh - 3rem - 20px - 1rem - 0.5rem - 20px - 61px - 1rem);
 }
-
-/*# sourceMappingURL=dotcms.css.map */