diff --git a/.eslintrc.json b/.eslintrc.json
index 2ad07cd96..df79cb686 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,6 +5,15 @@
   ],
   "plugins": ["@nrwl/nx"],
   "overrides": [
+    {
+      "files": ["*.ts"],
+      "plugins": ["@alfresco/eslint-angular"],
+      "extends": ["plugin:@angular-eslint/template/process-inline-templates"],
+      "excludedFiles": ["*.spec.ts"],
+      "rules": {
+        "@alfresco/eslint-angular/use-none-component-view-encapsulation": "error"
+      }
+    },
     {
       "files": [
         "*.ts"
@@ -15,7 +24,6 @@
       "extends": [
         "plugin:@nrwl/nx/typescript",
         "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates",
         "plugin:@cspell/recommended"
       ],
       "plugins": [
@@ -315,10 +323,12 @@
         "*.html"
       ],
       "extends": ["plugin:@nrwl/nx/angular-template", "plugin:@angular-eslint/template/accessibility"],
+      "parser": "@angular-eslint/template-parser",
       "rules": {
         "@angular-eslint/template/no-negated-async": "off",
         "@angular-eslint/template/no-positive-tabindex": "error",
-        "@angular-eslint/template/eqeqeq": "error"
+        "@angular-eslint/template/eqeqeq": "error",
+        "@angular-eslint/template/no-call-expression": "warn"
       }
     },
     {
diff --git a/.github/actions/publish-libs/npm-publish.sh b/.github/actions/publish-libs/npm-publish.sh
index 65627e1ad..49b97a232 100755
--- a/.github/actions/publish-libs/npm-publish.sh
+++ b/.github/actions/publish-libs/npm-publish.sh
@@ -12,7 +12,6 @@ fi
 
 export PROJECTS=(
   'aca-content'
-  'aca-folder-rules'
   'aca-preview'
   'aca-shared'
   'aca-viewer'
diff --git a/.github/actions/run-e2e-playwright/action.yml b/.github/actions/run-e2e-playwright/action.yml
new file mode 100644
index 000000000..b0364c946
--- /dev/null
+++ b/.github/actions/run-e2e-playwright/action.yml
@@ -0,0 +1,57 @@
+name: "Run e2e Playwright"
+description: "Run e2e Playwright"
+
+inputs:
+  options:
+    description: 'Options'
+    required: true
+    type: string
+  test-runner:
+    description: 'Test runner'
+    required: false
+    type: string
+    default: 'Playwright'
+  artifact-name:
+    description: Name of the artifact cache
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+    - name: Setup and run with options
+      shell: bash
+      run: |
+        # npx http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
+
+        {
+          echo "APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port}"
+          echo "APP_CONFIG_PLUGIN_FOLDER_RULES=true"
+          echo "APP_CONFIG_PLUGIN_AOS=true"
+          echo "APP_CONFIG_PLUGIN_CONTENT_SERVICE=true"
+          echo "APP_CONFIG_ENABLE_MOBILE_APP_SWITCH=false"
+          echo "APP_CONFIG_PROVIDER=ECM"
+          echo "APP_CONFIG_AUTH_TYPE=BASIC"
+          echo "APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco"
+          echo "APP_CONFIG_OAUTH2_CLIENTID=alfresco"
+          echo "APP_CONFIG_SESSION_TIME_FOR_OPEN_APP_DIALOG_DISPLAY_IN_HOURS=12"
+          echo "APP_CONFIG_OAUTH2_IMPLICIT_FLOW=true"
+          echo "APP_CONFIG_OAUTH2_SILENT_LOGIN=true"
+          echo "APP_CONFIG_OAUTH2_REDIRECT_LOGOUT=/"
+          echo "APP_CONFIG_OAUTH2_REDIRECT_LOGIN=/"
+          echo "APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI={protocol}//{hostname}{:port}/assets/silent-refresh.html"
+        } >> .env
+
+        npm start > /dev/null &\
+
+        echo "Running playwright tests with options ${{ inputs.options }}"
+        sleep 90
+        npx nx run ${{ inputs.options }}-e2e:e2e
+
+
+    - name: Upload E2Es results
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.artifact-name }}
+        path: test-results/
diff --git a/.github/actions/run-e2e/action.yml b/.github/actions/run-e2e/action.yml
index 4725b49ab..5e52b0669 100644
--- a/.github/actions/run-e2e/action.yml
+++ b/.github/actions/run-e2e/action.yml
@@ -22,7 +22,7 @@ runs:
     - name: Setup and run with options
       shell: bash
       run: |
-        ./node_modules/.bin/tsc -p "./e2e/$E2E_TSCONFIG" || exit 1;
+        ./node_modules/.bin/tsc -p "./e2e/protractor/$E2E_TSCONFIG" || exit 1;
         # npx http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
 
         {
@@ -48,7 +48,7 @@ runs:
         if [ ${{ inputs.test-runner }} == "playwright" ]; then
           echo "Running playwright tests with options ${{ inputs.options }}"
           sleep 90
-          npx playwright test --config ${{ inputs.options }}
+          npx nx run ${{ inputs.options }}-e2e:e2e
         else
           echo "Running protractor tests with options ${{ inputs.options }}"
           echo "./node_modules/.bin/protractor \"./protractor.conf.js\" ${{ inputs.options }} || exit 1"
diff --git a/.github/actions/update-library-versions/update-lib-versions.sh b/.github/actions/update-library-versions/update-lib-versions.sh
index b570e6036..5b983fabc 100755
--- a/.github/actions/update-library-versions/update-lib-versions.sh
+++ b/.github/actions/update-library-versions/update-lib-versions.sh
@@ -11,7 +11,6 @@ fi
 
 export PROJECTS=(
   'aca-content'
-  'aca-folder-rules'
   'aca-preview'
   'aca-shared'
   'aca-viewer'
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 4b65f5bea..82846abc7 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -13,6 +13,14 @@ env:
   APP_CONFIG_ECM_HOST: ${{ secrets.PIPELINE_ENV_URL }}
   ADMIN_EMAIL: ${{ secrets.PIPELINE_ADMIN_USERNAME }}
   ADMIN_PASSWORD: ${{ secrets.PIPELINE_ADMIN_PASSWORD }}
+  HR_USER: ${{ secrets.HR_USER }}
+  HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }}
+  SUPERADMIN_EMAIL: ${{ secrets.SUPERADMIN_EMAIL }}
+  SUPERADMIN_PASSWORD: ${{ secrets.SUPERADMIN_PASSWORD }}
+  IDENTITY_USER_EMAIL: ${{ secrets.IDENTITY_USER_EMAIL }}
+  IDENTITY_USER_PASSWORD: ${{ secrets.IDENTITY_USER_PASSWORD }}
+  CONTENT_IDENTITY_USERNAME: ${{ secrets.CONTENT_IDENTITY_USERNAME }}
+  CONTENT_IDENTITY_PASSWORD: ${{ secrets.CONTENT_IDENTITY_PASSWORD }}
   SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }}
   SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}}
   AWS_REGION: "eu-west-2"
@@ -96,7 +104,6 @@ jobs:
         unit-tests:
           - name: "aca-content"
           - name: "aca-shared"
-          - name: "aca-folder-rules"
           - name: "aca-preview"
     steps:
       - name: Checkout
@@ -178,8 +185,16 @@ jobs:
 
   e2es-playwright:
     needs: [lint, build, unit-tests]
-    name: 'E2e test suites: Folder Rules - Playwright'
+    name: 'E2e test suites: Playwright'
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        e2e-suites:
+          - name: "actions"
+            id: 1
+          - name: "folder-rules"
+            id: 2
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -204,10 +219,10 @@ jobs:
       - name: before playwright
         shell: bash
         run: npx playwright install chromium
-      - uses: ./.github/actions/run-e2e
+      - uses: ./.github/actions/run-e2e-playwright
         with:
-          options: "e2e/playwright/tests/folder-rules/playwright.config.ts"
-          artifact-name: folder-rules
+          options: "${{ matrix.e2e-suites.name }}"
+          artifact-name: ${{ matrix.e2e-suites.name }}
           test-runner: playwright
       - uses: ./.github/actions/after-e2e
 
diff --git a/README.md b/README.md
index ac47e9862..e8c41747c 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,14 @@ Please refer to the public [documentation](https://alfresco-content-app.netlify.
 
 ## Compatibility
 
-| ACA | ACS | Node | ADF | Angular |
-| --- | --- | --- | --- | --- |
-| 4.1 | 7.4 | 18.x | 6.1.0 | 14.x |
-| 4.0 | 7.4 | 14.x | 6.0.0 | 14.x |
+| ACA  | ADF | ACS | Node | Angular |
+| ---- | --- | --- | ---- | ------- |
+| 4.1  | 6.1 | 7.4 | 18.x | 14.x    |
+| 4.0  | 6.1 | 7.4 | 14.x | 14.x    |
+| 3.1  | 5.1 | 7.3 |      |         |
+| 3.0  | 5.0 | 7.3 |      |         |
+
+> See <https://angular.io/guide/versions> for more details on Angular and Node.js compatibility
 
 ## Running
 
@@ -48,7 +52,6 @@ APP_CONFIG_DOWNLOAD_PROMPT_DELAY=<time>
 APP_CONFIG_DOWNLOAD_PROMPT_REMINDER_DELAY=<time>
 APP_CONFIG_ENABLE_FILE_AUTO_DOWNLOAD=true
 APP_CONFIG_FILE_AUTO_DOWNLOAD_SIZE_THRESHOLD_IN_MB=<file-size>
-
 ```
 
 Where `<URL>` is the address of the ACS.
diff --git a/app/project.json b/app/project.json
index a19f1e575..e5471f111 100644
--- a/app/project.json
+++ b/app/project.json
@@ -79,13 +79,13 @@
           },
           {
             "glob": "folder-rules.plugin.json",
-            "input": "projects/aca-folder-rules/assets",
+            "input": "projects/aca-content/folder-rules/assets",
             "output": "./assets/plugins"
           },
           {
             "glob": "**/*",
-            "input": "projects/aca-folder-rules/assets",
-            "output": "./assets/aca-folder-rules"
+            "input": "projects/aca-content/folder-rules/assets",
+            "output": "./assets/folder-rules"
           },
           {
             "glob": "**/*",
@@ -253,7 +253,11 @@
         "assets": [
           "app/src/assets",
           "app/src/favicon-96x96.png",
-          "projects/aca-content/assets",
+          {
+            "glob": "**/*",
+            "input": "projects/aca-content/assets",
+            "output": "/assets"
+          },
           {
             "input": "app/.tmp",
             "output": "/",
diff --git a/app/src/app.config.json.tpl b/app/src/app.config.json.tpl
index 527e3714d..c4120df0b 100644
--- a/app/src/app.config.json.tpl
+++ b/app/src/app.config.json.tpl
@@ -39,7 +39,6 @@
     "copyright": "APP.COPYRIGHT"
   },
   "viewer.maxRetries": 1,
-  "sharedLinkDateTimePickerType": "datetime",
   "customCssPath": "",
   "webFontPath": "",
   "pagination": {
@@ -65,77 +64,6 @@
     "preserveState": true,
     "expandedSidenav": true
   },
-  "languages": [
-    {
-      "key": "de",
-      "label": "Deutsch"
-    },
-    {
-      "key": "en",
-      "label": "English"
-    },
-    {
-      "key": "es",
-      "label": "Español"
-    },
-    {
-      "key": "fr",
-      "label": "Français"
-    },
-    {
-      "key": "it",
-      "label": "Italiano"
-    },
-    {
-      "key": "ja",
-      "label": "日本語"
-    },
-    {
-      "key": "nb",
-      "label": "Bokmål"
-    },
-    {
-      "key": "nl",
-      "label": "Nederlands"
-    },
-    {
-      "key": "pt-BR",
-      "label": "Português (Brasil)"
-    },
-    {
-      "key": "ru",
-      "label": "Русский"
-    },
-    {
-      "key": "zh-CN",
-      "label": "中文简体"
-    },
-    {
-      "key": "cs",
-      "label": "Čeština"
-    },
-    {
-      "key": "da",
-      "label": "Dansk"
-    },
-    {
-      "key": "fi",
-      "label": "Suomi"
-    },
-    {
-      "key": "pl",
-      "label": "Polski"
-    },
-    {
-      "key": "sv",
-      "label": "Svenska"
-    },
-    {
-      "key": "ar",
-      "label": "العربية",
-      "direction": "rtl"
-    }
-  ],
   "mimeTypes": [
     {
       "value": "video/3gpp",
@@ -1017,6 +945,19 @@
       "TAG"
     ],
     "categories": [
+      {
+        "id": "logic",
+        "name": "SEARCH.CATEGORIES.LOGIC",
+        "enabled": true,
+        "component": {
+          "selector": "logical-filter",
+          "settings": {
+            "allowUpdateOnChange": false,
+            "hideDefaultAction": true,
+            "field": "cm:name,cm:title,cm:description,TEXT,TAG"
+          }
+        }
+      },
       {
         "id": "queryName",
         "name": "SEARCH.SEARCH_HEADER.FILTERS.NAME.TITLE",
diff --git a/app/src/app/app.component.scss b/app/src/app/app.component.scss
index 70b2f597a..e79d1f871 100644
--- a/app/src/app/app.component.scss
+++ b/app/src/app/app.component.scss
@@ -1,4 +1,4 @@
-:host {
+app-root {
   display: flex;
   flex: 1;
 
diff --git a/app/src/app/app.components.ts b/app/src/app/app.components.ts
index 618d277e1..8416499d8 100644
--- a/app/src/app/app.components.ts
+++ b/app/src/app/app.components.ts
@@ -22,14 +22,15 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  styleUrls: ['./app.component.scss'],
+  encapsulation: ViewEncapsulation.None
 })
 export class AppComponent {
   onDestroy$: Subject<boolean> = new Subject<boolean>();
diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts
index 1253e42c9..bd3da6d89 100644
--- a/app/src/app/app.module.ts
+++ b/app/src/app/app.module.ts
@@ -64,7 +64,7 @@ import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store';
 import { ShellModule, SHELL_APP_SERVICE, SHELL_AUTH_TOKEN } from '@alfresco/adf-core/shell';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { APP_ROUTES } from './app.routes';
-import { AppLoginModule } from './components/login/login.module';
+import { LoginComponent } from './components/login/login.component';
 
 registerLocaleData(localeFr);
 registerLocaleData(localeDe);
@@ -90,7 +90,7 @@ registerLocaleData(localeSv);
     CoreModule.forRoot(),
     SharedModule,
     CoreExtensionsModule.forRoot(),
-    AppLoginModule,
+    LoginComponent,
     environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
     !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 25 }) : [],
     RouterModule.forRoot(APP_ROUTES, {
diff --git a/app/src/app/components/login/login.component.ts b/app/src/app/components/login/login.component.ts
index 5af69b21d..7a3a3a910 100644
--- a/app/src/app/components/login/login.component.ts
+++ b/app/src/app/components/login/login.component.ts
@@ -22,9 +22,14 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component } from '@angular/core';
+import { AppConfigModule, LoginModule } from '@alfresco/adf-core';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
-  templateUrl: './login.component.html'
+  standalone: true,
+  imports: [LoginModule, AppConfigModule, TranslateModule],
+  templateUrl: './login.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class LoginComponent {}
diff --git a/app/src/app/components/login/login.module.ts b/app/src/app/components/login/login.module.ts
deleted file mode 100644
index 46ecdf334..000000000
--- a/app/src/app/components/login/login.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { LoginComponent } from './login.component';
-import { TranslateModule } from '@ngx-translate/core';
-
-@NgModule({
-  imports: [CommonModule, CoreModule.forChild(), TranslateModule.forChild()],
-  exports: [LoginComponent],
-  declarations: [LoginComponent]
-})
-export class AppLoginModule {}
diff --git a/app/src/app/extensions.module.ts b/app/src/app/extensions.module.ts
index 9f63703f9..7c08b6c7d 100644
--- a/app/src/app/extensions.module.ts
+++ b/app/src/app/extensions.module.ts
@@ -23,9 +23,9 @@
  */
 
 import { NgModule } from '@angular/core';
+import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules';
 import { AosExtensionModule } from '@alfresco/aca-content/ms-office';
 import { AcaAboutModule, DEV_MODE_TOKEN, PACKAGE_JSON } from '@alfresco/aca-content/about';
-import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
 import { environment } from '../environments/environment';
 import packageJson from 'package.json';
 
diff --git a/app/src/app/material.module.ts b/app/src/app/material.module.ts
deleted file mode 100644
index be7866368..000000000
--- a/app/src/app/material.module.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { NgModule } from '@angular/core';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatIconModule } from '@angular/material/icon';
-import { MatButtonModule } from '@angular/material/button';
-import { MatDialogModule, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
-import { MatInputModule } from '@angular/material/input';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatProgressBarModule } from '@angular/material/progress-bar';
-import { MatCardModule } from '@angular/material/card';
-
-@NgModule({
-  imports: [MatMenuModule, MatIconModule, MatButtonModule, MatDialogModule, MatInputModule, MatSnackBarModule, MatProgressBarModule, MatCardModule],
-  exports: [MatMenuModule, MatIconModule, MatButtonModule, MatDialogModule, MatInputModule, MatSnackBarModule, MatProgressBarModule, MatCardModule],
-  providers: [
-    {
-      provide: MAT_DIALOG_DEFAULT_OPTIONS,
-      useValue: { closeOnNavigation: true, hasBackdrop: true, autoFocus: true }
-    }
-  ]
-})
-export class MaterialModule {}
diff --git a/app/src/assets/plugins/app.card-view.json b/app/src/assets/plugins/app.card-view.json
deleted file mode 100644
index e438dea5b..000000000
--- a/app/src/assets/plugins/app.card-view.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "$schema": "../../../../extension.schema.json",
-  "$id": "app.demo.cardView",
-  "$name": "app.demo.cardView",
-  "$version": "1.0.0",
-  "$vendor": "Hyland Software, Inc. and its affiliates",
-  "$license": "LGPL-3.0",
-  "$runtime": "1.5.0",
-  "$description": "Simple extension that provides Card View toolbar button",
-
-  "features": {
-    "toolbar": [
-      {
-        "id": "app.toolbar.cardView",
-        "order": 50,
-        "type": "custom",
-        "component": "app.toolbar.cardView"
-      }
-    ]
-  }
-}
diff --git a/app/src/assets/plugins/app.debug.json b/app/src/assets/plugins/app.debug.json
deleted file mode 100644
index 88486a21e..000000000
--- a/app/src/assets/plugins/app.debug.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-    "$schema": "../../../../extension.schema.json",
-    "$id": "app.debug.plugin",
-    "$version": "1.0.0",
-    "$name": "app.debug.plugin",
-    "$vendor": "Hyland Software, Inc. and its affiliates",
-    "$license": "LGPL-3.0",
-    "$runtime": "1.5.0",
-    "$description": "Plugin for debugging and testing purposes",
-
-    "actions": [
-        {
-            "id": "plugin1.actions.settings",
-            "type": "NAVIGATE_URL",
-            "payload": "/settings"
-        },
-        {
-            "id": "plugin1.actions.info",
-            "type": "SNACKBAR_INFO",
-            "payload": "I'm a nice little popup raised by extension."
-        },
-        {
-            "id": "plugin1.actions.node-name",
-            "type": "SNACKBAR_INFO",
-            "payload": "$('Action for ' + context.selection.first.entry.name)"
-        }
-    ],
-
-    "features": {
-        "viewer": {
-            "openWith": [
-                {
-                    "id": "plugin1.viewer.openWith.action1",
-                    "type": "button",
-                    "icon": "build",
-                    "title": "Snackbar",
-                    "actions": {
-                        "click": "plugin1.actions.info"
-                    }
-                }
-            ]
-        },
-        "navbar": [
-            {
-                "id": "__app.navbar.primary",
-                "disabled": true,
-                "items": [
-                    {
-                        "id": "app.navbar.personalFiles",
-                        "icon": "extension",
-                        "title": "APP.BROWSE.PERSONAL.SIDENAV_LINK.LABEL",
-                        "route": "personal-files"
-                    }
-                ]
-            }
-        ],
-        "toolbar": [
-            {
-                "disabled": true,
-                "id": "app.toolbar.createFolder",
-                "type": "button",
-                "order": 10,
-                "title": "APP.NEW_MENU.MENU_ITEMS.CREATE_FOLDER",
-                "description": "APP.NEW_MENU.TOOLTIPS.CREATE_FOLDER",
-                "icon": "create_new_folder",
-                "actions": {
-                    "click": "CREATE_FOLDER"
-                },
-                "rules": {
-                    "visible": "app.navigation.folder.canCreate"
-                }
-            },
-            {
-                "disabled": true,
-                "id": "app.toolbar.uploadFile",
-                "order": 11,
-                "type": "button",
-                "icon": "file_upload",
-                "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FILE",
-                "description": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FILES",
-                "actions": {
-                    "click": "UPLOAD_FILES"
-                },
-                "rules": {
-                    "visible": "app.navigation.folder.canUpload"
-                }
-            },
-            {
-                "disabled": true,
-                "id": "app.toolbar.uploadFolder",
-                "order": 12,
-                "type": "button",
-                "icon": "cloud_upload",
-                "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER",
-                "description": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS",
-                "actions": {
-                    "click": "UPLOAD_FOLDER"
-                },
-                "rules": {
-                    "visible": "app.navigation.folder.canUpload"
-                }
-            },
-            {
-                "disabled": true,
-                "id": "plugin1.toolbar.menu1",
-                "type": "menu",
-                "icon": "storage",
-                "order": 300,
-                "children": [
-                    {
-                        "id": "plugin1.toolbar.menu1.settings",
-                        "type": "button",
-                        "title": "Settings",
-                        "icon": "settings_applications",
-                        "actions": {
-                            "click": "plugin1.actions.settings"
-                        }
-                    }
-                ]
-            },
-            {
-                "disabled": true,
-                "id": "plugin1.toolbar.separator3",
-                "order": 301,
-                "type": "separator"
-            }
-        ]
-    }
-}
diff --git a/app/src/assets/plugins/app.metadata.json b/app/src/assets/plugins/app.metadata.json
deleted file mode 100644
index b678160bd..000000000
--- a/app/src/assets/plugins/app.metadata.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$schema": "../../../../extension.schema.json",
-  "$id": "app.demo.metadata",
-  "$name": "metadata-plugin",
-  "$version": "1.0.0",
-  "$vendor": "Hyland Software, Inc. and its affiliates",
-  "$license": "LGPL-3.0",
-  "$runtime": "1.5.0",
-  "$description": "metadata card configuration plugin - testing purpose",
-
-  "features": {
-    "content-metadata-presets": [
-      {
-        "id": "app.content.metadata.custom",
-        "custom": [
-          {
-            "id": "app.content.metadata.customGroup",
-            "title": "testing extension props",
-            "items": [
-              {
-                "id": "app.content.metadata.exifAspect",
-                "disabled": true
-              },
-              {
-                "id": "app.content.metadata.exifAspect2",
-                "aspect": "exif:exif",
-                "properties": [
-                  "exif:orientation",
-                  "exif:manufacturer",
-                  "exif:model",
-                  "exif:software"
-                ]
-              }
-            ]
-          },
-          {
-            "id": "app.content.metadata.customGroup2",
-            "title": "testing extension props2",
-            "items": [
-              {
-                "id": "app.content.metadata.exifAspect",
-                "aspect": "exif:exif",
-                "properties": [
-                  "exif:pixelXDimension",
-                  "exif:pixelYDimension",
-                  "exif:dateTimeOriginal"
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "id": "app.content.metadata.kitten-images",
-        "kitten-images": {
-          "id": "app.content.metadata.kittenAspect",
-          "custom:aspect": "*",
-          "exif:exif": [ "exif:pixelXDimension", "exif:pixelYDimension"]
-        }
-      }
-    ]
-  }
-}
diff --git a/app/src/assets/plugins/app.search.json b/app/src/assets/plugins/app.search.json
deleted file mode 100644
index b7d56f456..000000000
--- a/app/src/assets/plugins/app.search.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "$schema": "../../../../extension.schema.json",
-    "$id": "app.debug-search.plugin",
-    "$version": "1.0.0",
-    "$name": "app.debug-search.plugin",
-    "$vendor": "Hyland Software, Inc. and its affiliates",
-    "$license": "LGPL-3.0",
-    "$runtime": "1.5.0",
-    "$description": "Plugin for debugging and testing purposes",
-
-    "features": {
-      "search": [
-        {
-          "id": "app.search.example",
-          "order": 200,
-          "name": "Extension search (folder)",
-          "default": true,
-          "filterWithContains": true,
-          "aca:fields": ["cm:name", "cm:title", "cm:description", "TEXT", "TAG"],
-          "include": ["path", "allowableOperations", "properties"],
-          "sorting": {
-            "options": [
-              {
-                "key": "score",
-                "label": "SEARCH.SORT.RELEVANCE",
-                "type": "SCORE",
-                "field": "score",
-                "ascending": false
-              },
-              {
-                "key": "name",
-                "label": "SEARCH.SORT.FILENAME",
-                "type": "FIELD",
-                "field": "cm:name",
-                "ascending": true
-              },
-              {
-                "key": "title",
-                "label": "SEARCH.SORT.TITLE",
-                "type": "FIELD",
-                "field": "cm:title",
-                "ascending": true
-              },
-              {
-                "key": "modified",
-                "label": "SEARCH.SORT.MODIFIED_DATE",
-                "type": "FIELD",
-                "field": "cm:modified",
-                "ascending": true
-              },
-              {
-                "key": "modifier",
-                "label": "SEARCH.SORT.MODIFIER",
-                "type": "FIELD",
-                "field": "cm:modifier",
-                "ascending": true
-              },
-              {
-                "key": "created",
-                "label": "SEARCH.SORT.CREATE_DATE",
-                "type": "FIELD",
-                "field": "cm:created",
-                "ascending": true
-              },
-              {
-                "key": "content.sizeInBytes",
-                "label": "SEARCH.SORT.SIZE",
-                "type": "FIELD",
-                "field": "content.size",
-                "ascending": true
-              },
-              {
-                "key": "content.mimetype",
-                "label": "SEARCH.SORT.TYPE",
-                "type": "FIELD",
-                "field": "content.mimetype",
-                "ascending": true
-              }
-            ],
-            "defaults": [
-              {
-                "key": "score",
-                "type": "SCORE",
-                "field": "score",
-                "ascending": false
-              }
-            ]
-          },
-          "aca:triggeredOnChange": false,
-          "resetButton": true,
-          "filterQueries": [
-            { "query": "+TYPE:'cm:folder'" },
-            {
-              "query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'"
-            },
-            { "query": "-cm:creator:System AND -QNAME:comment" },
-            {
-              "query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'"
-            },
-            {
-              "query": "-TYPE:'dl:dataList' AND -TYPE:'dl:todoList' AND -TYPE:'dl:issue'"
-            },
-            { "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" },
-            { "query": "-TYPE:'lnk:link'" },
-            { "query": "-PNAME:'0/wiki'" }
-          ],
-          "facetQueries": {
-            "label": "SEARCH.CATEGORIES.MODIFIED_DATE",
-            "expanded": true,
-            "queries": [
-              {
-                "label": "SEARCH.FACET_QUERIES.TODAY",
-                "query": "cm:modified:[TODAY to TODAY]"
-              },
-              {
-                "label": "SEARCH.FACET_QUERIES.THIS_WEEK",
-                "query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
-              },
-              {
-                "label": "SEARCH.FACET_QUERIES.THIS_MONTH",
-                "query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
-              },
-              {
-                "label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
-                "query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
-              },
-              {
-                "label": "SEARCH.FACET_QUERIES.THIS_YEAR",
-                "query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
-              }
-            ],
-            "settings": {
-              "allowUpdateOnChange": false,
-              "hideDefaultAction": true
-            }
-          },
-          "categories": [
-            {
-              "id": "createdDateRange",
-              "name": "SEARCH.CATEGORIES.CREATED_DATE",
-              "enabled": true,
-              "component": {
-                "selector": "date-range",
-                "settings": {
-                  "allowUpdateOnChange": false,
-                  "hideDefaultAction": true,
-                  "field": "cm:created",
-                  "dateFormat": "DD-MMM-YY",
-                  "maxDate": "today"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-}
diff --git a/docs/README.md b/docs/README.md
index c0863071c..d2211dad6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -38,27 +38,31 @@ The documentation is divided into the following sections:
 
 ## Compatibility
 
-| ACA Version | Built with | Tested on |
-| ----------- | ---------- | --------- |
-| ACA 3.1.0    | ADF 5.1.0  | ACS 7.3   |
-| ACA 3.0.0    | ADF 5.0.0  | ACS 7.3   |
-| ACA 2.4.0    | ADF 4.4.0  | ACS 6.2   |
-| ACA 2.3.0    | ADF 4.3.0  | ACS 6.2   |
-| ACA 2.2.0    | ADF 4.2.0  | ACS 6.2   |
-| ACA 2.1.0    | ADF 4.1.0  | ACS 6.2   |
-| ACA 1.12    | ADF 3.9.0  | ACS 6.2   |
-| ACA 1.11    | ADF 3.8.0  | ACS 6.2   |
-| ACA 1.10    | ADF 3.7.0  | ACS 6.2   |
-| ACA 1.9     | ADF 3.6.0  | ACS 6.2   |
-| ACA 1.8     | ADF 3.3.0  | ACS 6.1   |
-| ACA 1.7     | ADF 3.0.0  | ACS 6.1   |
-| ACA 1.6     | ADF 2.6.1  | ACS 6.1   |
-| ACA 1.5     | ADF 2.6.0  | ACS 6.0   |
-| ACA 1.4     | ADF 2.5.0  | ACS 6.0   |
-| ACA 1.3     | ADF 2.4.0  | ACS 6.0   |
-| ACA 1.2     | ADF 2.3.0  | ACS 5.2   |
-| ACA 1.1     | ADF 2.2.0  | ACS 5.2   |
-| ACA 1.0     | ADF 2.0.0  | ACS 5.2   |
+| ACA  | ADF | ACS | Node | Angular |
+| ---- | --- | --- | ---- | ------- |
+| 4.1  | 6.1 | 7.4 | 18.x | 14.x    |
+| 4.0  | 6.1 | 7.4 | 14.x | 14.x    |
+| 3.1  | 5.1 | 7.3 |      |         |
+| 3.0  | 5.0 | 7.3 |      |         |
+| 2.4  | 4.4 | 6.2 |      |         |
+| 2.3  | 4.3 | 6.2 |      |         |
+| 2.2  | 4.2 | 6.2 |      |         |
+| 2.1  | 4.1 | 6.2 |      |         |
+| 1.12 | 3.9 | 6.2 |      |         |
+| 1.11 | 3.8 | 6.2 |      |         |
+| 1.10 | 3.7 | 6.2 |      |         |
+| 1.9  | 3.6 | 6.2 |      |         |
+| 1.8  | 3.3 | 6.1 |      |         |
+| 1.7  | 3.0 | 6.1 |      |         |
+| 1.6  | 2.6 | 6.1 |      |         |
+| 1.5  | 2.6 | 6.0 |      |         |
+| 1.4  | 2.5 | 6.0 |      |         |
+| 1.3  | 2.4 | 6.0 |      |         |
+| 1.2  | 2.3 | 5.2 |      |         |
+| 1.1  | 2.2 | 5.2 |      |         |
+| 1.0  | 2.0 | 5.2 |      |         |
+
+> See <https://angular.io/guide/versions> for more details on Angular and Node.js compatibility
 
 ## Available Features
 
diff --git a/docs/getting-started/building-from-source.md b/docs/getting-started/building-from-source.md
index 33ec9ecea..f2989cfbd 100644
--- a/docs/getting-started/building-from-source.md
+++ b/docs/getting-started/building-from-source.md
@@ -8,8 +8,8 @@ The Content App is based on [Angular CLI](https://cli.angular.io), and you can u
 
 ## Prerequisites for building
 
-- [Node.js](https://nodejs.org/en/) 14.x
-- NPM 6.x
+- [Node.js](https://nodejs.org/en/) 18.x
+- NPM 9.x
 - (optional) [Angular CLI](https://cli.angular.io/) 14.x or later
 
 > The Angular CLI libraries are already part of the setup.
diff --git a/docs/getting-started/nvm.md b/docs/getting-started/nvm.md
index 00678d06a..d4f904637 100644
--- a/docs/getting-started/nvm.md
+++ b/docs/getting-started/nvm.md
@@ -6,13 +6,14 @@ Title: Node Version Manager
 
 Nvm is a version manager for Node.js. You can use it to install and switch to correct Node.js version.
 
-## Installation 
+## Installation
 
 To install nvm you can run following:
 
 ```sh
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
 ```
+
 for other installation options and troubleshooting instructions please follow [nvm installation docs](https://github.com/nvm-sh/nvm#install--update-script).
 
 ## Usage
diff --git a/projects/aca-folder-rules/.eslintrc.js b/e2e/playwright/actions/.eslintrc.json
similarity index 53%
rename from projects/aca-folder-rules/.eslintrc.js
rename to e2e/playwright/actions/.eslintrc.json
index 9e780e164..67b7dbf29 100644
--- a/projects/aca-folder-rules/.eslintrc.js
+++ b/e2e/playwright/actions/.eslintrc.json
@@ -1,6 +1,5 @@
-path = require("path");
-module.exports = {
-  "extends": "../../.eslintrc.json",
+{
+  "extends": "../../../.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
   ],
@@ -11,12 +10,16 @@ module.exports = {
       ],
       "parserOptions": {
         "project": [
-          path.join(__dirname, "tsconfig.lib.json"),
-          path.join(__dirname, "tsconfig.spec.json")
+          "e2e/playwright/actions/tsconfig.e2e.json"
         ],
         "createDefaultProgram": true
       },
+      "plugins": [
+        "rxjs",
+        "unicorn"
+      ],
       "rules": {
+        "@typescript-eslint/no-floating-promises": "off"
       }
     }
   ]
diff --git a/e2e/playwright/actions/exclude.tests.json b/e2e/playwright/actions/exclude.tests.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/e2e/playwright/actions/exclude.tests.json
@@ -0,0 +1 @@
+{}
diff --git a/e2e/playwright/tests/folder-rules/page-objects/pages/personal-files.page.ts b/e2e/playwright/actions/playwright.config.ts
similarity index 68%
rename from e2e/playwright/tests/folder-rules/page-objects/pages/personal-files.page.ts
rename to e2e/playwright/actions/playwright.config.ts
index 58efd392b..9b921ce47 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/pages/personal-files.page.ts
+++ b/e2e/playwright/actions/playwright.config.ts
@@ -22,15 +22,23 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BasePage, DataTableComponent } from '@alfresco/playwright-shared';
-import { Page } from '@playwright/test';
+import { PlaywrightTestConfig } from '@playwright/test';
+import { CustomConfig, getGlobalConfig, getExcludedTestsRegExpArray } from '@alfresco/playwright-shared';
+import EXCLUDED_JSON from './exclude.tests.json';
 
-export class PersonalFilesPage extends BasePage {
-  private static pageUrl = 'personal-files';
+const config: PlaywrightTestConfig<CustomConfig> = {
+  ...getGlobalConfig,
 
-  constructor(page: Page) {
-    super(page, PersonalFilesPage.pageUrl);
-  }
+  grepInvert: getExcludedTestsRegExpArray(EXCLUDED_JSON, 'Actions'),
+  projects: [
+    {
+      name: 'Actions',
+      testDir: './src/tests',
+      use: {
+        users: ['hruser']
+      }
+    }
+  ]
+};
 
-  public dataTable = new DataTableComponent(this.page);
-}
+export default config;
diff --git a/e2e/playwright/actions/project.json b/e2e/playwright/actions/project.json
new file mode 100644
index 000000000..c7228bfa0
--- /dev/null
+++ b/e2e/playwright/actions/project.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "name": "actions-e2e",
+  "sourceRoot": "e2e/playwright/actions/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "nx:run-commands",
+      "options": {
+          "commands": [
+              "npx playwright test --config=e2e/playwright/actions/playwright.config.ts"
+          ]
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "content-ce:serve:production"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "e2e/**/*.ts",
+          "e2e/**/*.html"
+        ],
+        "cache": true,
+        "cacheLocation": ".eslintcache",
+        "ignorePath": ".eslintignore"
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  }
+}
diff --git a/e2e/playwright/shared/page-objects/components/dataTable/mat-menu.component.ts b/e2e/playwright/actions/src/tests/create-folder.spec.ts
similarity index 51%
rename from e2e/playwright/shared/page-objects/components/dataTable/mat-menu.component.ts
rename to e2e/playwright/actions/src/tests/create-folder.spec.ts
index 92953f751..585a66d07 100644
--- a/e2e/playwright/shared/page-objects/components/dataTable/mat-menu.component.ts
+++ b/e2e/playwright/actions/src/tests/create-folder.spec.ts
@@ -22,17 +22,29 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Page } from '@playwright/test';
-import { BaseComponent } from '../base.component';
+import { expect } from '@playwright/test';
+import { getUserState, test } from '@alfresco/playwright-shared';
 
-export class MatMenuComponent extends BaseComponent {
-  private static rootElement = '.mat-menu-content';
+test.use({ storageState: getUserState('hruser') });
+test.describe('Create actions', () => {
+  let randomFolderName: string;
 
-  constructor(page: Page) {
-    super(page, MatMenuComponent.rootElement);
-  }
+  test.beforeEach(async ({ personalFiles }) => {
+    randomFolderName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
+    await personalFiles.navigate();
+  });
 
-  public getMenuItemsLocator = this.getChild('button');
+  test.afterEach(async ({ personalFiles }) => {
+    await personalFiles.dataTable.performActionFromExpandableMenu(randomFolderName, 'Delete');
+  });
 
-  public getButtonByText = (text: string) => this.getChild('button', { hasText: text });
-}
+  test('[C216341] Create a folder with name only', async ({ personalFiles }) => {
+    await personalFiles.acaHeader.createButton.click();
+    await personalFiles.matMenu.createFolder.click();
+    await personalFiles.folderDialog.folderNameInputLocator.fill(randomFolderName);
+    await personalFiles.folderDialog.createButton.click();
+
+    await personalFiles.dataTable.goThroughPagesLookingForRowWithName(randomFolderName);
+    await expect(personalFiles.dataTable.getRowByName(randomFolderName)).toBeVisible();
+  });
+});
diff --git a/e2e/playwright/actions/tsconfig.e2e.adf.json b/e2e/playwright/actions/tsconfig.e2e.adf.json
new file mode 100644
index 000000000..87cbcf775
--- /dev/null
+++ b/e2e/playwright/actions/tsconfig.e2e.adf.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.adf.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node"],
+    "skipLibCheck": true,
+    "paths": {
+      "@alfresco/playwright-shared": ["../../../projects/aca-playwright-shared/src/index.ts"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/actions/tsconfig.e2e.json b/e2e/playwright/actions/tsconfig.e2e.json
new file mode 100755
index 000000000..d1d140fba
--- /dev/null
+++ b/e2e/playwright/actions/tsconfig.e2e.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
+    "skipLibCheck": true,
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/folder-rules/.eslintrc.json b/e2e/playwright/folder-rules/.eslintrc.json
new file mode 100644
index 000000000..d241111e1
--- /dev/null
+++ b/e2e/playwright/folder-rules/.eslintrc.json
@@ -0,0 +1,26 @@
+{
+  "extends": "../../../.eslintrc.json",
+  "ignorePatterns": [
+    "!**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "e2e/playwright/folder-rules/tsconfig.e2e.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "plugins": [
+        "rxjs",
+        "unicorn"
+      ],
+      "rules": {
+        "@typescript-eslint/no-floating-promises": "off"
+      }
+    }
+  ]
+}
diff --git a/e2e/playwright/folder-rules/exclude.tests.json b/e2e/playwright/folder-rules/exclude.tests.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/e2e/playwright/folder-rules/exclude.tests.json
@@ -0,0 +1 @@
+{}
diff --git a/e2e/playwright/shared/page-objects/components/adf-folder-dialog.component.ts b/e2e/playwright/folder-rules/playwright.config.ts
similarity index 68%
rename from e2e/playwright/shared/page-objects/components/adf-folder-dialog.component.ts
rename to e2e/playwright/folder-rules/playwright.config.ts
index 5a50d0ff0..8a4f25ecb 100644
--- a/e2e/playwright/shared/page-objects/components/adf-folder-dialog.component.ts
+++ b/e2e/playwright/folder-rules/playwright.config.ts
@@ -22,16 +22,23 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BaseComponent } from './base.component';
-import { Page } from '@playwright/test';
+import { PlaywrightTestConfig } from '@playwright/test';
+import { CustomConfig, getGlobalConfig, getExcludedTestsRegExpArray } from '@alfresco/playwright-shared';
+import EXCLUDED_JSON from './exclude.tests.json';
 
-export class AdfFolderDialogComponent extends BaseComponent {
-  private static rootElement = 'adf-folder-dialog';
+const config: PlaywrightTestConfig<CustomConfig> = {
+  ...getGlobalConfig,
 
-  public folderNameInputLocator = this.getChild('[id="adf-folder-name-input"]');
-  public createButton = this.getChild('[id="adf-folder-create-button"]');
+  grepInvert: getExcludedTestsRegExpArray(EXCLUDED_JSON, 'Folder Rules'),
+  projects: [
+    {
+      name: 'Folder Rules',
+      testDir: './src/tests',
+      use: {
+        users: ['admin']
+      }
+    }
+  ]
+};
 
-  constructor(page: Page) {
-    super(page, AdfFolderDialogComponent.rootElement);
-  }
-}
+export default config;
diff --git a/e2e/playwright/folder-rules/project.json b/e2e/playwright/folder-rules/project.json
new file mode 100644
index 000000000..f279a4ba6
--- /dev/null
+++ b/e2e/playwright/folder-rules/project.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "name": "folder-rules-e2e",
+  "sourceRoot": "e2e/playwright/folder-rules/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "nx:run-commands",
+      "options": {
+          "commands": [
+              "npx playwright test --config=e2e/playwright/folder-rules/playwright.config.ts"
+          ]
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "content-ce:serve:production"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "e2e/**/*.ts",
+          "e2e/**/*.html"
+        ],
+        "cache": true,
+        "cacheLocation": ".eslintcache",
+        "ignorePath": ".eslintignore"
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  }
+}
diff --git a/e2e/playwright/tests/folder-rules/tests/actions.spec.ts b/e2e/playwright/folder-rules/src/tests/actions.spec.ts
similarity index 83%
rename from e2e/playwright/tests/folder-rules/tests/actions.spec.ts
rename to e2e/playwright/folder-rules/src/tests/actions.spec.ts
index 860b8354b..2bbcf9542 100644
--- a/e2e/playwright/tests/folder-rules/tests/actions.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/actions.spec.ts
@@ -22,10 +22,10 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { test } from '../fixtures/page-initialization';
-import { ActionType } from '../page-objects/components/actions-dropdown.component';
 import { expect } from '@playwright/test';
+import { ActionType, getUserState, test } from '@alfresco/playwright-shared';
 
+test.use({ storageState: getUserState('admin') });
 test.describe('Folder Rules Actions', () => {
   const randomFolderName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
   const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
@@ -36,8 +36,8 @@ test.describe('Folder Rules Actions', () => {
 
   let folderId: string;
 
-  test.beforeAll(async ({ apiClient }) => {
-    const node = await apiClient.nodes.createNode('-my-', { name: randomFolderName, nodeType: 'cm:folder', relativePath: '/' });
+  test.beforeAll(async ({ superAdminApiClient }) => {
+    const node = await superAdminApiClient.nodes.createNode('-my-', { name: randomFolderName, nodeType: 'cm:folder', relativePath: '/' });
     folderId = node.entry.id;
   });
 
@@ -45,15 +45,15 @@ test.describe('Folder Rules Actions', () => {
     await personalFiles.navigate({ waitUntil: 'domcontentloaded' });
   });
 
-  test.afterAll(async ({ apiClient }) => {
-    await apiClient.nodes.deleteNode(folderId);
+  test.afterAll(async ({ superAdminApiClient }) => {
+    await superAdminApiClient.nodes.deleteNode(folderId);
   });
 
-  test('Create a rule with actions', async ({ personalFiles, nodesPage }) => {
+  test('[C691637] Create a rule with actions', async ({ personalFiles, nodesPage }) => {
     await personalFiles.dataTable.performActionFromExpandableMenu(randomFolderName, 'Manage rules');
 
     await nodesPage.toolbar.clickCreateRuleButton();
-    await nodesPage.manageRulesDialog.typeRuleName(randomRuleName);
+    await nodesPage.manageRulesDialog.ruleNameInputLocator.type(randomRuleName);
 
     await nodesPage.actionsDropdown.selectAction(ActionType.HideRecord, 0);
     await nodesPage.actionsDropdown.selectAction(ActionType.IncrementCounter, 1);
diff --git a/e2e/playwright/tests/folder-rules/tests/conditions.spec.ts b/e2e/playwright/folder-rules/src/tests/conditions.spec.ts
similarity index 77%
rename from e2e/playwright/tests/folder-rules/tests/conditions.spec.ts
rename to e2e/playwright/folder-rules/src/tests/conditions.spec.ts
index ce5136d4e..283ddd5fe 100644
--- a/e2e/playwright/tests/folder-rules/tests/conditions.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/conditions.spec.ts
@@ -22,11 +22,10 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { test } from '../fixtures/page-initialization';
-import { ActionType } from '../page-objects/components/actions-dropdown.component';
-import { Comparator, Field } from '../page-objects/components/conditions.component';
 import { expect } from '@playwright/test';
+import { ActionType, Comparator, Field, getUserState, test } from '@alfresco/playwright-shared';
 
+test.use({ storageState: getUserState('admin') });
 test.describe('Folder Rules Conditions', () => {
   const randomFolderName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
   const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
@@ -34,8 +33,8 @@ test.describe('Folder Rules Conditions', () => {
 
   let folderId: string;
 
-  test.beforeAll(async ({ apiClient }) => {
-    const node = await apiClient.nodes.createNode('-my-', { name: randomFolderName, nodeType: 'cm:folder', relativePath: '/' });
+  test.beforeAll(async ({ superAdminApiClient }) => {
+    const node = await superAdminApiClient.nodes.createNode('-my-', { name: randomFolderName, nodeType: 'cm:folder', relativePath: '/' });
     folderId = node.entry.id;
   });
 
@@ -43,18 +42,18 @@ test.describe('Folder Rules Conditions', () => {
     await personalFiles.navigate();
   });
 
-  test.afterAll(async ({ apiClient }) => {
-    await apiClient.nodes.deleteNode(folderId);
+  test.afterAll(async ({ superAdminApiClient }) => {
+    await superAdminApiClient.nodes.deleteNode(folderId);
   });
 
-  test('Create a rule with condition', async ({ personalFiles, nodesPage }) => {
+  test('[C691638] Create a rule with condition', async ({ personalFiles, nodesPage }) => {
     await personalFiles.dataTable.performActionFromExpandableMenu(randomFolderName, 'Manage rules');
 
     await nodesPage.toolbar.clickCreateRuleButton();
-    await nodesPage.manageRulesDialog.typeRuleName(randomRuleName);
+    await nodesPage.manageRulesDialog.ruleNameInputLocator.type(randomRuleName);
     await nodesPage.conditionsDropdown.addCondition(Field.Size, Comparator.Equals, specialChars, 0);
     await nodesPage.conditionsDropdown.addCondition(Field.Size, Comparator.Equals, specialChars, 1);
-    await nodesPage.conditionsDropdown.createConditionGroup();
+    await nodesPage.conditionsDropdown.addConditionGroupButton.click();
     await nodesPage.conditionsDropdown.addConditionGroup(Field.Size, Comparator.Equals, specialChars, 0);
     await nodesPage.conditionsDropdown.addConditionGroup(Field.Size, Comparator.Equals, specialChars, 1);
     await nodesPage.actionsDropdown.selectAction(ActionType.IncrementCounter, 0);
diff --git a/e2e/playwright/tests/folder-rules/tests/manage-rules.spec.ts b/e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts
similarity index 74%
rename from e2e/playwright/tests/folder-rules/tests/manage-rules.spec.ts
rename to e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts
index 0c18c6106..6683de63e 100644
--- a/e2e/playwright/tests/folder-rules/tests/manage-rules.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts
@@ -22,29 +22,30 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { test } from '../fixtures/page-initialization';
+import { getUserState, test } from '@alfresco/playwright-shared';
 
+test.use({ storageState: getUserState('admin') });
 test.describe('Rules - Manage Rules', () => {
   const randomName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
   const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
 
   let folderId: string;
 
-  test.beforeAll(async ({ apiClient }) => {
-    const node = await apiClient.nodes.createNode('-my-', { name: randomName, nodeType: 'cm:folder', relativePath: '/' });
+  test.beforeAll(async ({ superAdminApiClient }) => {
+    const node = await superAdminApiClient.nodes.createNode('-my-', { name: randomName, nodeType: 'cm:folder', relativePath: '/' });
     folderId = node.entry.id;
-    await apiClient.createRandomRule(folderId, randomRuleName);
+    await superAdminApiClient.createRandomRule(folderId, randomRuleName);
   });
 
   test.beforeEach(async ({ personalFiles }) => {
     await personalFiles.navigate();
   });
 
-  test.afterAll(async ({ apiClient }) => {
-    await apiClient.nodes.deleteNode(folderId);
+  test.afterAll(async ({ superAdminApiClient }) => {
+    await superAdminApiClient.nodes.deleteNode(folderId);
   });
 
-  test('Disable an existing rule', async ({ personalFiles, nodesPage }) => {
+  test('[C691651] Disable an existing rule', async ({ personalFiles, nodesPage }) => {
     await personalFiles.dataTable.performActionFromExpandableMenu(randomName, 'Manage rules');
     await nodesPage.manageRules.disableRuleToggle.click();
   });
diff --git a/e2e/playwright/folder-rules/tsconfig.e2e.adf.json b/e2e/playwright/folder-rules/tsconfig.e2e.adf.json
new file mode 100644
index 000000000..87cbcf775
--- /dev/null
+++ b/e2e/playwright/folder-rules/tsconfig.e2e.adf.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../tsconfig.adf.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node"],
+    "skipLibCheck": true,
+    "paths": {
+      "@alfresco/playwright-shared": ["../../../projects/aca-playwright-shared/src/index.ts"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/folder-rules/tsconfig.e2e.json b/e2e/playwright/folder-rules/tsconfig.e2e.json
new file mode 100755
index 000000000..d1d140fba
--- /dev/null
+++ b/e2e/playwright/folder-rules/tsconfig.e2e.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
+    "skipLibCheck": true,
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/playwright/shared/package.json b/e2e/playwright/shared/package.json
deleted file mode 100644
index c7bc52fd2..000000000
--- a/e2e/playwright/shared/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "playwright-shared",
-  "version": "3.0.0",
-  "main": "index.ts",
-  "dependencies": {
-    "tslib": "^2.0.0"
-  }
-}
diff --git a/e2e/playwright/shared/page-objects/components/aca-page-layout-header.component.ts b/e2e/playwright/shared/page-objects/components/aca-page-layout-header.component.ts
deleted file mode 100644
index 6af77531c..000000000
--- a/e2e/playwright/shared/page-objects/components/aca-page-layout-header.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { BaseComponent } from './base.component';
-import { Page } from '@playwright/test';
-
-export class AcaPageLayoutHeader extends BaseComponent {
-  private static rootElement = 'adf-toolbar';
-  public createButton = this.getChild('[id="app.toolbar.create"]');
-
-  constructor(page: Page) {
-    super(page, AcaPageLayoutHeader.rootElement);
-  }
-}
diff --git a/e2e/playwright/shared/page-objects/index.ts b/e2e/playwright/shared/page-objects/index.ts
deleted file mode 100644
index a54a1d387..000000000
--- a/e2e/playwright/shared/page-objects/index.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-export * from './global-variables';
-export * from './playwright-base';
-export * from './components';
-export * from './components/dataTable';
-export * from './pages';
-export * from './pages/personal-files.page';
diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
deleted file mode 100644
index 99fa003e6..000000000
--- a/e2e/protractor.excludes.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "C589205": "https://alfresco.atlassian.net/browse/ACA-4353",
-  "C261153": "https://alfresco.atlassian.net/browse/AAE-7517",
-  "C306959": "https://alfresco.atlassian.net/browse/ACA-4620",
-  "C213134": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
-  "C286252": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
-  "C284666": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
-  "C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189"
-}
diff --git a/e2e/.eslintrc.json b/e2e/protractor/.eslintrc.json
similarity index 81%
rename from e2e/.eslintrc.json
rename to e2e/protractor/.eslintrc.json
index 700775812..6ae84700d 100644
--- a/e2e/.eslintrc.json
+++ b/e2e/protractor/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../.eslintrc.json",
+  "extends": "../../.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
   ],
@@ -10,7 +10,7 @@
       ],
       "parserOptions": {
         "project": [
-          "e2e/tsconfig.e2e.json"
+          "e2e/protractor/tsconfig.e2e.json"
         ],
         "createDefaultProgram": true
       },
diff --git a/e2e/e2e-config/utils/build-number.js b/e2e/protractor/e2e-config/utils/build-number.js
similarity index 100%
rename from e2e/e2e-config/utils/build-number.js
rename to e2e/protractor/e2e-config/utils/build-number.js
diff --git a/e2e/e2e-config/utils/upload-output.js b/e2e/protractor/e2e-config/utils/upload-output.js
similarity index 100%
rename from e2e/e2e-config/utils/upload-output.js
rename to e2e/protractor/e2e-config/utils/upload-output.js
diff --git a/e2e/project.json b/e2e/protractor/project.json
similarity index 92%
rename from e2e/project.json
rename to e2e/protractor/project.json
index db7613fd9..ca6a4c653 100644
--- a/e2e/project.json
+++ b/e2e/protractor/project.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "name": "app-e2e",
   "sourceRoot": "e2e",
   "projectType": "application",
diff --git a/e2e/protractor/protractor.excludes.json b/e2e/protractor/protractor.excludes.json
new file mode 100644
index 000000000..03eedcb8f
--- /dev/null
+++ b/e2e/protractor/protractor.excludes.json
@@ -0,0 +1,29 @@
+{
+  "C589205": "https://alfresco.atlassian.net/browse/ACA-4353",
+  "C261153": "https://alfresco.atlassian.net/browse/AAE-7517",
+  "C306959": "https://alfresco.atlassian.net/browse/ACA-4620",
+  "C213134": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C286252": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C284666": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C279186": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279230": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279231": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279232": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279233": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279191": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279192": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279193": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279195": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C280051": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C280052": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279188": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C308042": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279219": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C279221": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C279220": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C286327": "https://alfresco.atlassian.net/browse/PRODSEC-6575",
+  "C286332": "https://alfresco.atlassian.net/browse/PRODSEC-6575",
+  "C286333": "https://alfresco.atlassian.net/browse/PRODSEC-6575"
+}
diff --git a/e2e/resources/extensibility-configs/context-submenus-ext.json b/e2e/protractor/resources/extensibility-configs/context-submenus-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/context-submenus-ext.json
rename to e2e/protractor/resources/extensibility-configs/context-submenus-ext.json
index 94bb45d02..336f324a7 100644
--- a/e2e/resources/extensibility-configs/context-submenus-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/context-submenus-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/document-presets-ext.json b/e2e/protractor/resources/extensibility-configs/document-presets-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/document-presets-ext.json
rename to e2e/protractor/resources/extensibility-configs/document-presets-ext.json
index fc3ab4bbc..84229b582 100644
--- a/e2e/resources/extensibility-configs/document-presets-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/document-presets-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/header-ext.json b/e2e/protractor/resources/extensibility-configs/header-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/header-ext.json
rename to e2e/protractor/resources/extensibility-configs/header-ext.json
index 5b5ea0efa..7d265f828 100644
--- a/e2e/resources/extensibility-configs/header-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/header-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/info-drawer-ext.json b/e2e/protractor/resources/extensibility-configs/info-drawer-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/info-drawer-ext.json
rename to e2e/protractor/resources/extensibility-configs/info-drawer-ext.json
index f03205721..333933877 100644
--- a/e2e/resources/extensibility-configs/info-drawer-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/info-drawer-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json b/e2e/protractor/resources/extensibility-configs/info-drawer-no-tabs-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json
rename to e2e/protractor/resources/extensibility-configs/info-drawer-no-tabs-ext.json
index d50b8d784..531c134f5 100644
--- a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/info-drawer-no-tabs-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/metadata-ext.json b/e2e/protractor/resources/extensibility-configs/metadata-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/metadata-ext.json
rename to e2e/protractor/resources/extensibility-configs/metadata-ext.json
index ea508fdd5..3fc4312a9 100644
--- a/e2e/resources/extensibility-configs/metadata-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/metadata-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/extensibility-configs/viewer-ext.json b/e2e/protractor/resources/extensibility-configs/viewer-ext.json
similarity index 99%
rename from e2e/resources/extensibility-configs/viewer-ext.json
rename to e2e/protractor/resources/extensibility-configs/viewer-ext.json
index be6702d8e..141e1c8c3 100644
--- a/e2e/resources/extensibility-configs/viewer-ext.json
+++ b/e2e/protractor/resources/extensibility-configs/viewer-ext.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "app.core",
   "$name": "app.core",
   "$version": "1.0.0",
diff --git a/e2e/resources/test-files/file-docx.docx b/e2e/protractor/resources/test-files/file-docx.docx
similarity index 100%
rename from e2e/resources/test-files/file-docx.docx
rename to e2e/protractor/resources/test-files/file-docx.docx
diff --git a/e2e/resources/test-files/file-jpg.jpg b/e2e/protractor/resources/test-files/file-jpg.jpg
similarity index 100%
rename from e2e/resources/test-files/file-jpg.jpg
rename to e2e/protractor/resources/test-files/file-jpg.jpg
diff --git a/e2e/resources/test-files/file-pdf.pdf b/e2e/protractor/resources/test-files/file-pdf.pdf
similarity index 100%
rename from e2e/resources/test-files/file-pdf.pdf
rename to e2e/protractor/resources/test-files/file-pdf.pdf
diff --git a/e2e/resources/test-files/file-xlsx.xlsx b/e2e/protractor/resources/test-files/file-xlsx.xlsx
similarity index 100%
rename from e2e/resources/test-files/file-xlsx.xlsx
rename to e2e/protractor/resources/test-files/file-xlsx.xlsx
diff --git a/e2e/resources/test-files/file2-docx.docx b/e2e/protractor/resources/test-files/file2-docx.docx
similarity index 100%
rename from e2e/resources/test-files/file2-docx.docx
rename to e2e/protractor/resources/test-files/file2-docx.docx
diff --git a/e2e/resources/test-files/file2-xlsx.xlsx b/e2e/protractor/resources/test-files/file2-xlsx.xlsx
similarity index 100%
rename from e2e/resources/test-files/file2-xlsx.xlsx
rename to e2e/protractor/resources/test-files/file2-xlsx.xlsx
diff --git a/e2e/resources/test-files/file_unsupported.3DS b/e2e/protractor/resources/test-files/file_unsupported.3DS
similarity index 100%
rename from e2e/resources/test-files/file_unsupported.3DS
rename to e2e/protractor/resources/test-files/file_unsupported.3DS
diff --git a/e2e/resources/test-files/protected.pdf b/e2e/protractor/resources/test-files/protected.pdf
similarity index 100%
rename from e2e/resources/test-files/protected.pdf
rename to e2e/protractor/resources/test-files/protected.pdf
diff --git a/e2e/smartrunner-factory.js b/e2e/protractor/smartrunner-factory.js
similarity index 100%
rename from e2e/smartrunner-factory.js
rename to e2e/protractor/smartrunner-factory.js
diff --git a/e2e/suites/actions-available/files-folders/folders-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/folders-actions.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
diff --git a/e2e/suites/actions-available/files-folders/generic.test.ts b/e2e/protractor/suites/actions-available/files-folders/generic.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/generic.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/generic.test.ts
diff --git a/e2e/suites/actions-available/files-folders/locked-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/locked-files-actions.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
diff --git a/e2e/suites/actions-available/files-folders/multiple-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/multiple-files-actions.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
diff --git a/e2e/suites/actions-available/files-folders/office-files-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/office-files-actions.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
diff --git a/e2e/suites/actions-available/files-folders/single-file-actions.test.ts b/e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/single-file-actions.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/single-file-actions.test.ts
diff --git a/e2e/suites/actions-available/files-folders/test-data.ts b/e2e/protractor/suites/actions-available/files-folders/test-data.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/test-data.ts
rename to e2e/protractor/suites/actions-available/files-folders/test-data.ts
diff --git a/e2e/suites/actions-available/files-folders/trash.test.ts b/e2e/protractor/suites/actions-available/files-folders/trash.test.ts
similarity index 100%
rename from e2e/suites/actions-available/files-folders/trash.test.ts
rename to e2e/protractor/suites/actions-available/files-folders/trash.test.ts
diff --git a/e2e/suites/actions-available/libraries/library-trash.test.ts b/e2e/protractor/suites/actions-available/libraries/library-trash.test.ts
similarity index 100%
rename from e2e/suites/actions-available/libraries/library-trash.test.ts
rename to e2e/protractor/suites/actions-available/libraries/library-trash.test.ts
diff --git a/e2e/suites/actions-available/libraries/library.test.ts b/e2e/protractor/suites/actions-available/libraries/library.test.ts
similarity index 100%
rename from e2e/suites/actions-available/libraries/library.test.ts
rename to e2e/protractor/suites/actions-available/libraries/library.test.ts
diff --git a/e2e/suites/actions-available/libraries/test-data-libraries.ts b/e2e/protractor/suites/actions-available/libraries/test-data-libraries.ts
similarity index 100%
rename from e2e/suites/actions-available/libraries/test-data-libraries.ts
rename to e2e/protractor/suites/actions-available/libraries/test-data-libraries.ts
diff --git a/e2e/suites/actions-available/new-menu/new-menu.test.ts b/e2e/protractor/suites/actions-available/new-menu/new-menu.test.ts
similarity index 100%
rename from e2e/suites/actions-available/new-menu/new-menu.test.ts
rename to e2e/protractor/suites/actions-available/new-menu/new-menu.test.ts
diff --git a/e2e/suites/actions-available/special-permissions/favorites.ts b/e2e/protractor/suites/actions-available/special-permissions/favorites.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/favorites.ts
rename to e2e/protractor/suites/actions-available/special-permissions/favorites.ts
diff --git a/e2e/suites/actions-available/special-permissions/my-libraries.ts b/e2e/protractor/suites/actions-available/special-permissions/my-libraries.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/my-libraries.ts
rename to e2e/protractor/suites/actions-available/special-permissions/my-libraries.ts
diff --git a/e2e/suites/actions-available/special-permissions/other-permissions.ts b/e2e/protractor/suites/actions-available/special-permissions/other-permissions.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/other-permissions.ts
rename to e2e/protractor/suites/actions-available/special-permissions/other-permissions.ts
diff --git a/e2e/suites/actions-available/special-permissions/search-results.ts b/e2e/protractor/suites/actions-available/special-permissions/search-results.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/search-results.ts
rename to e2e/protractor/suites/actions-available/special-permissions/search-results.ts
diff --git a/e2e/suites/actions-available/special-permissions/shared-files.ts b/e2e/protractor/suites/actions-available/special-permissions/shared-files.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/shared-files.ts
rename to e2e/protractor/suites/actions-available/special-permissions/shared-files.ts
diff --git a/e2e/suites/actions-available/special-permissions/special-permissions-actions.test.ts b/e2e/protractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/special-permissions-actions.test.ts
rename to e2e/protractor/suites/actions-available/special-permissions/special-permissions-actions.test.ts
diff --git a/e2e/suites/actions-available/special-permissions/test-data-permissions.ts b/e2e/protractor/suites/actions-available/special-permissions/test-data-permissions.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/test-data-permissions.ts
rename to e2e/protractor/suites/actions-available/special-permissions/test-data-permissions.ts
diff --git a/e2e/suites/actions-available/special-permissions/viewer.ts b/e2e/protractor/suites/actions-available/special-permissions/viewer.ts
similarity index 100%
rename from e2e/suites/actions-available/special-permissions/viewer.ts
rename to e2e/protractor/suites/actions-available/special-permissions/viewer.ts
diff --git a/e2e/suites/actions-available/test-util.ts b/e2e/protractor/suites/actions-available/test-util.ts
similarity index 100%
rename from e2e/suites/actions-available/test-util.ts
rename to e2e/protractor/suites/actions-available/test-util.ts
diff --git a/e2e/suites/actions/copy-move/copy.test.ts b/e2e/protractor/suites/actions/copy-move/copy.test.ts
similarity index 100%
rename from e2e/suites/actions/copy-move/copy.test.ts
rename to e2e/protractor/suites/actions/copy-move/copy.test.ts
diff --git a/e2e/suites/actions/copy-move/destination-picker-dialog.test.ts b/e2e/protractor/suites/actions/copy-move/destination-picker-dialog.test.ts
similarity index 99%
rename from e2e/suites/actions/copy-move/destination-picker-dialog.test.ts
rename to e2e/protractor/suites/actions/copy-move/destination-picker-dialog.test.ts
index 89608a429..622709f89 100755
--- a/e2e/suites/actions/copy-move/destination-picker-dialog.test.ts
+++ b/e2e/protractor/suites/actions/copy-move/destination-picker-dialog.test.ts
@@ -136,6 +136,7 @@ describe('Destination picker dialog : ', () => {
 
   afterEach(async () => {
     await page.closeOpenDialogs();
+    await page.dataTable.clearSelection();
   });
 
   describe('general', () => {
diff --git a/e2e/suites/actions/copy-move/move.test.ts b/e2e/protractor/suites/actions/copy-move/move.test.ts
similarity index 100%
rename from e2e/suites/actions/copy-move/move.test.ts
rename to e2e/protractor/suites/actions/copy-move/move.test.ts
diff --git a/e2e/suites/actions/create/create-file-from-template.test.ts b/e2e/protractor/suites/actions/create/create-file-from-template.test.ts
similarity index 100%
rename from e2e/suites/actions/create/create-file-from-template.test.ts
rename to e2e/protractor/suites/actions/create/create-file-from-template.test.ts
diff --git a/e2e/suites/actions/create/create-folder-from-template.test.ts b/e2e/protractor/suites/actions/create/create-folder-from-template.test.ts
similarity index 100%
rename from e2e/suites/actions/create/create-folder-from-template.test.ts
rename to e2e/protractor/suites/actions/create/create-folder-from-template.test.ts
diff --git a/e2e/suites/actions/create/create-folder.test.ts b/e2e/protractor/suites/actions/create/create-folder.test.ts
similarity index 100%
rename from e2e/suites/actions/create/create-folder.test.ts
rename to e2e/protractor/suites/actions/create/create-folder.test.ts
diff --git a/e2e/suites/actions/create/create-library.test.ts b/e2e/protractor/suites/actions/create/create-library.test.ts
similarity index 100%
rename from e2e/suites/actions/create/create-library.test.ts
rename to e2e/protractor/suites/actions/create/create-library.test.ts
diff --git a/e2e/suites/actions/delete/delete-undo-delete.test.ts b/e2e/protractor/suites/actions/delete/delete-undo-delete.test.ts
similarity index 100%
rename from e2e/suites/actions/delete/delete-undo-delete.test.ts
rename to e2e/protractor/suites/actions/delete/delete-undo-delete.test.ts
diff --git a/e2e/suites/actions/delete/permanently-delete.test.ts b/e2e/protractor/suites/actions/delete/permanently-delete.test.ts
similarity index 100%
rename from e2e/suites/actions/delete/permanently-delete.test.ts
rename to e2e/protractor/suites/actions/delete/permanently-delete.test.ts
diff --git a/e2e/suites/actions/delete/restore.test.ts b/e2e/protractor/suites/actions/delete/restore.test.ts
similarity index 100%
rename from e2e/suites/actions/delete/restore.test.ts
rename to e2e/protractor/suites/actions/delete/restore.test.ts
diff --git a/e2e/suites/actions/edit/edit-folder.test.ts b/e2e/protractor/suites/actions/edit/edit-folder.test.ts
similarity index 100%
rename from e2e/suites/actions/edit/edit-folder.test.ts
rename to e2e/protractor/suites/actions/edit/edit-folder.test.ts
diff --git a/e2e/suites/actions/edit/edit-offline.test.ts b/e2e/protractor/suites/actions/edit/edit-offline.test.ts
similarity index 100%
rename from e2e/suites/actions/edit/edit-offline.test.ts
rename to e2e/protractor/suites/actions/edit/edit-offline.test.ts
diff --git a/e2e/suites/actions/favorite/mark-favorite.test.ts b/e2e/protractor/suites/actions/favorite/mark-favorite.test.ts
similarity index 100%
rename from e2e/suites/actions/favorite/mark-favorite.test.ts
rename to e2e/protractor/suites/actions/favorite/mark-favorite.test.ts
diff --git a/e2e/suites/actions/library/library-actions.test.ts b/e2e/protractor/suites/actions/library/library-actions.test.ts
similarity index 100%
rename from e2e/suites/actions/library/library-actions.test.ts
rename to e2e/protractor/suites/actions/library/library-actions.test.ts
diff --git a/e2e/suites/actions/share/share-file.test.ts b/e2e/protractor/suites/actions/share/share-file.test.ts
similarity index 100%
rename from e2e/suites/actions/share/share-file.test.ts
rename to e2e/protractor/suites/actions/share/share-file.test.ts
diff --git a/e2e/suites/actions/share/unshare-file-search-results.test.ts b/e2e/protractor/suites/actions/share/unshare-file-search-results.test.ts
similarity index 100%
rename from e2e/suites/actions/share/unshare-file-search-results.test.ts
rename to e2e/protractor/suites/actions/share/unshare-file-search-results.test.ts
diff --git a/e2e/suites/actions/upload-download/download.test.ts b/e2e/protractor/suites/actions/upload-download/download.test.ts
similarity index 100%
rename from e2e/suites/actions/upload-download/download.test.ts
rename to e2e/protractor/suites/actions/upload-download/download.test.ts
diff --git a/e2e/suites/actions/upload-download/upload-file.test.ts b/e2e/protractor/suites/actions/upload-download/upload-file.test.ts
similarity index 100%
rename from e2e/suites/actions/upload-download/upload-file.test.ts
rename to e2e/protractor/suites/actions/upload-download/upload-file.test.ts
diff --git a/e2e/suites/actions/upload-download/upload-new-version.test.ts b/e2e/protractor/suites/actions/upload-download/upload-new-version.test.ts
similarity index 100%
rename from e2e/suites/actions/upload-download/upload-new-version.test.ts
rename to e2e/protractor/suites/actions/upload-download/upload-new-version.test.ts
diff --git a/e2e/suites/actions/upload-download/version-actions.test.ts b/e2e/protractor/suites/actions/upload-download/version-actions.test.ts
similarity index 100%
rename from e2e/suites/actions/upload-download/version-actions.test.ts
rename to e2e/protractor/suites/actions/upload-download/version-actions.test.ts
diff --git a/e2e/suites/application/general.test.ts b/e2e/protractor/suites/application/general.test.ts
similarity index 100%
rename from e2e/suites/application/general.test.ts
rename to e2e/protractor/suites/application/general.test.ts
diff --git a/e2e/suites/application/page-titles.test.ts b/e2e/protractor/suites/application/page-titles.test.ts
similarity index 100%
rename from e2e/suites/application/page-titles.test.ts
rename to e2e/protractor/suites/application/page-titles.test.ts
diff --git a/e2e/suites/authentication/login.test.ts b/e2e/protractor/suites/authentication/login.test.ts
similarity index 100%
rename from e2e/suites/authentication/login.test.ts
rename to e2e/protractor/suites/authentication/login.test.ts
diff --git a/e2e/suites/authentication/logout.test.ts b/e2e/protractor/suites/authentication/logout.test.ts
similarity index 100%
rename from e2e/suites/authentication/logout.test.ts
rename to e2e/protractor/suites/authentication/logout.test.ts
diff --git a/e2e/suites/extensions/ext-context-submenus.test.ts b/e2e/protractor/suites/extensions/ext-context-submenus.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-context-submenus.test.ts
rename to e2e/protractor/suites/extensions/ext-context-submenus.test.ts
diff --git a/e2e/suites/extensions/ext-document-list.test.ts b/e2e/protractor/suites/extensions/ext-document-list.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-document-list.test.ts
rename to e2e/protractor/suites/extensions/ext-document-list.test.ts
diff --git a/e2e/suites/extensions/ext-header.test.ts b/e2e/protractor/suites/extensions/ext-header.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-header.test.ts
rename to e2e/protractor/suites/extensions/ext-header.test.ts
diff --git a/e2e/suites/extensions/ext-info-drawer.test.ts b/e2e/protractor/suites/extensions/ext-info-drawer.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-info-drawer.test.ts
rename to e2e/protractor/suites/extensions/ext-info-drawer.test.ts
diff --git a/e2e/suites/extensions/ext-metadata.test.ts b/e2e/protractor/suites/extensions/ext-metadata.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-metadata.test.ts
rename to e2e/protractor/suites/extensions/ext-metadata.test.ts
diff --git a/e2e/suites/extensions/ext-viewer.test.ts b/e2e/protractor/suites/extensions/ext-viewer.test.ts
similarity index 100%
rename from e2e/suites/extensions/ext-viewer.test.ts
rename to e2e/protractor/suites/extensions/ext-viewer.test.ts
diff --git a/e2e/suites/info-drawer/comments.test.ts b/e2e/protractor/suites/info-drawer/comments.test.ts
similarity index 100%
rename from e2e/suites/info-drawer/comments.test.ts
rename to e2e/protractor/suites/info-drawer/comments.test.ts
diff --git a/e2e/suites/info-drawer/file-folder-properties.test.ts b/e2e/protractor/suites/info-drawer/file-folder-properties.test.ts
similarity index 100%
rename from e2e/suites/info-drawer/file-folder-properties.test.ts
rename to e2e/protractor/suites/info-drawer/file-folder-properties.test.ts
diff --git a/e2e/suites/info-drawer/file-preview.test.ts b/e2e/protractor/suites/info-drawer/file-preview.test.ts
similarity index 100%
rename from e2e/suites/info-drawer/file-preview.test.ts
rename to e2e/protractor/suites/info-drawer/file-preview.test.ts
diff --git a/e2e/suites/info-drawer/general.test.ts b/e2e/protractor/suites/info-drawer/general.test.ts
similarity index 100%
rename from e2e/suites/info-drawer/general.test.ts
rename to e2e/protractor/suites/info-drawer/general.test.ts
diff --git a/e2e/suites/info-drawer/library-properties.test.ts b/e2e/protractor/suites/info-drawer/library-properties.test.ts
similarity index 100%
rename from e2e/suites/info-drawer/library-properties.test.ts
rename to e2e/protractor/suites/info-drawer/library-properties.test.ts
diff --git a/e2e/suites/list-views/empty-list.test.ts b/e2e/protractor/suites/list-views/empty-list.test.ts
similarity index 100%
rename from e2e/suites/list-views/empty-list.test.ts
rename to e2e/protractor/suites/list-views/empty-list.test.ts
diff --git a/e2e/suites/list-views/favorites.test.ts b/e2e/protractor/suites/list-views/favorites.test.ts
similarity index 100%
rename from e2e/suites/list-views/favorites.test.ts
rename to e2e/protractor/suites/list-views/favorites.test.ts
diff --git a/e2e/suites/list-views/file-libraries.test.ts b/e2e/protractor/suites/list-views/file-libraries.test.ts
similarity index 100%
rename from e2e/suites/list-views/file-libraries.test.ts
rename to e2e/protractor/suites/list-views/file-libraries.test.ts
diff --git a/e2e/suites/list-views/generic-errors.test.ts b/e2e/protractor/suites/list-views/generic-errors.test.ts
similarity index 100%
rename from e2e/suites/list-views/generic-errors.test.ts
rename to e2e/protractor/suites/list-views/generic-errors.test.ts
diff --git a/e2e/suites/list-views/permissions.test.ts b/e2e/protractor/suites/list-views/permissions.test.ts
similarity index 100%
rename from e2e/suites/list-views/permissions.test.ts
rename to e2e/protractor/suites/list-views/permissions.test.ts
diff --git a/e2e/suites/list-views/personal-files.test.ts b/e2e/protractor/suites/list-views/personal-files.test.ts
similarity index 100%
rename from e2e/suites/list-views/personal-files.test.ts
rename to e2e/protractor/suites/list-views/personal-files.test.ts
diff --git a/e2e/suites/list-views/recent-files.test.ts b/e2e/protractor/suites/list-views/recent-files.test.ts
similarity index 100%
rename from e2e/suites/list-views/recent-files.test.ts
rename to e2e/protractor/suites/list-views/recent-files.test.ts
diff --git a/e2e/suites/list-views/shared-files.test.ts b/e2e/protractor/suites/list-views/shared-files.test.ts
similarity index 100%
rename from e2e/suites/list-views/shared-files.test.ts
rename to e2e/protractor/suites/list-views/shared-files.test.ts
diff --git a/e2e/suites/list-views/sort-list.test.ts b/e2e/protractor/suites/list-views/sort-list.test.ts
similarity index 100%
rename from e2e/suites/list-views/sort-list.test.ts
rename to e2e/protractor/suites/list-views/sort-list.test.ts
diff --git a/e2e/suites/list-views/tooltips.test.ts b/e2e/protractor/suites/list-views/tooltips.test.ts
similarity index 100%
rename from e2e/suites/list-views/tooltips.test.ts
rename to e2e/protractor/suites/list-views/tooltips.test.ts
diff --git a/e2e/suites/list-views/trash.test.ts b/e2e/protractor/suites/list-views/trash.test.ts
similarity index 100%
rename from e2e/suites/list-views/trash.test.ts
rename to e2e/protractor/suites/list-views/trash.test.ts
diff --git a/e2e/suites/navigation/breadcrumb.test.ts b/e2e/protractor/suites/navigation/breadcrumb.test.ts
similarity index 100%
rename from e2e/suites/navigation/breadcrumb.test.ts
rename to e2e/protractor/suites/navigation/breadcrumb.test.ts
diff --git a/e2e/suites/navigation/sidebar.test.ts b/e2e/protractor/suites/navigation/sidebar.test.ts
similarity index 100%
rename from e2e/suites/navigation/sidebar.test.ts
rename to e2e/protractor/suites/navigation/sidebar.test.ts
diff --git a/e2e/suites/navigation/single-click.test.ts b/e2e/protractor/suites/navigation/single-click.test.ts
similarity index 100%
rename from e2e/suites/navigation/single-click.test.ts
rename to e2e/protractor/suites/navigation/single-click.test.ts
diff --git a/e2e/suites/pagination/favorites.ts b/e2e/protractor/suites/pagination/favorites.ts
similarity index 100%
rename from e2e/suites/pagination/favorites.ts
rename to e2e/protractor/suites/pagination/favorites.ts
diff --git a/e2e/suites/pagination/multiple-pages-files.test.ts b/e2e/protractor/suites/pagination/multiple-pages-files.test.ts
similarity index 100%
rename from e2e/suites/pagination/multiple-pages-files.test.ts
rename to e2e/protractor/suites/pagination/multiple-pages-files.test.ts
diff --git a/e2e/suites/pagination/multiple-pages-libraries.test.ts b/e2e/protractor/suites/pagination/multiple-pages-libraries.test.ts
similarity index 100%
rename from e2e/suites/pagination/multiple-pages-libraries.test.ts
rename to e2e/protractor/suites/pagination/multiple-pages-libraries.test.ts
diff --git a/e2e/suites/pagination/multiple-pages-trash.test.ts b/e2e/protractor/suites/pagination/multiple-pages-trash.test.ts
similarity index 100%
rename from e2e/suites/pagination/multiple-pages-trash.test.ts
rename to e2e/protractor/suites/pagination/multiple-pages-trash.test.ts
diff --git a/e2e/suites/pagination/personal-files.ts b/e2e/protractor/suites/pagination/personal-files.ts
similarity index 100%
rename from e2e/suites/pagination/personal-files.ts
rename to e2e/protractor/suites/pagination/personal-files.ts
diff --git a/e2e/suites/pagination/recent-files.ts b/e2e/protractor/suites/pagination/recent-files.ts
similarity index 100%
rename from e2e/suites/pagination/recent-files.ts
rename to e2e/protractor/suites/pagination/recent-files.ts
diff --git a/e2e/suites/pagination/search-results.ts b/e2e/protractor/suites/pagination/search-results.ts
similarity index 100%
rename from e2e/suites/pagination/search-results.ts
rename to e2e/protractor/suites/pagination/search-results.ts
diff --git a/e2e/suites/pagination/shared-files.ts b/e2e/protractor/suites/pagination/shared-files.ts
similarity index 100%
rename from e2e/suites/pagination/shared-files.ts
rename to e2e/protractor/suites/pagination/shared-files.ts
diff --git a/e2e/suites/pagination/single-page.test.ts b/e2e/protractor/suites/pagination/single-page.test.ts
similarity index 100%
rename from e2e/suites/pagination/single-page.test.ts
rename to e2e/protractor/suites/pagination/single-page.test.ts
diff --git a/e2e/suites/search/search-filters.test.ts b/e2e/protractor/suites/search/search-filters.test.ts
similarity index 100%
rename from e2e/suites/search/search-filters.test.ts
rename to e2e/protractor/suites/search/search-filters.test.ts
diff --git a/e2e/suites/search/search-input.test.ts b/e2e/protractor/suites/search/search-input.test.ts
similarity index 100%
rename from e2e/suites/search/search-input.test.ts
rename to e2e/protractor/suites/search/search-input.test.ts
diff --git a/e2e/suites/search/search-results-files-folders.test.ts b/e2e/protractor/suites/search/search-results-files-folders.test.ts
similarity index 100%
rename from e2e/suites/search/search-results-files-folders.test.ts
rename to e2e/protractor/suites/search/search-results-files-folders.test.ts
diff --git a/e2e/suites/search/search-results-general.test.ts b/e2e/protractor/suites/search/search-results-general.test.ts
similarity index 100%
rename from e2e/suites/search/search-results-general.test.ts
rename to e2e/protractor/suites/search/search-results-general.test.ts
diff --git a/e2e/suites/search/search-results-libraries.test.ts b/e2e/protractor/suites/search/search-results-libraries.test.ts
similarity index 100%
rename from e2e/suites/search/search-results-libraries.test.ts
rename to e2e/protractor/suites/search/search-results-libraries.test.ts
diff --git a/e2e/suites/search/search-sorting.test.ts b/e2e/protractor/suites/search/search-sorting.test.ts
similarity index 100%
rename from e2e/suites/search/search-sorting.test.ts
rename to e2e/protractor/suites/search/search-sorting.test.ts
diff --git a/e2e/suites/viewer/viewer-actions.test.ts b/e2e/protractor/suites/viewer/viewer-actions.test.ts
similarity index 100%
rename from e2e/suites/viewer/viewer-actions.test.ts
rename to e2e/protractor/suites/viewer/viewer-actions.test.ts
diff --git a/e2e/suites/viewer/viewer-general.test.ts b/e2e/protractor/suites/viewer/viewer-general.test.ts
similarity index 100%
rename from e2e/suites/viewer/viewer-general.test.ts
rename to e2e/protractor/suites/viewer/viewer-general.test.ts
diff --git a/e2e/suites/viewer/viewer-protected-file.test.ts b/e2e/protractor/suites/viewer/viewer-protected-file.test.ts
similarity index 100%
rename from e2e/suites/viewer/viewer-protected-file.test.ts
rename to e2e/protractor/suites/viewer/viewer-protected-file.test.ts
diff --git a/e2e/tsconfig.e2e.adf.json b/e2e/protractor/tsconfig.e2e.adf.json
similarity index 58%
rename from e2e/tsconfig.e2e.adf.json
rename to e2e/protractor/tsconfig.e2e.adf.json
index 7ce2a4a8e..1b1fa99bb 100644
--- a/e2e/tsconfig.e2e.adf.json
+++ b/e2e/protractor/tsconfig.e2e.adf.json
@@ -1,14 +1,14 @@
 {
-  "extends": "../tsconfig.adf.json",
+  "extends": "../../tsconfig.adf.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
+    "outDir": "../../out-tsc/e2e",
     "baseUrl": "./",
     "module": "commonjs",
     "target": "es2017",
     "types": ["jasmine", "jasminewd2", "node"],
     "skipLibCheck": true,
     "paths": {
-      "@alfresco/aca-testing-shared": ["../projects/aca-testing-shared/src/index.ts"]
+      "@alfresco/aca-testing-shared": ["../../projects/aca-testing-shared/src/index.ts"]
     }
   },
   "exclude": ["node_modules"]
diff --git a/e2e/protractor/tsconfig.e2e.json b/e2e/protractor/tsconfig.e2e.json
new file mode 100755
index 000000000..14c0002b0
--- /dev/null
+++ b/e2e/protractor/tsconfig.e2e.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/e2e",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es2017",
+    "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
+    "skipLibCheck": true,
+    "paths": {
+      "@alfresco/aca-testing-shared": ["../../projects/aca-testing-shared/src/index.ts"],
+      "@alfresco/playwright-shared": ["../../projects/aca-playwright-shared/src/index.ts"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
deleted file mode 100755
index 1a23ff5b8..000000000
--- a/e2e/tsconfig.e2e.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
-    "module": "commonjs",
-    "target": "es2017",
-    "types": ["jasmine", "jasminewd2", "node", "@playwright/test"],
-    "skipLibCheck": true,
-    "paths": {
-      "@alfresco/aca-testing-shared": ["../projects/aca-testing-shared/src/index.ts"],
-      "@alfresco/playwright-shared": ["./playwright/shared/index.ts"]
-    }
-  },
-  "exclude": ["node_modules"]
-}
diff --git a/package-lock.json b/package-lock.json
index db7c572bb..6301fda4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,10 +10,11 @@
       "hasInstallScript": true,
       "license": "LGPL-3.0",
       "dependencies": {
-        "@alfresco/adf-content-services": "6.1.0-5015824596",
-        "@alfresco/adf-core": "6.1.0-5015824596",
-        "@alfresco/adf-extensions": "6.1.0-5015824596",
-        "@alfresco/js-api": "6.1.0-927",
+        "@alfresco/adf-content-services": "6.2.0-5276452186",
+        "@alfresco/adf-core": "6.2.0-5276452186",
+        "@alfresco/adf-extensions": "6.2.0-5276452186",
+        "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5201142775",
+        "@alfresco/js-api": "^6.1.0",
         "@angular/animations": "14.1.3",
         "@angular/cdk": "14.1.3",
         "@angular/common": "14.1.3",
@@ -32,17 +33,18 @@
         "@ngrx/store": "^14.2.0",
         "@ngrx/store-devtools": "^14.2.0",
         "@ngx-translate/core": "^14.0.0",
+        "date-fns": "^2.30.0",
         "minimatch-browser": "^1.0.0",
         "moment": "^2.29.4",
         "moment-es6": "1.0.0",
         "pdfjs-dist": "3.3.122",
         "rxjs": "6.6.6",
-        "tslib": "^2.5.0",
+        "tslib": "^2.5.3",
         "zone.js": "0.11.8"
       },
       "devDependencies": {
-        "@alfresco/adf-cli": "6.1.0-5015824596",
-        "@alfresco/adf-testing": "6.1.0-5015824596",
+        "@alfresco/adf-cli": "6.2.0-5276452186",
+        "@alfresco/adf-testing": "6.2.0-5276452186",
         "@angular-devkit/build-angular": "14.2.11",
         "@angular-devkit/core": "14.1.2",
         "@angular-devkit/schematics": "14.1.2",
@@ -58,7 +60,7 @@
         "@nrwl/angular": "15.9.2",
         "@nrwl/eslint-plugin-nx": "^15.9.2",
         "@nrwl/workspace": "15.9.2",
-        "@playwright/test": "^1.34.0",
+        "@playwright/test": "^1.35.0",
         "@schematics/angular": "14.1.2",
         "@types/event-emitter": "^0.3.3",
         "@types/jasmine": "~3.6.0",
@@ -69,11 +71,11 @@
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.48.2",
         "ajv-cli": "^4.2.0",
-        "cypress": "^12.13.0",
+        "cypress": "^12.14.0",
         "dotenv": "8.2.0",
         "dotenv-expand": "^5.1.0",
         "envsub": "^4.1.0",
-        "eslint": "^8.40.0",
+        "eslint": "^8.42.0",
         "eslint-plugin-ban": "^1.6.0",
         "eslint-plugin-import": "2.27.5",
         "eslint-plugin-jsdoc": "43.2.0",
@@ -102,7 +104,7 @@
         "protractor-screenshoter-plugin": "0.10.3",
         "protractor-smartrunner": "^2.0.0-beta6",
         "selenium-webdriver": "^4.1.1",
-        "stylelint": "^15.2.0",
+        "stylelint": "^15.6.3",
         "stylelint-config-standard-scss": "^7.0.1",
         "ts-node": "^10.9.1",
         "tsconfig-paths": "4.2.0",
@@ -117,12 +119,12 @@
       "dev": true
     },
     "node_modules/@alfresco/adf-cli": {
-      "version": "6.1.0-5015824596",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.1.0-5015824596.tgz",
-      "integrity": "sha512-bb4FIFEULJa3Dg3cmk3DqqG1XGrusNUcfqXxjHSVw+mtpHQSiGanpzrkjetLsxtYqw8DKB2gR6aYspzDLGp3bw==",
+      "version": "6.2.0-5276452186",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.2.0-5276452186.tgz",
+      "integrity": "sha512-8cQon3lhfFHDbK8QcFqL2Bgz6wY/AZktq56PO2chUP/3HLBLUhcT+Mcs4sjD5CYWiWA3OdSN4tBKSiC1tKpJwg==",
       "dev": true,
       "dependencies": {
-        "@alfresco/js-api": "^6.1.0-0",
+        "@alfresco/js-api": "^6.2.0-982",
         "commander": "^6.2.1",
         "ejs": "^3.1.9",
         "license-checker": "^25.0.1",
@@ -136,16 +138,27 @@
         "adf-cli": "bin/adf-cli"
       }
     },
+    "node_modules/@alfresco/adf-cli/node_modules/@alfresco/js-api": {
+      "version": "6.2.0-983",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.2.0-983.tgz",
+      "integrity": "sha512-z75YOKAfmWbirGyYA2LqmXoN9tnRpughUxefEV6EnocEnEqQAZqD18TAx27Dq2yA4mQZm9cT/IIlTvnIcruTBg==",
+      "dev": true,
+      "dependencies": {
+        "event-emitter": "^0.3.5",
+        "superagent": "^6.0.0",
+        "tslib": "^2.0.0"
+      }
+    },
     "node_modules/@alfresco/adf-content-services": {
-      "version": "6.1.0-5015824596",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.1.0-5015824596.tgz",
-      "integrity": "sha512-1tRuLAynfL3pDnvanmwHuychgN2hHF5JMvlfmNAwfxNCQniM/8mu/PL3Vx5n7eNIw1mY2ycE75+CGveMpfjPPA==",
+      "version": "6.2.0-5276452186",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.2.0-5276452186.tgz",
+      "integrity": "sha512-jfTQv1VaIXxp+i41gBjS7w26gGSEnugmMNhBEhPm28x1gzUVjZtnn1bHfKquMSXyd2iZliQrpUtvFxI83a8kaw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-core": "6.1.0-5015824596",
-        "@alfresco/js-api": "^6.1.0-0",
+        "@alfresco/adf-core": ">=6.2.0-5276452186",
+        "@alfresco/js-api": "^6.1.0",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -161,9 +174,9 @@
       }
     },
     "node_modules/@alfresco/adf-core": {
-      "version": "6.1.0-5015824596",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.1.0-5015824596.tgz",
-      "integrity": "sha512-p5nXxfgVppsU6xPnHui6pyv2UG+wGJt8/crx0c25OLrdBDEEQRYZFJ46A0Hmz2ybsUgbj7/3jqSK/Hp38cgKYg==",
+      "version": "6.2.0-5276452186",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.2.0-5276452186.tgz",
+      "integrity": "sha512-ZaZ9lZEBhbH5hzsR80SF/4dUbh5lpVrWTNOmimeQxdpV8MyCh20+epkzG1f8DzlMjKapFow01OtU8h+tneNMxw==",
       "dependencies": {
         "angular-oauth2-oidc": "^13.0.1",
         "angular-oauth2-oidc-jwks": "^13.0.1",
@@ -171,8 +184,8 @@
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/adf-extensions": "6.1.0-5015824596",
-        "@alfresco/js-api": "^6.1.0-0",
+        "@alfresco/adf-extensions": ">=6.2.0-5276452186",
+        "@alfresco/js-api": "^6.1.0",
         "@angular/animations": ">=14.1.3",
         "@angular/cdk": ">=14.1.2",
         "@angular/common": ">=14.1.3",
@@ -190,25 +203,25 @@
       }
     },
     "node_modules/@alfresco/adf-extensions": {
-      "version": "6.1.0-5015824596",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.1.0-5015824596.tgz",
-      "integrity": "sha512-moRwfutSaD6gN8Fz62wFopGSAEJ+Kmwf4MJoY2mi6MiiWOjCaeyHjAOXkXI/ea9XQXPSMF90EexNIDKNCg/ZTQ==",
+      "version": "6.2.0-5276452186",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.2.0-5276452186.tgz",
+      "integrity": "sha512-0Yq0EHsPEOnv1iwkvldrmYhJ09VUvmIisn19/icnOjDWD/kXARR6gZDVYfxG6IvaiA25QzoWfQzTz1W5yX+yoQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@alfresco/js-api": "^6.1.0-0",
+        "@alfresco/js-api": "^6.1.0",
         "@angular/common": ">=14.1.3",
         "@angular/core": ">=14.1.3"
       }
     },
     "node_modules/@alfresco/adf-testing": {
-      "version": "6.1.0-5015824596",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.1.0-5015824596.tgz",
-      "integrity": "sha512-yy0YKwpZ7t8YEp3mOrRzwbo+5ojqeK5/GpdY/yDcxLoZOV1IJkzCvZOy10iOpWY6o2UFTRSYK9hkNIBU/POn0A==",
+      "version": "6.2.0-5276452186",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.2.0-5276452186.tgz",
+      "integrity": "sha512-wL9xZh5ihEdGNP8cTCt2pKPyy1tZ4YyXnWM5AZ+IsMKktdpV8B4mCXwnQWL7w0KGCx++DHF+zUPw4cFcBUBp5A==",
       "dev": true,
       "dependencies": {
-        "@alfresco/js-api": "6.1.0-926",
+        "@alfresco/js-api": "6.2.0-982",
         "@angular/compiler": "14.1.3",
         "@angular/core": "14.1.3",
         "rxjs": "6.6.6",
@@ -216,13 +229,13 @@
         "zone.js": "~0.11.4"
       },
       "peerDependencies": {
-        "@alfresco/js-api": "^6.1.0-0"
+        "@alfresco/js-api": "^6.1.0"
       }
     },
     "node_modules/@alfresco/adf-testing/node_modules/@alfresco/js-api": {
-      "version": "6.1.0-926",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.1.0-926.tgz",
-      "integrity": "sha512-I6rlNOiB5Z5pBlPhx/c53orh8lVpZWAgxLCDIOktYWKlQbO0/WQC/RPcI/zVmwByvG8/UF48Niedpy9mlMIgOw==",
+      "version": "6.2.0-982",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.2.0-982.tgz",
+      "integrity": "sha512-tP7/VblH0QOMAlhjzCW8n/kE9PXA2nwkPisalNVNVtvOa6jVnwMQQlVvfnCRKf+yXX7SQYBMTKbvMA9Io0gBqw==",
       "dev": true,
       "dependencies": {
         "event-emitter": "^0.3.5",
@@ -230,10 +243,15 @@
         "tslib": "^2.0.0"
       }
     },
+    "node_modules/@alfresco/eslint-plugin-eslint-angular": {
+      "version": "6.2.0-5201142775",
+      "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.2.0-5201142775.tgz",
+      "integrity": "sha512-3rqok28L8paBXjgADymgZh8aHUeA26CBz/GpatXhkDCmZ92tiwFGpL3Q5/ArRn34CxCWeWgCI/xJzaLVrQxCQg=="
+    },
     "node_modules/@alfresco/js-api": {
-      "version": "6.1.0-927",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.1.0-927.tgz",
-      "integrity": "sha512-GjsDdUn1lGGejPhPsbFyi1NW6fm5Anj9YNLXrEOSa+dqrs987WmmQvlIR1odpHvRD328CxFPV7YlsXAevdIV2A==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.1.0.tgz",
+      "integrity": "sha512-bCPp/Yq/uMg9eJEKASGz2KCqZ6CDG09Pgdlit5GAGKNOpN3RuHtr6s7U1/TPCnXEOMjMUdM9suNfM/8WnC/gWA==",
       "dependencies": {
         "event-emitter": "^0.3.5",
         "superagent": "^6.0.0",
@@ -4175,17 +4193,23 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.1.tgz",
-      "integrity": "sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.2.0.tgz",
+      "integrity": "sha512-9BoQ/jSrPq4vv3b9jjLW+PNNv56KlDH5JMx5yASSNrCtvq70FCNZUjXRvbCeR9hYj9ZyhURtqpU/RFIgg6kiOw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
         "node": "^14 || ^16 || >=18"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
       "peerDependencies": {
         "@csstools/css-tokenizer": "^2.1.1"
       }
@@ -4204,17 +4228,23 @@
       }
     },
     "node_modules/@csstools/media-query-list-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.4.tgz",
-      "integrity": "sha512-GyYot6jHgcSDZZ+tLSnrzkR7aJhF2ZW6d+CXH66mjy5WpAQhZD4HDke2OQ36SivGRWlZJpAz7TzbW6OKlEpxAA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.0.tgz",
+      "integrity": "sha512-MXkR+TeaS2q9IkpyO6jVCdtA/bfpABJxIrfkLswThFN8EZZgI2RfAHhm6sDNDuYV25d5+b8Lj1fpTccIcSLPsQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
         "node": "^14 || ^16 || >=18"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
       "peerDependencies": {
         "@csstools/css-parser-algorithms": "^2.1.1",
         "@csstools/css-tokenizer": "^2.1.1"
@@ -4763,9 +4793,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
-      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
+      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4778,9 +4808,9 @@
       "dev": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -7482,19 +7512,19 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.34.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.34.0.tgz",
-      "integrity": "sha512-GIALJVODOIrMflLV54H3Cow635OfrTwOu24ZTDyKC66uchtFX2NcCRq83cLdakMjZKYK78lODNLQSYBj2OgaTw==",
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.35.0.tgz",
+      "integrity": "sha512-6qXdd5edCBynOwsz1YcNfgX8tNWeuS9fxy5o59D0rvHXxRtjXRebB4gE4vFVfEMXl/z8zTnAzfOs7aQDEs8G4Q==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
-        "playwright-core": "1.34.0"
+        "playwright-core": "1.35.0"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       },
       "optionalDependencies": {
         "fsevents": "2.3.2"
@@ -11987,9 +12017,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "12.13.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.13.0.tgz",
-      "integrity": "sha512-QJlSmdPk+53Zhy69woJMySZQJoWfEWun3X5OOenGsXjRPVfByVTHorxNehbzhZrEzH9RDUDqVcck0ahtlS+N/Q==",
+      "version": "12.14.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.14.0.tgz",
+      "integrity": "sha512-HiLIXKXZaIT1RT7sw1sVPt+qKtis3uYNm6KwC4qoYjabwLKaqZlyS/P+uVvvlBNcHIwL/BC6nQZajpbUd7hOgQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -12229,6 +12259,37 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
+    "node_modules/date-fns/node_modules/@babel/runtime": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.11"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/date-fns/node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+    },
     "node_modules/date-format": {
       "version": "4.0.14",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
@@ -13669,16 +13730,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
-      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
+      "version": "8.42.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
+      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.40.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/js": "8.42.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -13697,13 +13758,12 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
@@ -15789,6 +15849,12 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -19430,16 +19496,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -24395,12 +24451,15 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.34.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.34.0.tgz",
-      "integrity": "sha512-fMUY1+iR6kYbJF/EsOOqzBA99ZHXbw9sYPNjwA4X/oV0hVF/1aGlWYBGPVUEqxBkGANDKMziYoOdKGU5DIP5Gg==",
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.0.tgz",
+      "integrity": "sha512-muMXyPmIx/2DPrCHOD1H1ePT01o7OdKxKj2ebmCAYvqhUy+Y1bpal7B0rdoxros7YrXI294JT/DWw2LqyiqTPA==",
       "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       }
     },
     "node_modules/pluralize": {
@@ -24457,9 +24516,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
       "dev": true,
       "funding": [
         {
@@ -25539,9 +25598,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -28327,14 +28386,14 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "15.6.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.6.0.tgz",
-      "integrity": "sha512-Cqzpc8tvJm77KaM8qUbhpJ/UYK55Ia0whQXj4b9IId9dlPICO7J8Lyo15SZWiHxKjlvy3p5FQor/3n6i8ignXg==",
+      "version": "15.6.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.6.3.tgz",
+      "integrity": "sha512-qWUfFsnPyrgK8NMFvGkjUrF1+DNrS5VMoN39meJbeQcOW8NE3pxIwTpA35m0MG6lmZobs7GVoQUdELmzqdO7XQ==",
       "dev": true,
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^2.1.1",
+        "@csstools/css-parser-algorithms": "^2.2.0",
         "@csstools/css-tokenizer": "^2.1.1",
-        "@csstools/media-query-list-parser": "^2.0.4",
+        "@csstools/media-query-list-parser": "^2.1.0",
         "@csstools/selector-specificity": "^2.2.0",
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
@@ -28359,11 +28418,11 @@
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.22",
+        "postcss": "^8.4.24",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.11",
+        "postcss-selector-parser": "^6.0.13",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
         "string-width": "^4.2.3",
@@ -28373,7 +28432,7 @@
         "svg-tags": "^1.0.0",
         "table": "^6.8.1",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^5.0.0"
+        "write-file-atomic": "^5.0.1"
       },
       "bin": {
         "stylelint": "bin/stylelint.js"
@@ -28561,6 +28620,18 @@
       "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true
     },
+    "node_modules/stylelint/node_modules/signal-exit": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+      "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/stylelint/node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -28596,13 +28667,13 @@
       }
     },
     "node_modules/stylelint/node_modules/write-file-atomic": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.0.tgz",
-      "integrity": "sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
+        "signal-exit": "^4.0.1"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -29424,9 +29495,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
diff --git a/package.json b/package.json
index 9d2dda4ff..f31d0ae08 100644
--- a/package.json
+++ b/package.json
@@ -38,10 +38,11 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "6.1.0-5015824596",
-    "@alfresco/adf-core": "6.1.0-5015824596",
-    "@alfresco/adf-extensions": "6.1.0-5015824596",
-    "@alfresco/js-api": "6.1.0-927",
+    "@alfresco/adf-content-services": "6.2.0-5276452186",
+    "@alfresco/adf-core": "6.2.0-5276452186",
+    "@alfresco/adf-extensions": "6.2.0-5276452186",
+    "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5201142775",
+    "@alfresco/js-api": "^6.1.0",
     "@angular/animations": "14.1.3",
     "@angular/cdk": "14.1.3",
     "@angular/common": "14.1.3",
@@ -60,17 +61,18 @@
     "@ngrx/store": "^14.2.0",
     "@ngrx/store-devtools": "^14.2.0",
     "@ngx-translate/core": "^14.0.0",
+    "date-fns": "^2.30.0",
     "minimatch-browser": "^1.0.0",
     "moment": "^2.29.4",
     "moment-es6": "1.0.0",
     "pdfjs-dist": "3.3.122",
     "rxjs": "6.6.6",
-    "tslib": "^2.5.0",
+    "tslib": "^2.5.3",
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "6.1.0-5015824596",
-    "@alfresco/adf-testing": "6.1.0-5015824596",
+    "@alfresco/adf-cli": "6.2.0-5276452186",
+    "@alfresco/adf-testing": "6.2.0-5276452186",
     "@angular-devkit/build-angular": "14.2.11",
     "@angular-devkit/core": "14.1.2",
     "@angular-devkit/schematics": "14.1.2",
@@ -86,7 +88,7 @@
     "@nrwl/angular": "15.9.2",
     "@nrwl/eslint-plugin-nx": "^15.9.2",
     "@nrwl/workspace": "15.9.2",
-    "@playwright/test": "^1.34.0",
+    "@playwright/test": "^1.35.0",
     "@schematics/angular": "14.1.2",
     "@types/event-emitter": "^0.3.3",
     "@types/jasmine": "~3.6.0",
@@ -97,11 +99,11 @@
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.48.2",
     "ajv-cli": "^4.2.0",
-    "cypress": "^12.13.0",
+    "cypress": "^12.14.0",
     "dotenv": "8.2.0",
     "dotenv-expand": "^5.1.0",
     "envsub": "^4.1.0",
-    "eslint": "^8.40.0",
+    "eslint": "^8.42.0",
     "eslint-plugin-ban": "^1.6.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jsdoc": "43.2.0",
@@ -130,7 +132,7 @@
     "protractor-screenshoter-plugin": "0.10.3",
     "protractor-smartrunner": "^2.0.0-beta6",
     "selenium-webdriver": "^4.1.1",
-    "stylelint": "^15.2.0",
+    "stylelint": "^15.6.3",
     "stylelint-config-standard-scss": "^7.0.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "4.2.0",
diff --git a/projects/aca-content/about/src/about.component.scss b/projects/aca-content/about/src/about.component.scss
index caf329f4a..b3153eb10 100644
--- a/projects/aca-content/about/src/about.component.scss
+++ b/projects/aca-content/about/src/about.component.scss
@@ -1,4 +1,6 @@
-adf-about {
-  padding: 10px;
-  width: 100%;
+app-about-page {
+  adf-about {
+    padding: 10px;
+    width: 100%;
+  }
 }
diff --git a/projects/aca-content/about/src/about.component.ts b/projects/aca-content/about/src/about.component.ts
index 42d568657..8e16d7980 100644
--- a/projects/aca-content/about/src/about.component.ts
+++ b/projects/aca-content/about/src/about.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { DEV_MODE_TOKEN } from './dev-mode.tokens';
 import { AppExtensionService } from '@alfresco/adf-extensions';
 import { AboutModule, AppConfigService, AuthenticationService, RepositoryInfo } from '@alfresco/adf-core';
@@ -40,7 +40,8 @@ import { MatButtonModule } from '@angular/material/button';
   imports: [CommonModule, TranslateModule, AboutModule, PageLayoutModule, RouterModule, MatIconModule, MatButtonModule],
   selector: 'app-about-page',
   templateUrl: './about.component.html',
-  styleUrls: ['./about.component.scss']
+  styleUrls: ['./about.component.scss'],
+  encapsulation: ViewEncapsulation.None
 })
 export class AboutComponent implements OnInit {
   private authService = inject(AuthenticationService);
diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json
index a39d32975..a766884ad 100644
--- a/projects/aca-content/assets/app.extensions.json
+++ b/projects/aca-content/assets/app.extensions.json
@@ -1391,16 +1391,6 @@
         "facetFields": {
           "expanded": true,
           "fields": [
-            {
-              "mincount": 1,
-              "field": "content.mimetype",
-              "label": "SEARCH.FACET_FIELDS.FILE_TYPE",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 100
-              }
-            },
             {
               "mincount": 1,
               "field": "creator",
@@ -1420,71 +1410,23 @@
                 "hideDefaultAction": true,
                 "facetOrder": 300
               }
-            },
-            {
-              "mincount": 1,
-              "field": "SITE",
-              "label": "SEARCH.FACET_FIELDS.LOCATION",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 400
-              }
-            },
-            {
-              "mincount": 1,
-              "field": "TAG",
-              "label": "Tags",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 600
-              }
-            },
-            {
-              "mincount": 1,
-              "field": "cm:categories",
-              "label": "SEARCH.FACET_FIELDS.CATEGORIES",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 700
-              }
             }
           ]
         },
-        "facetQueries": {
-          "label": "SEARCH.CATEGORIES.MODIFIED_DATE",
-          "expanded": true,
-          "queries": [
-            {
-              "label": "SEARCH.FACET_QUERIES.TODAY",
-              "query": "cm:modified:[TODAY to TODAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_WEEK",
-              "query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_MONTH",
-              "query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
-              "query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_YEAR",
-              "query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
-            }
-          ],
-          "settings": {
-            "allowUpdateOnChange": false,
-            "hideDefaultAction": true,
-            "facetOrder": 500
-          }
-        },
         "categories": [
+          {
+            "id": "logic",
+            "name": "SEARCH.CATEGORIES.LOGIC",
+            "enabled": true,
+            "component": {
+              "selector": "logical-filter",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:name,cm:title,cm:description,TEXT,TAG"
+              }
+            }
+          },
           {
             "id": "size",
             "name": "SEARCH.CATEGORIES.SIZE",
@@ -1529,6 +1471,74 @@
                 "maxDate": "today"
               }
             }
+          },
+          {
+            "id": "modifiedDateRange",
+            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
+            "enabled": true,
+            "component": {
+              "selector": "date-range",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:modified",
+                "dateFormat": "DD-MMM-YY",
+                "maxDate": "today"
+              }
+            }
+          },
+          {
+            "id": "fileType",
+            "name": "SEARCH.FACET_FIELDS.FILE_TYPE",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "content.mimetype"
+              }
+            }
+          },
+          {
+            "id": "location",
+            "name": "SEARCH.FACET_FIELDS.LOCATION",
+            "enabled": true,
+            "component": {
+              "selector": "autocomplete-chips",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "allowOnlyPredefinedValues": false,
+                "field": "SITE",
+                "options": [ "_REPOSITORY_" ]
+              }
+            }
+          },
+          {
+            "id": "tag",
+            "name": "Tags",
+            "enabled": true,
+            "component": {
+              "selector": "autocomplete-chips",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "allowOnlyPredefinedValues": true,
+                "field": "TAG"
+              }
+            }
+          },
+          {
+            "id": "categories",
+            "name": "SEARCH.FACET_FIELDS.CATEGORIES",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:categories"
+              }
+            }
           }
         ]
       },
@@ -1641,6 +1651,19 @@
           ]
         },
         "categories": [
+          {
+            "id": "logic",
+            "name": "SEARCH.CATEGORIES.LOGIC",
+            "enabled": true,
+            "component": {
+              "selector": "logical-filter",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:name,cm:title,cm:description,TEXT,TAG"
+              }
+            }
+          },
           {
             "id": "createdDateRange",
             "name": "SEARCH.CATEGORIES.CREATED_DATE",
@@ -1761,40 +1784,22 @@
                 "hideDefaultAction": true
               }
             }
-
           ]
         },
-        "facetQueries": {
-          "label": "SEARCH.CATEGORIES.MODIFIED_DATE",
-          "expanded": true,
-          "queries": [
-            {
-              "label": "SEARCH.FACET_QUERIES.TODAY",
-              "query": "cm:modified:[TODAY to TODAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_WEEK",
-              "query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_MONTH",
-              "query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
-              "query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_YEAR",
-              "query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
-            }
-          ],
-          "settings": {
-            "allowUpdateOnChange": false,
-            "hideDefaultAction": true
-          }
-        },
         "categories": [
+          {
+            "id": "logic",
+            "name": "SEARCH.CATEGORIES.LOGIC",
+            "enabled": true,
+            "component": {
+              "selector": "logical-filter",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:name,cm:title,cm:description,TEXT,TAG"
+              }
+            }
+          },
           {
             "id": "createdDateRange",
             "name": "SEARCH.CATEGORIES.CREATED_DATE",
@@ -1810,6 +1815,21 @@
               }
             }
           },
+          {
+            "id": "modifiedDateRange",
+            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
+            "enabled": true,
+            "component": {
+              "selector": "date-range",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:modified",
+                "dateFormat": "DD-MMM-YY",
+                "maxDate": "today"
+              }
+            }
+          },
           {
             "id": "effectivnessFrom",
             "name": "SEARCH.CATEGORIES.EFFECTIVITY_FROM",
diff --git a/projects/aca-content/assets/i18n/ar.json b/projects/aca-content/assets/i18n/ar.json
index cfb308907..137deb02c 100644
--- a/projects/aca-content/assets/i18n/ar.json
+++ b/projects/aca-content/assets/i18n/ar.json
@@ -82,8 +82,6 @@
       "TITLE": "التفاصيل"
     },
     "NEW_MENU": {
-      "LABEL": "جديد",
-      "TOOLTIP": "إضافة ملفات ومجلدات جديدة، أو إنشاء مكتبة ملفات جديدة",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "إنشاء مجلد",
         "UPLOAD_FILE": "تحميل ملف",
@@ -106,7 +104,7 @@
     "HEADER": {
       "BUTTONS": {
         "CREATE": "إنشاء",
-        "CREATE_TOOLTIP": "إنشاء محتوى",
+        "CREATE_TOOLTIP": "إنشاء المحتوى",
         "UPLOAD": "تحميل",
         "UPLOAD_TOOLTIP": "تحميل المحتوى"
       }
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "السريان",
         "TITLE": "نتائج البحث",
+        "FILTER_SET": "مجموعة الفلاتر:",
+        "ADVANCED_FILTERS": "فلاتر متقدمة:",
+        "RESET": "إعادة تعيين",
         "RESET_ACTION": "إعادة تعيين عوامل تصفية البحث",
         "FOUND_RESULTS": "تم العثور على {{ number }} نتائج",
         "FOUND_ONE_RESULT": "تم العثور على {{ number }} نتيجة",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "المكتبات التي تم العثور عليها...",
         "FOUND_RESULTS": "{{ number }} نتائج",
         "FOUND_ONE_RESULT": "{{ number }} نتيجة"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "مغادرة المكتبة",
       "EDIT_OFFLINE": "تحرير دون اتصال بالإنترنت",
       "EDIT_OFFLINE_CANCEL": "إلغاء التحرير",
-      "LIST_MODE": "عرض القائمة",
-      "GALLERY_MODE": "عرض المعرض",
       "CHANGE_ASPECT": "تحرير الجوانب"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "إلغاء"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "فتح في التطبيق"
+        "MOBILE_APP_BUTTON_LABEL": "فتح في التطبيق",
+        "DOWNLOAD_APP_BUTTON_LABEL": "ليس لديك التطبيق؟ قم بالتحميل الان.",
+        "OPEN_ALFRESCO_MOBILE_APP": "فتح باستخدام تطبيق Alfresco Mobile؟"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "طي قائمة التنقل",
       "OPTIONS_SETTINGS": "الخيارات والإعدادات",
       "MY_PROFILE": "ملف التعريف الخاص بي",
-      "EXPAND_NAVIGATION": "توسيع قائمة التنقل"
+      "EXPAND_NAVIGATION": "قم بتوسيع قائمة التنقل"
     }
   },
   "NODE_SELECTOR": {
@@ -487,9 +487,9 @@
   "INFO_PANEL": {
     "TABS": {
 
-    },
-    "DETAILS": "التفاصيل"
   },
+      "DETAILS": "التفاصيل"
+    },
   "LIBRARY": {
     "DIALOG": {
       "CREATE_TITLE": "إنشاء مكتبة",
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "ملف مؤمن"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/cs.json b/projects/aca-content/assets/i18n/cs.json
index ddd73e97e..4f3e84b21 100644
--- a/projects/aca-content/assets/i18n/cs.json
+++ b/projects/aca-content/assets/i18n/cs.json
@@ -82,8 +82,6 @@
       "TITLE": "Podrobnosti"
     },
     "NEW_MENU": {
-      "LABEL": "Nový",
-      "TOOLTIP": "Přidat nové soubory a složky nebo vytvořit novou knihovnu souborů",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Vytvořit složku",
         "UPLOAD_FILE": "Odeslat soubor",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Účinnost",
         "TITLE": "Výsledky hledání",
+        "FILTER_SET": "Sada filtrů:",
+        "ADVANCED_FILTERS": "Pokročilé filtry:",
+        "RESET": "Reset",
         "RESET_ACTION": "Reset search filters",
         "FOUND_RESULTS": "Nalezené výsledky: {{ number }}",
         "FOUND_ONE_RESULT": "Nalezené výsledky: {{ number }}",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Nalezené knihovny...",
         "FOUND_RESULTS": "Výsledky: {{ number }}",
         "FOUND_ONE_RESULT": "Výsledky: {{ number }}"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Opustit knihovnu",
       "EDIT_OFFLINE": "Upravit offline",
       "EDIT_OFFLINE_CANCEL": "Zrušit úpravu",
-      "LIST_MODE": "Zobrazit seznam",
-      "GALLERY_MODE": "Zobrazit galerii",
       "CHANGE_ASPECT": "Upravit aspekty"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Zrušit"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Open in App"
+        "MOBILE_APP_BUTTON_LABEL": "Open in App",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Nemáte aplikaci? Stáhněte si ji nyní.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Otevřít za pomoci aplikace Alfresco Mobile?"
       }
     },
     "DOCUMENT_LIST": {
@@ -386,8 +386,8 @@
           "SINGULAR": "Přesunuté položky: {{ success }}",
           "PLURAL": "Přesunuté položky: {{ success }}",
           "PARTIAL": {
-            "SINGULAR": "Částečně přesunuté položky: {{ success }}",
-            "PLURAL": "Částečně přesunuté položky: {{ success }}",
+            "SINGULAR": "Částečně přesunuté položky: {{ partially }}",
+            "PLURAL": "Částečně přesunuté položky: {{ partially }}",
             "FAIL": "Některé položky ({{ failed }}) nebylo možné přesunout."
           }
         },
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Podrobnosti"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "uzamčený soubor"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/da.json b/projects/aca-content/assets/i18n/da.json
index 141b78154..d2513b411 100644
--- a/projects/aca-content/assets/i18n/da.json
+++ b/projects/aca-content/assets/i18n/da.json
@@ -82,8 +82,6 @@
       "TITLE": "Detaljer"
     },
     "NEW_MENU": {
-      "LABEL": "Ny(t)",
-      "TOOLTIP": "Tilføj nye filer og mapper, eller opret et nyt filbibliotek",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Opret mappe",
         "UPLOAD_FILE": "Upload fil",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin-kerne",
         "EFFECTIVITY": "Gældende periode",
         "TITLE": "Søgeresultater",
+        "FILTER_SET": "Filter indstillet:",
+        "ADVANCED_FILTERS": "Avancerede filtre:",
+        "RESET": "Nulstil",
         "RESET_ACTION": "Nulstil søgefiltre",
         "FOUND_RESULTS": "{{ number }} resultater fundet",
         "FOUND_ONE_RESULT": "{{ number }} resultat fundet",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Fundne biblioteker...",
         "FOUND_RESULTS": "{{ number }} resultater",
         "FOUND_ONE_RESULT": "{{ number }} resultat"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Forlad bibliotek",
       "EDIT_OFFLINE": "Rediger offline",
       "EDIT_OFFLINE_CANCEL": "Annuller redigering",
-      "LIST_MODE": "Vis liste",
-      "GALLERY_MODE": "Vis galleri",
       "CHANGE_ASPECT": "Rediger udseende"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Annuller"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Åbn i app"
+        "MOBILE_APP_BUTTON_LABEL": "Åbn i app",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Har du ikke appen? Download den nu.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Åbn med Alfresco Mobile-applikationen?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Luk navigationsmenuen",
       "OPTIONS_SETTINGS": "Valgmuligheder og indstillinger",
       "MY_PROFILE": "Min profil",
-      "EXPAND_NAVIGATION": "Udvid navigationsmenuen"
+      "EXPAND_NAVIGATION": "Udvid navigationsmenu"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Detaljer"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "låst fil"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/de.json b/projects/aca-content/assets/i18n/de.json
index dbeeda78e..5ce7e9f93 100644
--- a/projects/aca-content/assets/i18n/de.json
+++ b/projects/aca-content/assets/i18n/de.json
@@ -82,8 +82,6 @@
       "TITLE": "Details"
     },
     "NEW_MENU": {
-      "LABEL": "Neu",
-      "TOOLTIP": "Neue Dateien und Ordner hinzufügen oder neue Dateibibliothek erstellen",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Ordner erstellen",
         "UPLOAD_FILE": "Datei hochladen",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Effektivität",
         "TITLE": "Ergebnisse durchsuchen",
+        "FILTER_SET": "Filter-Satz:",
+        "ADVANCED_FILTERS": "Erweiterte Filter:",
+        "RESET": "Zurücksetzen",
         "RESET_ACTION": "Suchfilter zurücksetzen",
         "FOUND_RESULTS": "{{ number }} Ergebnisse gefunden",
         "FOUND_ONE_RESULT": "{{ number }} Ergebnisse gefunden",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliotheken gefunden...",
         "FOUND_RESULTS": "{{ number }} Ergebnisse",
         "FOUND_ONE_RESULT": "{{ number }} Ergebnis"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Bibliothek verlassen",
       "EDIT_OFFLINE": "Offline bearbeiten",
       "EDIT_OFFLINE_CANCEL": "Bearbeitung abbrechen",
-      "LIST_MODE": "Liste anzeigen",
-      "GALLERY_MODE": "Galerie anzeigen",
       "CHANGE_ASPECT": "Aspekte bearbeiten"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Abbrechen"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "In der App öffnen"
+        "MOBILE_APP_BUTTON_LABEL": "In der App öffnen",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Sie haben die App noch nicht? Jetzt herunterladen.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Mit der Alfresco Mobile-Anwendung öffnen?"
       }
     },
     "DOCUMENT_LIST": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Details"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "gesperrte Datei"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/en.json b/projects/aca-content/assets/i18n/en.json
index 52e89999f..011697200 100644
--- a/projects/aca-content/assets/i18n/en.json
+++ b/projects/aca-content/assets/i18n/en.json
@@ -268,8 +268,6 @@
             "LEAVE": "Leave Library",
             "EDIT_OFFLINE": "Edit Offline",
             "EDIT_OFFLINE_CANCEL": "Cancel Editing",
-            "LIST_MODE": "View list",
-            "GALLERY_MODE": "View gallery",
             "CHANGE_ASPECT": "Edit Aspects"
         },
         "DIALOGS": {
@@ -568,14 +566,8 @@
             },
             "CREATED_DATE": "Created date",
             "EFFECTIVITY_FROM": "Effectivity from",
-            "EFFECTIVITY_TO": "Effectivity to"
-        },
-        "FACET_QUERIES": {
-            "TODAY": "Today",
-            "THIS_WEEK": "This week",
-            "THIS_MONTH": "This month",
-            "LAST_6_MONTHS": "In the last 6 months",
-            "THIS_YEAR": "This year"
+            "EFFECTIVITY_TO": "Effectivity to",
+            "LOGIC": "Logic"
         },
         "SEARCH_HEADER" : {
           "TITLE":"Filter",
diff --git a/projects/aca-content/assets/i18n/es.json b/projects/aca-content/assets/i18n/es.json
index 295c41c0f..30b6a5ea8 100644
--- a/projects/aca-content/assets/i18n/es.json
+++ b/projects/aca-content/assets/i18n/es.json
@@ -82,8 +82,6 @@
       "TITLE": "Detalles"
     },
     "NEW_MENU": {
-      "LABEL": "Nuevo",
-      "TOOLTIP": "Añadir nuevos ficheros o carpetas, o crear una nueva biblioteca de ficheros",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Crear carpeta",
         "UPLOAD_FILE": "Cargar fichero",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "Efectividad",
         "TITLE": "Resultados de la búsqueda",
+        "FILTER_SET": "Conjunto de filtros:",
+        "ADVANCED_FILTERS": "Filtros avanzados:",
+        "RESET": "Reiniciar",
         "RESET_ACTION": "Restablecer los filtros de la búsqueda",
         "FOUND_RESULTS": "{{ number }} resultados encontrados",
         "FOUND_ONE_RESULT": "{{ number }} resultado encontrado",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliotecas encontradas...",
         "FOUND_RESULTS": "{{ number }} resultados",
         "FOUND_ONE_RESULT": "{{ number }} resultado"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Abandonar biblioteca",
       "EDIT_OFFLINE": "Editar fuera de línea",
       "EDIT_OFFLINE_CANCEL": "Cancelar edición",
-      "LIST_MODE": "Ver lista",
-      "GALLERY_MODE": "Ver galería",
       "CHANGE_ASPECT": "Editar aspectos"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Cancelar"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Abrir en la aplicación"
+        "MOBILE_APP_BUTTON_LABEL": "Abrir en la aplicación",
+        "DOWNLOAD_APP_BUTTON_LABEL": "¿No tiene la aplicación? Descárguela ahora.",
+        "OPEN_ALFRESCO_MOBILE_APP": "¿Abrir con la aplicación Alfresco Mobile?"
       }
     },
     "DOCUMENT_LIST": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Detalles"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "fichero bloqueado"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/fi.json b/projects/aca-content/assets/i18n/fi.json
index 14a75cec3..0abc7a067 100644
--- a/projects/aca-content/assets/i18n/fi.json
+++ b/projects/aca-content/assets/i18n/fi.json
@@ -82,8 +82,6 @@
       "TITLE": "Tiedot"
     },
     "NEW_MENU": {
-      "LABEL": "Uusi",
-      "TOOLTIP": "Lisää uusia tiedostoja ja kansioita tai luo uusi tiedostokirjasto",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Luo kansio",
         "UPLOAD_FILE": "Lataa tiedosto",
@@ -106,7 +104,7 @@
     "HEADER": {
       "BUTTONS": {
         "CREATE": "Luo",
-        "CREATE_TOOLTIP": "Sisällön luominen",
+        "CREATE_TOOLTIP": "Luo sisältöä",
         "UPLOAD": "Lataa",
         "UPLOAD_TOOLTIP": "Lataa sisältöä"
       }
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "Voimassaolo",
         "TITLE": "Hakutulosta",
+        "FILTER_SET": "Asetettu suodatin:",
+        "ADVANCED_FILTERS": "Edistyneet suodattimet:",
+        "RESET": "Nollaa",
         "RESET_ACTION": "Nollaa hakusuodattimet",
         "FOUND_RESULTS": "Löytyi {{ number }} tulosta",
         "FOUND_ONE_RESULT": "Löytyi {{ number }} tulos",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Löydetyt kirjastot...",
         "FOUND_RESULTS": "{{ number }} tulosta",
         "FOUND_ONE_RESULT": "{{ number }} tulos"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Poistu kirjastosta",
       "EDIT_OFFLINE": "Muokkaa offline-tilassa",
       "EDIT_OFFLINE_CANCEL": "Peruuta muokkaus",
-      "LIST_MODE": "Tarkastele luetteloa",
-      "GALLERY_MODE": "Tarkastele galleriaa",
       "CHANGE_ASPECT": "Muokkaa ominaisuusjoukkoja"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Peruuta"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Avaa sovelluksessa"
+        "MOBILE_APP_BUTTON_LABEL": "Avaa sovelluksessa",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Eikö sinulla ole sovellusta? Lataa se heti.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Avaa Alfresco-mobiilisovelluksella?"
       }
     },
     "DOCUMENT_LIST": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Tiedot"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "tiedosto lukittu"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/fr.json b/projects/aca-content/assets/i18n/fr.json
index 94da16f03..eca6215ad 100644
--- a/projects/aca-content/assets/i18n/fr.json
+++ b/projects/aca-content/assets/i18n/fr.json
@@ -82,8 +82,6 @@
       "TITLE": "Détails"
     },
     "NEW_MENU": {
-      "LABEL": "Nouveau",
-      "TOOLTIP": "Ajouter de nouveaux fichiers et dossiers ou créer une nouvelle bibliothèque de fichiers",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Créer un dossier",
         "UPLOAD_FILE": "Importer le fichier",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Validité",
         "TITLE": "Résultats de la recherche",
+        "FILTER_SET": "Ensemble de filtres :",
+        "ADVANCED_FILTERS": "Filtres avancés :",
+        "RESET": "Réinitialiser",
         "RESET_ACTION": "Réinitialiser les filtres de recherche",
         "FOUND_RESULTS": "{{ number }} résultats trouvés",
         "FOUND_ONE_RESULT": "{{ number }} résultat trouvé",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliothèques trouvées...",
         "FOUND_RESULTS": "{{ number }} résultats",
         "FOUND_ONE_RESULT": "{{ number }} résultat"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Quitter la bibliothèque",
       "EDIT_OFFLINE": "Editer hors-ligne",
       "EDIT_OFFLINE_CANCEL": "Annuler l'édition",
-      "LIST_MODE": "Afficher la liste",
-      "GALLERY_MODE": "Afficher la galerie",
       "CHANGE_ASPECT": "Modifier les aspects"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Annuler"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Ouvrir dans l'application"
+        "MOBILE_APP_BUTTON_LABEL": "Ouvrir dans l'application",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Vous n'avez pas l'application ? Téléchargez-la maintenant.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Ouvrir avec l'application Alfresco Mobile ?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Réduire le menu de navigation",
       "OPTIONS_SETTINGS": "Options et paramètres",
       "MY_PROFILE": "Mon profil",
-      "EXPAND_NAVIGATION": "Élargir le menu de navigation"
+      "EXPAND_NAVIGATION": "Agrandir le menu de navigation"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Détails"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "fichier verrouillé"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/it.json b/projects/aca-content/assets/i18n/it.json
index 61c501231..d54fefa33 100644
--- a/projects/aca-content/assets/i18n/it.json
+++ b/projects/aca-content/assets/i18n/it.json
@@ -82,8 +82,6 @@
       "TITLE": "Dettagli"
     },
     "NEW_MENU": {
-      "LABEL": "Nuovo",
-      "TOOLTIP": "Aggiungi nuovi file o cartelle oppure crea una nuova libreria di file",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Crea cartella",
         "UPLOAD_FILE": "Carica file",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "Validità",
         "TITLE": "Risultati della ricerca",
+        "FILTER_SET": "Set di filtri:",
+        "ADVANCED_FILTERS": "Filtri avanzati:",
+        "RESET": "Reimposta",
         "RESET_ACTION": "Reimposta filtri di ricerca",
         "FOUND_RESULTS": "{{ number }} risultati trovati",
         "FOUND_ONE_RESULT": "{{ number }} risultato trovato",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Librerie trovate...",
         "FOUND_RESULTS": "{{ number }} risultati",
         "FOUND_ONE_RESULT": "{{ number }} risultato"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Esci dalla libreria",
       "EDIT_OFFLINE": "Modifica offline",
       "EDIT_OFFLINE_CANCEL": "Annulla modifica",
-      "LIST_MODE": "Visualizza elenco",
-      "GALLERY_MODE": "Visualizza raccolta",
       "CHANGE_ASPECT": "Modifica aspetti"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Annulla"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Apri nell'App"
+        "MOBILE_APP_BUTTON_LABEL": "Apri nell'App",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Non si dispone dell'app? Scaricarla ora.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Aprire con l'applicazione Alfresco Mobile?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Comprimi il menu di navigazione",
       "OPTIONS_SETTINGS": "Opzioni e impostazioni",
       "MY_PROFILE": "Il mio profilo",
-      "EXPAND_NAVIGATION": "Espandi il menu di navigazione"
+      "EXPAND_NAVIGATION": "Espande il menu di navigazione"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Dettagli"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "File bloccato"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/ja.json b/projects/aca-content/assets/i18n/ja.json
index c7e224654..e9f0164b4 100644
--- a/projects/aca-content/assets/i18n/ja.json
+++ b/projects/aca-content/assets/i18n/ja.json
@@ -82,8 +82,6 @@
       "TITLE": "詳細"
     },
     "NEW_MENU": {
-      "LABEL": "新規",
-      "TOOLTIP": "新しいフィールドやフォルダを追加したり、新しいファイルライブラリを作成できます。",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "フォルダの作成",
         "UPLOAD_FILE": "ファイルのアップロード",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "有効性",
         "TITLE": "検索結果",
+        "FILTER_SET": "フィルタセット：",
+        "ADVANCED_FILTERS": "高度なフィルタ：",
+        "RESET": "リセット",
         "RESET_ACTION": "検索フィルタのリセット",
         "FOUND_RESULTS": "{{ number }} 件見つかりました",
         "FOUND_ONE_RESULT": "{{ number }} 件見つかりました",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "ライブラリが見つかりました...",
         "FOUND_RESULTS": "検索結果: {{ number }} 件",
         "FOUND_ONE_RESULT": "検索結果: {{ number }} 件"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "ライブラリから脱退",
       "EDIT_OFFLINE": "オフライン編集",
       "EDIT_OFFLINE_CANCEL": "編集のキャンセル",
-      "LIST_MODE": "リストを表示",
-      "GALLERY_MODE": "ギャラリーを表示",
       "CHANGE_ASPECT": "アスペクトを編集"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "キャンセル"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "アプリで開く"
+        "MOBILE_APP_BUTTON_LABEL": "アプリで開く",
+        "DOWNLOAD_APP_BUTTON_LABEL": "アプリがない場合は、今すぐダウンロードしてください。",
+        "OPEN_ALFRESCO_MOBILE_APP": "Alfresco Mobileアプリケーションを使用して開きますか？"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "ナビゲーションメニューを折りたたむ",
       "OPTIONS_SETTINGS": "オプションと設定",
       "MY_PROFILE": "あなたのプロフィール",
-      "EXPAND_NAVIGATION": "ないビゲーションメニューを展開する"
+      "EXPAND_NAVIGATION": "ナビゲーションメニューを展開します"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "詳細"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "ロックされているファイル"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/nb.json b/projects/aca-content/assets/i18n/nb.json
index 0a30f1f45..7e42becff 100644
--- a/projects/aca-content/assets/i18n/nb.json
+++ b/projects/aca-content/assets/i18n/nb.json
@@ -82,8 +82,6 @@
       "TITLE": "Detaljer"
     },
     "NEW_MENU": {
-      "LABEL": "Ny",
-      "TOOLTIP": "Legg til nye filer og mapper, eller opprett et nytt filbibliotek",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Opprett mappe",
         "UPLOAD_FILE": "Last opp fil",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Effektivitet",
         "TITLE": "Søkeresultater",
+        "FILTER_SET": "Filtersett:",
+        "ADVANCED_FILTERS": "Avanserte filtre:",
+        "RESET": "Tilbakestill",
         "RESET_ACTION": "Tilbakestill søkefiltre",
         "FOUND_RESULTS": "{{ number }} resultater funnet",
         "FOUND_ONE_RESULT": "{{ number }} resultat funnet",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Biblioteker funnet...",
         "FOUND_RESULTS": "{{ number }} resultater",
         "FOUND_ONE_RESULT": "{{ number }} resultat"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Forlat bibliotek",
       "EDIT_OFFLINE": "Rediger frakoblet",
       "EDIT_OFFLINE_CANCEL": "Avbryt redigering",
-      "LIST_MODE": "Vis liste",
-      "GALLERY_MODE": "Vis galleri",
       "CHANGE_ASPECT": "Rediger Aspekter"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Avbryt"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Åpne i app"
+        "MOBILE_APP_BUTTON_LABEL": "Åpne i app",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Har du ikke appen? Last den ned nå.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Vil du åpne med Alfresco-mobilapplikasjonen?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Skjul navigasjonsmeny",
       "OPTIONS_SETTINGS": "Alternativer og innstillinger",
       "MY_PROFILE": "Min profil",
-      "EXPAND_NAVIGATION": "Utvid navigasjonsmeny"
+      "EXPAND_NAVIGATION": "Utvider navigasjonsmenyen"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Detaljer"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "låst fil"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/nl.json b/projects/aca-content/assets/i18n/nl.json
index 747d9a8a1..224b221b9 100644
--- a/projects/aca-content/assets/i18n/nl.json
+++ b/projects/aca-content/assets/i18n/nl.json
@@ -82,8 +82,6 @@
       "TITLE": "Gegevens"
     },
     "NEW_MENU": {
-      "LABEL": "Nieuw",
-      "TOOLTIP": "Nieuwe bestanden en mappen toevoegen, of een nieuwe bestandsbibliotheek maken",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Map maken",
         "UPLOAD_FILE": "Bestand uploaden",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Effectiviteit",
         "TITLE": "Zoekresultaten",
+        "FILTER_SET": "Ingesteld filter:",
+        "ADVANCED_FILTERS": "Geavanceerde filters:",
+        "RESET": "Opnieuw instellen",
         "RESET_ACTION": "Zoekfilters opnieuw instellen",
         "FOUND_RESULTS": "{{ number }} resultaten gevonden",
         "FOUND_ONE_RESULT": "{{ number }} resultaat gevonden",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliotheken gevonden...",
         "FOUND_RESULTS": "{{ number }} resultaten",
         "FOUND_ONE_RESULT": "{{ number }} resultaat"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Bibliotheek verlaten",
       "EDIT_OFFLINE": "Offline bewerken",
       "EDIT_OFFLINE_CANCEL": "Bewerken annuleren",
-      "LIST_MODE": "Lijst weergeven",
-      "GALLERY_MODE": "Galerie weergeven",
       "CHANGE_ASPECT": "Aspecten bewerken"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Annuleren"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Openen in app"
+        "MOBILE_APP_BUTTON_LABEL": "Openen in app",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Hebt u de app niet? Download hem nu.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Openen met Alfresco Mobile-app?"
       }
     },
     "DOCUMENT_LIST": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Gegevens"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "Vergrendeld bestand"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/pl.json b/projects/aca-content/assets/i18n/pl.json
index cab8250af..f0215da74 100644
--- a/projects/aca-content/assets/i18n/pl.json
+++ b/projects/aca-content/assets/i18n/pl.json
@@ -82,8 +82,6 @@
       "TITLE": "Szczegóły"
     },
     "NEW_MENU": {
-      "LABEL": "Nowy",
-      "TOOLTIP": "Dodaj nowe pliki i foldery lub utwórz nową bibliotekę plików",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Utwórz Folder",
         "UPLOAD_FILE": "Prześlij plik",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin Core",
         "EFFECTIVITY": "Obowiązywanie",
         "TITLE": "Wyniki wyszukiwania",
+        "FILTER_SET": "Zestaw filtrów:",
+        "ADVANCED_FILTERS": "Zaawansowane filtry:",
+        "RESET": "Resetuj",
         "RESET_ACTION": "Resetuj filtry wyszukiwania",
         "FOUND_RESULTS": "Znaleziono wyników: {{ number }}",
         "FOUND_ONE_RESULT": "Znaleziono wyników: {{ number }}",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Znaleziono biblioteki...",
         "FOUND_RESULTS": "Wyniki: {{ number }}",
         "FOUND_ONE_RESULT": "Wynik: {{ number }}"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Opuść bibliotekę",
       "EDIT_OFFLINE": "Edytuj w trybie offline",
       "EDIT_OFFLINE_CANCEL": "Anuluj edytowanie",
-      "LIST_MODE": "Wyświetl listę",
-      "GALLERY_MODE": "Wyświetl galerię",
       "CHANGE_ASPECT": "Edytuj aspekty"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Anuluj"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Otwórz w aplikacji"
+        "MOBILE_APP_BUTTON_LABEL": "Otwórz w aplikacji",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Nie masz aplikacji? Pobierz teraz.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Otworzyć za pomocą aplikacji Alfresco Mobile?"
       }
     },
     "DOCUMENT_LIST": {
@@ -445,8 +445,8 @@
   "NODE_FROM_TEMPLATE": {
     "CANCEL": "Anuluj",
     "CREATE": "Utwórz",
-    "FOLDER_DIALOG_TITLE": "Utwórz nowy folder w oparciu o <span class=\"bold\">'{{ szablon }}'</span>",
-    "FILE_DIALOG_TITLE": "Utwórz nowy dokument w oparciu o <span class=\"bold\">'{{ szablon }}'</span>",
+    "FOLDER_DIALOG_TITLE": "Utwórz nowy folder w oparciu o <span class=\"bold\">'{{ template }}'</span>",
+    "FILE_DIALOG_TITLE": "Utwórz nowy dokument w oparciu o <span class=\"bold\">'{{ template }}'</span>",
     "FORM": {
       "PLACEHOLDER": {
         "NAME": "Nazwa",
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Szczegóły"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "zablokowany plik"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/pt-BR.json b/projects/aca-content/assets/i18n/pt-BR.json
index 45d8fd4a1..44fc3215a 100644
--- a/projects/aca-content/assets/i18n/pt-BR.json
+++ b/projects/aca-content/assets/i18n/pt-BR.json
@@ -82,8 +82,6 @@
       "TITLE": "Detalhes"
     },
     "NEW_MENU": {
-      "LABEL": "Novo",
-      "TOOLTIP": "Adicionar novos arquivos e pastas ou criar uma Biblioteca de Arquivos",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Criar pasta",
         "UPLOAD_FILE": "Carregar arquivo",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "Efetividade",
         "TITLE": "Resultados da pesquisa",
+        "FILTER_SET": "Conjunto de filtros:",
+        "ADVANCED_FILTERS": "Filtros avançados:",
+        "RESET": "Redefinir",
         "RESET_ACTION": "Redefinir filtros de pesquisa",
         "FOUND_RESULTS": "{{ number }} resultados encontrados",
         "FOUND_ONE_RESULT": "{{ number }} resultados encontrados",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliotecas encontradas...",
         "FOUND_RESULTS": "{{ number }} resultados",
         "FOUND_ONE_RESULT": "{{ number }} resultados"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Sair da biblioteca",
       "EDIT_OFFLINE": "Editar offline",
       "EDIT_OFFLINE_CANCEL": "Cancelar a edição",
-      "LIST_MODE": "Exibir lista",
-      "GALLERY_MODE": "Exibir galeria",
       "CHANGE_ASPECT": "Editar aspectos"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Cancelar"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Abrir no aplicativo"
+        "MOBILE_APP_BUTTON_LABEL": "Abrir no aplicativo",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Não tem o aplicativo? Baixe-o agora.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Abrir usando o aplicativo móvel Alfresco?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Recolher menu de navegação",
       "OPTIONS_SETTINGS": "Opções e configurações",
       "MY_PROFILE": "Meu perfil",
-      "EXPAND_NAVIGATION": "Expandir painel de navegação"
+      "EXPAND_NAVIGATION": "Expandir menu de navegação"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Detalhes"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "arquivo bloqueado"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/ru.json b/projects/aca-content/assets/i18n/ru.json
index ad9adaa7d..e4c6afcd4 100644
--- a/projects/aca-content/assets/i18n/ru.json
+++ b/projects/aca-content/assets/i18n/ru.json
@@ -82,8 +82,6 @@
       "TITLE": "Сведения"
     },
     "NEW_MENU": {
-      "LABEL": "Создать",
-      "TOOLTIP": "Добавить новые файлы или папки",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Создать папку",
         "UPLOAD_FILE": "Загрузить файл",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Дублинское ядро",
         "EFFECTIVITY": "Эффективность",
         "TITLE": "Результаты поиска",
+        "FILTER_SET": "Используется фильтр:",
+        "ADVANCED_FILTERS": "Дополнительные фильтры:",
+        "RESET": "Сброс",
         "RESET_ACTION": "Сбросить фильтры поиска",
         "FOUND_RESULTS": "Найдено результатов: {{ number }}",
         "FOUND_ONE_RESULT": "Найден результат: {{ number }}",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Найденные библиотеки...",
         "FOUND_RESULTS": "Результатов: {{ number }}",
         "FOUND_ONE_RESULT": "Результат: {{ number }}"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Покинуть библиотеку",
       "EDIT_OFFLINE": "Редактировать в автономном режиме",
       "EDIT_OFFLINE_CANCEL": "Отменить редактирование",
-      "LIST_MODE": "Просмотреть список",
-      "GALLERY_MODE": "Просмотреть галерею",
       "CHANGE_ASPECT": "Редактировать аспекты"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Отмена"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Открыть в приложении"
+        "MOBILE_APP_BUTTON_LABEL": "Открыть в приложении",
+        "DOWNLOAD_APP_BUTTON_LABEL": "У вас не установлено приложение? Скачайте его прямо сейчас.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Открыть, используя приложение Alfresco Mobile?"
       }
     },
     "DOCUMENT_LIST": {
@@ -445,8 +445,8 @@
   "NODE_FROM_TEMPLATE": {
     "CANCEL": "Отмена",
     "CREATE": "Создать",
-    "FOLDER_DIALOG_TITLE": "Создать новую папку из <span class=\"bold\">'{{ шаблона }}'</span>",
-    "FILE_DIALOG_TITLE": "Создать новый документ из <span class=\"bold\">'{{ шаблона }}'</span>",
+    "FOLDER_DIALOG_TITLE": "Создать новую папку из <span class=\"bold\">'{{ template }}'</span>",
+    "FILE_DIALOG_TITLE": "Создать новый документ из <span class=\"bold\">'{{ template }}'</span>",
     "FORM": {
       "PLACEHOLDER": {
         "NAME": "Имя",
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "заблокированный файл"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/sv.json b/projects/aca-content/assets/i18n/sv.json
index c2ae20ad0..e6685188a 100644
--- a/projects/aca-content/assets/i18n/sv.json
+++ b/projects/aca-content/assets/i18n/sv.json
@@ -82,8 +82,6 @@
       "TITLE": "Detaljer"
     },
     "NEW_MENU": {
-      "LABEL": "Ny",
-      "TOOLTIP": "Lägg till nya filer och mappar eller skapa ett nytt filbibliotek",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "Skapa mapp",
         "UPLOAD_FILE": "Ladda upp fil",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "Dublin core",
         "EFFECTIVITY": "Giltighet",
         "TITLE": "Sökresultat",
+        "FILTER_SET": "Filteruppsättning:",
+        "ADVANCED_FILTERS": "Avancerade filter:",
+        "RESET": "Återställ",
         "RESET_ACTION": "Återställ sökfilter",
         "FOUND_RESULTS": "{{ number }} resultat hittades",
         "FOUND_ONE_RESULT": "{{ number }} resultat hittades",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "Bibliotek hittade...",
         "FOUND_RESULTS": "{{ number }} resultat",
         "FOUND_ONE_RESULT": "{{ number }} resultat"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "Lämna bibliotek",
       "EDIT_OFFLINE": "Redigera offline",
       "EDIT_OFFLINE_CANCEL": "Avbryt redigering",
-      "LIST_MODE": "Visa lista",
-      "GALLERY_MODE": "Visa galleri",
       "CHANGE_ASPECT": "Redigera aspekter"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "Avbryt"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "Öppna i appen"
+        "MOBILE_APP_BUTTON_LABEL": "Öppna i appen",
+        "DOWNLOAD_APP_BUTTON_LABEL": "Har du inte appen? Ladda ner nu.",
+        "OPEN_ALFRESCO_MOBILE_APP": "Öppna med Alfresco Mobile-applikation?"
       }
     },
     "DOCUMENT_LIST": {
@@ -429,7 +429,7 @@
       "COLLAPSE_NAVIGATION": "Dölj navigeringsmenyn",
       "OPTIONS_SETTINGS": "Alternativ och inställningar",
       "MY_PROFILE": "Min profil",
-      "EXPAND_NAVIGATION": "Visa navigeringsmenyn"
+      "EXPAND_NAVIGATION": "Expandera navigeringsmenyn"
     }
   },
   "NODE_SELECTOR": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "Detaljer"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "låst fil"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-content/assets/i18n/zh-CN.json b/projects/aca-content/assets/i18n/zh-CN.json
index 17b398a6d..c588edce2 100644
--- a/projects/aca-content/assets/i18n/zh-CN.json
+++ b/projects/aca-content/assets/i18n/zh-CN.json
@@ -82,8 +82,6 @@
       "TITLE": "详细信息"
     },
     "NEW_MENU": {
-      "LABEL": "新建",
-      "TOOLTIP": "添加新文件或文件夹，或者创建新文件库",
       "MENU_ITEMS": {
         "CREATE_FOLDER": "创建文件夹",
         "UPLOAD_FILE": "上传文件",
@@ -215,6 +213,9 @@
         "DUBLIN_CORE": "都柏林核心",
         "EFFECTIVITY": "有效性",
         "TITLE": "搜索结果",
+        "FILTER_SET": "筛选器集:",
+        "ADVANCED_FILTERS": "高级筛选器:",
+        "RESET": "重置",
         "RESET_ACTION": "重置搜索筛选器",
         "FOUND_RESULTS": "找到 {{ number }} 个结果",
         "FOUND_ONE_RESULT": "找到 {{ number }} 个结果",
@@ -234,7 +235,6 @@
         }
       },
       "SEARCH_LIBRARIES": {
-        "TITLE": "库找到...",
         "FOUND_RESULTS": "{{ number }} 个结果",
         "FOUND_ONE_RESULT": "{{ number }} 个结果"
       }
@@ -268,8 +268,6 @@
       "LEAVE": "离开库",
       "EDIT_OFFLINE": "离线编辑",
       "EDIT_OFFLINE_CANCEL": "取消编辑",
-      "LIST_MODE": "查看列表",
-      "GALLERY_MODE": "查看图库",
       "CHANGE_ASPECT": "编辑纵横比"
     },
     "DIALOGS": {
@@ -286,7 +284,9 @@
         "NO_LABEL": "取消"
       },
       "MOBILE_APP": {
-        "MOBILE_APP_BUTTON_LABEL": "在 App 中打开"
+        "MOBILE_APP_BUTTON_LABEL": "在 App 中打开",
+        "DOWNLOAD_APP_BUTTON_LABEL": "没有这个 App? 现在就下载。",
+        "OPEN_ALFRESCO_MOBILE_APP": "使用 Alfresco 移动应用程序打开？"
       }
     },
     "DOCUMENT_LIST": {
@@ -486,7 +486,7 @@
   },
   "INFO_PANEL": {
     "TABS": {
-
+    
     },
     "DETAILS": "详细信息"
   },
@@ -647,4 +647,4 @@
       "BASELINE-LOCK-24PX": "锁定的文件"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/projects/aca-folder-rules/assets/folder-rules.plugin.json b/projects/aca-content/folder-rules/assets/folder-rules.plugin.json
similarity index 97%
rename from projects/aca-folder-rules/assets/folder-rules.plugin.json
rename to projects/aca-content/folder-rules/assets/folder-rules.plugin.json
index a3845283a..c653eedbb 100644
--- a/projects/aca-folder-rules/assets/folder-rules.plugin.json
+++ b/projects/aca-content/folder-rules/assets/folder-rules.plugin.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../../../extension.schema.json",
+  "$schema": "../../../../extension.schema.json",
   "$id": "0455ca6c-cc7a-43ae-bbf7-35795413d2dd",
   "$name": "Folder Rules Plugin",
   "$version": "0.0.1",
diff --git a/projects/aca-folder-rules/assets/i18n/ar.json b/projects/aca-content/folder-rules/assets/i18n/ar.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/ar.json
rename to projects/aca-content/folder-rules/assets/i18n/ar.json
diff --git a/projects/aca-folder-rules/assets/i18n/cs.json b/projects/aca-content/folder-rules/assets/i18n/cs.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/cs.json
rename to projects/aca-content/folder-rules/assets/i18n/cs.json
diff --git a/projects/aca-folder-rules/assets/i18n/da.json b/projects/aca-content/folder-rules/assets/i18n/da.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/da.json
rename to projects/aca-content/folder-rules/assets/i18n/da.json
diff --git a/projects/aca-folder-rules/assets/i18n/de.json b/projects/aca-content/folder-rules/assets/i18n/de.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/de.json
rename to projects/aca-content/folder-rules/assets/i18n/de.json
diff --git a/projects/aca-folder-rules/assets/i18n/en.json b/projects/aca-content/folder-rules/assets/i18n/en.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/en.json
rename to projects/aca-content/folder-rules/assets/i18n/en.json
diff --git a/projects/aca-folder-rules/assets/i18n/es.json b/projects/aca-content/folder-rules/assets/i18n/es.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/es.json
rename to projects/aca-content/folder-rules/assets/i18n/es.json
diff --git a/projects/aca-folder-rules/assets/i18n/fi.json b/projects/aca-content/folder-rules/assets/i18n/fi.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/fi.json
rename to projects/aca-content/folder-rules/assets/i18n/fi.json
diff --git a/projects/aca-folder-rules/assets/i18n/fr.json b/projects/aca-content/folder-rules/assets/i18n/fr.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/fr.json
rename to projects/aca-content/folder-rules/assets/i18n/fr.json
diff --git a/projects/aca-folder-rules/assets/i18n/it.json b/projects/aca-content/folder-rules/assets/i18n/it.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/it.json
rename to projects/aca-content/folder-rules/assets/i18n/it.json
diff --git a/projects/aca-folder-rules/assets/i18n/ja.json b/projects/aca-content/folder-rules/assets/i18n/ja.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/ja.json
rename to projects/aca-content/folder-rules/assets/i18n/ja.json
diff --git a/projects/aca-folder-rules/assets/i18n/nb.json b/projects/aca-content/folder-rules/assets/i18n/nb.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/nb.json
rename to projects/aca-content/folder-rules/assets/i18n/nb.json
diff --git a/projects/aca-folder-rules/assets/i18n/nl.json b/projects/aca-content/folder-rules/assets/i18n/nl.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/nl.json
rename to projects/aca-content/folder-rules/assets/i18n/nl.json
diff --git a/projects/aca-folder-rules/assets/i18n/pl.json b/projects/aca-content/folder-rules/assets/i18n/pl.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/pl.json
rename to projects/aca-content/folder-rules/assets/i18n/pl.json
diff --git a/projects/aca-folder-rules/assets/i18n/pt-BR.json b/projects/aca-content/folder-rules/assets/i18n/pt-BR.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/pt-BR.json
rename to projects/aca-content/folder-rules/assets/i18n/pt-BR.json
diff --git a/projects/aca-folder-rules/assets/i18n/ru.json b/projects/aca-content/folder-rules/assets/i18n/ru.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/ru.json
rename to projects/aca-content/folder-rules/assets/i18n/ru.json
diff --git a/projects/aca-folder-rules/assets/i18n/sv.json b/projects/aca-content/folder-rules/assets/i18n/sv.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/sv.json
rename to projects/aca-content/folder-rules/assets/i18n/sv.json
diff --git a/projects/aca-folder-rules/assets/i18n/zh-CN.json b/projects/aca-content/folder-rules/assets/i18n/zh-CN.json
similarity index 100%
rename from projects/aca-folder-rules/assets/i18n/zh-CN.json
rename to projects/aca-content/folder-rules/assets/i18n/zh-CN.json
diff --git a/projects/aca-content/folder-rules/ng-package.json b/projects/aca-content/folder-rules/ng-package.json
new file mode 100644
index 000000000..fbafcc444
--- /dev/null
+++ b/projects/aca-content/folder-rules/ng-package.json
@@ -0,0 +1,5 @@
+{
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
diff --git a/projects/aca-folder-rules/src/lib/folder-rules.module.ts b/projects/aca-content/folder-rules/src/folder-rules.module.ts
similarity index 97%
rename from projects/aca-folder-rules/src/lib/folder-rules.module.ts
rename to projects/aca-content/folder-rules/src/folder-rules.module.ts
index 6d17ea720..d888af542 100644
--- a/projects/aca-folder-rules/src/lib/folder-rules.module.ts
+++ b/projects/aca-content/folder-rules/src/folder-rules.module.ts
@@ -82,7 +82,7 @@ const routes: Routes = [
 })
 export class AcaFolderRulesModule {
   constructor(translation: TranslationService, extensions: ExtensionService) {
-    translation.addTranslationFolder('aca-folder-rules', 'assets/aca-folder-rules');
+    translation.addTranslationFolder('folder-rules', 'assets/folder-rules');
 
     extensions.setEvaluators({
       'rules.canManageFolderRules': rules.canManageFolderRules
diff --git a/projects/aca-folder-rules/src/lib/folder-rules.rules.spec.ts b/projects/aca-content/folder-rules/src/folder-rules.rules.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/folder-rules.rules.spec.ts
rename to projects/aca-content/folder-rules/src/folder-rules.rules.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/folder-rules.rules.ts b/projects/aca-content/folder-rules/src/folder-rules.rules.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/folder-rules.rules.ts
rename to projects/aca-content/folder-rules/src/folder-rules.rules.ts
diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
similarity index 95%
rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html
rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
index a5451562c..35144a075 100644
--- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.html
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.html
@@ -47,7 +47,7 @@
               </button>
 
               <button
-                *ngIf="canEditRule(mainRuleSet$ | async)"
+                *ngIf="canEditMainRule"
                 data-automation-id="manage-rules-create-button"
                 mat-flat-button color="primary"
                 (click)="openCreateUpdateRuleDialog()">
@@ -58,7 +58,7 @@
           </adf-toolbar>
           <mat-divider></mat-divider>
 
-          <div class="aca-manage-rules__container" *ngIf="isMainRuleSetNotEmpty(mainRuleSet$ | async) || isInheritedRuleSetsNotEmpty(inheritedRuleSets$ | async); else emptyContent">
+          <div class="aca-manage-rules__container" *ngIf="isMainRuleSetNotEmpty || isInheritedRuleSetsNotEmpty; else emptyContent">
             <aca-rule-list
               [mainRuleSet]="mainRuleSet$ | async"
               [folderId]="nodeId"
@@ -87,7 +87,7 @@
                 </div>
 
                 <div class="aca-manage-rules__container__rule-details__header__buttons">
-                  <ng-container *ngIf="canEditRule(selectedRuleSet$ | async); else goToFolderButton">
+                  <ng-container *ngIf="canEditSelectedRule; else goToFolderButton">
                     <button mat-stroked-button (click)="onRuleDeleteButtonClicked(selectedRule)" id="delete-rule-btn">
                       <mat-icon>delete_outline</mat-icon>
                     </button>
diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
similarity index 97%
rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss
rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
index 20037426d..8e3c941e9 100644
--- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.scss
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
@@ -34,7 +34,7 @@
 
   &__container {
     display: grid;
-    grid-template-columns: minmax(250px,1fr) 3fr;
+    grid-template-columns: minmax(250px, 1fr) 3fr;
     padding: 20px;
     gap: 12px;
     overflow-y: auto;
diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
similarity index 92%
rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts
rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
index 14593c884..00c14cbd6 100644
--- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.spec.ts
@@ -23,7 +23,8 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AcaFolderRulesModule, ManageRulesSmartComponent } from '@alfresco/aca-folder-rules';
+import { AcaFolderRulesModule } from '../folder-rules.module';
+import { ManageRulesSmartComponent } from './manage-rules.smart-component';
 import { DebugElement, Predicate } from '@angular/core';
 import { CoreTestingModule } from '@alfresco/adf-core';
 import { FolderRulesService } from '../services/folder-rules.service';
@@ -37,7 +38,7 @@ import {
   ruleSetWithLinkMock
 } from '../mock/rule-sets.mock';
 import { By } from '@angular/platform-browser';
-import { owningFolderIdMock, owningFolderMock } from '../mock/node.mock';
+import { getOwningFolderEntryMock, owningFolderIdMock, owningFolderMock } from '../mock/node.mock';
 import { MatDialog } from '@angular/material/dialog';
 import { ActionsService } from '../services/actions.service';
 import { FolderRuleSetsService } from '../services/folder-rule-sets.service';
@@ -53,6 +54,7 @@ describe('ManageRulesSmartComponent', () => {
   let folderRuleSetsService: FolderRuleSetsService;
   let folderRulesService: FolderRulesService;
   let actionsService: ActionsService;
+  let callApiSpy: jasmine.Spy;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -81,6 +83,19 @@ describe('ManageRulesSmartComponent', () => {
     actionsService = TestBed.inject(ActionsService);
 
     spyOn(actionsService, 'loadActionDefinitions').and.stub();
+    spyOn(folderRulesService, 'getRuleSettings').and.returnValue(Promise.resolve(ruleSettingsMock));
+    callApiSpy = spyOn<any>(folderRuleSetsService, 'callApi');
+    callApiSpy
+      .withArgs(`/nodes/${owningFolderIdMock}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET')
+      .and.returnValue(Promise.resolve(ownedRuleSetMock))
+      .withArgs(`/nodes/${owningFolderIdMock}/rule-sets/-default-?include=isLinkedTo,owningFolder,linkedToBy`, 'GET')
+      .and.returnValue(Promise.resolve(ownedRuleSetMock))
+      .withArgs(`/nodes/${owningFolderIdMock}?include=path%2Cproperties%2CallowableOperations%2Cpermissions`, 'GET')
+      .and.returnValue(Promise.resolve(getOwningFolderEntryMock));
+  });
+
+  afterEach(() => {
+    fixture.destroy();
   });
 
   it('should show a list of rule sets and rules', () => {
diff --git a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts
similarity index 91%
rename from projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts
rename to projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts
index 47ff67a37..a2a570f95 100644
--- a/projects/aca-folder-rules/src/lib/manage-rules/manage-rules.smart-component.ts
+++ b/projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { Location } from '@angular/common';
 import { FolderRulesService } from '../services/folder-rules.service';
 import { Observable, Subject, Subscription } from 'rxjs';
@@ -47,6 +47,7 @@ import { ActionParameterConstraint } from '../model/action-parameter-constraint.
   templateUrl: 'manage-rules.smart-component.html',
   styleUrls: ['manage-rules.smart-component.scss'],
   encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.Default,
   host: { class: 'aca-manage-rules' }
 })
 export class ManageRulesSmartComponent implements OnInit, OnDestroy {
@@ -65,6 +66,10 @@ export class ManageRulesSmartComponent implements OnInit, OnDestroy {
   actionsLoading$: Observable<boolean>;
   actionDefinitions$: Observable<ActionDefinitionTransformed[]>;
   parameterConstraints$: Observable<ActionParameterConstraint[]>;
+  canEditMainRule = false;
+  canEditSelectedRule = false;
+  isMainRuleSetNotEmpty = false;
+  isInheritedRuleSetsNotEmpty = false;
 
   private destroyed$ = new Subject<void>();
   private _actionDefinitionsSub: Subscription;
@@ -110,6 +115,19 @@ export class ManageRulesSmartComponent implements OnInit, OnDestroy {
     this._actionDefinitionsSub = this.actionDefinitions$.subscribe((actionDefinitions: ActionDefinitionTransformed[]) =>
       this.actionsService.loadActionParameterConstraints(actionDefinitions)
     );
+
+    this.mainRuleSet$.pipe(takeUntil(this.destroyed$)).subscribe((ruleSet) => {
+      this.canEditMainRule = this.canEditRule(ruleSet);
+      this.isMainRuleSetNotEmpty = !!ruleSet;
+    });
+
+    this.inheritedRuleSets$.pipe(takeUntil(this.destroyed$)).subscribe((inheritedRuleSet) => {
+      this.isInheritedRuleSetsNotEmpty = inheritedRuleSet.some((ruleSet) => ruleSet.rules.some((rule: Rule) => rule.isEnabled));
+    });
+
+    this.selectedRuleSet$.pipe(takeUntil(this.destroyed$)).subscribe((ruleSet) => {
+      this.canEditSelectedRule = this.canEditRule(ruleSet);
+    });
   }
 
   ngOnDestroy() {
@@ -251,12 +269,4 @@ export class ManageRulesSmartComponent implements OnInit, OnDestroy {
         }
       });
   }
-
-  isMainRuleSetNotEmpty(mainRuleSet: RuleSet): boolean {
-    return !!mainRuleSet;
-  }
-
-  isInheritedRuleSetsNotEmpty(inheritedRuleSets: RuleSet[]): boolean {
-    return inheritedRuleSets.some((ruleSet) => ruleSet.rules.some((rule: Rule) => rule.isEnabled));
-  }
 }
diff --git a/projects/aca-folder-rules/src/lib/mock/action-parameter-constraints.mock.ts b/projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/action-parameter-constraints.mock.ts
rename to projects/aca-content/folder-rules/src/mock/action-parameter-constraints.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/mock/actions.mock.ts b/projects/aca-content/folder-rules/src/mock/actions.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/actions.mock.ts
rename to projects/aca-content/folder-rules/src/mock/actions.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/mock/conditions.mock.ts b/projects/aca-content/folder-rules/src/mock/conditions.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/conditions.mock.ts
rename to projects/aca-content/folder-rules/src/mock/conditions.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/mock/node.mock.ts b/projects/aca-content/folder-rules/src/mock/node.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/node.mock.ts
rename to projects/aca-content/folder-rules/src/mock/node.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/mock/rule-sets.mock.ts b/projects/aca-content/folder-rules/src/mock/rule-sets.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/rule-sets.mock.ts
rename to projects/aca-content/folder-rules/src/mock/rule-sets.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/mock/rules.mock.ts b/projects/aca-content/folder-rules/src/mock/rules.mock.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/mock/rules.mock.ts
rename to projects/aca-content/folder-rules/src/mock/rules.mock.ts
diff --git a/projects/aca-folder-rules/src/lib/model/action-parameter-constraint.model.ts b/projects/aca-content/folder-rules/src/model/action-parameter-constraint.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/action-parameter-constraint.model.ts
rename to projects/aca-content/folder-rules/src/model/action-parameter-constraint.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule-action.model.ts b/projects/aca-content/folder-rules/src/model/rule-action.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule-action.model.ts
rename to projects/aca-content/folder-rules/src/model/rule-action.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule-composite-condition.model.ts b/projects/aca-content/folder-rules/src/model/rule-composite-condition.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule-composite-condition.model.ts
rename to projects/aca-content/folder-rules/src/model/rule-composite-condition.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule-grouping-item.model.ts b/projects/aca-content/folder-rules/src/model/rule-grouping-item.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule-grouping-item.model.ts
rename to projects/aca-content/folder-rules/src/model/rule-grouping-item.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule-set.model.ts b/projects/aca-content/folder-rules/src/model/rule-set.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule-set.model.ts
rename to projects/aca-content/folder-rules/src/model/rule-set.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule-simple-condition.model.ts b/projects/aca-content/folder-rules/src/model/rule-simple-condition.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule-simple-condition.model.ts
rename to projects/aca-content/folder-rules/src/model/rule-simple-condition.model.ts
diff --git a/projects/aca-folder-rules/src/lib/model/rule.model.ts b/projects/aca-content/folder-rules/src/model/rule.model.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/model/rule.model.ts
rename to projects/aca-content/folder-rules/src/model/rule.model.ts
diff --git a/projects/aca-folder-rules/src/public-api.ts b/projects/aca-content/folder-rules/src/public-api.ts
similarity index 89%
rename from projects/aca-folder-rules/src/public-api.ts
rename to projects/aca-content/folder-rules/src/public-api.ts
index 0a9f4273f..1db452bcf 100644
--- a/projects/aca-folder-rules/src/public-api.ts
+++ b/projects/aca-content/folder-rules/src/public-api.ts
@@ -22,5 +22,5 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './lib/folder-rules.module';
-export { ManageRulesSmartComponent } from './lib/manage-rules/manage-rules.smart-component';
+export * from './folder-rules.module';
+export { ManageRulesSmartComponent } from './manage-rules/manage-rules.smart-component';
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
similarity index 95%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
index 071dae114..1af5b6d3b 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
@@ -19,7 +19,7 @@
       mat-menu-item
       data-automation-id="rule-action-list-remove-action-button"
       [title]="'ACA_FOLDER_RULES.RULE_DETAILS.ACTION_BUTTONS.REMOVE' | translate"
-      [disabled]="formArray.controls.length <= 1"
+      [disabled]="formControls.length <= 1"
       (click)="removeAction(control)">
       <mat-icon>delete</mat-icon>
       <span>{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ACTION_BUTTONS.REMOVE' | translate }}</span>
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.ts
similarity index 93%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.ts
index 853557982..7c5bca6e6 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action-list.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.ts
@@ -56,9 +56,7 @@ export class RuleActionListUiComponent implements ControlValueAccessor, OnDestro
   formArray = new FormArray([]);
   private formArraySubscription: Subscription;
 
-  get formControls(): FormControl[] {
-    return this.formArray.controls as FormControl[];
-  }
+  formControls: FormControl[] = [];
 
   onChange: (actions: RuleAction[]) => void = () => undefined;
   onTouch: () => void = () => undefined;
@@ -73,6 +71,7 @@ export class RuleActionListUiComponent implements ControlValueAccessor, OnDestro
       ];
     }
     this.formArray = new FormArray(actions.map((action: RuleAction) => new FormControl(action)));
+    this.formControls = this.formArray.controls as FormControl[];
     this.formArraySubscription?.unsubscribe();
     this.formArraySubscription = this.formArray.valueChanges.subscribe((value: any) => {
       this.onChange(value);
@@ -94,6 +93,7 @@ export class RuleActionListUiComponent implements ControlValueAccessor, OnDestro
       params: {}
     };
     this.formArray.push(new FormControl(newAction, [Validators.required, ruleActionValidator(this.actionDefinitions)]));
+    this.formControls = this.formArray.controls as FormControl[];
   }
 
   ngOnDestroy() {
@@ -103,5 +103,6 @@ export class RuleActionListUiComponent implements ControlValueAccessor, OnDestro
   removeAction(control: FormControl) {
     const index = this.formArray.value.indexOf(control.value);
     this.formArray.removeAt(index);
+    this.formControls = this.formArray.controls as FormControl[];
   }
 }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html
similarity index 91%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html
index 5a8be2c76..32119eb02 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.html
@@ -16,7 +16,7 @@
   <adf-card-view
     data-automation-id="rule-action-card-view"
     [properties]="cardViewItems"
-    [ngStyle]="cardViewStyle"
+    [ngClass]="{ 'aca-rule-action-full-width': isFullWidth }"
     [editable]="!readOnly">
   </adf-card-view>
 
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
similarity index 87%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
index b34ac6879..51598a840 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
@@ -8,4 +8,8 @@
       width: 280px;
     }
   }
+
+  &-full-width {
+    width: 100%;
+  }
 }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
similarity index 92%
rename from projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
index 5094e279c..1eba93faa 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/actions/rule-action.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, forwardRef, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, forwardRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
 import { ActionDefinitionTransformed, RuleAction } from '../../model/rule-action.model';
 import { CardViewItem } from '@alfresco/adf-core/lib/card-view/interfaces/card-view-item.interface';
@@ -57,27 +57,15 @@ import { TranslateService } from '@ngx-translate/core';
     CardViewUpdateService
   ]
 })
-export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnDestroy {
+export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnChanges, OnDestroy {
   @Input()
   nodeId = '';
 
-  private _actionDefinitions: ActionDefinitionTransformed[];
   @Input()
-  get actionDefinitions(): ActionDefinitionTransformed[] {
-    return this._actionDefinitions;
-  }
-  set actionDefinitions(value: ActionDefinitionTransformed[]) {
-    this._actionDefinitions = value.sort((a, b) => a.title.localeCompare(b.title));
-  }
+  actionDefinitions: ActionDefinitionTransformed[];
 
-  private _readOnly = false;
   @Input()
-  get readOnly(): boolean {
-    return this._readOnly;
-  }
-  set readOnly(isReadOnly: boolean) {
-    this.setDisabledState(isReadOnly);
-  }
+  readOnly = false;
 
   private _parameterConstraints = [];
   @Input()
@@ -135,6 +123,10 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnDe
   }
 
   ngOnInit() {
+    this.actionDefinitions = this.actionDefinitions.sort((firstActionDefinition, secondActionDefinition) =>
+      firstActionDefinition.title.localeCompare(secondActionDefinition.title)
+    );
+
     this.form.valueChanges.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
       this.setDefaultParameters();
       this.setCardViewProperties();
@@ -158,6 +150,14 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnDe
     });
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    const readOnly = changes['readOnly']?.currentValue;
+    if (readOnly !== undefined && readOnly !== null) {
+      this.readOnly = readOnly;
+      this.setDisabledState(readOnly);
+    }
+  }
+
   ngOnDestroy() {
     this.onDestroy$.next();
     this.onDestroy$.complete();
@@ -272,10 +272,10 @@ export class RuleActionUiComponent implements ControlValueAccessor, OnInit, OnDe
 
   setDisabledState(isDisabled: boolean) {
     if (isDisabled) {
-      this._readOnly = true;
+      this.readOnly = true;
       this.form.disable();
     } else {
-      this._readOnly = false;
+      this.readOnly = false;
       this.form.enable();
     }
   }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
similarity index 92%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
index 4cea158eb..ab2e23dff 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
@@ -9,9 +9,8 @@
 
     <mat-form-field *ngIf="i === 0">
       <mat-select
-        [value]="invertedControl.value"
-        [disabled]="readOnly"
-        (selectionChange)="setInverted($event.value)">
+        [formControl]="invertedControl"
+        [disabled]="readOnly">
         <mat-option [value]="false">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.IF' | translate }}</mat-option>
         <mat-option [value]="true">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.NOT_IF' | translate }}</mat-option>
       </mat-select>
@@ -19,9 +18,8 @@
 
     <mat-form-field *ngIf="i > 0">
       <mat-select
-        [value]="booleanModeControl.value"
         [disabled]="!isOrImplemented || i > 1 || readOnly"
-        (selectionChange)="setBooleanMode($event.value)">
+        [formControl]="booleanModeControl">
         <mat-option value="and">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.AND' | translate }}</mat-option>
         <mat-option value="or">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.OR' | translate }}</mat-option>
       </mat-select>
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
similarity index 86%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
index f3f061c1d..f53d58831 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-composite-condition.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, forwardRef, HostBinding, Input, OnDestroy, ViewEncapsulation } from '@angular/core';
+import { Component, forwardRef, HostBinding, Input, OnChanges, OnDestroy, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { RuleCompositeCondition } from '../../model/rule-composite-condition.model';
 import { ControlValueAccessor, FormArray, FormControl, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { RuleSimpleCondition } from '../../model/rule-simple-condition.model';
@@ -41,7 +41,7 @@ import { RuleSimpleCondition } from '../../model/rule-simple-condition.model';
     }
   ]
 })
-export class RuleCompositeConditionUiComponent implements ControlValueAccessor, OnDestroy {
+export class RuleCompositeConditionUiComponent implements ControlValueAccessor, OnDestroy, OnChanges {
   @HostBinding('class.secondaryBackground')
   @Input()
   secondaryBackground = false;
@@ -58,26 +58,17 @@ export class RuleCompositeConditionUiComponent implements ControlValueAccessor,
 
   readonly isOrImplemented = false;
 
-  private _readOnly = false;
   @Input()
-  get readOnly(): boolean {
-    return this._readOnly;
-  }
-  set readOnly(isReadOnly: boolean) {
-    this.setDisabledState(isReadOnly);
-  }
+  public readOnly = false;
 
   private formSubscription = this.form.valueChanges.subscribe((value: any) => {
     this.onChange(value);
     this.onTouch();
   });
 
-  get invertedControl(): FormControl {
-    return this.form.get('inverted') as FormControl;
-  }
-  get booleanModeControl(): FormControl {
-    return this.form.get('booleanMode') as FormControl;
-  }
+  public invertedControl = this.form.get('inverted') as FormControl;
+  public booleanModeControl = this.form.get('booleanMode') as FormControl;
+
   get compositeConditionsFormArray(): FormArray {
     return this.form.get('compositeConditions') as FormArray;
   }
@@ -111,22 +102,14 @@ export class RuleCompositeConditionUiComponent implements ControlValueAccessor,
 
   setDisabledState(isDisabled: boolean) {
     if (isDisabled) {
-      this._readOnly = true;
+      this.readOnly = true;
       this.form.disable();
     } else {
-      this._readOnly = false;
+      this.readOnly = false;
       this.form.enable();
     }
   }
 
-  setInverted(value: boolean) {
-    this.invertedControl.setValue(value);
-  }
-
-  setBooleanMode(value: 'and' | 'or') {
-    this.booleanModeControl.setValue(value);
-  }
-
   isFormControlSimpleCondition(control: FormControl): boolean {
     // eslint-disable-next-line no-prototype-builtins
     return control.value.hasOwnProperty('field');
@@ -160,4 +143,12 @@ export class RuleCompositeConditionUiComponent implements ControlValueAccessor,
   ngOnDestroy() {
     this.formSubscription.unsubscribe();
   }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    const readOnly = changes['readOnly'].currentValue;
+    if (readOnly !== undefined && readOnly !== null) {
+      this.readOnly = readOnly;
+      this.setDisabledState(readOnly);
+    }
+  }
 }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-comparators.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-comparators.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-comparators.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-comparators.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-fields.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-fields.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-condition-fields.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-condition-fields.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-mime-types.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-mime-types.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-mime-types.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-mime-types.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.html
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/conditions/rule-simple-condition.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/conditions/rule-simple-condition.ui-component.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.smart-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.smart-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.html
diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
similarity index 97%
rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
index 34344e4f8..a24044e64 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
@@ -36,7 +36,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin: 20px 0
+      margin: 20px 0;
     }
   }
 
diff --git a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.ts
similarity index 91%
rename from projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.ts
index a7a6e75cc..d5948842c 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/edit-rule-dialog.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.ts
@@ -52,6 +52,9 @@ export class EditRuleDialogUiComponent {
   formValue: Partial<Rule>;
   @Output() submitted = new EventEmitter<Partial<Rule>>();
 
+  title = 'ACA_FOLDER_RULES.EDIT_RULE_DIALOG.' + (this.isUpdateMode ? 'UPDATE_TITLE' : 'CREATE_TITLE');
+  submitLabel = 'ACA_FOLDER_RULES.EDIT_RULE_DIALOG.' + (this.isUpdateMode ? 'UPDATE' : 'CREATE');
+
   constructor(@Inject(MAT_DIALOG_DATA) public data: EditRuleDialogOptions) {
     this.model = this.data?.model || {};
     this.nodeId = this.data?.nodeId;
@@ -62,15 +65,6 @@ export class EditRuleDialogUiComponent {
   get isUpdateMode(): boolean {
     return !!this.data?.model?.id;
   }
-
-  get title(): string {
-    return 'ACA_FOLDER_RULES.EDIT_RULE_DIALOG.' + (this.isUpdateMode ? 'UPDATE_TITLE' : 'CREATE_TITLE');
-  }
-
-  get submitLabel(): string {
-    return 'ACA_FOLDER_RULES.EDIT_RULE_DIALOG.' + (this.isUpdateMode ? 'UPDATE' : 'CREATE');
-  }
-
   onSubmit() {
     this.submitted.emit(this.formValue);
   }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
similarity index 93%
rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
index 687288771..e996d0aba 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.html
@@ -18,14 +18,10 @@
         data-automation-id="rule-option-select-errorScript">
 
         <mat-option value="">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.OPTIONS.NO_SCRIPT' | translate }}</mat-option>
-
-        <ng-template ngFor [ngForOf]="errorScriptOptions" let-option>
-          <mat-option
+          <mat-option *ngFor="let option of errorScriptOptions"
             [value]="option.value">
             {{ option.label }}
           </mat-option>
-        </ng-template>
-
       </mat-select>
 
     </mat-form-field>
diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
similarity index 89%
rename from projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
index 6a6f6ddfb..3c34bfd00 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/options/rule-options.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/options/rule-options.ui-component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, forwardRef, HostBinding, Input, OnDestroy, ViewEncapsulation } from '@angular/core';
+import { Component, forwardRef, HostBinding, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { AbstractControl, ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { RuleOptions } from '../../model/rule.model';
@@ -42,7 +42,7 @@ import { ActionParameterConstraint, ConstraintValue } from '../../model/action-p
     }
   ]
 })
-export class RuleOptionsUiComponent implements ControlValueAccessor, OnDestroy {
+export class RuleOptionsUiComponent implements ControlValueAccessor, OnInit, OnDestroy {
   form = new FormGroup({
     isDisabled: new FormControl(),
     isInheritable: new FormControl(),
@@ -51,6 +51,8 @@ export class RuleOptionsUiComponent implements ControlValueAccessor, OnDestroy {
   });
 
   formSubscription = this.form.valueChanges.subscribe((value: any) => {
+    this.isAsynchronousChecked = value.isAsynchronous;
+    this.isInheritableChecked = value.isInheritable;
     this.onChange({
       isEnabled: !value.isDisabled,
       isInheritable: value.isInheritable,
@@ -71,16 +73,10 @@ export class RuleOptionsUiComponent implements ControlValueAccessor, OnDestroy {
   onChange: (options: RuleOptions) => void = () => undefined;
   onTouch: () => void = () => undefined;
 
-  get isAsynchronousChecked(): boolean {
-    return this.form.get('isAsynchronous').value;
-  }
-  get isInheritableChecked(): boolean {
-    return this.form.get('isInheritable').value;
-  }
+  isAsynchronousChecked = false;
+  isInheritableChecked = false;
 
-  get errorScriptOptions(): ConstraintValue[] {
-    return this.errorScriptConstraint?.constraints ?? [];
-  }
+  errorScriptOptions: ConstraintValue[] = [];
 
   writeValue(options: RuleOptions) {
     const isAsynchronousFormControl = this.form.get('isAsynchronous');
@@ -116,6 +112,10 @@ export class RuleOptionsUiComponent implements ControlValueAccessor, OnDestroy {
     }
   }
 
+  ngOnInit(): void {
+    this.errorScriptOptions = this.errorScriptConstraint?.constraints ?? [];
+  }
+
   ngOnDestroy() {
     this.formSubscription.unsubscribe();
   }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
similarity index 78%
rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
index 5b98554d7..a649c0360 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
@@ -8,8 +8,8 @@
           <input
             id="rule-details-name-input"
             matInput type="text" formControlName="name" data-automation-id="rule-details-name-input"
-            [placeholder]="getPlaceholder('name') | translate">
-          <mat-error>{{ getErrorMessage(name) | translate }}</mat-error>
+            [placeholder]="'ACA_FOLDER_RULES.RULE_DETAILS.PLACEHOLDER.NAME' | translate">
+          <mat-error>{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.REQUIRED' | translate }}</mat-error>
         </mat-form-field>
       </div>
     </div>
@@ -21,7 +21,7 @@
         <textarea
           id="rule-details-description-textarea"
           matInput formControlName="description" data-automation-id="rule-details-description-textarea"
-          [placeholder]="getPlaceholder('description') | translate">
+          [placeholder]="descriptionPlaceHolder | translate">
         </textarea>
         </mat-form-field>
       </div>
@@ -32,13 +32,13 @@
     <div class="label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.WHEN' | translate }}</div>
     <div>
       <aca-rule-triggers formControlName="triggers" data-automation-id="rule-details-triggers-component"></aca-rule-triggers>
-      <mat-error class="rule-details-error">{{ getErrorMessage(triggers) | translate }}</mat-error>
+      <mat-error class="rule-details-error" *ngIf="triggers.hasError('required')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.INSUFFICIENT_TRIGGERS_SELECTED' | translate }}</mat-error>
     </div>
   </div>
 
   <div class="aca-rule-details__form__conditions">
     <aca-rule-composite-condition formControlName="conditions"></aca-rule-composite-condition>
-    <mat-error class="rule-details-error">{{ getErrorMessage(conditions) | translate }}</mat-error>
+    <mat-error class="rule-details-error" *ngIf="conditions.hasError('ruleCompositeConditionInvalid')">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.RULE_COMPOSITE_CONDITION_INVALID' | translate }}</mat-error>
   </div>
 
   <div class="aca-rule-details__form__row aca-rule-details__form__actions">
diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
similarity index 86%
rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
index 752a92aea..0661eaca3 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.scss
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
@@ -24,7 +24,8 @@
       align-items: baseline;
       gap: 8px;
 
-      & > label, & > .label {
+      & > label,
+      & > .label {
         font-weight: bold;
         width: 20%;
         min-width: 100px;
@@ -75,12 +76,15 @@
       }
     }
 
-    &.read-only, .mat-form-field-disabled {
-      .mat-form-field-underline, .mat-select-arrow-wrapper {
+    &.read-only,
+    .mat-form-field-disabled {
+      .mat-form-field-underline,
+      .mat-select-arrow-wrapper {
         display: none;
       }
 
-      *:disabled, .mat-select-disabled .mat-select-value {
+      *:disabled,
+      .mat-select-disabled .mat-select-value {
         color: inherit;
       }
     }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
similarity index 80%
rename from projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
index 97d13698c..7bb35e43c 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/rule-details.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { AbstractControl, UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
 import { Subject } from 'rxjs';
 import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators';
 import { Rule, RuleForForm } from '../model/rule.model';
@@ -41,21 +41,11 @@ import { ActionParameterConstraint } from '../model/action-parameter-constraint.
   host: { class: 'aca-rule-details' }
 })
 export class RuleDetailsUiComponent implements OnInit, OnDestroy {
-  private _readOnly = false;
   @Input()
-  get readOnly(): boolean {
-    return this._readOnly;
-  }
-  set readOnly(value: boolean) {
-    this._readOnly = value;
-    if (this.form?.disable) {
-      if (value) {
-        this.form.disable();
-      } else {
-        this.form.enable();
-      }
-    }
-  }
+  readOnly: boolean;
+
+  descriptionPlaceHolder: string;
+
   private _initialValue: RuleForForm = FolderRulesService.emptyRuleForForm;
   @Input()
   get value(): Partial<Rule> {
@@ -107,6 +97,7 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
   private onDestroy$ = new Subject();
   form: UntypedFormGroup;
 
+  errorScriptConstraint: ActionParameterConstraint;
   get name(): UntypedFormControl {
     return this.form.get('name') as UntypedFormControl;
   }
@@ -116,6 +107,7 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
   get triggers(): UntypedFormControl {
     return this.form.get('triggers') as UntypedFormControl;
   }
+
   get conditions(): UntypedFormControl {
     return this.form.get('conditions') as UntypedFormControl;
   }
@@ -124,10 +116,6 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
     return !this.readOnly || this.value.isAsynchronous || this.value.isInheritable;
   }
 
-  get errorScriptConstraint(): ActionParameterConstraint {
-    return this.parameterConstraints.find((parameterConstraint: ActionParameterConstraint) => parameterConstraint.name === 'script-ref');
-  }
-
   ngOnInit() {
     this.form = new UntypedFormGroup({
       id: new UntypedFormControl(this.value.id),
@@ -151,7 +139,6 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
         errorScript: this.value.errorScript
       })
     });
-    this.readOnly = this._readOnly;
 
     this.form.statusChanges
       .pipe(
@@ -167,39 +154,24 @@ export class RuleDetailsUiComponent implements OnInit, OnDestroy {
     this.form.valueChanges.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
       this.formValueChanged.emit(this.value);
     });
+
+    if (this.readOnly) {
+      this.form.disable();
+    } else {
+      this.form.enable();
+    }
+
+    this.descriptionPlaceHolder = this.readOnly
+      ? 'ACA_FOLDER_RULES.RULE_DETAILS.PLACEHOLDER.NO_DESCRIPTION'
+      : 'ACA_FOLDER_RULES.RULE_DETAILS.PLACEHOLDER.DESCRIPTION';
+
+    this.errorScriptConstraint = this.parameterConstraints.find(
+      (parameterConstraint: ActionParameterConstraint) => parameterConstraint.name === 'script-ref'
+    );
   }
 
   ngOnDestroy() {
     this.onDestroy$.next();
     this.onDestroy$.complete();
   }
-
-  getErrorMessage(control: AbstractControl): string {
-    if (this.readOnly) {
-      return '';
-    }
-    if (control.hasError('required')) {
-      return control === this.triggers
-        ? 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.INSUFFICIENT_TRIGGERS_SELECTED'
-        : 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.REQUIRED';
-    } else if (control.hasError('ruleCompositeConditionInvalid')) {
-      return 'ACA_FOLDER_RULES.RULE_DETAILS.ERROR.RULE_COMPOSITE_CONDITION_INVALID';
-    }
-    return '';
-  }
-
-  getPlaceholder(fieldName: string): string {
-    let str = 'ACA_FOLDER_RULES.RULE_DETAILS.PLACEHOLDER.';
-    switch (fieldName) {
-      case 'name':
-        str += 'NAME';
-        break;
-      case 'description':
-        str += this.readOnly ? 'NO_DESCRIPTION' : 'DESCRIPTION';
-        break;
-      default:
-        return '';
-    }
-    return str;
-  }
 }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.html
similarity index 87%
rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.html
index dc03cc0b3..16501ff7f 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.html
@@ -1,7 +1,7 @@
 <div *ngFor="let trigger of triggerOptions">
   <ng-container *ngIf="readOnly; else checkbox">
     <div
-      *ngIf="isTriggerSelected(trigger)"
+      *ngIf="selectedTriggers[trigger]"
       [attr.data-automation-id]="'rule-trigger-value-' + trigger | lowercase">
       {{ 'ACA_FOLDER_RULES.RULE_DETAILS.TRIGGERS.' + trigger | uppercase | translate }}
     </div>
@@ -10,7 +10,7 @@
   <ng-template #checkbox>
     <mat-checkbox
       [attr.data-automation-id]="'rule-trigger-checkbox-' + trigger | lowercase"
-      [checked]="isTriggerChecked(trigger)"
+      [checked]="selectedTriggers[trigger]"
       (change)="onTriggerChange(trigger, $event.checked)">
       {{ 'ACA_FOLDER_RULES.RULE_DETAILS.TRIGGERS.' + trigger | uppercase | translate }}
     </mat-checkbox>
diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.ts b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.ts
similarity index 91%
rename from projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.ts
index 07334d823..2c5557022 100644
--- a/projects/aca-folder-rules/src/lib/rule-details/triggers/rule-triggers.ui-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-details/triggers/rule-triggers.ui-component.ts
@@ -42,6 +42,10 @@ import { RuleTrigger } from '../../model/rule.model';
 export class RuleTriggersUiComponent implements ControlValueAccessor {
   readonly triggerOptions: RuleTrigger[] = ['inbound', 'update', 'outbound'];
 
+  public selectedTriggers: { [key: string]: boolean } = {
+    inbound: true
+  };
+
   value: RuleTrigger[] = ['inbound'];
   readOnly = false;
 
@@ -50,6 +54,8 @@ export class RuleTriggersUiComponent implements ControlValueAccessor {
 
   writeValue(triggers: RuleTrigger[]) {
     this.value = triggers;
+    this.selectedTriggers = {};
+    this.value.forEach((trigger) => (this.selectedTriggers[trigger] = true));
   }
 
   registerOnChange(fn: () => void) {
@@ -64,10 +70,6 @@ export class RuleTriggersUiComponent implements ControlValueAccessor {
     this.readOnly = isDisabled;
   }
 
-  isTriggerChecked(trigger: RuleTrigger): boolean {
-    return this.value.includes(trigger);
-  }
-
   onTriggerChange(trigger: RuleTrigger, checked: boolean) {
     if (checked) {
       this.value.push(trigger);
@@ -77,11 +79,8 @@ export class RuleTriggersUiComponent implements ControlValueAccessor {
         1
       );
     }
+    this.selectedTriggers[trigger] = checked;
     this.onTouch();
     this.onChange([...this.value]);
   }
-
-  isTriggerSelected(trigger: RuleTrigger): boolean {
-    return this.value.includes(trigger);
-  }
 }
diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.spec.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.spec.ts
rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-actions.validator.ts
rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-actions.validator.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-details/validators/rule-composite-condition.validator.ts b/projects/aca-content/folder-rules/src/rule-details/validators/rule-composite-condition.validator.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-details/validators/rule-composite-condition.validator.ts
rename to projects/aca-content/folder-rules/src/rule-details/validators/rule-composite-condition.validator.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
similarity index 96%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
index 263750e71..6f94c0b94 100644
--- a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.html
@@ -5,7 +5,7 @@
     matRipple matRippleColor="hsla(0,0%,0%,0.05)"
     tabindex="0"
     [rule]="item.rule"
-    [isSelected]="isSelected(item.rule)"
+    [isSelected]="item.rule.id === this.selectedRule?.id"
     [showEnabledToggle]="showEnabledToggles"
     (click)="onRuleClicked(item.rule)"
     (enabledChanged)="onEnabledChanged(item.rule, $event)">
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts
similarity index 97%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts
index 4f8d42d85..49969c4d7 100644
--- a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.spec.ts
@@ -28,7 +28,7 @@ import { ruleListGroupingItemsMock, rulesMock } from '../../mock/rules.mock';
 import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { CoreTestingModule } from '@alfresco/adf-core';
-import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
+import { AcaFolderRulesModule } from '../../folder-rules.module';
 
 describe('RuleListGroupingUiComponent', () => {
   let component: RuleListGroupingUiComponent;
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-grouping/rule-list-grouping.ui-component.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.html
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list-item/rule-list-item.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-list/rule-list-item/rule-list-item.ui-component.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.html b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.html
rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.html
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.scss b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.scss
rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.spec.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.ts b/projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-list/rule-list/rule-list.ui-component.ts
rename to projects/aca-content/folder-rules/src/rule-list/rule-list/rule-list.ui-component.ts
diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.html b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
similarity index 93%
rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.html
rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
index 484ffdec5..12a097fa1 100644
--- a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.html
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.html
@@ -23,7 +23,7 @@
     </ng-container>
 
     <ng-template #rulesLoaded>
-      <ng-container *ngIf="hasOwnedRules(mainRuleSet$ | async); else noOwnedRules">
+      <ng-container *ngIf="hasOwnedRules; else noOwnedRules">
         <div class="aca-rule-set-picker__content__rule-list__header">
           {{ 'ACA_FOLDER_RULES.LINK_RULES_DIALOG.LIST_OF_RULES_TO_LINK' | translate }}
         </div>
@@ -52,7 +52,7 @@
 
   <button
     mat-flat-button color="primary"
-    [disabled]="!hasOwnedRules(mainRuleSet$ | async) || isBusy"
+    [disabled]="!hasOwnedRules || isBusy"
     (click)="onSubmit()">
     {{ 'ACA_FOLDER_RULES.LINK_RULES_DIALOG.SUBMIT' | translate }}
   </button>
diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.scss b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss
similarity index 100%
rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.scss
rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.scss
diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.spec.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
similarity index 77%
rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.spec.ts
rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
index 1c441657a..25432fd1d 100644
--- a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.spec.ts
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.spec.ts
@@ -25,11 +25,12 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RuleSetPickerOptions, RuleSetPickerSmartComponent } from './rule-set-picker.smart-component';
 import { CoreTestingModule } from '@alfresco/adf-core';
-import { folderToLinkMock } from '../mock/node.mock';
+import { folderToLinkMock, otherFolderMock } from '../mock/node.mock';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { FolderRuleSetsService } from '../services/folder-rule-sets.service';
 import { of } from 'rxjs';
-import { ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock';
+import { ownedRuleSetMock, ruleSetWithLinkMock, ruleSetWithNoRulesToLinkMock, ruleSetWithOwnedRulesToLinkMock } from '../mock/rule-sets.mock';
+import { ContentApiService } from '@alfresco/aca-shared';
 import { By } from '@angular/platform-browser';
 
 describe('RuleSetPickerSmartComponent', () => {
@@ -38,6 +39,7 @@ describe('RuleSetPickerSmartComponent', () => {
   let folderRuleSetsService: FolderRuleSetsService;
 
   let loadRuleSetsSpy: jasmine.Spy;
+  let callApiSpy: jasmine.Spy;
 
   const dialogRef = {
     close: jasmine.createSpy('close'),
@@ -54,7 +56,18 @@ describe('RuleSetPickerSmartComponent', () => {
       imports: [CoreTestingModule],
       providers: [
         { provide: MatDialogRef, useValue: dialogRef },
-        { provide: MAT_DIALOG_DATA, useValue: dialogOptions }
+        { provide: MAT_DIALOG_DATA, useValue: dialogOptions },
+        {
+          provide: ContentApiService,
+          useValue: {
+            getNode: () => {
+              return of({ entry: folderToLinkMock });
+            },
+            getNodeInfo: () => {
+              return of(otherFolderMock);
+            }
+          }
+        }
       ]
     });
 
@@ -63,7 +76,19 @@ describe('RuleSetPickerSmartComponent', () => {
     component = fixture.componentInstance;
     component['folderRuleSetsService'] = folderRuleSetsService;
 
-    loadRuleSetsSpy = spyOn(folderRuleSetsService, 'loadRuleSets');
+    loadRuleSetsSpy = spyOn(folderRuleSetsService, 'loadRuleSets').and.callThrough();
+    callApiSpy = spyOn<any>(folderRuleSetsService, 'callApi');
+    callApiSpy
+      .withArgs(`/nodes/${dialogOptions.nodeId}/rule-sets?include=isLinkedTo,owningFolder,linkedToBy&skipCount=0&maxItems=100`, 'GET')
+      .and.returnValue(Promise.resolve(ownedRuleSetMock))
+      .withArgs(`/nodes/${dialogOptions.nodeId}/rule-sets/-default-?include=isLinkedTo,owningFolder,linkedToBy`, 'GET')
+      .and.returnValue(Promise.resolve(ownedRuleSetMock))
+      .withArgs(`/nodes/${folderToLinkMock.id}?include=path%2Cproperties%2CallowableOperations%2Cpermissions`, 'GET')
+      .and.returnValue(Promise.resolve({ entry: folderToLinkMock }));
+  });
+
+  afterEach(() => {
+    fixture.destroy();
   });
 
   it('should load the rule sets of a node once it has been selected', () => {
diff --git a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.ts b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.ts
similarity index 84%
rename from projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.ts
rename to projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.ts
index 1eebae1d9..a43ff637d 100644
--- a/projects/aca-folder-rules/src/lib/rule-set-picker/rule-set-picker.smart-component.ts
+++ b/projects/aca-content/folder-rules/src/rule-set-picker/rule-set-picker.smart-component.ts
@@ -22,13 +22,13 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Inject, ViewEncapsulation } from '@angular/core';
+import { Component, Inject, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { FolderRuleSetsService } from '../services/folder-rule-sets.service';
 import { Node } from '@alfresco/js-api';
 import { RuleSet } from '../model/rule-set.model';
-import { BehaviorSubject, combineLatest, from, of } from 'rxjs';
-import { finalize, map, switchMap } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, from, of, Subject } from 'rxjs';
+import { finalize, map, switchMap, takeUntil } from 'rxjs/operators';
 import { NotificationService } from '@alfresco/adf-core';
 
 export interface RuleSetPickerOptions {
@@ -45,11 +45,12 @@ export interface RuleSetPickerOptions {
   host: { class: 'aca-rule-set-picker' },
   providers: [FolderRuleSetsService]
 })
-export class RuleSetPickerSmartComponent {
+export class RuleSetPickerSmartComponent implements OnInit, OnDestroy {
   nodeId = '-root-';
   defaultNodeId = '-root-';
   isBusy = false;
   existingRuleSet: RuleSet = null;
+  hasOwnedRules = false;
 
   private selectedNodeId = '';
   private folderLoading$ = new BehaviorSubject<boolean>(true);
@@ -59,6 +60,8 @@ export class RuleSetPickerSmartComponent {
     map(([rulesLoading, folderLoading]) => rulesLoading || folderLoading)
   );
 
+  onDestroy$ = new Subject<void>();
+
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: RuleSetPickerOptions,
     private folderRuleSetsService: FolderRuleSetsService,
@@ -70,8 +73,15 @@ export class RuleSetPickerSmartComponent {
     this.existingRuleSet = this.data?.existingRuleSet ?? null;
   }
 
-  hasOwnedRules(ruleSet: RuleSet): boolean {
-    return ruleSet?.rules.length > 0 && FolderRuleSetsService.isOwnedRuleSet(ruleSet, this.selectedNodeId);
+  ngOnInit(): void {
+    this.mainRuleSet$.pipe(takeUntil(this.onDestroy$)).subscribe((mainRuleSet) => {
+      this.hasOwnedRules = mainRuleSet?.rules.length > 0 && FolderRuleSetsService.isOwnedRuleSet(mainRuleSet, this.selectedNodeId);
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.onDestroy$.next();
+    this.onDestroy$.complete();
   }
 
   onNodeSelect(nodes: Node[]) {
diff --git a/projects/aca-folder-rules/src/lib/services/actions.service.spec.ts b/projects/aca-content/folder-rules/src/services/actions.service.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/services/actions.service.spec.ts
rename to projects/aca-content/folder-rules/src/services/actions.service.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/services/actions.service.ts b/projects/aca-content/folder-rules/src/services/actions.service.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/services/actions.service.ts
rename to projects/aca-content/folder-rules/src/services/actions.service.ts
diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.spec.ts
rename to projects/aca-content/folder-rules/src/services/folder-rule-sets.service.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
similarity index 99%
rename from projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts
rename to projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
index 6af1fe52c..8d5620233 100644
--- a/projects/aca-folder-rules/src/lib/services/folder-rule-sets.service.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rule-sets.service.ts
@@ -233,8 +233,8 @@ export class FolderRuleSetsService {
 
   refreshMainRuleSet(ruleToSelect: Rule = null) {
     this.getMainRuleSet(this.currentFolder.id).subscribe((mainRuleSet: RuleSet) => {
-      this.mainRuleSet = mainRuleSet;
-      this.mainRuleSetSource.next(mainRuleSet);
+      this.mainRuleSet = { ...mainRuleSet };
+      this.mainRuleSetSource.next(this.mainRuleSet);
       if (mainRuleSet) {
         const ruleToSelectInRuleSet = ruleToSelect ? mainRuleSet.rules.find((rule: Rule) => rule.id === ruleToSelect.id) : mainRuleSet.rules[0];
         this.folderRulesService.selectRule(ruleToSelectInRuleSet);
diff --git a/projects/aca-folder-rules/src/lib/services/folder-rules.service.spec.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts
similarity index 100%
rename from projects/aca-folder-rules/src/lib/services/folder-rules.service.spec.ts
rename to projects/aca-content/folder-rules/src/services/folder-rules.service.spec.ts
diff --git a/projects/aca-folder-rules/src/lib/services/folder-rules.service.ts b/projects/aca-content/folder-rules/src/services/folder-rules.service.ts
similarity index 99%
rename from projects/aca-folder-rules/src/lib/services/folder-rules.service.ts
rename to projects/aca-content/folder-rules/src/services/folder-rules.service.ts
index 69afc1c07..2c84547cd 100644
--- a/projects/aca-folder-rules/src/lib/services/folder-rules.service.ts
+++ b/projects/aca-content/folder-rules/src/services/folder-rules.service.ts
@@ -162,7 +162,7 @@ export class FolderRulesService {
   }
 
   private formatRules(res): Rule[] {
-    return res.list.entries.map((entry) => this.formatRule(entry.entry));
+    return [...res.list.entries.map((entry) => this.formatRule(entry.entry))];
   }
 
   private formatRule(obj): Rule {
diff --git a/projects/aca-content/ng-package.json b/projects/aca-content/ng-package.json
index 893f210ec..ddb6ac172 100644
--- a/projects/aca-content/ng-package.json
+++ b/projects/aca-content/ng-package.json
@@ -11,6 +11,7 @@
       "input": "./src/lib/ui/",
       "output": "ui"
     },
+    "folder-rules/assets",
     "about/assets",
     "ms-office/assets",
     "assets"
diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json
index eabdddfc8..989d48169 100644
--- a/projects/aca-content/package.json
+++ b/projects/aca-content/package.json
@@ -4,7 +4,18 @@
   "license": "LGPL-3.0",
   "peerDependencies": {
     "@angular/common": "^14.1.0",
-    "@angular/core": "^14.1.0"
+    "@angular/core": "^14.1.0",
+    "@alfresco/adf-core": "^6.1.0-0",
+    "@alfresco/adf-content-services": "^6.1.0-0",
+    "@alfresco/adf-extensions": "^6.1.0-0",
+    "@alfresco/js-api": "^6.1.0-0",
+    "@angular/animations": "^14.1.3",
+    "@angular/cdk": "^14.1.3",
+    "@angular/forms": "^14.1.3",
+    "@angular/material": "^14.1.3",
+    "@ngx-translate/core": "^14.0.0",
+    "rxjs": "6.6.6",
+    "zone.js": "0.11.8"
   },
   "dependencies": {
     "tslib": "^2.3.0"
diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts
index 3da5bb1d5..ac48d850a 100644
--- a/projects/aca-content/src/lib/aca-content.module.ts
+++ b/projects/aca-content/src/lib/aca-content.module.ts
@@ -34,13 +34,19 @@ import {
   LibraryStatusColumnComponent,
   TrashcanNameColumnComponent
 } from '@alfresco/adf-content-services';
-import { DocumentBasePageService, ExtensionsDataLoaderGuard, PageLayoutModule, SharedModule, GenericErrorComponent } from '@alfresco/aca-shared';
+import {
+  DocumentBasePageService,
+  ExtensionsDataLoaderGuard,
+  PageLayoutModule,
+  SharedModule,
+  GenericErrorComponent,
+  OpenInAppModule
+} from '@alfresco/aca-shared';
 import * as rules from '@alfresco/aca-shared/rules';
 
 import { FilesComponent } from './components/files/files.component';
 import { LibrariesComponent } from './components/libraries/libraries.component';
 import { FavoriteLibrariesComponent } from './components/favorite-libraries/favorite-libraries.component';
-import { ViewProfileModule } from './components/view-profile/view-profile.module';
 
 import { AppStoreModule } from './store/app-store.module';
 import { MaterialModule } from './material.module';
@@ -72,7 +78,6 @@ import { LibraryMetadataTabComponent } from './components/info-drawer/library-me
 import { MetadataTabComponent } from './components/info-drawer/metadata-tab/metadata-tab.component';
 import { VersionsTabComponent } from './components/info-drawer/versions-tab/versions-tab.component';
 import { PreviewComponent } from '@alfresco/aca-preview';
-import { DocumentDisplayModeComponent } from './components/toolbar/document-display-mode/document-display-mode.component';
 import { ToggleEditOfflineComponent } from './components/toolbar/toggle-edit-offline/toggle-edit-offline.component';
 import { ToggleFavoriteLibraryComponent } from './components/toolbar/toggle-favorite-library/toggle-favorite-library.component';
 import { ToggleFavoriteComponent } from './components/toolbar/toggle-favorite/toggle-favorite.component';
@@ -83,9 +88,8 @@ import { ViewNodeComponent } from './components/toolbar/view-node/view-node.comp
 import { CONTENT_ROUTES } from './aca-content.routes';
 import { RouterModule } from '@angular/router';
 import { UploadFilesDialogComponent } from './components/upload-files-dialog/upload-files-dialog.component';
-import { AppTrashcanModule } from './components/trashcan/trashcan.module';
 import { AppSharedLinkViewModule } from './components/shared-link-view/shared-link-view.module';
-import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules';
+import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules';
 import { TagsColumnComponent } from './components/dl-custom-components/tags-column/tags-column.component';
 import { UserInfoComponent } from './components/common/user-info/user-info.component';
 import { SidenavComponent } from './components/sidenav/sidenav.component';
@@ -93,6 +97,8 @@ import { ContentManagementService } from './services/content-management.service'
 import { ShellLayoutComponent, SHELL_NAVBAR_MIN_WIDTH } from '@alfresco/adf-core/shell';
 import { UserMenuComponent } from './components/sidenav/user-menu/user-menu.component';
 import { ContextMenuComponent } from './components/context-menu/context-menu.component';
+import { ViewProfileComponent } from './components/view-profile/view-profile.component';
+import { TrashcanComponent } from './components/trashcan/trashcan.component';
 
 @NgModule({
   imports: [
@@ -118,12 +124,14 @@ import { ContextMenuComponent } from './components/context-menu/context-menu.com
     AppSearchInputModule,
     AppSearchResultsModule,
     HammerModule,
-    ViewProfileModule,
-    AppTrashcanModule,
+    ViewProfileComponent,
+    TrashcanComponent,
     AppSharedLinkViewModule,
     AcaFolderRulesModule,
     GenericErrorComponent,
-    DetailsComponent
+    DetailsComponent,
+    CreateFromTemplateDialogComponent,
+    OpenInAppModule
   ],
   declarations: [
     FilesComponent,
@@ -132,7 +140,6 @@ import { ContextMenuComponent } from './components/context-menu/context-menu.com
     FavoritesComponent,
     RecentFilesComponent,
     SharedFilesComponent,
-    CreateFromTemplateDialogComponent,
     HomeComponent,
     UploadFilesDialogComponent
   ],
@@ -170,7 +177,6 @@ export class ContentServiceExtensionModule {
       'app.toolbar.toggleFavorite': ToggleFavoriteComponent,
       'app.toolbar.toggleFavoriteLibrary': ToggleFavoriteLibraryComponent,
       'app.toolbar.toggleJoinLibrary': ToggleJoinLibraryButtonComponent,
-      'app.toolbar.cardView': DocumentDisplayModeComponent,
       'app.menu.toggleJoinLibrary': ToggleJoinLibraryMenuComponent,
       'app.shared-link.toggleSharedLink': ToggleSharedComponent,
       'app.columns.name': CustomNameColumnComponent,
diff --git a/projects/aca-content/src/lib/aca-content.routes.ts b/projects/aca-content/src/lib/aca-content.routes.ts
index 56cc53481..3c720c96b 100644
--- a/projects/aca-content/src/lib/aca-content.routes.ts
+++ b/projects/aca-content/src/lib/aca-content.routes.ts
@@ -571,7 +571,7 @@ export const CONTENT_LAYOUT_ROUTES: Route = {
       children: [
         {
           path: '',
-          loadChildren: () => import('@alfresco/aca-folder-rules').then((m) => m.AcaFolderRulesModule)
+          loadChildren: () => import('@alfresco/aca-content/folder-rules').then((m) => m.AcaFolderRulesModule)
         }
       ]
     },
diff --git a/projects/aca-content/src/lib/components/common/common.module.ts b/projects/aca-content/src/lib/components/common/common.module.ts
index 5d3ccb6d5..dbf7f3eee 100644
--- a/projects/aca-content/src/lib/components/common/common.module.ts
+++ b/projects/aca-content/src/lib/components/common/common.module.ts
@@ -22,21 +22,12 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NgModule } from '@angular/core';
 import { LocationLinkComponent } from './location-link/location-link.component';
 import { ToggleSharedComponent } from './toggle-shared/toggle-shared.component';
 import { LanguagePickerComponent } from './language-picker/language-picker.component';
 import { LogoutComponent } from './logout/logout.component';
 import { UserInfoComponent } from './user-info/user-info.component';
 
-/**
- * @deprecated Use `APP_COMMON_DIRECTIVES` instead
- */
-@NgModule({
-  imports: [LanguagePickerComponent, LocationLinkComponent, LogoutComponent, ToggleSharedComponent, UserInfoComponent]
-})
-export class AppCommonModule {}
-
 export const APP_COMMON_DIRECTIVES = [
   LanguagePickerComponent,
   LocationLinkComponent,
diff --git a/projects/aca-content/src/lib/components/common/language-picker/language-picker.component.ts b/projects/aca-content/src/lib/components/common/language-picker/language-picker.component.ts
index ec6464df1..830967281 100644
--- a/projects/aca-content/src/lib/components/common/language-picker/language-picker.component.ts
+++ b/projects/aca-content/src/lib/components/common/language-picker/language-picker.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { LanguageMenuModule } from '@alfresco/adf-core';
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { TranslateModule } from '@ngx-translate/core';
@@ -40,6 +40,7 @@ import { TranslateModule } from '@ngx-translate/core';
     <mat-menu #langMenu="matMenu">
       <adf-language-menu></adf-language-menu>
     </mat-menu>
-  `
+  `,
+  encapsulation: ViewEncapsulation.None
 })
 export class LanguagePickerComponent {}
diff --git a/projects/aca-content/src/lib/components/common/logout/logout.component.ts b/projects/aca-content/src/lib/components/common/logout/logout.component.ts
index a119e3372..6ec51a9ce 100644
--- a/projects/aca-content/src/lib/components/common/logout/logout.component.ts
+++ b/projects/aca-content/src/lib/components/common/logout/logout.component.ts
@@ -22,23 +22,25 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
+import { DirectiveModule } from '@alfresco/adf-core';
 
 @Component({
   standalone: true,
-  imports: [TranslateModule, MatIconModule, MatMenuModule],
+  imports: [TranslateModule, MatIconModule, MatMenuModule, DirectiveModule],
   selector: 'aca-logout',
   template: `
     <button mat-menu-item (click)="onLogoutEvent()" adf-logout>
       <mat-icon>exit_to_app</mat-icon>
       <span>{{ 'APP.SIGN_OUT' | translate }}</span>
     </button>
-  `
+  `,
+  encapsulation: ViewEncapsulation.None
 })
 export class LogoutComponent {
   constructor(private store: Store) {}
diff --git a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.html b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.html
index 8721a52cf..ba165602c 100644
--- a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.html
+++ b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.html
@@ -1,8 +1,8 @@
-<ng-container *ngIf="selection$ | async as selection">
+<ng-container *ngIf="selectionState">
   <ng-container *ngIf="!data.iconButton">
-    <button mat-menu-item data-automation-id="share-action-button" (click)="editSharedNode(selection, '.adf-context-menu-source')">
+    <button mat-menu-item data-automation-id="share-action-button" (click)="editSharedNode(selectionState, '.adf-context-menu-source')">
       <mat-icon>link</mat-icon>
-      <ng-container *ngIf="isShared(selection); else not_shared">
+      <ng-container *ngIf="isShared; else not_shared">
         <span>{{ 'APP.ACTIONS.SHARE_EDIT' | translate }}</span>
       </ng-container>
     </button>
@@ -12,9 +12,9 @@
     <button
       mat-icon-button
       data-automation-id="share-action-button"
-      (click)="editSharedNode(selection, '#share-action-button')"
-      [attr.aria-label]="getLabel(selection) | translate"
-      [attr.title]="getLabel(selection) | translate"
+      (click)="editSharedNode(selectionState, '#share-action-button')"
+      [attr.aria-label]="selectionLabel | translate"
+      [attr.title]="selectionLabel | translate"
       id="share-action-button"
     >
       <mat-icon>link</mat-icon>
diff --git a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.spec.ts b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.spec.ts
index 99b86c6d6..38241d6e8 100644
--- a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.spec.ts
+++ b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.spec.ts
@@ -56,14 +56,14 @@ describe('ToggleSharedComponent', () => {
   it('should return false when entry is not shared', () => {
     component.ngOnInit();
 
-    expect(component.isShared({ first: { entry } })).toBe(false);
+    expect(component.isShared).toBe(false);
   });
 
   it('should return true when entry is shared', () => {
     entry.properties['qshare:sharedId'] = 'some-id';
     component.ngOnInit();
 
-    expect(component.isShared({ first: { entry } })).toBe(true);
+    expect(component.isShared).toBe(true);
   });
 
   it('should dispatch `SHARE_NODE` action on share', () => {
@@ -74,7 +74,7 @@ describe('ToggleSharedComponent', () => {
 
   it('should get action label for unshared file', () => {
     component.ngOnInit();
-    const label = component.getLabel({ first: { entry } });
+    const label = component.selectionLabel;
 
     expect(label).toBe('APP.ACTIONS.SHARE');
   });
@@ -82,7 +82,7 @@ describe('ToggleSharedComponent', () => {
   it('should get action label for shared file', () => {
     entry.properties['qshare:sharedId'] = 'some-id';
     component.ngOnInit();
-    const label = component.getLabel({ first: { entry } });
+    const label = component.selectionLabel;
 
     expect(label).toBe('APP.ACTIONS.SHARE_EDIT');
   });
diff --git a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.ts b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.ts
index fd99b9121..46ac9e961 100644
--- a/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.ts
+++ b/projects/aca-content/src/lib/components/common/toggle-shared/toggle-shared.component.ts
@@ -22,8 +22,8 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit, Input } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { SelectionState } from '@alfresco/adf-extensions';
 import { AppStore, ShareNodeAction, getAppSelection } from '@alfresco/aca-shared/store';
@@ -32,36 +32,47 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatIconModule } from '@angular/material/icon';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
   standalone: true,
   imports: [CommonModule, MatMenuModule, MatIconModule, TranslateModule, MatButtonModule],
   selector: 'app-toggle-shared',
-  templateUrl: './toggle-shared.component.html'
+  templateUrl: './toggle-shared.component.html',
+  encapsulation: ViewEncapsulation.None
 })
-export class ToggleSharedComponent implements OnInit {
+export class ToggleSharedComponent implements OnInit, OnDestroy {
   @Input()
   data: {
     iconButton?: string;
   };
 
   selection$: Observable<SelectionState>;
+  selectionState: SelectionState;
+  selectionLabel = '';
+  isShared = false;
+
+  onDestroy$ = new Subject<void>();
 
   constructor(private store: Store<AppStore>) {}
 
   ngOnInit() {
     this.selection$ = this.store.select(getAppSelection);
+    this.selection$.pipe(takeUntil(this.onDestroy$)).subscribe((selectionState) => {
+      this.selectionState = selectionState;
+
+      this.isShared =
+        (this.selectionState.first && this.selectionState.first.entry && (this.selectionState.first.entry as any).sharedByUser) ||
+        !!this.selectionState?.first?.entry?.properties?.['qshare:sharedId'];
+
+      this.selectionLabel = this.isShared ? 'APP.ACTIONS.SHARE_EDIT' : 'APP.ACTIONS.SHARE';
+    });
   }
 
-  isShared(selection: SelectionState) {
-    // workaround for shared files
-    if (selection.first && selection.first.entry && (selection.first.entry as any).sharedByUser) {
-      return true;
-    }
-
-    return selection.first && selection.first.entry && selection.first.entry.properties && !!selection.first.entry.properties['qshare:sharedId'];
+  ngOnDestroy(): void {
+    this.onDestroy$.next();
+    this.onDestroy$.complete();
   }
-
   editSharedNode(selection: SelectionState, focusedElementOnCloseSelector: string) {
     this.store.dispatch(
       new ShareNodeAction(selection.first, {
@@ -69,8 +80,4 @@ export class ToggleSharedComponent implements OnInit {
       })
     );
   }
-
-  getLabel(selection: SelectionState): string {
-    return this.isShared(selection) ? 'APP.ACTIONS.SHARE_EDIT' : 'APP.ACTIONS.SHARE';
-  }
 }
diff --git a/projects/aca-content/src/lib/components/common/user-info/user-info.component.scss b/projects/aca-content/src/lib/components/common/user-info/user-info.component.scss
index 1d168b2ec..de0fe59cb 100644
--- a/projects/aca-content/src/lib/components/common/user-info/user-info.component.scss
+++ b/projects/aca-content/src/lib/components/common/user-info/user-info.component.scss
@@ -13,8 +13,8 @@
     line-height: 32px;
     text-align: center;
     vertical-align: middle;
-    background: var(--theme-user-initials-background-color);
-    color: var(--theme-user-intials-text-color);
+    background: var(--theme-about-panel-border-color);
+    color: var(--theme-selected-text-color);
     border: none;
   }
 
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts
index a2ae25ee6..5daf9ddac 100644
--- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts
+++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts
@@ -26,7 +26,7 @@ import { CustomNameColumnComponent } from './name-column.component';
 import { Actions } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CoreModule } from '@alfresco/adf-core';
+import { HttpClientModule } from '@angular/common/http';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('CustomNameColumnComponent', () => {
@@ -35,12 +35,7 @@ describe('CustomNameColumnComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        CoreModule.forRoot(),
-        CustomNameColumnComponent,
-        StoreModule.forRoot({ app: () => {} }, { initialState: {} })
-      ],
+      imports: [HttpClientModule, TranslateModule.forRoot(), CustomNameColumnComponent, StoreModule.forRoot({ app: () => {} }, { initialState: {} })],
       providers: [Actions]
     });
 
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
index 516c65630..e3a1e87a7 100644
--- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
+++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts
@@ -46,12 +46,17 @@ import { TranslateModule } from '@ngx-translate/core';
 export class CustomNameColumnComponent extends NameColumnComponent implements OnInit, OnDestroy {
   private onDestroy$$ = new Subject<boolean>();
 
+  isFile: boolean;
+  isFileWriteLocked: boolean;
+
   constructor(element: ElementRef, private cd: ChangeDetectorRef, private actions$: Actions, private nodesService: NodesApiService) {
     super(element, nodesService);
   }
 
   ngOnInit() {
     this.updateValue();
+    this.isFile = this.node?.entry && !this.node.entry.isFolder;
+    this.isFileWriteLocked = isLocked(this.node);
 
     this.nodesService.nodeUpdated.pipe(takeUntil(this.onDestroy$$)).subscribe((node: any) => {
       const row = this.context.row;
@@ -65,6 +70,9 @@ export class CustomNameColumnComponent extends NameColumnComponent implements On
           row.node = { entry };
           this.updateValue();
         }
+
+        this.isFile = this.node?.entry && !this.node.entry.isFolder;
+        this.isFileWriteLocked = isLocked(this.node);
       }
     });
 
@@ -75,6 +83,7 @@ export class CustomNameColumnComponent extends NameColumnComponent implements On
         takeUntil(this.onDestroy$$)
       )
       .subscribe(() => {
+        this.isFileWriteLocked = isLocked(this.node);
         this.cd.detectChanges();
       });
   }
@@ -90,12 +99,4 @@ export class CustomNameColumnComponent extends NameColumnComponent implements On
     this.onDestroy$$.next(true);
     this.onDestroy$$.complete();
   }
-
-  get isFile(): boolean {
-    return this.node && this.node.entry && !this.node.entry.isFolder;
-  }
-
-  get isFileWriteLocked(): boolean {
-    return isLocked(this.node);
-  }
 }
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/tags-column/tags-column.component.ts b/projects/aca-content/src/lib/components/dl-custom-components/tags-column/tags-column.component.ts
index 4ce98763a..dc365da92 100644
--- a/projects/aca-content/src/lib/components/dl-custom-components/tags-column/tags-column.component.ts
+++ b/projects/aca-content/src/lib/components/dl-custom-components/tags-column/tags-column.component.ts
@@ -22,16 +22,15 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ShareDataRow, TagModule } from '@alfresco/adf-content-services';
-import { ChangeDetectorRef, Component, Input, ViewEncapsulation } from '@angular/core';
+import { TagModule } from '@alfresco/adf-content-services';
+import { ChangeDetectorRef, Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 
 @Component({
   standalone: true,
   imports: [TagModule],
   selector: 'aca-tags-column',
   template: `
-    <adf-tag-node-list [showDelete]="false" [limitTagsDisplayed]="true" [nodeId]="getNodeId(context.row)" (results)="onTagsLoaded()">
-    </adf-tag-node-list>
+    <adf-tag-node-list [showDelete]="false" [limitTagsDisplayed]="true" [nodeId]="nodeId" (results)="onTagsLoaded()"> </adf-tag-node-list>
   `,
   styleUrls: ['./tags-column.component.scss'],
   encapsulation: ViewEncapsulation.None,
@@ -39,14 +38,16 @@ import { ChangeDetectorRef, Component, Input, ViewEncapsulation } from '@angular
     class: 'adf-datatable-content-cell aca-tags-name-column'
   }
 })
-export class TagsColumnComponent {
+export class TagsColumnComponent implements OnInit {
   @Input()
   context: any;
 
+  nodeId: string;
+
   constructor(private cd: ChangeDetectorRef) {}
 
-  getNodeId(row: ShareDataRow): string {
-    return row.id;
+  ngOnInit(): void {
+    this.nodeId = this.context?.row?.id;
   }
 
   onTagsLoaded(): void {
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
index 5dd5dfc8f..632d10589 100644
--- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
+++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts
@@ -25,7 +25,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Router } from '@angular/router';
-import { AlfrescoApiService, AppConfigModule, DataTableComponent, UserPreferencesService } from '@alfresco/adf-core';
+import { AlfrescoApiService, DataTableComponent, UserPreferencesService } from '@alfresco/adf-core';
 import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { FavoriteLibrariesComponent } from './favorite-libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
@@ -35,6 +35,8 @@ import { RouterEffects } from '@alfresco/aca-shared/store';
 import { of, throwError } from 'rxjs';
 import { LibraryEffects } from '../../store/effects';
 import { NodeEntry } from '@alfresco/js-api';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('FavoriteLibrariesComponent', () => {
   let fixture: ComponentFixture<FavoriteLibrariesComponent>;
@@ -57,7 +59,7 @@ describe('FavoriteLibrariesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), AppConfigModule],
+      imports: [AppTestingModule, EffectsModule.forRoot([RouterEffects, LibraryEffects]), MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, FavoriteLibrariesComponent],
       schemas: [NO_ERRORS_SCHEMA]
     });
diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
index 7523f2d19..c4a7667c9 100644
--- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
+++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
+import { ChangeDetectorRef, Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { SiteEntry, FavoritePaging, Pagination } from '@alfresco/js-api';
 import { AppHookService, ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
@@ -30,7 +30,8 @@ import { UserPreferencesService } from '@alfresco/adf-core';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({
-  templateUrl: './favorite-libraries.component.html'
+  templateUrl: './favorite-libraries.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class FavoriteLibrariesComponent extends PageComponent implements OnInit {
   pagination: Pagination = new Pagination({
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
index e767e6219..ea806c996 100644
--- a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
+++ b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts
@@ -25,12 +25,14 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Router } from '@angular/router';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core';
+import { DataTableComponent } from '@alfresco/adf-core';
 import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { of } from 'rxjs';
 import { FavoritesComponent } from './favorites.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { ContentApiService } from '@alfresco/aca-shared';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('FavoritesComponent', () => {
   let fixture: ComponentFixture<FavoritesComponent>;
@@ -41,7 +43,7 @@ describe('FavoritesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule],
+      imports: [AppTestingModule, MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, FavoritesComponent],
       providers: [
         {
diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.ts
index b95229ad3..10a0ee480 100644
--- a/projects/aca-content/src/lib/components/favorites/favorites.component.ts
+++ b/projects/aca-content/src/lib/components/favorites/favorites.component.ts
@@ -24,12 +24,13 @@
 
 import { ContentApiService, PageComponent } from '@alfresco/aca-shared';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, PathInfo } from '@alfresco/js-api';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { debounceTime, map } from 'rxjs/operators';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({
-  templateUrl: './favorites.component.html'
+  templateUrl: './favorites.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class FavoritesComponent extends PageComponent implements OnInit {
   columns: DocumentListPresetRef[] = [];
diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html
index ee274b2c4..07807ecd4 100644
--- a/projects/aca-content/src/lib/components/files/files.component.html
+++ b/projects/aca-content/src/lib/components/files/files.component.html
@@ -72,7 +72,7 @@
             </ng-container>
           </data-columns>
 
-          <adf-custom-empty-content-template *ngIf="isFilterHeaderActive()">
+          <adf-custom-empty-content-template *ngIf="isFilterHeaderActive">
             <ng-container>
               <div class="empty-search__block" aria-live="polite">
                 <p class="empty-search__text">
diff --git a/projects/aca-content/src/lib/components/files/files.component.spec.ts b/projects/aca-content/src/lib/components/files/files.component.spec.ts
index 5aae07575..8fa4f518c 100644
--- a/projects/aca-content/src/lib/components/files/files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/files/files.component.spec.ts
@@ -25,7 +25,7 @@
 import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA, SimpleChange, SimpleChanges } from '@angular/core';
 import { Router, ActivatedRoute, convertToParamMap } from '@angular/router';
-import { DataTableComponent, AppConfigModule, DataTableModule, PaginationModule } from '@alfresco/adf-core';
+import { DataTableComponent, DataTableModule, PaginationModule } from '@alfresco/adf-core';
 import {
   DocumentListComponent,
   DocumentListService,
@@ -72,7 +72,7 @@ describe('FilesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, DataTableModule, PaginationModule, SharedDirectivesModule, DirectivesModule, AppConfigModule],
+      imports: [AppTestingModule, DataTableModule, PaginationModule, SharedDirectivesModule, DirectivesModule],
       declarations: [FilesComponent, DataTableComponent, NodeFavoriteDirective, DocumentListComponent],
       providers: [
         {
diff --git a/projects/aca-content/src/lib/components/files/files.component.ts b/projects/aca-content/src/lib/components/files/files.component.ts
index f26db70aa..d7df92e79 100644
--- a/projects/aca-content/src/lib/components/files/files.component.ts
+++ b/projects/aca-content/src/lib/components/files/files.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { ShowHeaderMode } from '@alfresco/adf-core';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElement, PathElementEntity } from '@alfresco/js-api';
 import { NodeActionsService } from '../../services/node-actions.service';
@@ -34,7 +34,8 @@ import { FilterSearch, ShareDataRow, FileUploadEvent } from '@alfresco/adf-conte
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({
-  templateUrl: './files.component.html'
+  templateUrl: './files.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
   isValidPath = true;
@@ -46,6 +47,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
   private nodePath: PathElement[];
 
   columns: DocumentListPresetRef[] = [];
+  isFilterHeaderActive = false;
 
   constructor(private route: ActivatedRoute, private contentApi: ContentApiService, private nodeActionsService: NodeActionsService) {
     super();
@@ -306,9 +308,11 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
   onFilterSelected(activeFilters: FilterSearch[]) {
     if (activeFilters.length) {
       this.showHeader = ShowHeaderMode.Always;
+      this.isFilterHeaderActive = true;
       this.navigateToFilter(activeFilters);
     } else {
       this.router.navigate(['.'], { relativeTo: this.route });
+      this.isFilterHeaderActive = false;
       this.showHeader = ShowHeaderMode.Data;
       this.onAllFilterCleared();
     }
@@ -329,10 +333,6 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
     this.router.navigate([], { relativeTo: this.route, queryParams: objectFromMap });
   }
 
-  isFilterHeaderActive(): boolean {
-    return this.showHeader === ShowHeaderMode.Always;
-  }
-
   onError() {
     this.isValidPath = false;
   }
diff --git a/projects/aca-content/src/lib/components/home/home.component.ts b/projects/aca-content/src/lib/components/home/home.component.ts
index d9c0166f2..13fd5167d 100644
--- a/projects/aca-content/src/lib/components/home/home.component.ts
+++ b/projects/aca-content/src/lib/components/home/home.component.ts
@@ -22,12 +22,13 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { Router } from '@angular/router';
 import { AppConfigService } from '@alfresco/adf-core';
 
 @Component({
-  template: ''
+  template: '',
+  encapsulation: ViewEncapsulation.None
 })
 export class HomeComponent implements OnInit {
   readonly DEFAULT_LANDING_PAGE = '/personal-files';
diff --git a/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.spec.ts b/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.spec.ts
index 144af5939..28654b690 100644
--- a/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.spec.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.spec.ts
@@ -83,22 +83,26 @@ describe('CommentsTabComponent', () => {
       expect(component.canUpdateNode).toBe(false);
     });
 
-    it('should check [update] permission if node selected is a not locked file', () => {
+    it('should check [update] permission if node selected is a not locked file', async () => {
       component.node = {
         id: 'test-node-id',
         isFile: true,
         isFolder: false
       } as Node;
+      fixture.detectChanges();
+      await fixture.whenStable();
       expect(component.canUpdateNode).toBe(true);
       expect(checked).toContain('update');
     });
 
-    it('should check [update] permission if node selected is a folder', () => {
+    it('should check [update] permission if node selected is a folder', async () => {
       component.node = {
         id: 'test-node-id',
         isFile: false,
         isFolder: true
       } as Node;
+      fixture.detectChanges();
+      await fixture.whenStable();
       expect(component.canUpdateNode).toBe(true);
       expect(checked).toContain('update');
     });
diff --git a/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.ts b/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.ts
index 012e225ee..7d85c7097 100644
--- a/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/comments-tab/comments-tab.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';
 import { NodePermissionService, isLocked } from '@alfresco/aca-shared';
 import { MatCardModule } from '@angular/material/card';
@@ -32,22 +32,23 @@ import { NodeCommentsModule } from '@alfresco/adf-content-services';
   standalone: true,
   imports: [MatCardModule, NodeCommentsModule],
   selector: 'app-comments-tab',
-  template: `<mat-card><adf-node-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-node-comments></mat-card>`
+  template: `<mat-card><adf-node-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-node-comments></mat-card>`,
+  encapsulation: ViewEncapsulation.None
 })
-export class CommentsTabComponent {
+export class CommentsTabComponent implements OnInit {
   @Input()
   node: MinimalNodeEntryEntity;
 
+  canUpdateNode = false;
+
   constructor(private permission: NodePermissionService) {}
 
-  get canUpdateNode(): boolean {
+  ngOnInit(): void {
     if (!this.node) {
-      return false;
+      this.canUpdateNode = false;
     }
-
     if (this.node.isFolder || (this.node.isFile && !isLocked({ entry: this.node }))) {
-      return this.permission.check(this.node, ['update']);
+      this.canUpdateNode = this.permission.check(this.node, ['update']);
     }
-    return false;
   }
 }
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
index 448c04b72..f11ba26e7 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
@@ -47,7 +47,7 @@
             </span>
 
             <span class="mat-input-element">
-              {{ getVisibilityLabel(form.controls.visibility.value) | translate }}
+              {{ visibilityLabel | translate }}
             </span>
           </div>
         </div>
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
index 841b4661d..63fefa5e2 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input, OnInit, OnChanges, OnDestroy } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { UntypedFormGroup, UntypedFormControl, Validators, FormGroupDirective, NgForm, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { QueriesApi, SiteEntry, SitePaging } from '@alfresco/js-api';
 import { Store } from '@ngrx/store';
@@ -63,7 +63,8 @@ export class InstantErrorStateMatcher implements ErrorStateMatcher {
     MatButtonModule
   ],
   selector: 'app-library-metadata-form',
-  templateUrl: './library-metadata-form.component.html'
+  templateUrl: './library-metadata-form.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class LibraryMetadataFormComponent implements OnInit, OnChanges, OnDestroy {
   private _queriesApi: QueriesApi;
@@ -92,15 +93,12 @@ export class LibraryMetadataFormComponent implements OnInit, OnChanges, OnDestro
   });
 
   matcher = new InstantErrorStateMatcher();
+  canUpdateLibrary = false;
+  visibilityLabel = '';
 
   onDestroy$: Subject<boolean> = new Subject<boolean>();
 
   constructor(private alfrescoApiService: AlfrescoApiService, protected store: Store<AppStore>) {}
-
-  get canUpdateLibrary() {
-    return this.node && this.node.entry && this.node.entry.role === 'SiteManager';
-  }
-
   getVisibilityLabel(value: string) {
     return this.libraryType.find((type) => type.value === value).label;
   }
@@ -136,6 +134,8 @@ export class LibraryMetadataFormComponent implements OnInit, OnChanges, OnDestro
           this.libraryTitleExists = false;
         }
       });
+    this.canUpdateLibrary = this.node?.entry?.role === 'SiteManager';
+    this.visibilityLabel = this.libraryType.find((type) => type.value === this.form.controls['visibility'].value).label;
   }
 
   ngOnDestroy() {
diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts
index 18931b5df..f78e2d907 100644
--- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input } from '@angular/core';
+import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { SiteEntry } from '@alfresco/js-api';
 import { LibraryMetadataFormComponent } from './library-metadata-form.component';
 
@@ -31,7 +31,8 @@ import { LibraryMetadataFormComponent } from './library-metadata-form.component'
   imports: [LibraryMetadataFormComponent],
   selector: 'app-library-metadata-tab',
   template: '<app-library-metadata-form [node]="node"></app-library-metadata-form>',
-  host: { class: 'app-metadata-tab' }
+  host: { class: 'app-metadata-tab' },
+  encapsulation: ViewEncapsulation.None
 })
 export class LibraryMetadataTabComponent {
   @Input()
diff --git a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
index ffba748e0..1912ffd3b 100644
--- a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
@@ -23,14 +23,14 @@
  */
 
 import { MetadataTabComponent } from './metadata-tab.component';
-import { Node } from '@alfresco/js-api';
+import { MinimalNodeEntryEntity, Node } from '@alfresco/js-api';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { Store } from '@ngrx/store';
 import { AppState, SetInfoDrawerMetadataAspectAction } from '@alfresco/aca-shared/store';
 import { By } from '@angular/platform-browser';
-import { AppExtensionService } from '@alfresco/aca-shared';
+import { AppExtensionService, NodePermissionService } from '@alfresco/aca-shared';
 
 describe('MetadataTabComponent', () => {
   let fixture: ComponentFixture<MetadataTabComponent>;
@@ -38,17 +38,22 @@ describe('MetadataTabComponent', () => {
   let store: Store<AppState>;
   let appConfig: AppConfigService;
   let extensions: AppExtensionService;
+  let nodePermissionService: NodePermissionService;
+
   const presets = {
     default: {
       includeAll: true
     },
     custom: []
   };
-
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [CoreModule, AppTestingModule, MetadataTabComponent]
     });
+    nodePermissionService = TestBed.inject(NodePermissionService);
+    spyOn(nodePermissionService, 'check').and.callFake((source: MinimalNodeEntryEntity, permissions: string[]) => {
+      return permissions.some((permission) => source.allowableOperations.includes(permission));
+    });
   });
 
   afterEach(() => {
@@ -86,11 +91,12 @@ describe('MetadataTabComponent', () => {
       component = fixture.componentInstance;
     });
 
-    it('should return true if node is not locked and has update permission', () => {
+    it('should return true if node is not locked and has update permission', async () => {
       component.node = {
         isLocked: false,
         allowableOperations: ['update']
       } as Node;
+      component.ngOnInit();
       expect(component.canUpdateNode).toBe(true);
     });
 
@@ -99,6 +105,7 @@ describe('MetadataTabComponent', () => {
         isLocked: true,
         allowableOperations: ['update']
       } as Node;
+      component.ngOnInit();
       expect(component.canUpdateNode).toBe(false);
     });
 
@@ -107,6 +114,7 @@ describe('MetadataTabComponent', () => {
         isLocked: false,
         allowableOperations: ['other']
       } as Node;
+      component.ngOnInit();
       expect(component.canUpdateNode).toBe(false);
     });
 
@@ -118,6 +126,7 @@ describe('MetadataTabComponent', () => {
           'cm:lockType': 'WRITE_LOCK'
         }
       } as Node;
+      component.ngOnInit();
       expect(component.canUpdateNode).toBe(false);
     });
   });
diff --git a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
index 9733a3f9d..6370607c5 100644
--- a/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
@@ -52,6 +52,8 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
 
   displayAspect$: Observable<string>;
 
+  canUpdateNode = false;
+
   constructor(
     private permission: NodePermissionService,
     protected extensions: AppExtensionService,
@@ -66,18 +68,13 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
     this.displayAspect$ = this.store.select(infoDrawerMetadataAspect);
   }
 
-  get canUpdateNode(): boolean {
-    if (this.node && !isLocked({ entry: this.node })) {
-      return this.permission.check(this.node, ['update']);
-    }
-
-    return false;
-  }
-
   ngOnInit() {
     this.contentMetadataService.error.pipe(takeUntil(this.onDestroy$)).subscribe((err: { message: string }) => {
       this.notificationService.showError(err.message);
     });
+    if (this.node && !isLocked({ entry: this.node })) {
+      this.canUpdateNode = this.permission.check(this.node, ['update']);
+    }
   }
 
   ngOnDestroy() {
diff --git a/projects/aca-content/src/lib/components/info-drawer/versions-tab/versions-tab.component.ts b/projects/aca-content/src/lib/components/info-drawer/versions-tab/versions-tab.component.ts
index 16afde3a0..921d4b751 100644
--- a/projects/aca-content/src/lib/components/info-drawer/versions-tab/versions-tab.component.ts
+++ b/projects/aca-content/src/lib/components/info-drawer/versions-tab/versions-tab.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';
 import { CommonModule } from '@angular/common';
 import { VersionManagerModule } from '@alfresco/adf-content-services';
@@ -50,7 +50,8 @@ import { TranslateModule } from '@ngx-translate/core';
         {{ 'VERSION.SELECTION.EMPTY' | translate }}
       </div>
     </ng-template>
-  `
+  `,
+  encapsulation: ViewEncapsulation.None
 })
 export class VersionsTabComponent implements OnInit, OnChanges {
   @Input()
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
index def1d76a6..fd26f655a 100644
--- a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
+++ b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts
@@ -25,13 +25,15 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Router } from '@angular/router';
-import { AlfrescoApiService, DataTableComponent, AppConfigModule } from '@alfresco/adf-core';
+import { AlfrescoApiService, DataTableComponent } from '@alfresco/adf-core';
 import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { LibrariesComponent } from './libraries.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { EffectsModule } from '@ngrx/effects';
 import { LibraryEffects } from '../../store/effects';
 import { ContentApiService } from '@alfresco/aca-shared';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('LibrariesComponent', () => {
   let fixture: ComponentFixture<LibrariesComponent>;
@@ -52,7 +54,7 @@ describe('LibrariesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), AppConfigModule],
+      imports: [AppTestingModule, EffectsModule.forRoot([LibraryEffects]), MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, LibrariesComponent],
       schemas: [NO_ERRORS_SCHEMA]
     });
diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.ts
index 6c9b495e1..849df0495 100644
--- a/projects/aca-content/src/lib/components/libraries/libraries.component.ts
+++ b/projects/aca-content/src/lib/components/libraries/libraries.component.ts
@@ -24,12 +24,13 @@
 
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
 import { SiteEntry } from '@alfresco/js-api';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { AppHookService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({
-  templateUrl: './libraries.component.html'
+  templateUrl: './libraries.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class LibrariesComponent extends PageComponent implements OnInit {
   columns: DocumentListPresetRef[] = [];
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
index 8bb5a47ff..640940605 100644
--- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts
@@ -24,13 +24,15 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core';
+import { DataTableComponent } from '@alfresco/adf-core';
 import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { RecentFilesComponent } from './recent-files.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 import { Router } from '@angular/router';
 import { NodePaging, SearchApi } from '@alfresco/js-api';
 import { of } from 'rxjs';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('RecentFilesComponent', () => {
   let fixture: ComponentFixture<RecentFilesComponent>;
@@ -40,7 +42,7 @@ describe('RecentFilesComponent', () => {
     const searchApi = jasmine.createSpyObj('SearchApi', ['search']);
 
     const testBed = TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule],
+      imports: [AppTestingModule, MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, RecentFilesComponent],
       providers: [
         { provide: SearchApi, useValue: searchApi },
diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
index e4e41d42c..d8ee48a93 100644
--- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
+++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts
@@ -22,14 +22,15 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntity } from '@alfresco/js-api';
 import { debounceTime } from 'rxjs/operators';
 import { PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 
 @Component({
-  templateUrl: './recent-files.component.html'
+  templateUrl: './recent-files.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class RecentFilesComponent extends PageComponent implements OnInit {
   columns: DocumentListPresetRef[] = [];
diff --git a/projects/aca-content/src/lib/components/search/search-action-menu/search-action-menu.component.spec.ts b/projects/aca-content/src/lib/components/search/search-action-menu/search-action-menu.component.spec.ts
index c1bc49d47..dbf30fe5e 100644
--- a/projects/aca-content/src/lib/components/search/search-action-menu/search-action-menu.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-action-menu/search-action-menu.component.spec.ts
@@ -27,6 +27,7 @@ import { SearchSortingDefinition } from '@alfresco/adf-content-services/lib/sear
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { SearchActionMenuComponent } from './search-action-menu.component';
+import { MatMenuModule } from '@angular/material/menu';
 
 const mockSortingData: SearchSortingDefinition[] = [
   {
@@ -52,7 +53,7 @@ describe('SearchActionMenuComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule],
+      imports: [AppTestingModule, MatMenuModule],
       declarations: [SearchActionMenuComponent],
       providers: [SearchQueryBuilderService]
     });
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
index c8d37ae08..ef6b84825 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
@@ -37,7 +37,7 @@
         (searchChange)="onSearchChange($event)"
       >
       </app-search-input-control>
-      <mat-hint *ngIf="hasLibraryConstraint()" class="app-search-hint">{{ 'SEARCH.INPUT.HINT' | translate }}</mat-hint>
+      <mat-hint *ngIf="hasLibrariesConstraint" class="app-search-hint">{{ 'SEARCH.INPUT.HINT' | translate }}</mat-hint>
 
       <div id="search-options">
         <mat-checkbox
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
index d63e3608c..ffc355a04 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
@@ -33,6 +33,8 @@ import { map } from 'rxjs/operators';
 import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { SearchNavigationService } from '../search-navigation.service';
 import { BehaviorSubject, Subject } from 'rxjs';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatMenuModule } from '@angular/material/menu';
 
 describe('SearchInputComponent', () => {
   let fixture: ComponentFixture<SearchInputComponent>;
@@ -47,7 +49,7 @@ describe('SearchInputComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule],
+      imports: [AppTestingModule, MatSnackBarModule, MatMenuModule],
       declarations: [SearchInputComponent],
       providers: [
         {
@@ -89,7 +91,7 @@ describe('SearchInputComponent', () => {
   });
 
   it('should have no library constraint by default', () => {
-    expect(component.hasLibraryConstraint()).toBe(false);
+    expect(component.evaluateLibrariesConstraint()).toBe(false);
   });
 
   it('should have library constraint on 400 error received', async () => {
@@ -101,7 +103,7 @@ describe('SearchInputComponent', () => {
 
     appHookService.library400Error.next();
 
-    expect(component.hasLibraryConstraint()).toBe(true);
+    expect(component.evaluateLibrariesConstraint()).toBe(true);
   });
 
   describe('onSearchSubmit()', () => {
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
index e73004fa6..ceb891462 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
@@ -49,6 +49,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
   hasNewChange = false;
   navigationTimer: any;
   has400LibraryError = false;
+  hasLibrariesConstraint = false;
   searchOnChange: boolean;
 
   searchedWord: string = null;
@@ -106,6 +107,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
 
     this.appHookService.library400Error.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
       this.has400LibraryError = true;
+      this.hasLibrariesConstraint = this.evaluateLibrariesConstraint();
     });
   }
 
@@ -116,6 +118,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
   showInputValue() {
     this.appService.appNavNarMode$.next('collapsed');
     this.has400LibraryError = false;
+    this.hasLibrariesConstraint = this.evaluateLibrariesConstraint();
     this.searchedWord = this.getUrlSearchTerm();
 
     if (this.searchInputControl) {
@@ -162,6 +165,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
     }
 
     this.has400LibraryError = false;
+    this.hasLibrariesConstraint = this.evaluateLibrariesConstraint();
     this.searchedWord = searchTerm;
 
     if (this.hasOneChange) {
@@ -187,6 +191,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
     this.syncInputValues();
     this.has400LibraryError = false;
     if (this.isLibrariesChecked()) {
+      this.hasLibrariesConstraint = this.evaluateLibrariesConstraint();
       if (this.onLibrariesSearchResults && this.isSameSearchTerm()) {
         this.queryLibrariesBuilder.update();
       } else if (this.searchedWord) {
@@ -238,7 +243,7 @@ export class SearchInputComponent implements OnInit, OnDestroy {
     return this.isFilesChecked() || this.isFoldersChecked();
   }
 
-  hasLibraryConstraint(): boolean {
+  evaluateLibrariesConstraint(): boolean {
     if (this.isLibrariesChecked()) {
       return this.has400LibraryError || this.searchInputControl.isTermTooShort();
     }
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
index f65f504dd..7de4f6274 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html
@@ -79,7 +79,7 @@
             </adf-custom-empty-content-template>
           </adf-document-list>
 
-          <adf-pagination *ngIf="!documentList.isEmpty()" acaPagination [target]="documentList" (change)="onPaginationChanged($event)">
+          <adf-pagination *ngIf="totalResults > 0" acaPagination [target]="documentList" (change)="onPaginationChanged($event)">
           </adf-pagination>
         </div>
       </div>
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
index d9a615d68..bb9707162 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.scss
@@ -1,45 +1,47 @@
 @import '../../../ui/mixins';
 
-.adf-search-results {
-  @include flex-row;
-
-  &__content {
-    @include flex-column;
-
-    border-left: 1px solid #eee;
-  }
-
-  &__content-header {
-    display: flex;
-    padding: 0 25px;
-    flex-direction: row;
-    align-items: center;
-    border-bottom: 1px solid #eee;
-  }
-
-  &--info-text {
-    flex: 1;
-    font-size: 16px;
-    color: rgba(0, 0, 0, 0.54);
-  }
-
-  .text--bold {
-    font-weight: 600;
-  }
-
-  .content {
+aca-search-results {
+  .adf-search-results {
     @include flex-row;
 
-    flex: unset;
-    height: unset;
-    padding-top: 8px;
-    padding-bottom: 8px;
-    flex-wrap: wrap;
-
-    &__side--left {
+    &__content {
       @include flex-column;
 
+      border-left: 1px solid #eee;
+    }
+
+    &__content-header {
+      display: flex;
+      padding: 0 25px;
+      flex-direction: row;
+      align-items: center;
+      border-bottom: 1px solid #eee;
+    }
+
+    &--info-text {
+      flex: 1;
+      font-size: 16px;
+      color: rgba(0, 0, 0, 0.54);
+    }
+
+    .text--bold {
+      font-weight: 600;
+    }
+
+    .content {
+      @include flex-row;
+
+      flex: unset;
       height: unset;
+      padding-top: 8px;
+      padding-bottom: 8px;
+      flex-wrap: wrap;
+
+      &__side--left {
+        @include flex-column;
+
+        height: unset;
+      }
     }
   }
 }
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
index 6465a8664..7df48ca7d 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.spec.ts
@@ -24,13 +24,15 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
-import { AppConfigModule, DataTableComponent } from '@alfresco/adf-core';
+import { DataTableComponent } from '@alfresco/adf-core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { SearchLibrariesResultsComponent } from './search-libraries-results.component';
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
 import { DocumentListComponent } from '@alfresco/adf-content-services';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('SearchLibrariesResultsComponent', () => {
   let component: SearchLibrariesResultsComponent;
@@ -44,7 +46,7 @@ describe('SearchLibrariesResultsComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule],
+      imports: [AppTestingModule, MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, DocumentListComponent, SearchLibrariesResultsComponent],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
index 40b462dbf..232aba54c 100644
--- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.ts
@@ -24,7 +24,7 @@
 
 import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
 import { NodePaging, Pagination, SiteEntry } from '@alfresco/js-api';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { SearchLibrariesQueryBuilderService } from './search-libraries-query-builder.service';
 import { AppHookService, AppService, PageComponent } from '@alfresco/aca-shared';
@@ -33,7 +33,8 @@ import { DocumentListPresetRef } from '@alfresco/adf-extensions';
 @Component({
   selector: 'aca-search-results',
   templateUrl: './search-libraries-results.component.html',
-  styleUrls: ['./search-libraries-results.component.scss']
+  styleUrls: ['./search-libraries-results.component.scss'],
+  encapsulation: ViewEncapsulation.None
 })
 export class SearchLibrariesResultsComponent extends PageComponent implements OnInit {
   searchedWord: string;
diff --git a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts
index ed1e006cd..1941f82f3 100644
--- a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts
@@ -50,6 +50,8 @@ export class SearchResultsRowComponent implements OnInit, OnDestroy {
   name$ = new BehaviorSubject<string>('');
   title$ = new BehaviorSubject<string>('');
 
+  isFile = false;
+
   constructor(
     private store: Store<any>,
     private nodesApiService: NodesApiService,
@@ -77,6 +79,7 @@ export class SearchResultsRowComponent implements OnInit, OnDestroy {
 
   private updateValues() {
     this.node = this.context.row.node;
+    this.isFile = this.node.entry.isFile;
 
     const { name, properties } = this.node.entry;
     const title = properties ? properties['cm:title'] : '';
@@ -93,10 +96,6 @@ export class SearchResultsRowComponent implements OnInit, OnDestroy {
     this.onDestroy$.complete();
   }
 
-  get isFile(): boolean {
-    return this.node.entry.isFile;
-  }
-
   showPreview(event: Event) {
     event.stopPropagation();
     if (this.fileAutoDownloadService.shouldFileAutoDownload(this.node.entry.content.sizeInBytes)) {
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
index 1886663ca..b52faf4d7 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
@@ -95,7 +95,7 @@
             </adf-custom-empty-content-template>
           </adf-document-list>
 
-          <adf-pagination *ngIf="!documentList.isEmpty()" acaPagination [target]="documentList" (change)="onPaginationChanged($event)">
+          <adf-pagination *ngIf="totalResults > 0" acaPagination [target]="documentList" (change)="onPaginationChanged($event)">
           </adf-pagination>
         </div>
       </div>
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
index c6cd41c5d..8a89d9d72 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
@@ -1,8 +1,5 @@
 @import '../../../ui/mixins';
 
-$adf-chip-background: #efefef;
-$contrast-gray: #646569;
-
 .adf-search-results {
   @include flex-row;
 
@@ -28,13 +25,29 @@ $contrast-gray: #646569;
     border-bottom: 1px solid var(--theme-border-color);
 
     .adf-search-filter-chip {
+      &[disabled] {
+        &.mat-chip {
+          background-color: var(--theme-disabled-chip-background-color);
+          color: var(--theme-search-chip-icon-color);
+        }
+      }
+
       &.mat-chip {
-        background-color: $adf-chip-background;
-        color: $contrast-gray;
+        background-color: var(--theme-dropdown-color);
+        color: var(--theme-selected-text-color);
+
+        &:hover,
+        &:focus {
+          background-color: var(--theme-grey-background-hover);
+        }
+
+        mat-icon {
+          color: var(--theme-search-chip-icon-color);
+        }
       }
 
       .adf-search-filter-placeholder {
-        color: $contrast-gray;
+        color: var(--theme-selected-text-color);
       }
     }
   }
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
index 8a76f6d5f..2b0d11d0e 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.ts
@@ -56,6 +56,7 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
   data: ResultSetPaging;
   sorting = ['name', 'asc'];
   isLoading = false;
+  totalResults: number;
 
   constructor(private queryBuilder: SearchQueryBuilderService, private route: ActivatedRoute, private translationService: TranslationService) {
     super();
@@ -191,6 +192,14 @@ export class SearchResultsComponent extends PageComponent implements OnInit {
 
   onSearchResultLoaded(nodePaging: ResultSetPaging) {
     this.data = nodePaging;
+    this.totalResults = this.getNumberOfResults();
+  }
+
+  getNumberOfResults() {
+    if (this.data?.list?.pagination) {
+      return this.data.list.pagination.totalItems;
+    }
+    return 0;
   }
 
   onPaginationChanged(pagination: Pagination) {
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
index 1ec80c171..abc34ca44 100644
--- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
+++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts
@@ -24,7 +24,7 @@
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DataTableComponent, AppConfigModule } from '@alfresco/adf-core';
+import { DataTableComponent } from '@alfresco/adf-core';
 import { CustomResourcesService, DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
 import { SharedFilesComponent } from './shared-files.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
@@ -32,6 +32,8 @@ import { Router } from '@angular/router';
 import { of } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { SharedLinkPaging } from '@alfresco/js-api';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('SharedFilesComponent', () => {
   let fixture: ComponentFixture<SharedFilesComponent>;
@@ -39,7 +41,7 @@ describe('SharedFilesComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule],
+      imports: [AppTestingModule, MatDialogModule, MatSnackBarModule],
       declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, SharedFilesComponent],
       providers: [
         {
diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
index 218776d7c..6a67d8ac4 100644
--- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
+++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts
@@ -22,13 +22,15 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { debounceTime } from 'rxjs/operators';
 import { MinimalNodeEntity } from '@alfresco/js-api';
 import { AppHookService, PageComponent } from '@alfresco/aca-shared';
 import { DocumentListPresetRef } from '@alfresco/adf-extensions';
+
 @Component({
-  templateUrl: './shared-files.component.html'
+  templateUrl: './shared-files.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class SharedFilesComponent extends PageComponent implements OnInit {
   columns: DocumentListPresetRef[] = [];
diff --git a/projects/aca-content/src/lib/components/sidenav/components/button-menu.component.html b/projects/aca-content/src/lib/components/sidenav/components/button-menu.component.html
index 026df2c99..38b8efeca 100644
--- a/projects/aca-content/src/lib/components/sidenav/components/button-menu.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/components/button-menu.component.html
@@ -25,7 +25,7 @@
     [attr.aria-label]="item.title | translate"
     class="action-button"
     [ngClass]="{
-      'action-button--active': acaMenuPanel.hasActiveLinks()
+      'action-button--active': acaMenuPanel.hasActiveChildren
     }"
   >
     <adf-icon [value]="item.icon"></adf-icon>
diff --git a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
index 01066a8ea..36cc0442b 100644
--- a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
+++ b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.scss
@@ -8,7 +8,7 @@
   line-height: 32px;
   text-align: center;
   vertical-align: middle;
-  background: var(--theme-user-initials-background-color);
-  color: var(--theme-user-intials-text-color);
+  background: var(--theme-about-panel-border-color);
+  color: var(--theme-selected-text-color);
   border: none;
 }
diff --git a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.spec.ts b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.spec.ts
index e16d82f9f..c80b104eb 100644
--- a/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.spec.ts
+++ b/projects/aca-content/src/lib/components/sidenav/user-menu/user-menu.component.spec.ts
@@ -29,6 +29,7 @@ import { AppTestingModule } from '../../../testing/app-testing.module';
 import { UserMenuComponent } from './user-menu.component';
 import { of } from 'rxjs';
 import { SharedToolbarModule } from '@alfresco/aca-shared';
+import { MatMenuModule } from '@angular/material/menu';
 
 describe('UserMenuComponent', () => {
   let component: UserMenuComponent;
@@ -107,7 +108,7 @@ describe('UserMenuComponent', () => {
     };
 
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, SharedToolbarModule],
+      imports: [AppTestingModule, SharedToolbarModule, MatMenuModule],
       declarations: [UserMenuComponent],
       providers: [
         { provide: AuthenticationService, useValue: authServiceStub },
diff --git a/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.spec.ts b/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.spec.ts
deleted file mode 100644
index 054dbc84c..000000000
--- a/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { DocumentDisplayModeComponent } from './document-display-mode.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CoreModule } from '@alfresco/adf-core';
-import { AppTestingModule } from '../../../testing/app-testing.module';
-import { of } from 'rxjs';
-
-describe('DocumentDisplayModeComponent', () => {
-  let component: DocumentDisplayModeComponent;
-  let fixture: ComponentFixture<DocumentDisplayModeComponent>;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [CoreModule, AppTestingModule]
-    });
-
-    fixture = TestBed.createComponent(DocumentDisplayModeComponent);
-    component = fixture.componentInstance;
-  });
-
-  it('should show the list button when list', async () => {
-    component.displayMode$ = of('list');
-    fixture.detectChanges();
-    await fixture.whenStable();
-
-    const displayButton: HTMLButtonElement = fixture.nativeElement.querySelector('#app-document-display-mode-button');
-    expect(displayButton.title).toBe('APP.ACTIONS.LIST_MODE');
-  });
-
-  it('should show the gallery button when list', async () => {
-    component.displayMode$ = of('gallery');
-    fixture.detectChanges();
-    await fixture.whenStable();
-
-    const displayButton: HTMLButtonElement = fixture.nativeElement.querySelector('#app-document-display-mode-button');
-    expect(displayButton.title).toBe('APP.ACTIONS.GALLERY_MODE');
-  });
-});
diff --git a/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.ts b/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.ts
deleted file mode 100644
index 423859746..000000000
--- a/projects/aca-content/src/lib/components/toolbar/document-display-mode/document-display-mode.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { Component, ViewEncapsulation } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { AppStore, ToggleDocumentDisplayMode, getDocumentDisplayMode } from '@alfresco/aca-shared/store';
-
-@Component({
-  selector: 'app-document-display-mode',
-  template: `
-    <ng-container *ngIf="displayMode$ | async as displayMode">
-      <button
-        id="app-document-display-mode-button"
-        [attr.title]="getTitle(displayMode) | translate"
-        [attr.aria-label]="getTitle(displayMode) | translate"
-        mat-icon-button
-        color="primary"
-        (click)="onClick()"
-      >
-        <mat-icon *ngIf="displayMode === 'list'">view_comfy</mat-icon>
-        <mat-icon *ngIf="displayMode === 'gallery'">list</mat-icon>
-      </button>
-    </ng-container>
-  `,
-  encapsulation: ViewEncapsulation.None,
-  host: { class: 'app-document-display-mode' }
-})
-export class DocumentDisplayModeComponent {
-  displayMode$: Observable<string>;
-
-  constructor(private store: Store<AppStore>) {
-    this.displayMode$ = store.select(getDocumentDisplayMode);
-  }
-
-  getTitle(displayMode: string): string {
-    return displayMode === 'list' ? 'APP.ACTIONS.LIST_MODE' : 'APP.ACTIONS.GALLERY_MODE';
-  }
-
-  onClick() {
-    this.store.dispatch(new ToggleDocumentDisplayMode());
-  }
-}
diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
index ebc859ad3..2539f92eb 100644
--- a/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
@@ -32,11 +32,7 @@ import { AlfrescoApiService } from '@alfresco/adf-core';
 @Component({
   selector: 'app-toggle-edit-offline',
   template: `
-    <button
-      mat-menu-item
-      [attr.title]="(isNodeLocked ? 'APP.ACTIONS.EDIT_OFFLINE_CANCEL' : 'APP.ACTIONS.EDIT_OFFLINE') | translate"
-      (click)="onClick()"
-    >
+    <button mat-menu-item [attr.title]="nodeTitle | translate" (click)="onClick()">
       <ng-container *ngIf="isNodeLocked">
         <mat-icon>cancel</mat-icon>
         <span>{{ 'APP.ACTIONS.EDIT_OFFLINE_CANCEL' | translate }}</span>
@@ -54,6 +50,8 @@ import { AlfrescoApiService } from '@alfresco/adf-core';
 export class ToggleEditOfflineComponent implements OnInit {
   private nodesApi: NodesApi;
   selection: MinimalNodeEntity;
+  nodeTitle = '';
+  isNodeLocked = false;
 
   constructor(private store: Store<AppStore>, private alfrescoApiService: AlfrescoApiService) {
     this.nodesApi = new NodesApi(this.alfrescoApiService.getInstance());
@@ -62,13 +60,11 @@ export class ToggleEditOfflineComponent implements OnInit {
   ngOnInit() {
     this.store.select(getAppSelection).subscribe(({ file }) => {
       this.selection = file;
+      this.isNodeLocked = this.selection && isLocked(this.selection);
+      this.nodeTitle = this.isNodeLocked ? 'APP.ACTIONS.EDIT_OFFLINE_CANCEL' : 'APP.ACTIONS.EDIT_OFFLINE';
     });
   }
 
-  get isNodeLocked(): boolean {
-    return !!(this.selection && isLocked(this.selection));
-  }
-
   async onClick() {
     await this.toggleLock(this.selection);
   }
diff --git a/projects/aca-content/src/lib/components/toolbar/toolbar.module.ts b/projects/aca-content/src/lib/components/toolbar/toolbar.module.ts
index 46ec47a3c..73df94e65 100644
--- a/projects/aca-content/src/lib/components/toolbar/toolbar.module.ts
+++ b/projects/aca-content/src/lib/components/toolbar/toolbar.module.ts
@@ -23,7 +23,6 @@
  */
 
 import { NgModule } from '@angular/core';
-import { DocumentDisplayModeComponent } from './document-display-mode/document-display-mode.component';
 import { ToggleFavoriteComponent } from './toggle-favorite/toggle-favorite.component';
 import { ToggleInfoDrawerComponent } from './toggle-info-drawer/toggle-info-drawer.component';
 import { CommonModule } from '@angular/common';
@@ -40,7 +39,6 @@ import { SharedToolbarModule } from '@alfresco/aca-shared';
 @NgModule({
   imports: [CommonModule, CoreModule.forChild(), ExtensionsModule, SharedToolbarModule, DirectivesModule],
   declarations: [
-    DocumentDisplayModeComponent,
     ToggleFavoriteComponent,
     ToggleInfoDrawerComponent,
     ToggleJoinLibraryButtonComponent,
@@ -50,7 +48,6 @@ import { SharedToolbarModule } from '@alfresco/aca-shared';
     ViewNodeComponent
   ],
   exports: [
-    DocumentDisplayModeComponent,
     ToggleFavoriteComponent,
     ToggleInfoDrawerComponent,
     ToggleJoinLibraryButtonComponent,
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
index 2d6cee5cf..4efd975cb 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts
@@ -22,10 +22,8 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { AlfrescoApiService, DataTableComponent, AppConfigModule } from '@alfresco/adf-core';
-import { DocumentListComponent, NodeFavoriteDirective } from '@alfresco/adf-content-services';
+import { AlfrescoApiService } from '@alfresco/adf-core';
 import { TrashcanComponent } from './trashcan.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
 
@@ -36,9 +34,7 @@ describe('TrashcanComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule],
-      declarations: [DataTableComponent, NodeFavoriteDirective, DocumentListComponent, TrashcanComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      imports: [AppTestingModule, TrashcanComponent]
     });
 
     fixture = TestBed.createComponent(TrashcanComponent);
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
index 1230f86e5..bc4e2b86b 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.ts
@@ -23,12 +23,33 @@
  */
 
 import { getUserProfile } from '@alfresco/aca-shared/store';
-import { DocumentListPresetRef } from '@alfresco/adf-extensions';
-import { Component, OnInit } from '@angular/core';
-import { PageComponent } from '@alfresco/aca-shared';
+import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { PageComponent, PageLayoutModule, SharedToolbarModule } from '@alfresco/aca-shared';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { BreadcrumbModule, DocumentListModule } from '@alfresco/adf-content-services';
+import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
+import { DirectivesModule } from '../../directives/directives.module';
 
 @Component({
-  templateUrl: './trashcan.component.html'
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    PageLayoutModule,
+    BreadcrumbModule,
+    ToolbarModule,
+    SharedToolbarModule,
+    DocumentListModule,
+    TemplateModule,
+    DirectivesModule,
+    PaginationModule,
+    DataTableModule,
+    ExtensionsModule
+  ],
+  templateUrl: './trashcan.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class TrashcanComponent extends PageComponent implements OnInit {
   user$ = this.store.select(getUserProfile);
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts
deleted file mode 100644
index 9d00bcc18..000000000
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { TrashcanComponent } from './trashcan.component';
-import { ContentModule } from '@alfresco/adf-content-services';
-import { AppToolbarModule } from '../toolbar/toolbar.module';
-import { DirectivesModule } from '../../directives/directives.module';
-import { AppSearchInputModule } from '../search/search-input.module';
-import { PageLayoutModule } from '@alfresco/aca-shared';
-import { ExtensionsModule } from '@alfresco/adf-extensions';
-import { ContextMenuComponent } from '../context-menu/context-menu.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CoreModule.forChild(),
-    ContentModule.forChild(),
-    DirectivesModule,
-    AppToolbarModule,
-    ContextMenuComponent,
-    PageLayoutModule,
-    AppSearchInputModule,
-    ExtensionsModule
-  ],
-  declarations: [TrashcanComponent],
-  exports: [TrashcanComponent]
-})
-export class AppTrashcanModule {}
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.html b/projects/aca-content/src/lib/components/view-profile/view-profile.component.html
index 4172a838b..710357842 100644
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.html
+++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.html
@@ -23,7 +23,7 @@
       <div class="app-general-edit-btn" *ngIf="!generalSectionButtonsToggle">
         <button mat-raised-button class="app-general-cancel-btn" id="general-cancel-button"
           (click)="toggleGeneralButtons()">{{'APP.EDIT_PROFILE.CANCEL' | translate}}</button>
-        <button mat-raised-button class="app-general-save-btn" id="general-save-button" [disabled]="isSaveButtonDisabled()"
+        <button mat-raised-button class="app-general-save-btn" id="general-save-button" [disabled]="profileForm.invalid"
           (click)="onSaveGeneralData(profileForm)">{{'APP.EDIT_PROFILE.SAVE' | translate}}</button>
       </div>
     </div>
@@ -92,7 +92,7 @@
       <div class="app-general-edit-btn" *ngIf="!contactSectionButtonsToggle">
         <button mat-raised-button class="app-general-cancel-btn" id="contact-cancel-button"
           (click)="toggleContactButtons()">{{'APP.EDIT_PROFILE.CANCEL' | translate}}</button>
-        <button mat-raised-button  class="app-general-save-btn" id="contact-save-button" [disabled]="isSaveButtonDisabled()"
+        <button mat-raised-button  class="app-general-save-btn" id="contact-save-button" [disabled]="profileForm.invalid"
           (click)="onSaveCompanyData(profileForm)">{{'APP.EDIT_PROFILE.SAVE' | translate}}</button>
       </div>
     </div>
@@ -142,4 +142,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss b/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss
index 00d6a8553..73134f9b6 100644
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss
+++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.scss
@@ -11,7 +11,7 @@ app-view-profile {
     width: 100%;
     height: 32px;
     padding: 32px 0;
-    border-bottom: 1px solid var(--theme-header-border-color);
+    border-bottom: 1px solid var(--theme-about-panel-border-color);
   }
 
   .app-profile-title {
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts
index 2e7cd95ed..c21627872 100644
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts
+++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts
@@ -23,13 +23,10 @@
  */
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { AppConfigModule } from '@alfresco/adf-core';
 import { ViewProfileComponent } from './view-profile.component';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-import { MatDividerModule } from '@angular/material/divider';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
 
@@ -44,8 +41,7 @@ describe('ViewProfileComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, AppConfigModule, FormsModule, ReactiveFormsModule, MatDividerModule],
-      declarations: [ViewProfileComponent],
+      imports: [AppTestingModule, ViewProfileComponent],
       providers: [
         {
           provide: AppService,
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
index 39305256b..5890d4819 100644
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
+++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.ts
@@ -25,13 +25,21 @@
 import { AlfrescoApiService } from '@alfresco/adf-core';
 import { PeopleApi, Person } from '@alfresco/js-api';
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { Observable, Subject, throwError } from 'rxjs';
 import { AppService } from '@alfresco/aca-shared';
 import { takeUntil } from 'rxjs/operators';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatFormFieldModule } from '@angular/material/form-field';
 
 @Component({
+  standalone: true,
+  imports: [CommonModule, TranslateModule, ReactiveFormsModule, MatButtonModule, MatIconModule, MatDividerModule, MatFormFieldModule],
   selector: 'app-view-profile',
   templateUrl: './view-profile.component.html',
   styleUrls: ['./view-profile.component.scss'],
diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.module.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.module.ts
deleted file mode 100644
index b96898268..000000000
--- a/projects/aca-content/src/lib/components/view-profile/view-profile.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { NgModule } from '@angular/core';
-import { ViewProfileComponent } from './view-profile.component';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-
-@NgModule({
-  imports: [CommonModule, CoreModule.forChild()],
-  declarations: [ViewProfileComponent]
-})
-export class ViewProfileModule {}
diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
index 7fc0a9b55..993f50403 100644
--- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
+++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
@@ -1,4 +1,4 @@
-<h2 mat-dialog-title [innerHTML]="title()"></h2>
+<h2 mat-dialog-title [innerHTML]="title"></h2>
 <div mat-dialog-content>
   <form [formGroup]="form" novalidate>
     <mat-form-field class="adf-full-width">
diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.spec.ts b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.spec.ts
index 619ca3370..302c05f4c 100644
--- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.spec.ts
+++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.spec.ts
@@ -25,8 +25,8 @@
 import { CreateFromTemplateDialogComponent } from './create-from-template.dialog';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { AppTestingModule } from '../../testing/app-testing.module';
-import { CoreModule, TranslationMock } from '@alfresco/adf-core';
-import { MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { TranslationMock } from '@alfresco/adf-core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { CreateFromTemplate } from '@alfresco/aca-shared/store';
 import { Node } from '@alfresco/js-api';
@@ -51,8 +51,8 @@ describe('CreateFileFromTemplateDialogComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CoreModule.forRoot(), AppTestingModule, MatDialogModule],
-      declarations: [CreateFromTemplateDialogComponent],
+      imports: [AppTestingModule, CreateFromTemplateDialogComponent],
+      declarations: [],
       providers: [
         {
           provide: MatDialogRef,
diff --git a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.ts b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.ts
index f04fcc869..7df6e8ee0 100644
--- a/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.ts
+++ b/projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.ts
@@ -23,14 +23,21 @@
  */
 
 import { Component, ViewEncapsulation, Inject, OnInit } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import { Node } from '@alfresco/js-api';
-import { UntypedFormBuilder, UntypedFormGroup, Validators, UntypedFormControl, ValidationErrors } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, UntypedFormControl, ValidationErrors, ReactiveFormsModule } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppStore, CreateFromTemplate } from '@alfresco/aca-shared/store';
 import { TranslationService } from '@alfresco/adf-core';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatButtonModule } from '@angular/material/button';
 
 @Component({
+  standalone: true,
+  imports: [CommonModule, TranslateModule, MatDialogModule, ReactiveFormsModule, MatFormFieldModule, MatInputModule, MatButtonModule],
   templateUrl: './create-from-template.dialog.html',
   styleUrls: ['./create-from-template.dialog.scss'],
   encapsulation: ViewEncapsulation.None
@@ -38,6 +45,8 @@ import { TranslationService } from '@alfresco/adf-core';
 export class CreateFromTemplateDialogComponent implements OnInit {
   public form: UntypedFormGroup;
 
+  title = '';
+
   constructor(
     private translationService: TranslationService,
     private store: Store<AppStore>,
@@ -52,6 +61,11 @@ export class CreateFromTemplateDialogComponent implements OnInit {
       title: [this.data.properties ? this.data.properties['cm:title'] : '', Validators.maxLength(256)],
       description: [this.data.properties ? this.data.properties['cm:description'] : '', Validators.maxLength(512)]
     });
+
+    this.title = this.translationService.instant(
+      this.data.isFolder ? 'NODE_FROM_TEMPLATE.FOLDER_DIALOG_TITLE' : 'NODE_FROM_TEMPLATE.FILE_DIALOG_TITLE',
+      { template: this.data.name }
+    );
   }
 
   onSubmit() {
@@ -66,14 +80,6 @@ export class CreateFromTemplateDialogComponent implements OnInit {
     this.store.dispatch(new CreateFromTemplate(data));
   }
 
-  title(): string {
-    if (this.data.isFolder) {
-      return this.translationService.instant('NODE_FROM_TEMPLATE.FOLDER_DIALOG_TITLE', { template: this.data.name });
-    }
-
-    return this.translationService.instant('NODE_FROM_TEMPLATE.FILE_DIALOG_TITLE', { template: this.data.name });
-  }
-
   close() {
     this.dialogRef.close();
   }
diff --git a/projects/aca-content/src/lib/services/content-management.service.spec.ts b/projects/aca-content/src/lib/services/content-management.service.spec.ts
index c72279d4f..49e29d7d5 100644
--- a/projects/aca-content/src/lib/services/content-management.service.spec.ts
+++ b/projects/aca-content/src/lib/services/content-management.service.spec.ts
@@ -53,8 +53,8 @@ import { Store } from '@ngrx/store';
 import { ContentManagementService } from './content-management.service';
 import { NodeActionsService } from './node-actions.service';
 import { TranslationService, NotificationService } from '@alfresco/adf-core';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatSnackBarModule, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { NodeEntry, Node, VersionPaging, MinimalNodeEntity } from '@alfresco/js-api';
 import {
   NewVersionUploaderDataAction,
@@ -81,7 +81,7 @@ describe('ContentManagementService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([NodeEffects])]
+      imports: [AppTestingModule, EffectsModule.forRoot([NodeEffects]), MatDialogModule, MatSnackBarModule]
     });
 
     contentApi = TestBed.inject(ContentApiService);
diff --git a/projects/aca-content/src/lib/services/node-actions.service.spec.ts b/projects/aca-content/src/lib/services/node-actions.service.spec.ts
index b5e349d1a..f2c7d7026 100644
--- a/projects/aca-content/src/lib/services/node-actions.service.spec.ts
+++ b/projects/aca-content/src/lib/services/node-actions.service.spec.ts
@@ -23,7 +23,7 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { of, throwError, Subject, Observable } from 'rxjs';
 import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
 import { DocumentListService, NodeAction } from '@alfresco/adf-content-services';
@@ -96,7 +96,7 @@ describe('NodeActionsService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule]
+      imports: [AppTestingModule, MatDialogModule]
     });
 
     spyOnSuccess = jasmine.createSpy('spyOnSuccess');
diff --git a/projects/aca-content/src/lib/services/node-template.service.spec.ts b/projects/aca-content/src/lib/services/node-template.service.spec.ts
index 6257903bb..19fb9bd05 100644
--- a/projects/aca-content/src/lib/services/node-template.service.spec.ts
+++ b/projects/aca-content/src/lib/services/node-template.service.spec.ts
@@ -28,7 +28,7 @@ import { AppStore, SnackbarErrorAction } from '@alfresco/aca-shared/store';
 import { TemplateEffects } from '../store/effects/template.effects';
 import { AppTestingModule } from '../testing/app-testing.module';
 import { Store } from '@ngrx/store';
-import { MatDialog } from '@angular/material/dialog';
+import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { NodeTemplateService } from './node-template.service';
 import { ResultSetPaging } from '@alfresco/js-api';
 
@@ -47,7 +47,7 @@ describe('NodeTemplateService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([TemplateEffects])],
+      imports: [AppTestingModule, EffectsModule.forRoot([TemplateEffects]), MatDialogModule],
       providers: [NodeTemplateService]
     });
 
diff --git a/projects/aca-content/src/lib/store/effects/contextmenu.effects.spec.ts b/projects/aca-content/src/lib/store/effects/contextmenu.effects.spec.ts
index 953623184..ca1e79aac 100644
--- a/projects/aca-content/src/lib/store/effects/contextmenu.effects.spec.ts
+++ b/projects/aca-content/src/lib/store/effects/contextmenu.effects.spec.ts
@@ -29,7 +29,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { ContextMenu } from '@alfresco/aca-shared/store';
 import { ContextMenuService } from '../../components/context-menu/context-menu.service';
-import { OverlayRef } from '@angular/cdk/overlay';
+import { OverlayModule, OverlayRef } from '@angular/cdk/overlay';
 import { ContextMenuOverlayRef } from '../../components/context-menu/context-menu-overlay';
 
 describe('ContextMenuEffects', () => {
@@ -39,7 +39,7 @@ describe('ContextMenuEffects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([ContextMenuEffects])],
+      imports: [AppTestingModule, EffectsModule.forRoot([ContextMenuEffects]), OverlayModule],
       providers: [ContextMenuService]
     });
 
diff --git a/projects/aca-content/src/lib/store/effects/download.effects.spec.ts b/projects/aca-content/src/lib/store/effects/download.effects.spec.ts
index c66be428a..29606debb 100644
--- a/projects/aca-content/src/lib/store/effects/download.effects.spec.ts
+++ b/projects/aca-content/src/lib/store/effects/download.effects.spec.ts
@@ -27,7 +27,7 @@ import { AppTestingModule } from '../../testing/app-testing.module';
 import { EffectsModule } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { DownloadNodesAction } from '@alfresco/aca-shared/store';
 import { SelectionState } from '@alfresco/adf-extensions';
 import { VersionEntry } from '@alfresco/js-api';
@@ -38,7 +38,7 @@ describe('DownloadEffects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([DownloadEffects])]
+      imports: [AppTestingModule, EffectsModule.forRoot([DownloadEffects]), MatDialogModule]
     });
     store = TestBed.inject(Store);
   });
diff --git a/projects/aca-content/src/lib/store/effects/node.effects.spec.ts b/projects/aca-content/src/lib/store/effects/node.effects.spec.ts
index 7def4b57c..e019b1ecf 100644
--- a/projects/aca-content/src/lib/store/effects/node.effects.spec.ts
+++ b/projects/aca-content/src/lib/store/effects/node.effects.spec.ts
@@ -53,6 +53,8 @@ import { RenditionService } from '@alfresco/adf-content-services';
 import { ViewerEffects } from './viewer.effects';
 import { Router } from '@angular/router';
 import { of } from 'rxjs';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('NodeEffects', () => {
   let store: Store<any>;
@@ -63,7 +65,7 @@ describe('NodeEffects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, SharedStoreModule, EffectsModule.forRoot([NodeEffects, ViewerEffects])],
+      imports: [AppTestingModule, SharedStoreModule, EffectsModule.forRoot([NodeEffects, ViewerEffects]), MatDialogModule, MatSnackBarModule],
       providers: [RenditionService]
     });
 
diff --git a/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts b/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts
index 922b789a6..df8424705 100644
--- a/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts
+++ b/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts
@@ -31,6 +31,8 @@ import { NgZone } from '@angular/core';
 import { UploadService, FileUploadCompleteEvent, FileModel } from '@alfresco/adf-content-services';
 import { UnlockWriteAction, UploadFilesAction, UploadFileVersionAction, UploadFolderAction } from '@alfresco/aca-shared/store';
 import { ContentManagementService } from '../../services/content-management.service';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 describe('UploadEffects', () => {
   let store: Store<any>;
@@ -41,7 +43,7 @@ describe('UploadEffects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([UploadEffects])]
+      imports: [AppTestingModule, EffectsModule.forRoot([UploadEffects]), MatDialogModule, MatSnackBarModule]
     });
 
     zone = TestBed.inject(NgZone);
diff --git a/projects/aca-content/src/lib/store/effects/viewer.effects.spec.ts b/projects/aca-content/src/lib/store/effects/viewer.effects.spec.ts
index 981eda817..cc2997f0f 100644
--- a/projects/aca-content/src/lib/store/effects/viewer.effects.spec.ts
+++ b/projects/aca-content/src/lib/store/effects/viewer.effects.spec.ts
@@ -29,6 +29,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { Router } from '@angular/router';
 import { ViewFileAction, ViewNodeAction, SetSelectedNodesAction, SetCurrentFolderAction } from '@alfresco/aca-shared/store';
+import { MatDialogModule } from '@angular/material/dialog';
 
 describe('ViewerEffects', () => {
   let store: Store<any>;
@@ -36,7 +37,7 @@ describe('ViewerEffects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, EffectsModule.forRoot([ViewerEffects])]
+      imports: [AppTestingModule, EffectsModule.forRoot([ViewerEffects]), MatDialogModule]
     });
 
     store = TestBed.inject(Store);
diff --git a/projects/aca-content/src/lib/testing/app-testing.module.ts b/projects/aca-content/src/lib/testing/app-testing.module.ts
index f85f4dba1..3f3c6e8b3 100644
--- a/projects/aca-content/src/lib/testing/app-testing.module.ts
+++ b/projects/aca-content/src/lib/testing/app-testing.module.ts
@@ -31,27 +31,27 @@ import {
   AuthenticationService,
   AlfrescoApiService,
   PipeModule,
-  AlfrescoApiServiceMock
+  AlfrescoApiServiceMock,
+  PageTitleService
 } from '@alfresco/adf-core';
-import { DiscoveryApiService } from '@alfresco/adf-content-services';
+import { DiscoveryApiService, SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { RepositoryInfo } from '@alfresco/js-api';
 import { HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
 import { appReducer } from '../store/reducers/app.reducer';
 import { RouterTestingModule } from '@angular/router/testing';
 import { EffectsModule } from '@ngrx/effects';
-import { MaterialModule } from '../material.module';
 import { INITIAL_STATE } from '../store/initial-state';
-import { BehaviorSubject, Observable, of } from 'rxjs';
+import { BehaviorSubject, Observable, Subject, of } from 'rxjs';
 import { ContentManagementService } from '../services/content-management.service';
 import { DocumentBasePageService } from '@alfresco/aca-shared';
+import { STORE_INITIAL_APP_DATA } from '@alfresco/aca-shared/store';
 
 @NgModule({
   imports: [
     NoopAnimationsModule,
     HttpClientModule,
     RouterTestingModule,
-    MaterialModule,
     TranslateModule.forRoot(),
     StoreModule.forRoot(
       { app: appReducer },
@@ -66,8 +66,9 @@ import { DocumentBasePageService } from '@alfresco/aca-shared';
     EffectsModule.forRoot([]),
     PipeModule
   ],
-  exports: [RouterTestingModule, MaterialModule, PipeModule, TranslateModule],
+  exports: [RouterTestingModule, PipeModule, TranslateModule],
   providers: [
+    SearchQueryBuilderService,
     { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
     { provide: TranslationService, useClass: TranslationMock },
     { provide: DocumentBasePageService, useExisting: ContentManagementService },
@@ -85,8 +86,19 @@ import { DocumentBasePageService } from '@alfresco/aca-shared';
         getRedirect: (): string | null => null,
         setRedirect() {},
         isOauth: (): boolean => false,
-        isOAuthWithoutSilentLogin: (): boolean => false
+        isOAuthWithoutSilentLogin: (): boolean => false,
+        onLogin: new Subject<any>(),
+        onLogout: new Subject<any>(),
+        isLoggedIn: () => true
       }
+    },
+    {
+      provide: PageTitleService,
+      useValue: {}
+    },
+    {
+      provide: STORE_INITIAL_APP_DATA,
+      useValue: {}
     }
   ]
 })
diff --git a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
index dd4be04a4..3d9df5b1a 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
@@ -16,13 +16,10 @@
       margin: 24px !important;
       width: 95%;
       border: 1px solid var(--theme-about-panel-border-color);
-      background-color: var(--theme-about-panel-background-color);
     }
 
     mat-expansion-panel-header {
-      display: flex;
       height: 80px !important;
-      padding: 24px;
       line-height: 32px;
     }
 
@@ -31,8 +28,6 @@
       font-weight: 700;
       font-size: 14px;
       line-height: 24px;
-      color: var(--theme-about-panel-title-color);
     }
-
   }
 }
diff --git a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
index 04db7a883..e8fd8a22f 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-pagination.theme.scss
@@ -12,7 +12,6 @@
     height: 32px !important;
     line-height: 24px !important;
     padding: 16px 0;
-    background: var(--theme-pagination-background-color);
   }
 
   .adf-pagination__range-block {
diff --git a/projects/aca-content/src/lib/ui/overrides/ay11.scss b/projects/aca-content/src/lib/ui/overrides/ay11.scss
index 8d5976f93..dac2b8593 100644
--- a/projects/aca-content/src/lib/ui/overrides/ay11.scss
+++ b/projects/aca-content/src/lib/ui/overrides/ay11.scss
@@ -162,7 +162,7 @@
   }
 
   .mat-datetimepicker-calendar-body-active .mat-datetimepicker-calendar-body-cell-content.mat-datetimepicker-calendar-body-selected {
-    background-color: var(--theme-datetimepicker-cell-focus-background);
+    background-color: var(--theme-about-panel-border-color);
     color: var(--theme-datetimepicker-font-color);
   }
 
diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss
index 8205b50c6..cd6559c85 100644
--- a/projects/aca-content/src/lib/ui/variables/variables.scss
+++ b/projects/aca-content/src/lib/ui/variables/variables.scss
@@ -1,9 +1,6 @@
 /* stylelint-disable scss/no-global-function-names */
 @use '@angular/material' as mat;
 
-$warn: map-get($custom-theme, warn);
-$accent: map-get($custom-theme, accent);
-$primary: map-get($custom-theme, primary);
 $foreground: map-get($custom-theme, foreground);
 $background: map-get($custom-theme, background);
 
@@ -25,28 +22,22 @@ $grey-hover-background: rgba(33, 33, 33, 0.24);
 $blue-save-button-background: #1f74db;
 $black-heading: #4e4c4c;
 $grey-dropdown-background: #eee;
+$grey-background-hover: #e0e0e0;
 $grey-divider: rgba(0, 0, 0, 0.22);
 $datetimepicker-font-color: rgba(black, 0.87);
 $datetimepicker-selected-date-background: #2254b2;
 $datetimepicker-cell-background-color: #fff;
 $datetimepicker-cell-focus-border-color: #1f74db;
-$datetimepicker-cell-focus-background-color: rgba(33, 33, 33, 0.12);
 $sidenav-background-color: #f8f8f8;
 $selected-text-color: #212121;
 $selected-background-color: rgba(31, 116, 219, 0.24);
 $action-button-text-color: rgba(33, 35, 40, 0.7);
 $page-layout-header-background-color: #fff;
-$aca-toolbar-button-background-color: rgba(33, 33, 33, 0.05);
-$aca-user-initials-background: rgba(33, 33, 33, 0.12);
-$aca-user-initials-text-color: #212121;
+$search-chip-icon-color: #757575;
+$disabled-chip-background-color: #f5f5f5;
 
 // CSS Variables
 $defaults: (
-  --theme-primary-color: mat.get-color-from-palette($primary),
-  --theme-primary-color-default-contrast: mat.get-color-from-palette($primary, default-contrast),
-  --theme-warn-color: mat.get-color-from-palette($warn),
-  --theme-accent-color: mat.get-color-from-palette($accent),
-  --theme-background-color: mat.get-color-from-palette($background, background),
   --theme-text-color: mat.get-color-from-palette($foreground, text, 0.54),
   --theme-text-bold-color: mat.get-color-from-palette($foreground, text, 0.87),
   --theme-title-color: mat.get-color-from-palette($foreground, text, 0.87),
@@ -66,6 +57,7 @@ $defaults: (
   --theme-blue-button-color: $blue-save-button-background,
   --theme-heading-color: $black-heading,
   --theme-dropdown-color: $grey-dropdown-background,
+  --theme-grey-background-hover: $grey-background-hover,
   --theme-grey-divider-color: $grey-divider,
   --theme-pagination-background-color: mat.get-color-from-palette($background, background),
   --theme-about-panel-border-color: $grey-background,
@@ -75,17 +67,14 @@ $defaults: (
   --theme-datetimepicker-selected-date-background: $datetimepicker-selected-date-background,
   --theme-datetimepicker-cell-background: $datetimepicker-cell-background-color,
   --theme-datetimepicker-cell-focus-border: $datetimepicker-cell-focus-border-color,
-  --theme-datetimepicker-cell-focus-background: $datetimepicker-cell-focus-background-color,
   --theme-sidenav-background-color: $sidenav-background-color,
   --theme-selected-text-color: $selected-text-color,
   --theme-selected-background-color: $selected-background-color,
   --theme-hover-background-color: $grey-text-background,
   --theme-action-button-text-color: $action-button-text-color,
-  --theme-header-border-color: $grey-background,
   --theme-page-layout-header-background-color: $page-layout-header-background-color,
-  --theme-app-toolbar-button-background-color: $aca-toolbar-button-background-color,
-  --theme-user-initials-background-color: $aca-user-initials-background,
-  --theme-user-intials-text-color: $aca-user-initials-text-color
+  --theme-search-chip-icon-color: $search-chip-icon-color,
+  --theme-disabled-chip-background-color: $disabled-chip-background-color
 );
 
 // propagates SCSS variables into the CSS variables scope
diff --git a/projects/aca-content/tsconfig.lib.json b/projects/aca-content/tsconfig.lib.json
index 8532fb4c6..5b863a5b8 100644
--- a/projects/aca-content/tsconfig.lib.json
+++ b/projects/aca-content/tsconfig.lib.json
@@ -3,10 +3,27 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
+    "target": "es2020",
+    "moduleResolution": "node",
+    "sourceMap": true,
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,
-    "types": []
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "types": [],
+    "lib": [
+      "dom",
+      "es2020"
+    ]
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "enableResourceInlining": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
   },
   "exclude": [
     "test.ts",
diff --git a/projects/aca-content/tsconfig.lib.prod.json b/projects/aca-content/tsconfig.lib.prod.json
index fc8229de4..de0d99b65 100644
--- a/projects/aca-content/tsconfig.lib.prod.json
+++ b/projects/aca-content/tsconfig.lib.prod.json
@@ -7,7 +7,6 @@
       "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"],
       "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"],
       "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"],
-      "@alfresco/aca-folder-rules": ["dist/@alfresco/aca-folder-rules"],
       "@alfresco/aca-viewer": ["dist/@alfresco/aca-viewer"],
       "@alfresco/aca-preview": ["dist/@alfresco/aca-preview"]
     },
diff --git a/projects/aca-folder-rules/README.md b/projects/aca-folder-rules/README.md
deleted file mode 100644
index 8854b79d8..000000000
--- a/projects/aca-folder-rules/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Folder Rules
-
-## Build
-
-Run `nx build aca-folder-rules` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Running unit tests
-
-Run `nx test aca-folder-rules` to execute the unit tests via [Karma](https://karma-runner.github.io).
diff --git a/projects/aca-folder-rules/karma.conf.js b/projects/aca-folder-rules/karma.conf.js
deleted file mode 100644
index 6c900ccaf..000000000
--- a/projects/aca-folder-rules/karma.conf.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-const { join } = require('path');
-const getBaseKarmaConfig = require('../../karma.conf');
-
-module.exports = function (config) {
-  const baseConfig = getBaseKarmaConfig();
-  config.set({
-    ...baseConfig,
-    coverageReporter: {
-      ...baseConfig.coverageReporter,
-      dir: join(__dirname, '../../coverage/aca-folder-rules'),
-    },
-  });
-};
diff --git a/projects/aca-folder-rules/ng-package.json b/projects/aca-folder-rules/ng-package.json
deleted file mode 100644
index cbd0584c8..000000000
--- a/projects/aca-folder-rules/ng-package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/@alfresco/aca-folder-rules",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  },
-  "assets": [
-    "assets"
-  ]
-}
diff --git a/projects/aca-folder-rules/package.json b/projects/aca-folder-rules/package.json
deleted file mode 100644
index f24a104aa..000000000
--- a/projects/aca-folder-rules/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@alfresco/aca-folder-rules",
-  "version": "0.0.1",
-  "license": "LGPL-3.0",
-  "peerDependencies": {
-    "@angular/common": "^14.1.0",
-    "@angular/core": "^14.1.0",
-    "@alfresco/adf-core": "^6.1.0-0",
-    "@alfresco/adf-content-services": "^6.1.0-0",
-    "@alfresco/adf-extensions": "^6.1.0-0",
-    "@alfresco/js-api": "^6.1.0-0",
-    "@angular/animations": "^14.1.3",
-    "@angular/cdk": "^14.1.3",
-    "@angular/forms": "^14.1.3",
-    "@angular/material": "^14.1.3",
-    "@ngx-translate/core": "^14.0.0",
-    "rxjs": "6.6.6",
-    "tslib": "^2.0.0",
-    "zone.js": "0.11.8"
-  },
-  "dependencies": {
-    "tslib": "^2.3.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/alfresco-content-app.git"
-  }
-}
diff --git a/projects/aca-folder-rules/project.json b/projects/aca-folder-rules/project.json
deleted file mode 100644
index c56130a2a..000000000
--- a/projects/aca-folder-rules/project.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "name": "aca-folder-rules",
-  "projectType": "library",
-  "sourceRoot": "projects/aca-folder-rules/src",
-  "prefix": "lib",
-  "targets": {
-    "build": {
-      "executor": "@angular-devkit/build-angular:ng-packagr",
-      "options": {
-        "tsConfig": "projects/aca-folder-rules/tsconfig.lib.json",
-        "project": "projects/aca-folder-rules/ng-package.json"
-      },
-      "configurations": {
-        "production": {
-          "tsConfig": "projects/aca-folder-rules/tsconfig.lib.prod.json"
-        }
-      },
-      "defaultConfiguration": "production",
-      "outputs": [
-        "{workspaceRoot}/dist/@alfresco/aca-folder-rules"
-      ]
-    },
-    "test": {
-      "executor": "@angular-devkit/build-angular:karma",
-      "options": {
-        "codeCoverage": true,
-        "main": "projects/aca-folder-rules/src/test.ts",
-        "tsConfig": "projects/aca-folder-rules/tsconfig.spec.json",
-        "karmaConfig": "projects/aca-folder-rules/karma.conf.js"
-      },
-      "configurations": {
-        "adfprod": {
-          "tsConfig": "projects/aca-folder-rules/tsconfig.spec.adf.json"
-        }
-      }
-    },
-    "lint": {
-      "executor": "@angular-eslint/builder:lint",
-      "options": {
-        "lintFilePatterns": [
-          "projects/aca-folder-rules/**/*.ts",
-          "projects/aca-folder-rules/**/*.html"
-        ],
-        "cache": true,
-        "cacheLocation": ".eslintcache",
-        "ignorePath": ".eslintignore"
-      },
-      "outputs": [
-        "{options.outputFile}"
-      ]
-    }
-  }
-}
diff --git a/projects/aca-folder-rules/src/test.ts b/projects/aca-folder-rules/src/test.ts
deleted file mode 100644
index 24bdc445c..000000000
--- a/projects/aca-folder-rules/src/test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
-
-declare const require: {
-  context(
-    path: string,
-    deep?: boolean,
-    filter?: RegExp
-  ): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/projects/aca-folder-rules/tsconfig.lib.json b/projects/aca-folder-rules/tsconfig.lib.json
deleted file mode 100644
index a5aa46ace..000000000
--- a/projects/aca-folder-rules/tsconfig.lib.json
+++ /dev/null
@@ -1,25 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/lib",
-    "target": "es2020",
-    "declaration": true,
-    "declarationMap": true,
-    "inlineSources": true,
-    "types": [],
-    "lib": [
-      "dom",
-      "es2020"
-    ]
-  },
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true,
-    "strictMetadataEmit": true,
-    "enableResourceInlining": true
-  },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
-}
diff --git a/projects/aca-folder-rules/tsconfig.lib.prod.json b/projects/aca-folder-rules/tsconfig.lib.prod.json
deleted file mode 100644
index 2d277e037..000000000
--- a/projects/aca-folder-rules/tsconfig.lib.prod.json
+++ /dev/null
@@ -1,15 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "./tsconfig.lib.json",
-  "compilerOptions": {
-    "declarationMap": false,
-    "paths": {
-      "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"],
-      "@alfresco/aca-shared/store": ["dist/@alfresco/aca-shared/store"],
-      "@alfresco/aca-shared/rules": ["dist/@alfresco/aca-shared/rules"]
-    }
-  },
-  "angularCompilerOptions": {
-    "enableIvy": false
-  }
-}
diff --git a/projects/aca-folder-rules/tsconfig.spec.adf.json b/projects/aca-folder-rules/tsconfig.spec.adf.json
deleted file mode 100644
index 04a6994be..000000000
--- a/projects/aca-folder-rules/tsconfig.spec.adf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "extends": "../../tsconfig.adf.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "files": [
-    "src/test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/projects/aca-folder-rules/tsconfig.spec.json b/projects/aca-folder-rules/tsconfig.spec.json
deleted file mode 100644
index 715dd0a5d..000000000
--- a/projects/aca-folder-rules/tsconfig.spec.json
+++ /dev/null
@@ -1,17 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "files": [
-    "src/test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
diff --git a/projects/aca-playwright-shared/package.json b/projects/aca-playwright-shared/package.json
new file mode 100644
index 000000000..75014efa3
--- /dev/null
+++ b/projects/aca-playwright-shared/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "aca-playwright-shared",
+  "version": "3.0.0",
+  "license": "LGPL-3.0",
+  "main": "src/index.ts",
+  "dependencies": {
+    "tslib": "^2.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Alfresco/alfresco-content-app.git"
+  }
+}
diff --git a/projects/aca-playwright-shared/project.json b/projects/aca-playwright-shared/project.json
new file mode 100644
index 000000000..fc840b198
--- /dev/null
+++ b/projects/aca-playwright-shared/project.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "playwright-shared",
+  "sourceRoot": "projects/aca-playwright-shared/src",
+  "projectType": "library",
+  "prefix": "lib"
+}
diff --git a/e2e/playwright/shared/api/api-client-factory.ts b/projects/aca-playwright-shared/src/api/api-client-factory.ts
similarity index 99%
rename from e2e/playwright/shared/api/api-client-factory.ts
rename to projects/aca-playwright-shared/src/api/api-client-factory.ts
index e02cb1b4e..907635b9d 100644
--- a/e2e/playwright/shared/api/api-client-factory.ts
+++ b/projects/aca-playwright-shared/src/api/api-client-factory.ts
@@ -37,9 +37,9 @@ import {
   SitesApi,
   UploadApi
 } from '@alfresco/js-api';
-import { users } from '../page-objects';
 import { logger } from '@alfresco/adf-cli/scripts/logger';
 import { ActionTypes, Rule } from './rules-api';
+import { users } from '../base-config';
 
 export interface AcaBackend {
   sites: SitesApi;
diff --git a/e2e/playwright/shared/api/index.ts b/projects/aca-playwright-shared/src/api/index.ts
similarity index 100%
rename from e2e/playwright/shared/api/index.ts
rename to projects/aca-playwright-shared/src/api/index.ts
diff --git a/e2e/playwright/shared/api/rules-api.ts b/projects/aca-playwright-shared/src/api/rules-api.ts
similarity index 100%
rename from e2e/playwright/shared/api/rules-api.ts
rename to projects/aca-playwright-shared/src/api/rules-api.ts
diff --git a/e2e/playwright/shared/page-objects/global-variables.ts b/projects/aca-playwright-shared/src/base-config/global-variables.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/global-variables.ts
rename to projects/aca-playwright-shared/src/base-config/global-variables.ts
diff --git a/e2e/playwright/shared/base-config/global.setup.ts b/projects/aca-playwright-shared/src/base-config/global.setup.ts
similarity index 51%
rename from e2e/playwright/shared/base-config/global.setup.ts
rename to projects/aca-playwright-shared/src/base-config/global.setup.ts
index 678969a2c..8d1ce5d9b 100644
--- a/e2e/playwright/shared/base-config/global.setup.ts
+++ b/projects/aca-playwright-shared/src/base-config/global.setup.ts
@@ -24,39 +24,49 @@
 
 import { chromium, FullConfig } from '@playwright/test';
 import { LoginPage } from '../page-objects';
+import { CustomConfig } from '../models';
+import { users } from './global-variables';
 import fs from 'fs';
+import { paths } from '../utils/paths';
 
-const E2E_HOST = process.env.PLAYWRIGHT_E2E_HOST;
-const E2E_PORT = process.env.PLAYWRIGHT_E2E_PORT;
-const acsAdminUser = process.env.ADMIN_EMAIL;
-const acsAdminUserPassword = process.env.ADMIN_PASSWORD;
-
-async function globalSetup(config: FullConfig) {
+async function globalSetup(config: FullConfig<CustomConfig>) {
   const { use } = config.projects[0];
 
-  let baseUrl: string;
+  await removeOutputFolders();
+  await createOutputFolders();
 
-  if (use.baseURL) {
-    baseUrl = use.baseURL;
-  } else {
-    if (E2E_HOST?.match(/localhost/)) {
-      baseUrl = `${E2E_HOST}:${E2E_PORT}`;
-    } else {
-      baseUrl = E2E_HOST;
+  if (use.users) {
+    for (const user of use.users) {
+      if (users[user].username) {
+        const browser = await chromium.launch();
+        const page = await browser.newPage();
+        const loginPage = new LoginPage(page);
+        await page.goto(use.baseURL);
+        await loginPage.loginUser({ username: users[user].username, password: users[user].password }, {
+          withNavigation: false,
+          waitForLoading: true
+        });
+        await page.context().storageState({ path: `${paths.userStates}/${user}UserState.json` });
+        await browser.close();
+      } else {
+        throw new Error(`Add credentials for ${user} to you .env file!`);
+      }
     }
   }
+}
 
-  const browser = await chromium.launch({
-    args: ['--disable-web-security']
-  });
-  const page = await browser.newPage();
-  const loginPage = new LoginPage(page);
+async function createOutputFolders() {
+  for (const path in paths) {
+    if (!fs.existsSync(paths[path])) {
+      fs.mkdirSync(paths[path], { recursive: true });
+    }
+  }
+}
 
-  fs.mkdirSync(`./storage-state`, { recursive: true });
-  await page.goto(baseUrl);
-  await loginPage.loginUser({ username: acsAdminUser, password: acsAdminUserPassword }, { withNavigation: false, waitForLoading: true });
-  await page.context().storageState({ path: `./storage-state/AdminUserState.json` });
-  await browser.close();
+async function removeOutputFolders() {
+  if (fs.existsSync(paths.rootFolder)) {
+    fs.rmdirSync(paths.rootFolder, { recursive: true });
+  }
 }
 
 export default globalSetup;
diff --git a/projects/aca-playwright-shared/src/base-config/index.ts b/projects/aca-playwright-shared/src/base-config/index.ts
new file mode 100644
index 000000000..0944bc93d
--- /dev/null
+++ b/projects/aca-playwright-shared/src/base-config/index.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export * from './global.setup';
+export * from './playwright.config';
+export * from './global-variables';
diff --git a/e2e/playwright/tests/folder-rules/playwright.config.ts b/projects/aca-playwright-shared/src/base-config/playwright.config.ts
similarity index 70%
rename from e2e/playwright/tests/folder-rules/playwright.config.ts
rename to projects/aca-playwright-shared/src/base-config/playwright.config.ts
index 0ec69eeea..928870680 100644
--- a/e2e/playwright/tests/folder-rules/playwright.config.ts
+++ b/projects/aca-playwright-shared/src/base-config/playwright.config.ts
@@ -22,43 +22,49 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { PlaywrightTestConfig, devices } from '@playwright/test';
+import { PlaywrightTestConfig, ReporterDescription, devices } from '@playwright/test';
+import { timeouts } from '../utils';
 
-require('dotenv').config();
+require('@alfresco/adf-cli/tooling').dotenvConfig();
+const { env } = process;
 
-export const config: PlaywrightTestConfig = {
-  testDir: './',
+const report: ReporterDescription[] = (env.CI) ? [['github']] : [['html']];
+
+export const getGlobalConfig: PlaywrightTestConfig = {
+  timeout: timeouts.globalTest,
+  globalTimeout: timeouts.globalSpec,
   expect: {
     /**
      * Maximum time expect() should wait for the condition to be met.
      * For example in `await expect(locator).toHaveText();`
      */
-    timeout: 10000
+    timeout: timeouts.medium
   },
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
+  forbidOnly: !!env.CI,
   /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
+  retries: env.CI ? 2 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: 5,
-  timeout: 40000,
-
-  globalSetup: require.resolve('../../shared/base-config/global.setup'),
+  workers: 3,
+  reporter: [['list'], ...report],
+  globalSetup: require.resolve('./global.setup'),
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
-    storageState: './storage-state/AdminUserState.json',
     actionTimeout: 0,
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: process.env.PLAYWRIGHT_E2E_HOST,
+    baseURL: env.PLAYWRIGHT_E2E_HOST,
+    headless: !!env.PLAYWRIGHT_HEADLESS ? (env.PLAYWRIGHT_HEADLESS === 'true') : !!env.CI,
     ignoreHTTPSErrors: true,
     bypassCSP: true,
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
+    trace: 'retain-on-failure',
+    video: 'retain-on-failure',
+    screenshot: 'only-on-failure',
     launchOptions: {
       devtools: false,
-      args: ['--disable-web-security', '--no-sandbox', '--disable-site-isolation-trials']
+      args: ['--no-sandbox', '--disable-site-isolation-trials']
     }
   },
 
@@ -70,7 +76,5 @@ export const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome']
       }
     }
-  ]
+  ],
 };
-
-export default config;
diff --git a/e2e/playwright/tests/folder-rules/fixtures/page-initialization.ts b/projects/aca-playwright-shared/src/fixtures/page-initialization.ts
similarity index 89%
rename from e2e/playwright/tests/folder-rules/fixtures/page-initialization.ts
rename to projects/aca-playwright-shared/src/fixtures/page-initialization.ts
index 84ef9e860..b9a701c7c 100644
--- a/e2e/playwright/tests/folder-rules/fixtures/page-initialization.ts
+++ b/projects/aca-playwright-shared/src/fixtures/page-initialization.ts
@@ -22,9 +22,9 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { PersonalFilesPage, NodesPage } from '../page-objects';
+
 import { test as base } from '@playwright/test';
-import { ApiClientFactory } from '@alfresco/playwright-shared';
+import { ApiClientFactory, NodesPage, PersonalFilesPage } from '../';
 
 interface Pages {
   personalFiles: PersonalFilesPage;
@@ -32,7 +32,7 @@ interface Pages {
 }
 
 interface Api {
-  apiClient: ApiClientFactory;
+  superAdminApiClient: ApiClientFactory;
 }
 
 export const test = base.extend<Pages & Api>({
@@ -43,7 +43,7 @@ export const test = base.extend<Pages & Api>({
     await use(new NodesPage(page));
   },
   // eslint-disable-next-line no-empty-pattern
-  apiClient: async ({}, use) => {
+  superAdminApiClient: async ({ }, use) => {
     const apiClient = new ApiClientFactory();
     await apiClient.setUpAcaBackend('admin');
     await use(apiClient);
diff --git a/e2e/playwright/shared/index.ts b/projects/aca-playwright-shared/src/index.ts
similarity index 94%
rename from e2e/playwright/shared/index.ts
rename to projects/aca-playwright-shared/src/index.ts
index 41459a82d..24b44026e 100644
--- a/e2e/playwright/shared/index.ts
+++ b/projects/aca-playwright-shared/src/index.ts
@@ -26,3 +26,5 @@ export * from './api';
 export * from './base-config';
 export * from './models';
 export * from './page-objects';
+export * from './fixtures/page-initialization';
+export * from './utils';
diff --git a/e2e/playwright/shared/page-objects/components/index.ts b/projects/aca-playwright-shared/src/models/custom-config.ts
similarity index 91%
rename from e2e/playwright/shared/page-objects/components/index.ts
rename to projects/aca-playwright-shared/src/models/custom-config.ts
index 9b5e828c2..64f83e05b 100644
--- a/e2e/playwright/shared/page-objects/components/index.ts
+++ b/projects/aca-playwright-shared/src/models/custom-config.ts
@@ -22,6 +22,8 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './base.component';
-export * from './snack-bar.component';
-export * from './spinner.component';
+import { users } from '../base-config';
+
+export interface CustomConfig {
+  users: Array<keyof typeof users>;
+}
diff --git a/e2e/playwright/shared/models/index.ts b/projects/aca-playwright-shared/src/models/index.ts
similarity index 97%
rename from e2e/playwright/shared/models/index.ts
rename to projects/aca-playwright-shared/src/models/index.ts
index 728baa1f3..57b33edbd 100644
--- a/e2e/playwright/shared/models/index.ts
+++ b/projects/aca-playwright-shared/src/models/index.ts
@@ -23,3 +23,4 @@
  */
 
 export * from './user-model';
+export * from './custom-config';
diff --git a/e2e/playwright/shared/models/user-model.ts b/projects/aca-playwright-shared/src/models/user-model.ts
similarity index 100%
rename from e2e/playwright/shared/models/user-model.ts
rename to projects/aca-playwright-shared/src/models/user-model.ts
diff --git a/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts b/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts
new file mode 100644
index 000000000..dc8c10ee4
--- /dev/null
+++ b/projects/aca-playwright-shared/src/page-objects/components/aca-header.component.ts
@@ -0,0 +1,35 @@
+/*!
+  * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+  *
+  * Alfresco Example Content Application
+  *
+  * This file is part of the Alfresco Example Content Application.
+  * If the software was purchased under a paid Alfresco license, the terms of
+  * the paid license agreement will prevail. Otherwise, the software is
+  * provided under the following open source license terms:
+  *
+  * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Lesser General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * GNU Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public License
+  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+  */
+
+ import { BaseComponent } from './base.component';
+ import { Page } from '@playwright/test';
+
+ export class AcaHeader extends BaseComponent {
+   private static rootElement = 'adf-toolbar';
+   public createButton = this.getChild('[id="app.toolbar.create"]');
+
+   constructor(page: Page) {
+     super(page, AcaHeader.rootElement);
+   }
+ }
diff --git a/e2e/playwright/tests/folder-rules/page-objects/components/actions-dropdown.component.ts b/projects/aca-playwright-shared/src/page-objects/components/actions-dropdown.component.ts
similarity index 98%
rename from e2e/playwright/tests/folder-rules/page-objects/components/actions-dropdown.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/actions-dropdown.component.ts
index 640bf0ff1..d6d5d57c2 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/components/actions-dropdown.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/actions-dropdown.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Locator, Page } from '@playwright/test';
-import { BaseComponent } from '@alfresco/playwright-shared';
+import { BaseComponent } from './base.component';
 
 export enum ActionType {
   AddAspect = 'Add aspect',
@@ -76,7 +76,7 @@ export class ActionsDropdownComponent extends BaseComponent {
     }
     await this.actionDropdownLocator.nth(index).click();
     const option = this.getOptionLocator(action);
-    await option.nth(0).click();
+    await option.click();
   }
 
   async dropdownSelection(selectValue: string, locator: string, index: number): Promise<void> {
diff --git a/e2e/playwright/shared/page-objects/components/base.component.ts b/projects/aca-playwright-shared/src/page-objects/components/base.component.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/components/base.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/base.component.ts
diff --git a/e2e/playwright/tests/folder-rules/page-objects/components/conditions.component.ts b/projects/aca-playwright-shared/src/page-objects/components/conditions.component.ts
similarity index 90%
rename from e2e/playwright/tests/folder-rules/page-objects/components/conditions.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/conditions.component.ts
index f54bedf19..a3bb86c5a 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/components/conditions.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/conditions.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Locator, Page } from '@playwright/test';
-import { ManageRulesDialogComponent } from './manage-rules-dialog.component';
+import { ManageRulesDialogComponent } from './manageRules/manage-rules-dialog.component';
 
 export enum Field {
   Name = 'Name',
@@ -61,17 +61,13 @@ export class ConditionComponent extends ManageRulesDialogComponent {
     await this.addConditionButton.click();
     await this.selectField(fields, index);
     await this.selectComparator(comparators, index);
-    await this.typeConditionValue(value, index);
-  }
-
-  async createConditionGroup(): Promise<void> {
-    await this.addConditionGroupButton.click();
+    await this.valueField.nth(index).type(value);
   }
 
   async addConditionGroup(fields: Partial<Field>, comparators: Partial<Comparator>, value: string, index: number): Promise<void> {
     await this.addConditionButton.nth(0).click();
     await this.selectField(fields, index);
     await this.selectComparator(comparators, index);
-    await this.typeConditionValue(value, index);
+    await this.valueField.nth(index).type(value);
   }
 }
diff --git a/e2e/playwright/shared/page-objects/components/dataTable/data-table.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/components/dataTable/data-table.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
diff --git a/e2e/playwright/shared/page-objects/components/dataTable/index.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/index.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/components/dataTable/index.ts
rename to projects/aca-playwright-shared/src/page-objects/components/dataTable/index.ts
diff --git a/e2e/playwright/shared/page-objects/components/mat-menu.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/mat-menu.component.ts
similarity index 97%
rename from e2e/playwright/shared/page-objects/components/mat-menu.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/dataTable/mat-menu.component.ts
index f79ca4027..82c466906 100644
--- a/e2e/playwright/shared/page-objects/components/mat-menu.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/dataTable/mat-menu.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Page } from '@playwright/test';
-import { BaseComponent } from './base.component';
+import { BaseComponent } from '../base.component';
 
 export class MatMenuComponent extends BaseComponent {
   private static rootElement = '.mat-menu-content';
@@ -34,7 +34,6 @@ export class MatMenuComponent extends BaseComponent {
 
   public getMenuItemsLocator = this.getChild('button');
   public getMenuItemTextLocator = this.getChild('[data-automation-id="menu-item-title"]');
-
-  public getButtonByText = (text: string) => this.getChild('button', { hasText: text });
   public createFolder = this.getChild('[id="app.create.folder"]');
+  public getButtonByText = (text: string) => this.getChild('button', { hasText: text });
 }
diff --git a/e2e/playwright/shared/page-objects/components/dataTable/toolbar.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/toolbar.component.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/components/dataTable/toolbar.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/dataTable/toolbar.component.ts
diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-folder-dialog.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-folder-dialog.component.ts
new file mode 100644
index 000000000..bc3a97d22
--- /dev/null
+++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/adf-folder-dialog.component.ts
@@ -0,0 +1,37 @@
+/*!
+  * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+  *
+  * Alfresco Example Content Application
+  *
+  * This file is part of the Alfresco Example Content Application.
+  * If the software was purchased under a paid Alfresco license, the terms of
+  * the paid license agreement will prevail. Otherwise, the software is
+  * provided under the following open source license terms:
+  *
+  * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Lesser General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+  * (at your option) any later version.
+  *
+  * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  * GNU Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public License
+  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+  */
+
+import { BaseComponent } from '../base.component';
+import { Page } from '@playwright/test';
+
+export class AdfFolderDialogComponent extends BaseComponent {
+  private static rootElement = 'adf-folder-dialog';
+
+  public folderNameInputLocator = this.getChild('[id="adf-folder-name-input"]');
+  public createButton = this.getChild('[id="adf-folder-create-button"]');
+
+  constructor(page: Page) {
+    super(page, AdfFolderDialogComponent.rootElement);
+  }
+}
diff --git a/e2e/playwright/shared/base-config/index.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
similarity index 96%
rename from e2e/playwright/shared/base-config/index.ts
rename to projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
index 8740deab6..f659ffb7d 100644
--- a/e2e/playwright/shared/base-config/index.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/dialogs/index.ts
@@ -22,4 +22,4 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './global.setup';
+export * from './adf-folder-dialog.component';
diff --git a/projects/aca-playwright-shared/src/page-objects/components/index.ts b/projects/aca-playwright-shared/src/page-objects/components/index.ts
new file mode 100644
index 000000000..2286fc706
--- /dev/null
+++ b/projects/aca-playwright-shared/src/page-objects/components/index.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export * from './snackBar/snack-bar.component';
+export * from './dataTable';
+export * from './dialogs';
+export * from './manageRules';
+export * from './base.component';
+export * from './spinner.component';
+export * from './actions-dropdown.component';
+export * from './conditions.component';
+export * from './pagination.component';
+
diff --git a/e2e/playwright/tests/folder-rules/page-objects/index.ts b/projects/aca-playwright-shared/src/page-objects/components/manageRules/index.ts
similarity index 92%
rename from e2e/playwright/tests/folder-rules/page-objects/index.ts
rename to projects/aca-playwright-shared/src/page-objects/components/manageRules/index.ts
index f237a20b8..78bb1806b 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/index.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/manageRules/index.ts
@@ -22,5 +22,5 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './pages/personal-files.page';
-export * from './pages/nodes.page';
+export * from './manage-rules-dialog.component';
+export * from './manage-rules.component';
diff --git a/e2e/playwright/tests/folder-rules/page-objects/components/manage-rules-dialog.component.ts b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules-dialog.component.ts
similarity index 78%
rename from e2e/playwright/tests/folder-rules/page-objects/components/manage-rules-dialog.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules-dialog.component.ts
index a4575d982..7b463cfdb 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/components/manage-rules-dialog.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules-dialog.component.ts
@@ -22,29 +22,22 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BaseComponent } from '@alfresco/playwright-shared';
+import { BaseComponent } from '../base.component';
 import { Page } from '@playwright/test';
 
 export class ManageRulesDialogComponent extends BaseComponent {
   private static rootElement = 'aca-edit-rule-dialog';
 
   public createRuleButton = this.getChild('[data-automation-id="edit-rule-dialog-submit"]');
-  private ruleNameInputLocator = this.getChild('[id="rule-details-name-input"]');
+  public ruleNameInputLocator = this.getChild('[id="rule-details-name-input"]');
   public addConditionButton = this.getChild('[data-automation-id="add-condition-button"]');
   public addConditionGroupButton = this.getChild('[data-automation-id="add-group-button"]');
   public fieldDropDown = this.getChild('[data-automation-id="field-select"]');
   public comparatorDropDown = this.getChild('[data-automation-id="comparator-select"]');
-  private valueField = this.getChild('[data-automation-id="value-input"]');
+  public valueField = this.getChild('[data-automation-id="value-input"]');
 
   constructor(page: Page) {
     super(page, ManageRulesDialogComponent.rootElement);
   }
 
-  async typeRuleName(ruleName: string): Promise<void> {
-    await this.ruleNameInputLocator.type(ruleName, { delay: 50 });
-  }
-
-  async typeConditionValue(ruleName: string, index: number): Promise<void> {
-    await this.valueField.nth(index).type(ruleName, { delay: 50 });
-  }
 }
diff --git a/e2e/playwright/tests/folder-rules/page-objects/components/manage-rules.component.ts b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts
similarity index 96%
rename from e2e/playwright/tests/folder-rules/page-objects/components/manage-rules.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts
index a2fdecc0e..b805c4fc7 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/components/manage-rules.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/manageRules/manage-rules.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Locator, Page } from '@playwright/test';
-import { BaseComponent } from '@alfresco/playwright-shared';
+import { BaseComponent } from '../base.component';
 
 export class ManageRules extends BaseComponent {
   private static rootElement = '.aca-manage-rules';
diff --git a/e2e/playwright/shared/page-objects/components/pagination.component.ts b/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
similarity index 97%
rename from e2e/playwright/shared/page-objects/components/pagination.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
index dee316d47..e964929f3 100644
--- a/e2e/playwright/shared/page-objects/components/pagination.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/pagination.component.ts
@@ -24,7 +24,7 @@
 
 import { BaseComponent } from './base.component';
 import { Page } from '@playwright/test';
-import { MatMenuComponent } from './mat-menu.component';
+import { MatMenuComponent } from './dataTable/mat-menu.component';
 
 export enum PaginationActionsType {
   PageSizeSelector = 'Page size selector',
diff --git a/e2e/playwright/shared/page-objects/components/snack-bar.component.ts b/projects/aca-playwright-shared/src/page-objects/components/snackBar/snack-bar.component.ts
similarity index 96%
rename from e2e/playwright/shared/page-objects/components/snack-bar.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/snackBar/snack-bar.component.ts
index 877c1a49d..0c160a03c 100644
--- a/e2e/playwright/shared/page-objects/components/snack-bar.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/snackBar/snack-bar.component.ts
@@ -23,7 +23,7 @@
  */
 
 import { Page } from '@playwright/test';
-import { BaseComponent } from './base.component';
+import { BaseComponent } from '../base.component';
 
 export class SnackBarComponent extends BaseComponent {
   private static rootElement = 'simple-snack-bar';
diff --git a/e2e/playwright/shared/page-objects/components/spinner.component.ts b/projects/aca-playwright-shared/src/page-objects/components/spinner.component.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/components/spinner.component.ts
rename to projects/aca-playwright-shared/src/page-objects/components/spinner.component.ts
diff --git a/e2e/playwright/shared/page-objects/pages/index.ts b/projects/aca-playwright-shared/src/page-objects/index.ts
similarity index 95%
rename from e2e/playwright/shared/page-objects/pages/index.ts
rename to projects/aca-playwright-shared/src/page-objects/index.ts
index 95963574e..b26b36a44 100644
--- a/e2e/playwright/shared/page-objects/pages/index.ts
+++ b/projects/aca-playwright-shared/src/page-objects/index.ts
@@ -22,5 +22,5 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-export * from './base.page';
-export * from './login.page';
+export * from './components';
+export * from './pages';
diff --git a/e2e/playwright/shared/page-objects/pages/base.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/base.page.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/pages/base.page.ts
rename to projects/aca-playwright-shared/src/page-objects/pages/base.page.ts
diff --git a/projects/aca-playwright-shared/src/page-objects/pages/index.ts b/projects/aca-playwright-shared/src/page-objects/pages/index.ts
new file mode 100644
index 000000000..c1d1ae1c1
--- /dev/null
+++ b/projects/aca-playwright-shared/src/page-objects/pages/index.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export * from './base.page';
+export * from './login.page';
+export * from './nodes.page';
+export * from './personal-files.page';
diff --git a/e2e/playwright/shared/page-objects/pages/login.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/login.page.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/pages/login.page.ts
rename to projects/aca-playwright-shared/src/page-objects/pages/login.page.ts
diff --git a/e2e/playwright/tests/folder-rules/page-objects/pages/nodes.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/nodes.page.ts
similarity index 80%
rename from e2e/playwright/tests/folder-rules/page-objects/pages/nodes.page.ts
rename to projects/aca-playwright-shared/src/page-objects/pages/nodes.page.ts
index 34f170b0d..4e8756955 100644
--- a/e2e/playwright/tests/folder-rules/page-objects/pages/nodes.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/nodes.page.ts
@@ -22,12 +22,10 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BasePage, ToolbarComponent } from '@alfresco/playwright-shared';
 import { Page } from '@playwright/test';
-import { ManageRulesDialogComponent } from '../components/manage-rules-dialog.component';
-import { ActionsDropdownComponent } from '../components/actions-dropdown.component';
-import { ConditionComponent } from '../components/conditions.component';
-import { ManageRules } from '../components/manage-rules.component';
+import { ConditionComponent, ManageRules, ManageRulesDialogComponent, ToolbarComponent, ActionsDropdownComponent } from '../components';
+import { BasePage } from './base.page';
+
 
 export class NodesPage extends BasePage {
   private static pageUrl = 'nodes';
diff --git a/e2e/playwright/shared/page-objects/pages/personal-files.page.ts b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
similarity index 80%
rename from e2e/playwright/shared/page-objects/pages/personal-files.page.ts
rename to projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
index f8d9edeb3..7845ee51b 100644
--- a/e2e/playwright/shared/page-objects/pages/personal-files.page.ts
+++ b/projects/aca-playwright-shared/src/page-objects/pages/personal-files.page.ts
@@ -22,11 +22,12 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { BasePage, DataTableComponent } from '@alfresco/playwright-shared';
+
 import { Page } from '@playwright/test';
-import { AcaPageLayoutHeader } from '../components/aca-page-layout-header.component';
-import { MatMenuComponent } from '../components/mat-menu.component';
-import { AdfFolderDialogComponent } from '../components/adf-folder-dialog.component';
+import { BasePage } from './base.page';
+import { DataTableComponent, MatMenuComponent } from '../components';
+import { AcaHeader } from '../components/aca-header.component';
+import { AdfFolderDialogComponent } from '../components/dialogs';
 
 export class PersonalFilesPage extends BasePage {
   private static pageUrl = 'personal-files';
@@ -35,11 +36,8 @@ export class PersonalFilesPage extends BasePage {
     super(page, PersonalFilesPage.pageUrl);
   }
 
-  public acaHeader = new AcaPageLayoutHeader(this.page);
-
+  public acaHeader = new AcaHeader(this.page);
   public matMenu = new MatMenuComponent(this.page);
-
   public folderDialog = new AdfFolderDialogComponent(this.page);
-
   public dataTable = new DataTableComponent(this.page);
 }
diff --git a/e2e/playwright/shared/page-objects/playwright-base.ts b/projects/aca-playwright-shared/src/page-objects/playwright-base.ts
similarity index 100%
rename from e2e/playwright/shared/page-objects/playwright-base.ts
rename to projects/aca-playwright-shared/src/page-objects/playwright-base.ts
diff --git a/projects/aca-playwright-shared/src/utils/exclude-tests.ts b/projects/aca-playwright-shared/src/utils/exclude-tests.ts
new file mode 100644
index 000000000..aa89a8a29
--- /dev/null
+++ b/projects/aca-playwright-shared/src/utils/exclude-tests.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2005 - 2021 Alfresco Software, Ltd. All rights reserved.
+ *
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+
+import { logger } from '@alfresco/adf-cli/scripts/logger';
+
+export const getExcludedTestsRegExpArray = (excludedJson: any, projectName: string) => {
+    const prefix = `[ 🎭 Playwright Excludes - ${projectName} ]`;
+    const objectKeys = Object.keys(excludedJson);
+
+    if (!objectKeys.length) {
+        logger.info(`${prefix} ✅ No excluded tests 🎉 `);
+    } else {
+        logger.warn(`${prefix} ❌ Tests excluded because of 🐛 : ${objectKeys}`);
+    }
+
+    return objectKeys.map((key) => new RegExp(key));
+};
diff --git a/projects/aca-playwright-shared/src/utils/index.ts b/projects/aca-playwright-shared/src/utils/index.ts
new file mode 100644
index 000000000..984ce0272
--- /dev/null
+++ b/projects/aca-playwright-shared/src/utils/index.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export * from './paths';
+export * from './timeouts';
+export * from './exclude-tests';
+export * from './state-helper';
diff --git a/projects/aca-playwright-shared/src/utils/paths.ts b/projects/aca-playwright-shared/src/utils/paths.ts
new file mode 100644
index 000000000..e5055fe4a
--- /dev/null
+++ b/projects/aca-playwright-shared/src/utils/paths.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const rootFolder = 'e2e-output';
+
+export const paths = {
+    rootFolder,
+    allData: `${rootFolder}/playwright-data`,
+    files: `${rootFolder}/playwright-data/downloads`,
+    report: `${rootFolder}/playwright-data/report`,
+    userStates: `${rootFolder}/playwright-data/user-states`,
+};
diff --git a/projects/aca-playwright-shared/src/utils/state-helper.ts b/projects/aca-playwright-shared/src/utils/state-helper.ts
new file mode 100644
index 000000000..b2def1b98
--- /dev/null
+++ b/projects/aca-playwright-shared/src/utils/state-helper.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+import { resolve } from 'path';
+import { paths } from '.';
+import { users } from '../base-config';
+
+export function getUserState(user: UserType) {
+    return resolve(process.cwd(), `${paths.userStates}/${user}UserState.json`);
+}
+
+type UserType = keyof typeof users;
diff --git a/projects/aca-playwright-shared/src/utils/timeouts.ts b/projects/aca-playwright-shared/src/utils/timeouts.ts
new file mode 100644
index 000000000..31b43b13f
--- /dev/null
+++ b/projects/aca-playwright-shared/src/utils/timeouts.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+export const timeouts = {
+  typingDelay: 50,
+  tiny: 500,
+  short: 1000,
+  normal: 2000,
+  medium: 5000,
+  large: 10000,
+  extraLarge: 20 * 1000,
+  globalTest: 45 * 1000,
+  extendedTest: 120 * 1000,
+  webServer: 240 * 1000,
+  globalSpec: 60 * 10 * 1000
+};
diff --git a/e2e/playwright/shared/tsconfig.lib.json b/projects/aca-playwright-shared/tsconfig.lib.json
similarity index 75%
rename from e2e/playwright/shared/tsconfig.lib.json
rename to projects/aca-playwright-shared/tsconfig.lib.json
index 281b7ca83..6db207fbc 100644
--- a/e2e/playwright/shared/tsconfig.lib.json
+++ b/projects/aca-playwright-shared/tsconfig.lib.json
@@ -1,7 +1,7 @@
 {
-  "extends": "../../tsconfig.e2e.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../out-tsc/playwright-testing",
+    "outDir": "../../out-tsc/aca-playwright-testing",
     "target": "es2015",
     "module": "es2015",
     "moduleResolution": "node",
@@ -11,6 +11,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
+    "types": [],
     "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
@@ -20,5 +21,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/test.ts", "**/*.spec.ts"]
 }
diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
index 5a6e594d4..43fcf6f8b 100644
--- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
+++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, HostListener, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { Component, HostListener, Input, OnChanges, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { MinimalNodeEntity, MinimalNodeEntryEntity, SiteEntry } from '@alfresco/js-api';
 import { ContentActionRef, ExtensionsModule, SidebarTabRef } from '@alfresco/adf-extensions';
 import { Store } from '@ngrx/store';
@@ -37,11 +37,13 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { InfoDrawerModule, ToolbarModule } from '@alfresco/adf-core';
 import { SharedToolbarModule } from '../tool-bar/shared-toolbar.module';
 import { TranslateModule } from '@ngx-translate/core';
+
 @Component({
   standalone: true,
   imports: [CommonModule, TranslateModule, MatProgressBarModule, InfoDrawerModule, SharedToolbarModule, ExtensionsModule, ToolbarModule],
   selector: 'aca-info-drawer',
-  templateUrl: './info-drawer.component.html'
+  templateUrl: './info-drawer.component.html',
+  encapsulation: ViewEncapsulation.None
 })
 export class InfoDrawerComponent implements OnChanges, OnInit, OnDestroy {
   @Input()
diff --git a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.spec.ts b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.spec.ts
index 56c5aa182..a5631d6e8 100644
--- a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.spec.ts
+++ b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.spec.ts
@@ -36,7 +36,7 @@ describe('LockedByComponent', () => {
         }
       } as any
     };
-
+    component.ngOnInit();
     expect(component.text).toBe('owner-name');
   });
 });
diff --git a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
index 7d8a830cb..5b67e5bec 100644
--- a/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
+++ b/projects/aca-shared/src/lib/components/locked-by/locked-by.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy, ViewEncapsulation, OnInit } from '@angular/core';
 import { NodeEntry } from '@alfresco/js-api';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatIconModule } from '@angular/material/icon';
@@ -43,11 +43,13 @@ import { MatIconModule } from '@angular/material/icon';
     class: 'aca-locked-by'
   }
 })
-export class LockedByComponent {
+export class LockedByComponent implements OnInit {
   @Input()
   node: NodeEntry;
 
-  get text(): string {
-    return this.node?.entry?.properties?.['cm:lockOwner']?.displayName;
+  public text: string;
+
+  ngOnInit(): void {
+    this.text = this.node?.entry?.properties?.['cm:lockOwner']?.displayName;
   }
 }
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
index 0c5b20304..a5c31058f 100644
--- a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
+++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss
@@ -31,7 +31,7 @@
           align-items: center;
           border-radius: 6px;
           height: 32px;
-          background: var(--theme-app-toolbar-button-background-color);
+          background: var(--theme-grey-text-background-color);
           color: var(--theme-selected-text-color);
           line-height: 32px;
 
diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
index b023cd90e..c6817a2d6 100644
--- a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
+++ b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
@@ -22,7 +22,7 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input, ViewEncapsulation, HostListener, ViewChild, ViewChildren, QueryList, AfterViewInit } from '@angular/core';
+import { Component, Input, ViewEncapsulation, HostListener, ViewChild, ViewChildren, QueryList, AfterViewInit, OnInit } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
 import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
 import { ThemePalette } from '@angular/material/core';
@@ -34,7 +34,7 @@ import { ToolbarMenuItemComponent } from '../toolbar-menu-item/toolbar-menu-item
   encapsulation: ViewEncapsulation.None,
   host: { class: 'app-toolbar-menu' }
 })
-export class ToolbarMenuComponent implements AfterViewInit {
+export class ToolbarMenuComponent implements OnInit, AfterViewInit {
   @Input()
   actionRef: ContentActionRef;
 
@@ -56,15 +56,17 @@ export class ToolbarMenuComponent implements AfterViewInit {
     color?: string;
   };
 
-  get type(): string {
-    return this.data?.menuType || 'default';
-  }
+  type = 'default';
 
   @HostListener('document:keydown.Escape')
   handleKeydownEscape() {
     this.matTrigger.closeMenu();
   }
 
+  ngOnInit(): void {
+    this.type = this.data?.menuType || 'default';
+  }
+
   ngAfterViewInit(): void {
     const menuItems: MatMenuItem[] = [];
     this.toolbarMenuItems.forEach((toolbarMenuItem: ToolbarMenuItemComponent) => {
diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts
index 25171b21f..553576e9c 100644
--- a/projects/aca-shared/src/lib/services/app.service.ts
+++ b/projects/aca-shared/src/lib/services/app.service.ts
@@ -166,7 +166,9 @@ export class AppService implements OnDestroy {
       if (isReady) {
         this.loadRepositoryStatus();
         this.loadUserProfile();
-        this.openMobileAppDialog();
+        setTimeout(() => {
+          this.openMobileAppDialog();
+        });
       }
     });
 
diff --git a/protractor.conf.js b/protractor.conf.js
index e7ef12248..5186a8932 100755
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -5,14 +5,14 @@ require('dotenv').config({path: process.env.ENV_FILE});
 const path = require('path');
 const {SpecReporter} = require('jasmine-spec-reporter');
 const retry = require('protractor-retry-angular-cli').retry;
-const {saveScreenshots} = require('./e2e/e2e-config/utils/upload-output');
-const smartRunnerFactory = require('./e2e/smartrunner-factory');
+const {saveScreenshots} = require('./e2e/protractor/e2e-config/utils/upload-output');
+const smartRunnerFactory = require('./e2e/protractor/smartrunner-factory');
 const argv = require('yargs').argv;
 
 const projectRoot = path.resolve(__dirname);
 const downloadFolder = path.join(__dirname, 'e2e-downloads');
 const screenshotsFolder = path.resolve(__dirname, 'e2e-output');
-const e2eFolder = path.resolve(projectRoot, 'e2e');
+const e2eFolder = path.resolve(projectRoot, 'e2e/protractor');
 const E2E_HOST = process.env.E2E_HOST || 'http://localhost:4200';
 const BROWSER_RUN = !!process.env.BROWSER_RUN;
 const width = 1366;
@@ -50,43 +50,43 @@ exports.config = {
   },
 
   specs: [
-    './e2e/suites/actions/**/**/*test.ts',
-    './e2e/suites/actions-available/**/**/*test.ts',
-    './e2e/suites/application/**/*test.ts',
-    './e2e/suites/authentication/**/*test.ts',
-    './e2e/suites/extensions/**/*test.ts',
-    './e2e/suites/info-drawer/**/*test.ts',
-    './e2e/suites/list-views/**/*test.ts',
-    './e2e/suites/navigation/**/*test.ts',
-    './e2e/suites/pagination/**/*test.ts',
-    './e2e/suites/search/**/*test.ts',
-    './e2e/suites/viewer/**/*test.ts'
+    './e2e/protractor/suites/actions/**/**/*test.ts',
+    './e2e/protractor/suites/actions-available/**/**/*test.ts',
+    './e2e/protractor/suites/application/**/*test.ts',
+    './e2e/protractor/suites/authentication/**/*test.ts',
+    './e2e/protractor/suites/extensions/**/*test.ts',
+    './e2e/protractor/suites/info-drawer/**/*test.ts',
+    './e2e/protractor/suites/list-views/**/*test.ts',
+    './e2e/protractor/suites/navigation/**/*test.ts',
+    './e2e/protractor/suites/pagination/**/*test.ts',
+    './e2e/protractor/suites/search/**/*test.ts',
+    './e2e/protractor/suites/viewer/**/*test.ts'
   ],
 
   suites: {
-    copyMoveActions: './e2e/suites/actions/copy-move/**/**/*test.ts',
-    createActions: './e2e/suites/actions/create/**/**/*test.ts',
-    deleteActions: './e2e/suites/actions/delete/**/**/*test.ts',
-    editActions: './e2e/suites/actions/edit/**/**/*test.ts',
-    favoriteActions: './e2e/suites/actions/favorite/**/**/*test.ts',
-    libraryActions: './e2e/suites/actions/library/**/**/*test.ts',
-    shareActions: './e2e/suites/actions/share/**/**/*test.ts',
-    uploadDownloadActions: './e2e/suites/actions/upload-download/**/**/*test.ts',
+    copyMoveActions: './e2e/protractor/suites/actions/copy-move/**/**/*test.ts',
+    createActions: './e2e/protractor/suites/actions/create/**/**/*test.ts',
+    deleteActions: './e2e/protractor/suites/actions/delete/**/**/*test.ts',
+    editActions: './e2e/protractor/suites/actions/edit/**/**/*test.ts',
+    favoriteActions: './e2e/protractor/suites/actions/favorite/**/**/*test.ts',
+    libraryActions: './e2e/protractor/suites/actions/library/**/**/*test.ts',
+    shareActions: './e2e/protractor/suites/actions/share/**/**/*test.ts',
+    uploadDownloadActions: './e2e/protractor/suites/actions/upload-download/**/**/*test.ts',
 
-    actionsAvailableFilesFolders: './e2e/suites/actions-available/files-folders/**/**/*test.ts',
-    actionsAvailableLibraries: './e2e/suites/actions-available/libraries/**/**/*test.ts',
-    actionsAvailableSpecialPermissions: './e2e/suites/actions-available/special-permissions/**/**/*test.ts',
-    actionsAvailableNewMenu: './e2e/suites/actions-available/new-menu/**/**/*test.ts',
+    actionsAvailableFilesFolders: './e2e/protractor/suites/actions-available/files-folders/**/**/*test.ts',
+    actionsAvailableLibraries: './e2e/protractor/suites/actions-available/libraries/**/**/*test.ts',
+    actionsAvailableSpecialPermissions: './e2e/protractor/suites/actions-available/special-permissions/**/**/*test.ts',
+    actionsAvailableNewMenu: './e2e/protractor/suites/actions-available/new-menu/**/**/*test.ts',
 
-    application: './e2e/suites/application/**/*test.ts',
-    authentication: './e2e/suites/authentication/**/*test.ts',
-    extensions: './e2e/suites/extensions/**/*test.ts',
-    infoDrawer: './e2e/suites/info-drawer/**/*test.ts',
-    listViews: './e2e/suites/list-views/**/*test.ts',
-    navigation: './e2e/suites/navigation/**/*test.ts',
-    pagination: './e2e/suites/pagination/**/*test.ts',
-    search: './e2e/suites/search/**/*test.ts',
-    viewer: './e2e/suites/viewer/**/*test.ts'
+    application: './e2e/protractor/suites/application/**/*test.ts',
+    authentication: './e2e/protractor/suites/authentication/**/*test.ts',
+    extensions: './e2e/protractor/suites/extensions/**/*test.ts',
+    infoDrawer: './e2e/protractor/suites/info-drawer/**/*test.ts',
+    listViews: './e2e/protractor/suites/list-views/**/*test.ts',
+    navigation: './e2e/protractor/suites/navigation/**/*test.ts',
+    pagination: './e2e/protractor/suites/pagination/**/*test.ts',
+    search: './e2e/protractor/suites/search/**/*test.ts',
+    viewer: './e2e/protractor/suites/viewer/**/*test.ts'
   },
 
   SELENIUM_PROMISE_MANAGER: false,
@@ -140,8 +140,6 @@ exports.config = {
     showColors: true,
     defaultTimeoutInterval: 200000,
     includeStackTrace: true,
-    print: function () {
-    },
     ...(process.env.CI ? smartRunnerFactory.applyExclusionFilter() : {})
   },
 
@@ -189,8 +187,10 @@ exports.config = {
       paths: tsConfig.compilerOptions.paths
     });
 
+    // eslint-disable-next-line no-undef
     browser.manage().window().setSize(width, height);
 
+    // eslint-disable-next-line no-undef
     jasmine.getEnv().addReporter(
       new SpecReporter({
         spec: {
@@ -200,6 +200,7 @@ exports.config = {
       })
     );
 
+    // eslint-disable-next-line no-undef
     browser.driver.sendChromiumCommand('Page.setDownloadBehavior', {
       behavior: 'allow',
       downloadPath: downloadFolder
diff --git a/tsconfig.adf.json b/tsconfig.adf.json
index 4edf86a8b..66df13c0b 100644
--- a/tsconfig.adf.json
+++ b/tsconfig.adf.json
@@ -23,7 +23,7 @@
     "paths": {
       "@alfresco/adf-testing": ["../alfresco-ng2-components/lib/testing"],
       "@alfresco/adf-testing/shared": ["../alfresco-ng2-components/lib/testing/src/lib/shared"],
-      "@alfresco/playwright-shared": ["e2e/playwright/shared/index.ts"],
+      "@alfresco/playwright-shared": ["projects/aca-playwright-shared/src/index.ts"],
       "@alfresco/adf-core": ["../alfresco-ng2-components/lib/core"],
       "@alfresco/adf-core/*": ["../alfresco-ng2-components/lib/core/*/public-api.ts"],
       "@alfresco/adf-core/shell": ["../alfresco-ng2-components/lib/core/shell/src/index.ts"],
@@ -38,9 +38,9 @@
       "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
       "@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"],
       "@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"],
-      "@alfresco/aca-folder-rules": ["projects/aca-folder-rules/src/public-api.ts"],
-      "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"],
       "@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"],
+      "@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"],
+      "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"],
       "@alfresco/aca-viewer": ["projects/aca-viewer/src/public-api.ts"],
       "@alfresco/aca-preview": ["projects/aca-preview/src/public-api.ts"],
       "package.json": ["package.json"],
diff --git a/tsconfig.json b/tsconfig.json
index 0a98d1d02..399e90fe4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,12 +26,12 @@
       "@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
       "@alfresco/aca-content/ms-office": ["projects/aca-content/ms-office/src/public-api.ts"],
       "@alfresco/aca-testing-shared": ["projects/aca-testing-shared/src/index.ts"],
-      "@alfresco/aca-folder-rules": ["projects/aca-folder-rules/src/public-api.ts"],
+      "@alfresco/aca-content/folder-rules": ["projects/aca-content/folder-rules/src/public-api.ts"],
       "@alfresco/aca-content": ["projects/aca-content/src/public-api.ts"],
       "@alfresco/aca-content/about": ["projects/aca-content/about/src/public-api.ts"],
       "@alfresco/aca-viewer": ["projects/aca-viewer/src/public-api.ts"],
       "@alfresco/aca-preview": ["projects/aca-preview/src/public-api.ts"],
-      "@alfresco/playwright-shared": ["e2e/playwright/shared/index.ts"],
+      "@alfresco/playwright-shared": ["projects/aca-playwright-shared/src/index.ts"],
       "package.json": ["package.json"]
     }
   },